CORE-16383 Recurring merge from main

build.gradle

@@ -343,7 +343,7 @@ tasks.named("dependencyUpdates").configure {
 }
 
 tasks.named("wrapper") {
-    gradleVersion = '8.2.1'
+    gradleVersion = '8.4'
     distributionType = Wrapper.DistributionType.BIN
 }
 

cordapp-configuration/src/main/resources/net/corda/cordapp/cordapp-configuration.properties

@@ -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
 

data/avro-schema/build.gradle

@@ -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'))
@@ -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')

data/avro-schema/src/main/resources/avro/net/corda/data/flow/FlowTimeout.avsc

@@ -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"
+          }
+      }
+    ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/flow/event/FlowEvent.avsc

@@ -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"

data/avro-schema/src/main/resources/avro/net/corda/data/flow/event/SessionEvent.avsc

@@ -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"

data/avro-schema/src/main/resources/avro/net/corda/data/flow/event/mapper/ExecuteCleanup.avsc

@@ -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"
+      }
+    }
   ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/flow/event/session/SessionCounterpartyInfoRequest.avsc

@@ -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."
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/flow/event/session/SessionCounterpartyInfoResponse.avsc

@@ -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": []
+}

data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindTransactionIdsAndStatuses.avsc

@@ -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."
+  }]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/FindUnconsumedVisibleExactStates.avsc

@@ -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"
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/ledger/persistence/LedgerPersistenceRequest.avsc

@@ -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"
       ]
     },
     {

data/avro-schema/src/main/resources/avro/net/corda/data/ledger/utxo/token/selection/data/TokenClaim.avsc

@@ -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": {

data/avro-schema/src/main/resources/avro/net/corda/data/ledger/utxo/token/selection/data/TokenForceClaimRelease.avsc

@@ -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"
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/ledger/utxo/token/selection/event/TokenPoolCacheEvent.avsc

@@ -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"
     }

data/avro-schema/src/main/resources/avro/net/corda/data/membership/command/registration/mgm/DeclineRegistration.avsc

@@ -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
     }
   ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/membership/p2p/v2/SetOwnRegistrationStatus.avsc

@@ -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"
+       ]
     }
   ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/membership/state/CompletedCommandMetadata.avsc

@@ -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"
+    }
+  ]
+}

data/avro-schema/src/main/resources/avro/net/corda/data/membership/state/RegistrationState.avsc

@@ -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": []
     }
   ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/persistence/EntityResponse.avsc

@@ -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
     }
   ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/persistence/FindWithNamedQuery.avsc

@@ -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": [
     {
@@ -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."
     }
   ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpgradeRequest.avsc

@@ -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
     }
   ]
 }