Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CORE-16383 Recurring merge from main #1310

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
1e5deac
CORE-16614: index utxo_visible_transaction_state.consumed (#1244)
jennyang-r3 Sep 15, 2023
4ea9029
CORE-16615: create index for utxo_transaction_output.type (#1251)
jennyang-r3 Sep 15, 2023
384de25
CORE-13119 Add `resumePoint` Avro field to support stable query pagin…
relyafi Sep 19, 2023
1e2c46c
CORE-9975: Add support for key category parameter to signing API
malachyb Sep 19, 2023
5663081
Revert "CORE-9975: Add support for key category parameter to signing …
malachyb Sep 19, 2023
1e00cfd
CORE-13621 Idempotency id table definition (#1222)
kyriathar Sep 20, 2023
0a18046
CORE-17257 - Reason column length is too short in RegistrationRequest…
nikinagy Sep 21, 2023
47bc6a2
CORE-17154 - boot config for state manager (#1242)
conalsmith-r3 Sep 21, 2023
e5b00ed
CORE-13620 Idempotency id table housekeeping (#1249)
kyriathar Sep 21, 2023
55b4afc
CORE-15396 Adding a new token selection event type. This event type i…
owenstanford Sep 21, 2023
28ffabb
CORE-16860 Add counterparty info request and response events (#1256)
LWogan Sep 21, 2023
b8dac97
CORE-15396 Add support for an expiry timeout on a token claim, this i…
owenstanford Sep 22, 2023
833512a
CORE-15820 - Added a new Token observer version (#1228)
filipesoliveira Sep 22, 2023
e886aad
CORE-16615: introduce new api to find an unconsumed states (#1260)
jennyang-r3 Sep 26, 2023
d6caca3
CORE-17344 - Update the db schema by following the instructions (#1262)
filipesoliveira Sep 26, 2023
b4e4474
CORE-12411 - Add reason for user in decline registration command (#1261)
dimosr Sep 26, 2023
8132b94
CORE-17362: Change rbac-creation schema correctly (#1266)
BenYip123 Sep 27, 2023
4c8fcdf
CORE-17360: Add topics for mapper scheduled cleanup and update cleanu…
JamesHR3 Sep 28, 2023
c8bddf4
CORE-17386 - Create new topic for flow processor scheduled tasks. (#1…
driessamyn Sep 29, 2023
fdcddfa
CORE-17391 Add command metadata to registration state so command hist…
charlieR3 Sep 29, 2023
cedc328
Topic and Avro schema for flow timeout events. (#1272)
driessamyn Oct 2, 2023
e5d1c58
CORE-17359: Rename topic for flow mapper scheduled task and add a sch…
JamesHR3 Oct 4, 2023
4f8bdaf
CORE-9031: Add forceUpgrade parameter to VirtualNodeUpgradeRequest (#…
Tom-Fitzpatrick Oct 4, 2023
38d2769
refactor (config) : reinstate properties for Flow Config
thiagoviana Oct 5, 2023
523413e
CORE-17471 - Apply indexing to frequently used columns of the db tabl…
filipesoliveira Oct 5, 2023
f1884b6
Merge branch 'release/os/5.1' into CORE-17485-reinstate-removed-prope…
thiagoviana Oct 5, 2023
c071e61
CORE-14025 Add new request to find existing transactions in database …
nkovacsx Oct 5, 2023
5917fad
CORE-17485 - Reinstate removed properties during flow session refactor
thiagoviana Oct 5, 2023
a5ef976
CORE-17425: Update version of Avro to address CVE-2023-39410 (#1279)
vkolomeyko Oct 5, 2023
2d5c31d
New topics for Flow Topology changes. (#1280)
driessamyn Oct 6, 2023
9403890
CORE-17117: Update version of `commons-compress` to address CVE-2023-…
vkolomeyko Oct 6, 2023
931648d
CORE-16183 Ledger data model simplifications (part 1) (#1270)
nkovacsx Oct 9, 2023
397b29e
CORE-17117: Update version of `commons-compress` to address CVE-2023-…
vkolomeyko Oct 9, 2023
edc6b36
CORE-17437: State Manager Configuration Section (#1277)
jujoramos Oct 9, 2023
30bae2c
ES-1452: bump to Gradle 8.4 (#1284)
ronanbrowne Oct 10, 2023
4e04896
CORE-17476 Adding Corda worker RPC endpoints to API schema (#1276)
ben-millar Oct 10, 2023
df258c8
CORE-17605 - Deprecated `TokenClaim.useAndRelease` (#1289)
filipesoliveira Oct 11, 2023
721b68d
allow same host/port
nadinequinr3 Oct 11, 2023
c8af85b
Merge pull request #1293 from corda/nadinequinr3/CORE-16721/allow-ser…
nadinequinr3 Oct 11, 2023
2bca1c6
Merge branch 'release/os/5.1' into alex/CORE-16383-recurring-merge-fr…
ac101m Oct 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ tasks.named("dependencyUpdates").configure {
}

tasks.named("wrapper") {
gradleVersion = '8.2.1'
gradleVersion = '8.4'
distributionType = Wrapper.DistributionType.BIN
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Corda-ClientStartableFlow-Classes=IMPLEMENTS;net.corda.v5.application.flows.Clie
Corda-InitiatedFlow-Classes=IMPLEMENTS;net.corda.v5.application.flows.ResponderFlow
Corda-Subflow-Classes=IMPLEMENTS;net.corda.v5.application.flows.Subflow
Corda-Token-Observer-Classes=IMPLEMENTS;net.corda.v5.ledger.utxo.observer.UtxoLedgerTokenStateObserver
Corda-Token-Observer-v2-Classes=IMPLEMENTS;net.corda.v5.ledger.utxo.observer.UtxoTokenTransactionStateObserver
Corda-Ledger-Named-Query-Classes=IMPLEMENTS;net.corda.v5.ledger.utxo.query.VaultNamedQueryFactory
Corda-Ledger-Vault-Json-Factory-Classes=IMPLEMENTS;net.corda.v5.ledger.utxo.query.json.ContractStateVaultJsonFactory

Expand Down
11 changes: 11 additions & 0 deletions data/avro-schema/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ dependencies {
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") {
because "required until new version of Avro available which updates Jackson"
}

implementation("org.apache.commons:commons-compress:$commonsCompressVersion") {
because "CVE-2023-42503, current version of Avro uses an outdated version"
}
}

implementation platform(project(':corda-api'))
Expand All @@ -23,6 +27,13 @@ dependencies {
compileOnly 'org.osgi:osgi.annotation'
}

configurations.all {
resolutionStrategy {
// CVE-2023-42503, current version of Avro uses an outdated version
force "org.apache.commons:commons-compress:$commonsCompressVersion"
}
}

description 'Data Model Definitions'

def generatedAvroDir = layout.buildDirectory.dir('generated-avro')
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "record",
"name": "FlowTimeout",
"namespace": "net.corda.data.flow",
"doc": "Represents of a flow timeout instruction.",
"fields": [
{
"name": "checkpointStateKey",
"type": "string",
"doc": "Key for the state record that is storing the checkpoint."
},
{
"name": "timeoutDateTime",
"type": {
"type": "long",
"logicalType": "timestamp-millis"
}
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"name": "payload",
"type": [
"net.corda.data.flow.event.StartFlow",
"net.corda.data.flow.event.Wakeup",
"net.corda.data.flow.output.FlowStatus",
"net.corda.data.flow.event.SessionEvent",
"net.corda.data.flow.event.external.ExternalEventResponse"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
{
"name": "payload",
"type": [
"net.corda.data.flow.event.session.SessionInit",
"net.corda.data.flow.event.session.SessionConfirm",
"net.corda.data.flow.event.session.SessionCounterpartyInfoRequest",
"net.corda.data.flow.event.session.SessionCounterpartyInfoResponse",
"net.corda.data.flow.event.session.SessionData",
"net.corda.data.flow.event.session.SessionClose",
"net.corda.data.flow.event.session.SessionError"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,13 @@
"docs": "When this event is processed the flow mapper state should be set to null",
"namespace": "net.corda.data.flow.event.mapper",
"fields": [
{
"name": "ids",
"docs": "A list of IDs of mapper states that should be deleted",
"type": {
"type": "array",
"items": "string"
}
}
]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "record",
"name": "SessionCounterpartyInfoRequest",
"doc" : "Request counterparties flow session information. This includes the flow protocol version that they are running.",
"namespace": "net.corda.data.flow.event.session",
"fields": [
{
"name": "sessionInit",
"type": "net.corda.data.flow.event.session.SessionInit",
"doc": "Contains information that can be used to start an initiated flow. Will be null for messages sent to the initiator. Will be null when initiated party is confirmed to be present to ensure out of order messages that arrive first contain this info."
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "record",
"name": "SessionCounterpartyInfoResponse",
"doc" : "Sent from initiated to initiating party to inform them which protocol version of the flow they are running.",
"namespace": "net.corda.data.flow.event.session",
"fields": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "record",
"name": "FindTransactionIdsAndStatuses",
"doc": "A request to fetch transaction IDs and their statuses.",
"namespace": "net.corda.data.ledger.persistence",
"fields": [
{
"name": "ids",
"type": {
"type" : "array",
"items" : "string"
},
"doc": "A list of the transaction IDs to fetch."
}]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "record",
"name": "FindUnconsumedStatesByExactType",
"doc": "Retrieve the unconsumed visible states of specific type. This only retrieves exact type excluding its states of subclass unlike {@link FindUnconsumedStatesByType}. One of several types of ledger persistence request {@link LedgerPersistenceRequest}",
"namespace": "net.corda.data.ledger.persistence",
"fields": [
{
"name": "stateClassName",
"type": "string",
"doc": "The fully qualified state class name"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@
"net.corda.data.ledger.persistence.PersistTransactionIfDoesNotExist",
"net.corda.data.ledger.persistence.FindTransaction",
"net.corda.data.ledger.persistence.FindUnconsumedStatesByType",
"net.corda.data.ledger.persistence.FindUnconsumedStatesByExactType",
"net.corda.data.ledger.persistence.ResolveStateRefs",
"net.corda.data.ledger.persistence.UpdateTransactionStatus",
"net.corda.data.persistence.FindWithNamedQuery",
"net.corda.data.ledger.persistence.FindSignedGroupParameters",
"net.corda.data.ledger.persistence.PersistSignedGroupParametersIfDoNotExist",
"net.corda.data.ledger.persistence.FindSignedLedgerTransaction"
"net.corda.data.ledger.persistence.FindSignedLedgerTransaction",
"net.corda.data.ledger.persistence.FindTransactionIdsAndStatuses"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
"type": "string",
"doc": "Unique identifier for the claim"
},
{
"name": "claimTimestamp",
"type": ["null", "long"],
"default": null,
"doc": "Timestamp of when the claim was made in epoc milliseconds"
},
{
"name": "claimedTokenStateRefs",
"type": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "record",
"name": "TokenForceClaimRelease",
"namespace": "net.corda.data.ledger.utxo.token.selection.data",
"doc": "Forcibly removes the entire claim. No response is expected for this event type.",
"fields": [
{
"name": "poolKey",
"type": "net.corda.data.ledger.utxo.token.selection.key.TokenPoolCacheKey",
"doc": "The key of the cache pool for the existing claim"
},
{
"name": "claimId",
"type": "string",
"doc": "Unique identifier for the claim"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"net.corda.data.ledger.utxo.token.selection.data.TokenClaimRelease",
"net.corda.data.ledger.utxo.token.selection.data.TokenLedgerChange",
"net.corda.data.ledger.utxo.token.selection.data.TokenCachedSyncCheck",
"net.corda.data.ledger.utxo.token.selection.data.TokenBalanceQuery"
"net.corda.data.ledger.utxo.token.selection.data.TokenBalanceQuery",
"net.corda.data.ledger.utxo.token.selection.data.TokenForceClaimRelease"
],
"doc": "Represents the specific type and data of inbound event"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@
"fields": [
{
"name": "reason",
"doc": "Reason that the request was declined.",
"doc": "Reason that the request was declined. This contains data that will remain internal in the MGM's system for record keeping.",
"type": "string"
},
{
"name": "reasonForUser",
"doc": "Reason that the request was declined. This contains data that will be communicated to the user to provide context. If not specified, no reason will be communicated back to the user.",
"type": [
"null",
"string"
],
"default": null
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
"name": "newStatus",
"doc": "The new registration status.",
"type": "net.corda.data.membership.common.v2.RegistrationStatus"
},
{
"name": "reason",
"doc": "The reason the registration request was moved to this status. Mostly relevant for switches to negative statuses (e.g. declined) to provide further context to the user on the underlying reason.",
"type": [
"null",
"string"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "record",
"name": "CompletedCommandMetadata",
"namespace": "net.corda.data.membership.state",
"doc": "Metadata about a previously completed registration command.",
"fields": [
{
"name": "index",
"doc": "An index which can be used to determine the order of previously completed registration commands.",
"type": "int"
},
{
"name": "command",
"doc": "The name of the command which was completed.",
"type": "string"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@
"name": "mgm",
"doc": "Holding identity of the MGM.",
"type": "net.corda.data.identity.HoldingIdentity"
},
{
"name": "previouslyCompletedCommands",
"doc": "A list of all the previously completed commands during registration. Can be used for idempotency in the case of message replays.",
"type": {
"type": "array",
"items": "net.corda.data.membership.state.CompletedCommandMetadata"
},
"default": []
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
"name": "metadata",
"doc": "Metadata returned from the execution of the persistence operation",
"type": "net.corda.data.KeyValuePairList"
},
{
"name": "resumePoint",
"doc": "Used by queries that support stable paging to return opaque data that indicates where the next page should resume from",
"type": ["null", "bytes"],
"default": null
}
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "record",
"name": "FindWithNamedQuery",
"doc": "Find entities matched by a named query. Parameters for the query may be specified. Pagination is supported, but there's no guarantee of consistency if the underlying data changes. The data will not be sorted in Corda; if the database returns an unpredictable order that must be handled by the caller. FindWithNamedQuery can be used to enforce ordering if required. Replies with {@link EntityResponse}",
"doc": "Find entities matched by a named query. Parameters for the query may be specified. Pagination is supported, but there's no guarantee of consistency if the underlying data changes and using offset-based pagination. The data will not be sorted in Corda; if the database returns an unpredictable order that must be handled by the caller. FindWithNamedQuery can be used to enforce ordering if required. Replies with {@link EntityResponse}",
"namespace": "net.corda.data.persistence",
"fields": [
{
Expand All @@ -26,6 +26,12 @@
"name": "limit",
"type": "int",
"doc": "Limit number of rows in the output query results, after applying the offset. Use the maximum int value if you do not want a lower limit."
},
{
"name": "resumePoint",
"type": ["null", "bytes"],
"default": null,
"doc": "When a query supports stable paging, contains opaque data telling the query where to resume from when making queries for subsequent pages."
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
"name": "actor",
"type": "string",
"doc": "ID of RPC user that requested the virtual node creation."
},
{
"name": "forceUpgrade",
"type": "boolean",
"doc": "Whether this upgrade should be forced regardless of OperationInProgress.",
"default": false
}
]
}
Loading