-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NOTICK Recurring merge from main (#1197)
# Changes - Merge recent changes from 5.1 into the interop syntax branch.
- Loading branch information
Showing
61 changed files
with
552 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
// Check corda-api compatibility with downstream consumers which implement CordApps | ||
@Library('[email protected]') _ | ||
|
||
cordaApiCompatibilityCheck() | ||
cordaApiCompatibilityCheck( | ||
javaVersion: '17' | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
@Library('[email protected]') _ | ||
|
||
cordaSnykScanPipeline ( | ||
snykTokenId: 'r3-snyk-corda5' | ||
snykTokenId: 'r3-snyk-corda5', | ||
javaVersion: '17' | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,4 +56,4 @@ ignore: | |
artifacts. | ||
expires: 2023-06-19T13:28:02.582Z | ||
created: 2023-03-20T13:28:02.597Z | ||
patch: {} | ||
patch: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...rc/main/resources/avro/net/corda/data/ledger/persistence/FindSignedLedgerTransaction.avsc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"type": "record", | ||
"name": "FindSignedLedgerTransaction", | ||
"doc": "Retrieve the specified ledger transaction, specified by id. One of several types of ledger persistence request {@link LedgerPersistenceRequest}", | ||
"namespace": "net.corda.data.ledger.persistence", | ||
"fields": [ | ||
{ | ||
"name": "id", | ||
"type": "string", | ||
"doc": "The transaction ID, derived from the root hash of its Merkle tree" | ||
}, | ||
{ | ||
"name": "transactionStatus", | ||
"type": "string", | ||
"doc": "The status of the transaction" | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...n/resources/avro/net/corda/data/membership/actions.request/DistributeGroupParameters.avsc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"type": "record", | ||
"name": "DistributeGroupParameters", | ||
"namespace": "net.corda.data.membership.actions.request", | ||
"doc": "Distribute group parameters to the rest of the network.", | ||
"fields": [ | ||
{ | ||
"name": "mgm", | ||
"doc": "The membership group manager of the group.", | ||
"type": "net.corda.data.identity.HoldingIdentity" | ||
}, | ||
{ | ||
"name": "minimumGroupParametersEpoch", | ||
"doc": "The minimum group parameters epoch to be distributed (if null, the latest version is used). If the group parameters with this epoch have not been published, then the membership actions processor will requeue this request to be retried later.", | ||
"type": ["null", "int"] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
.../avro/net/corda/data/membership/command/registration/mgm/CheckForPendingRegistration.avsc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"type": "record", | ||
"name": "CheckForPendingRegistration", | ||
"namespace": "net.corda.data.membership.command.registration.mgm", | ||
"doc": " Command issued when a member registration request is successfully queued.", | ||
"fields": [ | ||
{ | ||
"name": "mgm", | ||
"doc": "Holding identity of the MGM.", | ||
"type": "net.corda.data.identity.HoldingIdentity" | ||
}, | ||
{ | ||
"name": "member", | ||
"doc": "Holding identity of the registering member as provided during P2P communication. Used to verify the registration request.", | ||
"type": "net.corda.data.identity.HoldingIdentity" | ||
}, | ||
{ | ||
"name": "numberOfRetriesSoFar", | ||
"doc": "The number of times this request failed so far.", | ||
"type": "int" | ||
} | ||
] | ||
} |
28 changes: 28 additions & 0 deletions
28
.../resources/avro/net/corda/data/membership/command/registration/mgm/QueueRegistration.avsc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
{ | ||
"type": "record", | ||
"name": "QueueRegistration", | ||
"namespace": "net.corda.data.membership.command.registration.mgm", | ||
"doc": " Command issued when a member registration request is received and needs to be processed.", | ||
"fields": [ | ||
{ | ||
"name": "mgm", | ||
"doc": "Holding identity of the target MGM.", | ||
"type": "net.corda.data.identity.HoldingIdentity" | ||
}, | ||
{ | ||
"name": "member", | ||
"doc": "Holding identity of the requesting member.", | ||
"type": "net.corda.data.identity.HoldingIdentity" | ||
}, | ||
{ | ||
"name": "memberRegistrationRequest", | ||
"doc": "The full registration request as received from a registering member.", | ||
"type": "net.corda.data.membership.p2p.MembershipRegistrationRequest" | ||
}, | ||
{ | ||
"name": "numberOfRetriesSoFar", | ||
"doc": "The number of times this request failed so far.", | ||
"type": "int" | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
...chema/src/main/resources/avro/net/corda/data/membership/common/v2/RegistrationStatus.avsc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
{ | ||
"type": "enum", | ||
"name": "RegistrationStatus", | ||
"namespace": "net.corda.data.membership.common.v2", | ||
"doc": "Registration request status.", | ||
"symbols": [ | ||
"NEW", | ||
"SENT_TO_MGM", | ||
"RECEIVED_BY_MGM", | ||
"STARTED_PROCESSING_BY_MGM", | ||
"PENDING_MEMBER_VERIFICATION", | ||
"PENDING_MANUAL_APPROVAL", | ||
"PENDING_AUTO_APPROVAL", | ||
"DECLINED", | ||
"INVALID", | ||
"FAILED", | ||
"APPROVED" | ||
], | ||
"default": "NEW" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.