Commit Graph

10519 Commits

Author SHA1 Message Date
Adel El-Beik
616ac4bae4
Merge pull request #7844 from corda/merge-release/os/4.10-release/os/4.11-2024-10-17-376
ENT-12281: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-17
2024-10-17 14:26:33 +01:00
r3-build
ea568e0780 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-17 2024-10-17 03:33:27 +00:00
Adel El-Beik
5d0593c20f
Merge pull request #7841 from corda/merge-release/os/4.10-release/os/4.11-2024-10-14-372
ENT-12291: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-14
2024-10-16 23:20:21 +01:00
Adel El-Beik
98d9263aba ENT-11975: Fixed merge errors. 2024-10-15 17:38:56 +01:00
Adel El-Beik
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
Adel El-Beik
d1cfcfe74f
Merge pull request #7842 from corda/merge-release/os/4.9-release/os/4.10-2024-10-15-374
ENT-12283: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-15
2024-10-15 14:49:06 +01:00
chriscochrane
78e7f62df3
Updated commons-io version 2024-10-15 10:11:58 +01:00
Chris Cochrane
992265622a
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-10-15-374 2024-10-15 09:44:09 +01:00
Adel El-Beik
5193de2323
Merge pull request #7837 from corda/merge-release/os/4.9-release/os/4.10-2024-10-10-367
ENT-12291: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-10
2024-10-14 20:03:32 +01:00
Adel El-Beik
60c5e97d54
Merge pull request #7840 from corda/cc/dev/os/4.9/security_vulns
ENT-12287 - Security vulnerabilities
2024-10-14 17:00:24 +01:00
Adel El-Beik
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
chriscochrane
31ad1d99c4
New WriterOutputStream API 2024-10-14 14:43:45 +01:00
chriscochrane
94bd9dceac
Dependency update 2024-10-14 13:34:49 +01:00
Adel El-Beik
81268177ac
Merge pull request #7839 from corda/adel/ENT-11975-config-fix
ENT-11975: Updating config parsing with 4.12 version, which correctly parses the rotated keys config item.
2024-10-14 10:42:41 +01:00
Adel El-Beik
76b56679e6 ENT-11975: Updating config parsing with 4.12 version, which correctly parses the 4.12 rotated keys config item. 2024-10-13 19:26:01 +01:00
Adel El-Beik
c9bbb5373a
Merge pull request #7836 from corda/adel/ENT-12291
ENT-12291: Backport of contract key rotation to 4.9.
2024-10-10 17:13:04 +01:00
Adel El-Beik
4c0aa16f1e ENT-12291: RotatedKeys can be retrieved from MockServices. 2024-10-10 12:49:46 +01:00
Adel El-Beik
a2537d59f5 ENT-12291: Removed from rotated keys from public api. 2024-10-09 17:16:04 +01:00
Adel El-Beik
828066a646 Backport contract key rotation to 4.9. 2024-10-09 14:46:57 +01:00
Adel El-Beik
282ee95188 ENT-11975: Contract key rotation (#7806)
ENT-11975: Contract key rotation implementation.
2024-10-07 16:55:50 +01:00
Adel El-Beik
46cfdad07a
Merge pull request #7832 from corda/merge-release/os/4.10-release/os/4.11-2024-10-02-359
ENT-12072: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-02
2024-10-02 10:54:14 +01:00
r3-build
403cae5721 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-02 2024-10-02 08:33:34 +00:00
Adel El-Beik
1f193b0ef7
Merge pull request #7830 from corda/merge-release/os/4.9-release/os/4.10-2024-10-01-357
ENT-12072: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-01
2024-10-02 09:32:13 +01:00
r3-build
e3d6edb8b2 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-01 2024-10-01 13:48:28 +00:00
Adel El-Beik
61a4504d6d
Merge pull request #7824 from corda/merge-release/os/4.8-release/os/4.9-2024-10-01-337
ENT-12072: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-10-01
2024-10-01 14:47:45 +01:00
Adel El-Beik
229d3b26f0
Merge pull request #7829 from corda/merge-release/os/4.10-release/os/4.11-2024-10-01-357
ENT-12072: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-01
2024-10-01 14:46:00 +01:00
Adel El-Beik
b9fb90edda
Update build.gradle 2024-10-01 09:06:39 +01:00
Adel El-Beik
576e37c3bb
Update build.gradle 2024-10-01 09:06:15 +01:00
r3-build
2350de8635 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-01 2024-10-01 08:05:01 +00:00
Adel El-Beik
423fbf6993
Update constants.properties 2024-10-01 09:04:55 +01:00
Adel El-Beik
e9f05ce0e9
Merge pull request #7825 from corda/merge-release/os/4.9-release/os/4.10-2024-10-01-356
ENT-12072: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-01
2024-10-01 09:04:07 +01:00
Adel El-Beik
41550a0c28
Merge pull request #7826 from corda/merge-release/os/4.10-release/os/4.11-2024-10-01-356
ENT-12072: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-01
2024-10-01 09:03:28 +01:00
r3-build
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
r3-build
a032641a01 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-01 2024-10-01 03:23:28 +00:00
r3-build
732c6afe6a Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-10-01 2024-10-01 03:02:01 +00:00
Adel El-Beik
ca56d350b7
Merge pull request #7819 from corda/merge-release/os/4.10-release/os/4.11-2024-09-25-349
ENT-12044: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-09-25
2024-09-30 10:22:11 +01:00
Adel El-Beik
1a93ac6807
Merge pull request #7820 from corda/merge-release/os/4.9-release/os/4.10-2024-09-25-349
ENT-12033: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-25
2024-09-30 10:20:50 +01:00
Adel El-Beik
615cda1c91
Merge pull request #7822 from corda/merge-release/os/4.8-release/os/4.9-2024-09-27-332
ENT-12072: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-09-27
2024-09-30 10:20:12 +01:00
Adel El-Beik
b17027e46a
Merge pull request #7823 from corda/adel/ENT-12072-andENT-12073-pt2
ENT-12072: Reverted BC
2024-09-27 10:14:23 +01:00
Adel El-Beik
b048c28125 ENT-12072: Reverted BC 2024-09-27 09:58:51 +01:00
r3-build
a483b420f3 Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-09-27 2024-09-27 07:24:48 +00:00
Adel El-Beik
76ff377dca
Merge pull request #7821 from corda/adel/ENT-12072-and-ENT-12073
ENT-12072 ENT-12073: Check notary whitelist when resolving old identities and don't depend on network map availability first for old network parameters
2024-09-27 08:23:52 +01:00
Rick Parker
fd04fddd70 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-09-27 07:53:28 +01:00
r3-build
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
Adel El-Beik
071c6da518
Merge pull request #7818 from corda/cc/dev/os/4.9/dsl_orgunit
ENT-12033 - Recognise OU in DSL node X500 name
2024-09-25 14:17:59 +01:00
r3-build
0212655363 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-09-25 2024-09-25 03:33:27 +00:00
chriscochrane
63405a28ea
Recognise OU in DSL node X500 name 2024-09-24 17:16:47 +01:00
Adel El-Beik
447f0711e8
Merge pull request #7815 from corda/merge-release/os/4.10-release/os/4.11-2024-09-23-346
ENT-12169: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-09-23
2024-09-24 15:16:56 +01:00
Adel El-Beik
2723ec36a5
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-09-23-346 2024-09-24 11:56:09 +01:00
Adel El-Beik
0c0ec67170
Merge pull request #7816 from corda/merge-release/os/4.9-release/os/4.10-2024-09-23-346
ENT-12044: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-23
2024-09-24 11:51:11 +01:00