991aa9fff9
ES-853: Merging forward updates from 4.10 to 4.11 (2023-07-17)
2023-07-17 14:35:59 +01:00
03a9a95216
Merge branch 'release/os/4.10' into shams-4.11-merge-6b655c0f
...
# Conflicts:
# .github/workflows/check-pr-title.yml
# node/src/main/kotlin/net/corda/node/internal/ServicesForResolutionImpl.kt
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2023-07-17 10:17:38 +01:00
b01f85fb11
Merge branch 'release/os/4.9' into connelm/merge-4.9-4.10-2023-07-14
...
# Conflicts:
# build.gradle
2023-07-14 18:19:55 +01:00
58ecce1713
ENT-9875: New network parameters ( #7398 )
...
* ENT-9875: Added new network parameters
- Added `transactionRecoveryPeriod`
- Added `confidentialIdentityPreGenerationPeriod`
These new parameters are currently set to be nullable meaning they can be ignored and the duration if not specified will be null rather than, e.g., 0. This currently allows for nothing changing/breaking in the node-api
_Note: if these params can stay as nullable then the deprecated constructor might not even be needed (since the existing one will still work), needs to be discussed._
2023-07-14 12:02:21 +01:00
befae353ac
ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13)
2023-07-13 15:25:55 +01:00
3a6deeefa7
Merge branch 'release/os/4.9' into shams-4.10-merge-e6a80822
...
# Conflicts:
# .github/workflows/check-pr-title.yml
# .snyk
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPClientSslErrorsTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2023-07-13 10:53:30 +01:00
6bcc843f19
ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)
2023-07-13 07:07:17 +01:00
010a9a6c08
ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12)
2023-07-12 20:02:32 +01:00
b410cd2a5d
ES-853: update Artifactory refrences to new public location ( #7416 )
...
* ES-853: update artifactory references to new public location
2023-07-12 17:36:57 +01:00
671ce9ef97
Merge branch 'os-4.8-merge-point' into shams-4.9-merge-0b8536b9
...
# Conflicts:
# .github/workflows/check-pr-title.yml
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
2023-07-07 15:20:43 +01:00
602190095c
Merge remote-tracking branch 'origin/release/os/4.10' into adel/merge-from-os4.10-23jun-23
2023-06-23 11:39:02 +01:00
0bfce451ea
ENT-10013: Vault service refactoring backport
2023-06-06 16:17:58 +01:00
5510cb151b
Merge pull request #7375 from corda/shams-vault-page-overlap
...
ENT-9793: Added Page.previousPageAnchor to allow detection of vault changes whilst pages are loaded
2023-06-06 11:07:45 +01:00
f791adf442
ENT-9924 (Follow-up) Update recording of transaction flow recovery metadata into Send/Receive transaction flows. ( #7382 )
2023-06-05 16:59:06 +01:00
2c775bcc41
ENT-9924 Update recording of transaction flow recovery metadata into Send/Receive transaction flows. ( #7374 )
2023-06-02 16:05:28 +01:00
5706f89639
Merge branch 'release/os/4.8' into shams-4.9-frwd-merge-a817218b
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/revocation/RevocationTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/artemis/BrokerJaasLoginModule.kt
# node/src/main/kotlin/net/corda/node/internal/artemis/CertificateChainCheckPolicy.kt
# node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
2023-06-01 16:37:57 +01:00
d37df1572e
Merge remote-tracking branch 'origin/release/os/4.9' into adel/merge-from-4.9
2023-05-31 12:27:41 +01:00
e15f92b526
Merge pull request #7355 from corda/shams-crl-netty-threads-blocked
...
ENT-9806: Netty threads no longer blocked if CRL endpoints are unresponsive
2023-05-27 10:43:41 +01:00
ed08b2c5de
ENT-9793: Added Page.previousPageAnchor to allow detection of vault changes whilst pages are loaded
2023-05-26 12:52:06 +01:00
2e29e36e01
ENT-9923 Ledger Recovery: split out recovery metadata into own database schema. ( #7364 )
2023-05-24 09:42:09 +01:00
e6336666c2
Merge branch 'release/os/4.10' into shams-4.11-fwrd-merge-046ed0ac
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/X509Utilities.kt
2023-05-22 09:55:19 +01:00
c065021328
ENT-8827: The ordering of vault query results is clobbered by ServiceHub.loadStates
2023-05-18 15:59:25 +01:00
6e06630980
Upgraded sshd-common compile-time dependency
2023-05-18 11:25:46 +01:00
0a617097be
ENT-9806: Prevent Netty threads being blocked due to unresponsive CRL endpoints
2023-05-15 12:59:24 +01:00
a37d09486f
Merge branch 'release/os/4.9' into shams-4.10-fwrd-merge-7b7e3847
2023-05-15 09:55:31 +01:00
151dc16a0e
Merge branch 'release/os/4.8' into shams-4.9-frwd-merge-31a34e5a
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
2023-05-12 14:34:33 +01:00
31a34e5a5c
ENT-9941: Improved Netty logging, especially of the embedded broker ( #7365 )
2023-05-12 10:11:09 +01:00
c3e39a7052
ENT-9842 Re-factor 2PF to support issuance transactions (no notarisation) with observers. ( #7349 )
...
Re-factor 2PF to support issuance transactions (no notarisation) with observers.
2023-04-27 16:58:17 +01:00
e12ab8194f
Merge branch 'release/os/4.7' into cc/merge/os-4.7-os-4.8/25-apr-2023
...
Fwd-merge from OS 4.7.
2023-04-25 14:54:21 +01:00
91c38fa84b
Merge branch 'release/os/4.6' into cc/merge/os-4.6-os-4.7/24-apr-2023
...
Fwd-merge from OS 4.6.
2023-04-24 20:13:50 +01:00
c58c49d27a
Upgrade corda/crash, snakeyaml
2023-04-20 14:01:20 +01:00
7bd3f5dd33
ENT-9147 Remove un-notarised transactions upon Double Spend. ( #7324 )
2023-04-19 15:31:47 +01:00
29dfda3730
Resolved build-check issues
2023-04-18 20:34:42 +01:00
2556fde971
Merge branch 'release/os/4.10' into shams-4.11-frwd-merge-fc531761
2023-04-13 10:55:03 +01:00
7b6fc51710
Merge branch 'release/os/4.9' into shams-4.10-fwrd-merge-ceb76c56
...
# Conflicts:
# common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/SSLHelper.kt
2023-04-12 16:23:59 +01:00
724a4e5a36
Merge branch 'release/os/4.8' into shams-4.9-fwrd-merge-d140cb59
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
# node/src/main/kotlin/net/corda/node/internal/artemis/CertificateChainCheckPolicy.kt
2023-04-11 11:54:26 +01:00
1e6ccfdb60
ENT-8898: Replaced JDK cert revocation with custom plugable implementation ( #7322 )
2023-04-03 10:26:01 +01:00
4beeb470df
Additional signature verification and validation: recordTransactions()
2023-03-28 12:48:33 +01:00
0213861d22
ENT-9569: Apply the 60s SSL handshake timeout to the embedded Artemis server ( #7315 )
2023-03-22 13:22:12 +00:00
fda5cd07d2
INFRA-1955: Merging forward from 4.10 to 4.11
2023-03-22 11:24:31 +00:00
d2900d54ab
ENT-6875 Two Phase Finality Flow - improve ledger consistency & recoverability ( #7290 )
2023-03-22 10:47:51 +00:00
ec67e77c76
ENT-9476: Added in missing Kotlin API.
2023-03-07 18:18:37 +00:00
f7c654bc65
NOTICK: Resolved Kotlin api change.
2023-03-07 13:30:10 +00:00
2808347b58
Merge branch 'release/os/4.9' into adel/merge-from-OS4.10-7Mar23
2023-03-07 12:12:55 +00:00
e216b7715e
ENT-9476: Notary handle timeout can now be passed to driver. ( #7302 )
...
* ENT-9476: Notary handle timeout can now be passed to driver.
2023-03-03 17:54:52 +00:00
1a0d354903
ENT-8983 Upgrade H2 and liquibase to latest version ( #7298 )
2023-03-03 15:10:25 +00:00
044b83508e
ENT-8823: Added copyBaggageToTags configuration option to control if baggage is copied to tags.
...
Switched SimplLogTelemetryComponent to info logs.
2022-12-08 16:54:38 +00:00
7a133f687c
ENT-6893: First cut of telemetry integration. ( #7247 )
...
First cut of telemetry integration.
Open telemetry can be enabled in two ways, first is via an opentelemetry java agent specified on the command line. With this way you get the advantage of spans created from other libraries, like hibernate. The java agent does byte code rewriting to insert spans.
The second way is with the open telemetry driver (that links with the opentelemetry sdk). This is a fat jar provided with this project and needs to go into the node drivers directory.
2022-10-28 14:41:39 +01:00
c6197bbfaf
ENT-6784: Change Artemis Server logging to WARN ( #7215 )
2022-07-12 15:06:55 +01:00
d6fc10e632
ENT-6784: Change special provisions for Artemis Server logging ( #7174 )
...
As a side effect of enabling warnings for Artemis was the following messages to be produced in the Node's log:
```
[WARN ] 2022-05-16T14:53:01,203Z [main] core.server. - AMQ222165: No Dead Letter Address configured for queue rpc.server in AddressSettings
[WARN ] 2022-05-16T14:53:01,203Z [main] core.server. - AMQ222166: No Expiry Address configured for queue rpc.server in AddressSettings
...
[WARN ] 2022-05-16T14:53:01,885Z [Thread-1 (ActiveMQ-server-org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl$6@70eb0c59)] core.server. - AMQ222165: No Dead Letter Address configured for queue p2p.inbound.DL5WQBEduTfiTzdLkg7iXcz5vY4oaJNdJr7Y4xaLvYszPj in AddressSettings
[WARN ] 2022-05-16T14:53:01,885Z [Thread-1 (ActiveMQ-server-org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl$6@70eb0c59)] core.server. - AMQ222166: No Expiry Address configured for queue p2p.inbound.DL5WQBEduTfiTzdLkg7iXcz5vY4oaJNdJr7Y4xaLvYszPj in AddressSettings
```
To suppress them a dedicated filter been added.
The change to logging configuration been tested locally using out-of-process integration tests.
2022-05-18 15:15:06 +01:00
