4524c6522f
ENT-12401: Fixed compilation errors and changed alias from 4.12 variant.
2024-11-06 15:17:23 +00:00
d54f1e2eeb
ENT-12373: Can now cope with diff input states from diff rotated CorDapps.
2024-11-06 13:39:32 +00:00
828066a646
Backport contract key rotation to 4.9.
2024-10-09 14:46:57 +01:00
282ee95188
ENT-11975: Contract key rotation ( #7806 )
...
ENT-11975: Contract key rotation implementation.
2024-10-07 16:55:50 +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
71e187dddb
ENT-11118: Netty SSL handshake fix ( #5028 )
...
* ENT-11118: Added fix for netty SSL handshake fail
2023-12-15 17:16:15 +00:00
fb4247d5c9
ENT-10756: Use normal select count query for totalStatesAvailable ( #7492 )
...
Some DBs do not like the use of `distinct` in the count query for the `Page.totalStatesAvailable` result. It turns out it's not needed anyway and a non-distinct select count works as well.
2023-09-08 15:55:23 +01:00
134ff60af8
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow it to be enabled again with a system property.
2023-08-31 18:33:34 +01:00
fb303a20bf
Merge branch 'release/os/4.8' into shams-4.9-merge-5cdbec9d
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2023-08-21 14:18:09 +01:00
5cdbec9ddf
ENT-6876: Optimised vault query to not query for total state count if the first page isn't full ( #7449 )
2023-08-21 10:30:42 +01:00
4b7e2a3995
ENT-10045: Fix vault query bug on externalId and mapping with multiple keys
2023-07-26 12:46:27 +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
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
0bfce451ea
ENT-10013: Vault service refactoring backport
2023-06-06 16:17:58 +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
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
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
34d4a5f667
Fwd-merge from OS 4.8
2023-04-26 22:54:20 +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
c58c49d27a
Upgrade corda/crash, snakeyaml
2023-04-20 14:01:20 +01:00
29dfda3730
Resolved build-check issues
2023-04-18 20:34:42 +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
ddb979d693
ENT-8898: Revert change made to externalCrlSource checking
...
It's now moved back to createPKIXRevocationChecker(). RevocationConfig.enrichExternalCrlSource has also been removed, and moved to where it's called.
2023-04-06 14:42:38 +01:00
1e6ccfdb60
ENT-8898: Replaced JDK cert revocation with custom plugable implementation ( #7322 )
2023-04-03 10:26:01 +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
3e25f7fd1a
ENT-8817 OS port of compute deadlock changes
2022-11-25 09:31:41 +00:00
0131163db0
ENT-8814 - back-fit changes from Enterprise to OS ( #7272 )
2022-11-24 18:13:35 +00:00
188027c1f5
ENT-8811 OS port of flow draining fixes ( #7269 )
2022-11-24 10:27:00 +00:00
8d34be5129
ENT-6714: Fix Corda logging database password
...
This commit ports the previously implemented fix from Corda ENT. Due to
the unrelated changes and merge conflict, the fix has been manually
copied rather than cherry-picked.
2022-06-23 23:03:10 +01:00
47ec57186e
Merge commit '91ef44dc12b8cc921b9ec0a37b44de75c256d92d' into chrisr3-os-4.8-merge
2022-05-23 12:27:49 +01:00
57ddafa148
ENT-6532: Close any deserialization classloader that is evicted from the cache.
...
Also revert disabling caches when reading URLs.
2022-05-20 11:51:01 +01:00
ad5193f135
ENT-6636: Removing commons-codec - not used, at least not as a compile time dep.
2022-05-10 13:46:48 +01:00
bc6a6ee2ae
Merge pull request #7155 from corda/adel/ENT-6743
...
ENT-6743: SuspensionMeta in FlowInfo is null when a runnable flow has previously been hospitalized
2022-04-26 17:21:30 +01:00
c1002697c7
ENT-6743: Reverted RetryFlowMockTest as the retry op only available on ENT.
2022-04-25 11:30:24 +01:00
fa607024c2
ENT-6743: Contains method of flow hospital now correctly returns if flow is in hospital. Historic patient records not used.
2022-04-25 11:24:21 +01:00
54a131313d
ENT-6728: Archiving of a legal identity now done in its own txn, to cope with clustered notary nodes that have common legal identities between nodes (the service name one is common)
2022-03-15 12:25:39 +00:00
1e227fdfc4
ENT-6711 - Fix for upgrade to Jackson 2.12 and beyond (actual upgrade to 2.13.1) ( #7096 )
...
* NOTICK - Don't know what the JIRA is but wanted to share.
* Updates to resolve bukld issues
* NOTICK: Fixed JDK11 version to prevent capsule version error
* ENT-6711: Added comment for use of jackson_kotlin_version.
* ENT-6711: Avoid deprecation warning, switched to the default method.
Co-authored-by: Chris Cochrane <chris.cochrane@r3.com >
Co-authored-by: Adel El-Beik <adel.el-beik@r3.com >
2022-03-07 11:08:06 +00:00
