b16c93e76b
ENT-6875 Deserialisation exception on output state can cause ledger inconsistency ( #7476 )
2023-09-20 08:44:56 +01:00
13e32ae978
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-08
2023-09-08 16:48:35 +00:00
17f5cd5524
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-08
2023-09-08 14:56:56 +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
33798df51d
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-04
2023-09-04 10:21:44 +00:00
612cfcdb32
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-01
2023-09-01 20:47:47 +00: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
3ae6db8c04
ENT-10122: Now also added consuming transaction id in the resolveAndMakeUpdate code path. ( #7459 )
2023-08-30 11:33:01 +01:00
6edb1b779c
Placate Detekt
2023-08-23 15:03:08 +01:00
fe416879cd
Merge branch 'release/os/4.10' into shams-4.11-merge-53fe0e6c
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2023-08-23 14:56:46 +01:00
4fef01a5b0
Clean-up.
2023-08-22 16:03:13 +01:00
32c3b0c517
Merge remote-tracking branch 'origin/release/os/4.11' into colljos/encryption_receiver_self_recovery
2023-08-22 12:31:29 +01:00
46914a2b35
Merge branch 'release/os/4.9' into shams-4.10-merge-c8135331
2023-08-22 11:24:38 +01:00
4a7a4eb5bb
ENT-9876: Encrypting the ledger recovery participant distribution list ( #7423 )
2023-08-22 11:14:37 +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
a6786769e5
ENT-10306 Determine whether to use 2PF based on the execution CorDapp TPV. ( #7447 )
2023-08-21 09:11:00 +01:00
6a7e9000a4
Detekt
2023-08-18 17:26:22 +01:00
4a6e99556b
Incorporating PR review feedback.
2023-08-18 17:22:42 +01:00
06e43eb9e2
Fixes following merge.
2023-08-17 08:47:58 +01:00
f565232f36
Fix compilation errors following merge.
2023-08-16 18:05:18 +01:00
9b7affa6b3
Fix compilation errors following merge.
2023-08-16 17:40:33 +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
492373d180
Introduction of Sender and Receiver Distribution Lists to support receiver self-recovery mode.
2023-08-16 17:02:58 +01:00
0130914c89
ENT-9927 Ledger Recovery: synchronise changes from ENT -> OS. ( #7445 )
2023-08-15 15:32:00 +01:00
e0e4f51ba2
ENT-10285: Remove experimental DJVM support ( #7442 )
2023-08-09 08:44:32 +01:00
32af6f5c2d
ENT-10416: Rename ledger recovery tx_id columns to transaction_id ( #7444 )
...
This is so that the node archiving service, which scans for tables containing "transaction_id" column, can automatically archive the sender and receiver distribution record information with the transaction.
2023-08-09 08:43:21 +01:00
eccb9b4af6
Merge pull request #7430 from corda/adel/ENT-10122
...
ENT-10122: Add consuming transaction id to vault states table.
2023-08-07 13:35:04 +01:00
f543e47652
ENT-10371: Fix unit test failure in CordaServiceLifecycleTests.
2023-08-02 13:39:04 +01:00
3465917a93
ENT-10122: Fixed detekt issue.
2023-08-01 15:48:34 +01:00
c614b21a2a
ENT-10122: Added annotation for backwards compatibility and added test.
2023-08-01 15:11:21 +01:00
4b7e2a3995
ENT-10045: Fix vault query bug on externalId and mapping with multiple keys
2023-07-26 12:46:27 +01:00
de67ab7377
ENT-9876: Encrypting the ledger recovery participant distribution list
2023-07-25 14:59:43 +01:00
7d1d2297e7
ENT-10289 Ensure Sender and Receiver Distribution records share the same timestamp ( #7437 )
2023-07-20 09:55:44 +01:00
aa9e41c7c2
ENT-10122: Updated tests to include consuming transaction id in the Vault.Update check.
2023-07-19 16:36:39 +01:00
60bb4c58f2
ENT-10122: Made the consuming tx id field nullable, added missing changelog file.
2023-07-18 17:45:53 +01:00
669d6590af
ENT-10122: Add consuming transaction id to vault states table.
2023-07-17 17:58:31 +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
