Ronan Browne
d105415fb0
ES-1140: Merging forward updates from 4.7 to 4.8 (2023-07-20)
2023-08-23 16:40:17 +01:00
Shams Asari
6edb1b779c
Placate Detekt
2023-08-23 15:03:08 +01:00
Shams Asari
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
Rick Parker
53fe0e6cf8
Merge pull request #7453 from corda/shams-4.10-merge-c8135331
...
ENT-6876, ENT-10045: 4.9 to 4.10 forward merge
2023-08-23 14:32:36 +01:00
Adel El-Beik
9698c53e6e
Merge pull request #7446 from corda/colljos/encryption_receiver_self_recovery
...
ENT-10538 Encrypted Distribution Lists: changes required to allow Receiver self-recovery of failed flows
2023-08-23 13:08:03 +01:00
Jose Coll
3b78b46619
Merge remote-tracking branch 'origin/release/os/4.11' into colljos/encryption_receiver_self_recovery
2023-08-23 11:20:16 +01:00
Rick Parker
ec261cb0c3
ENT-10306 Swap logic from receive finality to receive transaction flows ( #7451 )
...
* Swap logic from receive finality to receive transaction flows
* Remote TPV check
* Make finality check more robust
* Make emulation of finality in tests compliant with changes
* Improve deferring of ack when issue transaction
* Remove API checking of SignedTransactionWithDistributionList as added it 4.11 so cannot be incompatible, yet.
* Regenerated API file from 4.10 to check only compatibility with 4.10
* Move function to private
* Revert "Regenerated API file from 4.10 to check only compatibility with 4.10"
This reverts commit 6428f957e1
2023-08-23 10:09:42 +01:00
Jose Coll
1aaff8e6ae
Clean-up.
2023-08-22 16:08:00 +01:00
Jose Coll
4fef01a5b0
Clean-up.
2023-08-22 16:03:13 +01:00
Ronan Browne
66a49ea4cd
Reverted changes to lib/quasar.jar from the previous commit ( #7454 )
2023-08-22 13:38:16 +01:00
Ronan Browne
a60ed8e479
ES-1140: use java 8u382 in base image
2023-08-22 13:06:23 +01:00
Jose Coll
32c3b0c517
Merge remote-tracking branch 'origin/release/os/4.11' into colljos/encryption_receiver_self_recovery
2023-08-22 12:31:29 +01:00
Shams Asari
46914a2b35
Merge branch 'release/os/4.9' into shams-4.10-merge-c8135331
2023-08-22 11:24:38 +01:00
Shams Asari
4a7a4eb5bb
ENT-9876: Encrypting the ledger recovery participant distribution list ( #7423 )
2023-08-22 11:14:37 +01:00
Rick Parker
c813533191
Merge pull request #7450 from corda/shams-4.9-merge-5cdbec9d
...
ENT-6876: 4.8 to 4.9 forward merge
2023-08-22 11:11:38 +01:00
Shams Asari
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
Jose Coll
3f067d9002
Check sender and receiver timestamps are same.
2023-08-21 12:28:23 +01:00
Shams Asari
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
Shams Asari
825a970b92
ENT-6750: Checkpoint serialisation to support primitive void.class ( #7448 )
2023-08-21 09:49:39 +01:00
Jose Coll
a6786769e5
ENT-10306 Determine whether to use 2PF based on the execution CorDapp TPV. ( #7447 )
2023-08-21 09:11:00 +01:00
Jose Coll
6a7e9000a4
Detekt
2023-08-18 17:26:22 +01:00
Jose Coll
4a6e99556b
Incorporating PR review feedback.
2023-08-18 17:22:42 +01:00
Jose Coll
06e43eb9e2
Fixes following merge.
2023-08-17 08:47:58 +01:00
Jose Coll
f565232f36
Fix compilation errors following merge.
2023-08-16 18:05:18 +01:00
Jose Coll
9b7affa6b3
Fix compilation errors following merge.
2023-08-16 17:40:33 +01:00
Jose Coll
daea257214
Merge remote-tracking branch 'origin/release/os/4.11' into colljos/encryption_receiver_self_recovery
2023-08-16 17:38:34 +01:00
Jose Coll
492373d180
Introduction of Sender and Receiver Distribution Lists to support receiver self-recovery mode.
2023-08-16 17:02:58 +01:00
Jose Coll
d2029b3e0c
ENT-10290 Create Enterprise Aliases for all new Recovery Flows ( #7440 )
2023-08-15 15:32:54 +01:00
Jose Coll
0130914c89
ENT-9927 Ledger Recovery: synchronise changes from ENT -> OS. ( #7445 )
2023-08-15 15:32:00 +01:00
Shams Asari
e0e4f51ba2
ENT-10285: Remove experimental DJVM support ( #7442 )
2023-08-09 08:44:32 +01:00
Shams Asari
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
Adel El-Beik
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
Adel El-Beik
1eb3b3b42b
Merge pull request #7443 from corda/adel/ENT-10371
...
ENT-10371: Fix unit test failure in CordaServiceLifecycleTests.
2023-08-02 20:51:34 +01:00
Adel El-Beik
f543e47652
ENT-10371: Fix unit test failure in CordaServiceLifecycleTests.
2023-08-02 13:39:04 +01:00
Adel El-Beik
3465917a93
ENT-10122: Fixed detekt issue.
2023-08-01 15:48:34 +01:00
Adel El-Beik
c614b21a2a
ENT-10122: Added annotation for backwards compatibility and added test.
2023-08-01 15:11:21 +01:00
Adel El-Beik
f0cdc6a25e
Merge pull request #7439 from corda/shams-externalid-multiple-keys-bug
...
ENT-10045: Fix vault query bug when same externalId is mapped to multiple keys
2023-08-01 10:15:56 +01:00
Adel El-Beik
106ccd7fe8
ENT-10273: Upgrade BC to 1.75. ( #7422 )
...
* ENT-10273: Upgrade BC to 1.75.
* Use BC 1.70 for core-deterministic avoid issue with primality checking done in 1.70+ which uses random numbers
---------
Co-authored-by: Shams Asari <shams.asari@r3.com>
2023-07-31 10:42:28 +01:00
Shams Asari
4b7e2a3995
ENT-10045: Fix vault query bug on externalId and mapping with multiple keys
2023-07-26 12:46:27 +01:00
Shams Asari
de67ab7377
ENT-9876: Encrypting the ledger recovery participant distribution list
2023-07-25 14:59:43 +01:00
Rick Parker
6ec8855c6e
Add system property to disable public key caching ( #7438 )
2023-07-21 08:56:22 +01:00
Adel El-Beik
8ad072e3fa
Merge pull request #7428 from corda/tom/ENT-9875/net-params-backwards-compatability-test
...
ENT-9875: Added test to deserialise 4.11 network params
2023-07-20 15:27:57 +01:00
Jose Coll
7d1d2297e7
ENT-10289 Ensure Sender and Receiver Distribution records share the same timestamp ( #7437 )
2023-07-20 09:55:44 +01:00
Rick Parker
48213b5f8c
ENT-10284 Performance optimise deserialisation ( #7425 )
2023-07-20 09:51:35 +01:00
Adel El-Beik
117d319317
ENT-10122: Removed commented code left in.
2023-07-20 09:31:46 +01:00
Adel El-Beik
aa9e41c7c2
ENT-10122: Updated tests to include consuming transaction id in the Vault.Update check.
2023-07-19 16:36:39 +01:00
Adel El-Beik
60bb4c58f2
ENT-10122: Made the consuming tx id field nullable, added missing changelog file.
2023-07-18 17:45:53 +01:00
Waldemar Żurowski
bcf4c11420
Merge pull request #7436 from corda/wzur-r3/ES-839/merge/release/os/4.10/with/release/os/4.11/2023-07-18-2
...
ES-839: Merging forward updates from release/os/4.10 to release/os/4.11 (2023-07-18)
2023-07-18 13:51:58 +01:00
Waldemar Zurowski
aab74aa6a4
ES-839: Merging forward updates from release/os/4.10 to release/os/4.11 (2023-07-18)
2023-07-18 11:26:17 +01:00
Waldemar Żurowski
71e48ed6f2
Merge pull request #7435 from corda/ronanb/merge-4.10--4.11-2023-07-18
...
ES-657: Merging forward updates from 4.10 to 4.11 (2023-07-18)
2023-07-18 11:24:54 +01:00
