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
Waldemar Żurowski
6abbc6a973
Merge pull request #7434 from corda/wzur-r3/ES-839/merge/release/os/4.9/with/release/os/4.10/2023-07-18
...
ES-839: Merging forward updates from release/os/4.9 to release/os/4.10 (2023-07-18)
2023-07-18 11:24:33 +01:00
Waldemar Zurowski
fa10eb39c2
ES-839: Merging forward updates from release/os/4.9 to release/os/4.10 (2023-07-18)
2023-07-18 08:49:20 +01:00
Ronan Browne
2f80e5a252
ES-657: Merging forward updates from 4.10 to 4.11 (2023-07-18)
2023-07-18 08:48:54 +01:00
Ronan Browne
08baf823a5
Merge pull request #7431 from corda/ronanb/merge-4.9--4.10-2023-07-17
...
ES-657: Merging forward updates from 4.9 to 4.10 (2023-07-17)
2023-07-18 08:43:38 +01:00
Waldemar Żurowski
c7296c0deb
Merge pull request #7433 from corda/wzur-r3/ES-839/merge/release/os/4.8/with/release/os/4.9/2023-07-17
...
ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17)
2023-07-18 08:33:33 +01:00
Waldemar Zurowski
e23efb0b2d
ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17)
2023-07-17 22:57:24 +01:00
Waldemar Żurowski
6a22494431
Merge pull request #7432 from corda/wzur-r3/ES-839/merge/release/os/4.7/with/release/os/4.8/2023-07-17
...
ES-839: Merging forward updates from release/os/4.7 to release/os/4.8 (2023-07-17)
2023-07-17 22:50:56 +01:00
Waldemar Zurowski
36940d228f
ES-839: Merging forward updates from release/os/4.7 to release/os/4.8 (2023-07-17)
2023-07-17 19:34:19 +01:00
Waldemar Żurowski
5a31ed0f23
ES-839: fix for dropping Zulu repository ( #7429 )
...
* make sure `rm` doesn't fail if the file is not present
* it makes it easier for forward merge to a branch with newer base image
without that file
2023-07-17 19:05:58 +01:00
Ronan Browne
e59145dd61
ES-657: Merging forward updates from 4.9 to 4.10 (2023-07-17)
2023-07-17 18:37:05 +01:00
Ronan Browne
306951c97d
ES-657: add auto import and snyk scanning for c4 corda community docker images ( #7415 )
2023-07-17 18:27:28 +01:00
Adel El-Beik
669d6590af
ENT-10122: Add consuming transaction id to vault states table.
2023-07-17 17:58:31 +01:00
Ronan Browne
653b731f96
Merge pull request #7427 from corda/ronanb/merge-4.10--4.11-2023-07-17
...
ES-853: Merging forward updates from 4.10 to 4.11 (17/7/23)
2023-07-17 17:05:08 +01:00
Ronan Browne
991aa9fff9
ES-853: Merging forward updates from 4.10 to 4.11 (2023-07-17)
2023-07-17 14:35:59 +01:00
tomstark99
639acc4c63
Added test to deserialise 4.11 network params
2023-07-17 14:35:16 +01:00
Rick Parker
6af6af4a80
Merge pull request #7426 from corda/shams-4.11-merge-6b655c0f
...
ENT-9806, ENT-9941, ENT-8827, ENT-10013, ENT-10016: Forward merge 4.10 to 4.11
2023-07-17 14:14:11 +01:00
Shams Asari
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
Jose Coll
c3e8284f28
ENT-9927 Ledger Recovery tweaks ( #7409 )
2023-07-17 09:48:37 +01:00
Ronan Browne
26c18acf8f
Merge pull request #7424 from corda/connelm/merge-4.9-4.10-2023-07-14
...
ES-853: Merging forward updates from 4.9 to 4.10 (2023-07-14)
2023-07-17 09:47:59 +01:00
Connel McGovern
52f2e8e2e6
ES-853: Correcting forward merge
2023-07-14 18:23:17 +01:00
Connel McGovern
b01f85fb11
Merge branch 'release/os/4.9' into connelm/merge-4.9-4.10-2023-07-14
...
# Conflicts:
# build.gradle
2023-07-14 18:19:55 +01:00
Adel El-Beik
45c021326f
Merge pull request #7421 from corda/ronanb/merge-4.8-4.9-2023-07-13
...
ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13)
2023-07-14 17:34:32 +01:00
Rick Parker
6b655c0f91
Merge pull request #7420 from corda/shams-4.10-merge-e6a80822
...
ENT-9806, ENT-9941, ENT-8827, ENT-10013, ENT-10016: Forward merge 4.9 to 4.10
2023-07-14 13:28:44 +01:00
Tom Stark
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
Ronan Browne
befae353ac
ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13)
2023-07-13 15:25:55 +01:00
Ronan Browne
7a27a464f6
Merge pull request #7419 from corda/ronanb/merge-4.7-4.8-2023-07-13
...
ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)
2023-07-13 15:12:05 +01:00
Shams Asari
5ecb36c302
Merge fix
2023-07-13 11:31:35 +01:00
Shams Asari
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
Rick Parker
e6a808226e
Merge pull request #7412 from corda/shams-4.9-merge-0b8536b9
...
ENT-10013, ENT-10016: 4.8 to 4.9 forward merge
2023-07-13 09:38:08 +01:00
Ronan Browne
6bcc843f19
ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)
2023-07-13 07:07:17 +01:00
Ronan Browne
c58bb4a090
Merge pull request #7418 from corda/ronanb/merge--4.6-4.7-2023-07-12
...
ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12)
2023-07-13 06:52:08 +01:00
Ronan Browne
010a9a6c08
ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12)
2023-07-12 20:02:32 +01:00
Ronan Browne
33df909cee
ES-757: update paramater in line with latest shared lib change ( #7417 )
2023-07-12 20:01:56 +01:00