5b812a56c2
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-10-14-372
2024-10-15 16:33:13 +01:00
3bf717a747
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-10-10-367
2024-10-14 16:11:30 +01:00
a2537d59f5
ENT-12291: Removed from rotated keys from public api.
2024-10-09 17:16:04 +01:00
282ee95188
ENT-11975: Contract key rotation ( #7806 )
...
ENT-11975: Contract key rotation implementation.
2024-10-07 16:55:50 +01:00
f968aa34d8
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-01
2024-10-01 03:33:29 +00:00
5f39faf438
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-25
2024-09-25 13:19:28 +00:00
63405a28ea
Recognise OU in DSL node X500 name
2024-09-24 17:16:47 +01:00
0d85c6d27f
ENT-12094 - Upgraded sshd-common ( #7810 )
2024-09-19 16:02:58 +01:00
433deb94dd
Upgraded sshd-common
2024-09-16 12:01:48 +01:00
e0e574caf0
Upgraded sshd-common
2024-09-16 11:37:40 +01:00
237d0032ea
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-08-12-297
...
# Conflicts:
# constants.properties
# core-deterministic/build.gradle
# core/src/main/kotlin/net/corda/core/flows/ReceiveTransactionFlow.kt
# serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializePublicKeyTest.kt
2024-08-13 10:22:05 +01:00
ed3875c8b7
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-08-12-297
2024-08-12 19:27:12 +01:00
38f24d33ba
ENT-12072 ENT-12073: Check notary whitelist when resolving old identities and don't depend on network map availability first for old network parameters ( #7781 )
...
Nodes currently will try and resolve network parameters from the network map and fail if it not available, rather than preferring the availability of a node they are currently interacting with.
A migrated notary identity could not be resolved on new nodes added post-migration, but the old identity is available in the network parameter notary whitelist.
Added a test that covers both bugs in a single reproduction test that simulates the scenario in which both were uncovered.
2024-08-12 19:19:30 +01:00
be433c1fd0
ENT-10100 Filter out UNVERIFIED txns + move TransactionStatus package. ( #7543 )
2023-10-24 17:01:37 +01:00
bc718088fe
ENT-10100 Changes required to support recovery of IN_FLIGHT transactions. ( #7541 )
2023-10-24 10:38:46 +01:00
67837523ab
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-10-06
2023-10-06 16:44:41 +00:00
de4eda5a35
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-10-06
2023-10-06 13:47:28 +00:00
1b332bb2e0
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-10-05
2023-10-05 14:18:04 +00:00
4325131c27
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-05
2023-10-05 10:17:26 +00:00
3cdb8901b4
Don't bind unless shared memory says it is free ( #7520 )
2023-10-05 11:16:12 +01:00
b16c93e76b
ENT-6875 Deserialisation exception on output state can cause ledger inconsistency ( #7476 )
2023-09-20 08:44:56 +01:00
4a6e99556b
Incorporating PR review feedback.
2023-08-18 17:22:42 +01:00
daea257214
Merge remote-tracking branch 'origin/release/os/4.11' into colljos/encryption_receiver_self_recovery
2023-08-16 17:38:34 +01:00
e0e4f51ba2
ENT-10285: Remove experimental DJVM support ( #7442 )
2023-08-09 08:44:32 +01:00
de67ab7377
ENT-9876: Encrypting the ledger recovery participant distribution list
2023-07-25 14:59:43 +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
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
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
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
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
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
7bd3f5dd33
ENT-9147 Remove un-notarised transactions upon Double Spend. ( #7324 )
2023-04-19 15:31:47 +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
