f543e47652
ENT-10371: Fix unit test failure in CordaServiceLifecycleTests.
2023-08-02 13:39:04 +01:00
7d1d2297e7
ENT-10289 Ensure Sender and Receiver Distribution records share the same timestamp ( #7437 )
2023-07-20 09:55:44 +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
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
5ecb36c302
Merge fix
2023-07-13 11:31:35 +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
1e0f7cd690
Merge fix
2023-07-07 15:29:44 +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
0f2312a201
ENT-8983 - Postgres migration failure ( #7408 )
...
* Set DB transaction isolation level only if its going to change; upgraded dependencies
* Removed duplicate changeset
2023-07-07 13:29:35 +01:00
0e877958fe
ENT-10009 Enhance SendTransactionFlow to allow sending a txn to multiple sessions. ( #7393 )
2023-06-09 17:19:43 +01:00
0b8536b97c
Merge pull request #7395 from corda/shams-thread-names
...
ENT-10016: Give all node threads descriptive names
2023-06-09 16:05:48 +01:00
5b3180bf7b
ENT-10016: Give all node threads descriptive names
2023-06-09 11:17:26 +01:00
c56ee1cc73
Fix failing slow test. ( #7387 )
2023-06-07 09:30:24 +01:00
0bfce451ea
ENT-10013: Vault service refactoring backport
2023-06-06 16:17:58 +01:00
ff0693a598
ENT-9793: Use streams when loading vault query pages
2023-06-06 13:13:22 +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
4dcd9245d3
ENT-9806: Using Artemis SSLContextFactory service to pass in custom TrustManagerFactory. This removes the need to copy code from NettyAcceptor.
2023-06-02 15:10:58 +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
a817218b08
ENT-9806: Added peer info to SSL handshake logging, and other changes for ENT merge ( #7380 )
2023-06-01 15:51:58 +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
0cc3ffe1d6
ENT-9941: Moved new connector factory to node-api ( #7369 )
2023-05-16 08:45:01 +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
13ca00deea
ENT-9941: Moved new connector factory to node-api
2023-05-12 17:42:27 +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
0951853207
ENT-6515: Cherry-pick of ENT-6315 - Allow dumping of paused flows ( #7008 ) ( #7363 )
...
This is a cherry-pick of https://github.com/corda/corda/pull/7008 , which also resolves ENT-6515
Co-authored-by: Dan Newton <dan.newton@r3.com >
2023-05-11 09:49:40 +01:00
cca09fef58
Merge branch 'release/os/4.10' into cc/merge/os-4.10-os-4.11/03-may-2023
...
Fwd-merge from OS 4.11.
2023-05-03 17:47:44 +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
2f53e8115f
Fwd-merge from OS 4.9
2023-04-27 16:45:16 +01:00
34d4a5f667
Fwd-merge from OS 4.8
2023-04-26 22:54:20 +01:00
9ba3919980
ENT-9583 Public key caching of encoded form (OS) ( #7332 )
2023-04-26 17:49:52 +01:00
1d4feedc62
ENT-9147 Propagate and handle Notary Error (Part 2) ( #7346 )
2023-04-26 09:06:32 +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
e5a6cac9e8
Flakey test fix
2023-04-21 16:00:19 +01:00
190acdc87c
NOTICK Fix failing StateMachineFinalityErrorHandlingTest's. ( #7339 )
2023-04-20 15:45:10 +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
c9fd22855e
Resolve compile issues
2023-04-11 12:16:02 +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
