r3-build
8335dcc931
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-08
2024-11-08 03:33:27 +00:00
r3-build
b6dbd51326
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-07
2024-11-07 11:08:57 +00:00
r3-build
78fd46fb1f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-07
2024-11-07 11:08:32 +00:00
Adel El-Beik
4524c6522f
ENT-12401: Fixed compilation errors and changed alias from 4.12 variant.
2024-11-06 15:17:23 +00:00
Adel El-Beik
d54f1e2eeb
ENT-12373: Can now cope with diff input states from diff rotated CorDapps.
2024-11-06 13:39:32 +00:00
r3-build
e34d019f85
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-06
2024-11-06 09:46:41 +00:00
Adel El-Beik
8d9120713c
ENT-12314: Dont display warning for sig constraint fail if checking for rotated keys after.
2024-11-05 18:17:58 +00:00
Adel El-Beik
8edfbb792c
ENT-11275: Removing obsolete DJVM stuff.
2024-10-28 14:11:19 +00:00
r3-build
3fb3917695
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-23
2024-10-23 07:59:33 +00:00
Adel El-Beik
1022d1ec97
ENT-11275: Added span to multi send and receive calls. ( #7845 )
...
* ENT-12275: Added spans around multi send & receive.
2024-10-23 08:58:40 +01:00
Adel El-Beik
a3519d9fd0
ENT-12314: Updated signature attachment constraint warning message to mention the key may be a rotated key.
2024-10-18 13:55:43 +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
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
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
Rick Parker
cc44c77ed4
ENT-12108 ReceiveFinalityFlow returns a transaction that is not signed by the notary ( #7804 )
2024-08-15 07:06:58 +01:00
rick.parker
237d0032ea
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-08-12-297
...
# Conflicts:
# constants.properties
# core-deterministic/build.gradle
# core/src/main/kotlin/net/corda/core/flows/ReceiveTransactionFlow.kt
# serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializePublicKeyTest.kt
2024-08-13 10:22:05 +01:00
Rick Parker
ed3875c8b7
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-08-12-297
2024-08-12 19:27:12 +01:00
Rick Parker
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
chriscochrane
4b90f93f77
Updates for security issues
2024-07-18 14:23:16 +01:00
Jose Coll
8f87b2060b
ENT-11245 Catch and transform new enum type value. ( #7596 )
2023-11-30 19:13:34 +00:00
Adel El-Beik
72e5c4fed2
ENT-11036: initiatedBy is now a list of CordaX500Names. ( #7592 )
2023-11-28 07:10:53 +00:00
Adel El-Beik
b715140625
ENT-11107: Ctors added to LedgerRecoveryFlow to match EnterpriseLedgerRecoveryFlow.
2023-11-15 16:11:45 +00:00
Jose Coll
60bcc99154
ENT-11037 Expose and use additional Ledger Recovery statistics ( #7553 )
2023-10-31 15:55:55 +00:00
Adel El-Beik
8ab92f0ee3
Merge pull request #7551 from corda/colljos/finality_flow_force_recover_flowids
...
ENT-11036 Add "forceRecoverFlowIds" parameter to FinalityRecoveryFlow
2023-10-27 18:17:31 +01:00
Jose Coll
5e017dfbc8
Drop FlowRecoveryQuery criteria: excludeFlowIds
2023-10-27 14:13:29 +01:00
Jose Coll
04b1e8fb3d
Add "forceRecoverFlowIds" parameter to FinalityRecoveryFlow
2023-10-27 13:45:19 +01:00
Rick Parker
c626d3a435
ENT-10100: fix batch support during recovery of in flight transactions ( #7549 )
2023-10-27 13:26:07 +01:00
Jose Coll
e52f086d11
ENT-11036 Additional parameter to enable recovery of IN_FLIGHT transactions (post ledger peer recovery) ( #7546 )
2023-10-26 09:38:52 +01:00
Jose Coll
be515abd08
ENT-11004 Store Ledger Recovery records only if the transaction was locally stored in the first place. ( #7544 )
2023-10-24 17:02:17 +01:00
Jose Coll
be433c1fd0
ENT-10100 Filter out UNVERIFIED txns + move TransactionStatus package. ( #7543 )
2023-10-24 17:01:37 +01:00
Jose Coll
bc718088fe
ENT-10100 Changes required to support recovery of IN_FLIGHT transactions. ( #7541 )
2023-10-24 10:38:46 +01:00
Jose Coll
39928563f6
Set verboseLogging to false by default.
...
Override toString() for ReceiverDistributionRecord
2023-10-19 09:29:05 +01:00
Jose Coll
6a2bad8077
ENT-10110 Back-port changes from ENT + additional clean-up ( #7532 )
2023-10-17 07:03:49 +01:00
Jose Coll
1981334921
ENT-10110 Clean-up. ( #7530 )
2023-10-13 11:26:07 +01:00
Jose Coll
fdf8d5344b
ENT-10110 Ledger Recovery tweaks ( #7519 )
2023-10-05 16:53:20 +01:00
Jose Coll
b15ca0f394
ENT-10110 LedgerRecovery parameters + flow return type change. ( #7516 )
2023-10-02 17:29:48 +01:00
Balwant Kothari
6243088ebb
ENT-10700 Updating timeWindow to nullable ( #7498 )
...
* ENT-10700 Updating timeWindow to nullable
2023-09-21 17:22:27 +01:00
Rick Parker
5d84d0a5c9
ENT-10306 Missed actually verifying transaction from recent refactor ( #7483 )
2023-09-06 16:32:47 +01:00
Jose Coll
b0ea7a6551
ENT-4973 Remove redundant 2PF warning message. ( #7470 )
...
* Remove redundant warning message.
Additional assertion to validate database records deleted.
2023-09-01 10:01:31 +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
.
* Reset ReceiveTransactionFlow and ReceiveFinalityFlow APIs
2023-08-23 10:09:42 +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
4a7a4eb5bb
ENT-9876: Encrypting the ledger recovery participant distribution list ( #7423 )
2023-08-22 11:14:37 +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
4a6e99556b
Incorporating PR review feedback.
2023-08-18 17:22:42 +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