Merge branch 'release/os/5.1' of https://github.com/corda/corda-api i…

…nto nandor/CORE-8695/backchain-batch-api

# Conflicts:
#	data/config-schema/src/main/java/net/corda/schema/configuration/LedgerConfig.java

Jenkinsfile

@@ -1,6 +1,6 @@
 @Library('[email protected]') _
 
-cordaPipeline(
+cordaPipelineKubernetesAgent(
  runIntegrationTests: false,
  dependentJobsNames: ['/Corda5/corda-runtime-os-version-compatibility/release%2Fos%2F5.1'],
  dependentJobsNonBlocking: ['/Corda5/corda-api-compatibility/'],

build.gradle

@@ -174,6 +174,7 @@ subprojects {
 
  // Test runtime libraries -> also keep consistent
  testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
  detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:$detektPluginVersion"
  }
@@ -342,7 +343,7 @@ tasks.named("dependencyUpdates").configure {
 }
 
 tasks.named("wrapper") {
- gradleVersion = '8.1.1'
+ gradleVersion = '8.2.1'
  distributionType = Wrapper.DistributionType.BIN
 }
 
@@ -406,4 +407,4 @@ if (project.hasProperty('generateSBOM')) {
  artifactoryPublish {
  publications('sbom')
  }
-}
+}

buildSrc/src/main/groovy/corda-api.common-library.gradle

@@ -26,9 +26,9 @@ configurations {
 
 dependencies {
  compileOnly "org.jetbrains:annotations:$jetbrainsAnnotationsVersion"
- testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
- testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
+ testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
  testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('jar', Jar) {

corda-api/build.gradle

@@ -57,8 +57,9 @@ dependencies {
  }
  }
  api('org.slf4j:slf4j-api') {
+ because 'Corda 5.1 only supports SLF4J 1.x'
  version {
- require slf4jVersion
+ strictly slf4jVersion
  }
  }
  }

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

@@ -15,7 +15,17 @@
  "type": "array",
  "items": "string"
  },
- "doc": "The List of state refs for the claimed tokens"
+ "default": [],
+ "doc": "Deprecated. The List of state refs for the claimed tokens"
+ },
+ {
+ "name": "claimedTokens",
+ "type": {
+ "type": "array",
+ "items": "net.corda.data.ledger.utxo.token.selection.data.Token"
+ },
+ "default": [],
+ "doc": "List of claimed tokens"
  }
  ]
 }

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

@@ -11,13 +11,27 @@
  },
  {
  "name": "memberContext",
- "doc": "Member provided data in MemberInfo.",
- "type": "net.corda.data.KeyValuePairList"
+ "doc": "Deprecated field, signedMemberContext should be used instead. Member provided data in MemberInfo.",
+ "type": ["null", "net.corda.data.KeyValuePairList"],
+ "default": null
  },
  {
  "name": "mgmContext",
- "doc": "MGM provided data in MemberInfo.",
- "type": "net.corda.data.KeyValuePairList"
+ "doc": "Deprecated field, serializedMgmContext should be used instead. MGM provided data in MemberInfo.",
+ "type": ["null", "net.corda.data.KeyValuePairList"],
+ "default": null
+ },
+ {
+ "name": "signedMemberContext",
+ "doc": "The serialized and signed byte data used as member context.",
+ "type": ["null", "SignedData"],
+ "default": null
+ },
+ {
+ "name": "serializedMgmContext",
+ "doc": "The serialized byte data used as MGM context.",
+ "type": ["null", "bytes"],
+ "default": null
  }
  ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/membership/common/RegistrationRequestDetails.avsc

@@ -42,33 +42,13 @@
  },
  {
  "name": "memberProvidedContext",
- "doc": "Member provided context submitted for registration.",
- "type": "net.corda.data.KeyValuePairList"
- },
- {
- "name": "memberSignature",
- "doc": "Signature of the member over the memberContext.",
- "type": "net.corda.data.crypto.wire.CryptoSignatureWithKey"
- },
- {
- "name": "memberSignatureSpec",
- "doc": "Signature spec of member signature.",
- "type": "net.corda.data.crypto.wire.CryptoSignatureSpec"
+ "doc": "Member provided data in MemberInfo which has been signed by the registering member. The data must be a serialised KeyValuePairList.",
+ "type": "net.corda.data.membership.SignedData"
  },
  {
  "name": "registrationContext",
- "doc": "Registration context submitted for registration.",
- "type": "net.corda.data.KeyValuePairList"
- },
- {
- "name": "registrationContextSignature",
- "doc": "Signature of the member over the registrationContext.",
- "type": "net.corda.data.crypto.wire.CryptoSignatureWithKey"
- },
- {
- "name": "registrationContextSignatureSpec",
- "doc": "Signature spec of member signature over the registrationContext.",
- "type": "net.corda.data.crypto.wire.CryptoSignatureSpec"
+ "doc": "Additional registration context which has been signed by the registering member and is not part of the MemberInfo (e.g. pre-auth token). The data must be a serialised KeyValuePairList.",
+ "type": "net.corda.data.membership.SignedData"
  },
  {
  "name": "reason",

data/avro-schema/src/main/resources/avro/net/corda/data/membership/db/request/command/PersistMemberInfo.avsc

@@ -6,11 +6,21 @@
  "fields": [
  {
  "name": "members",
- "doc": "List of MemberInfos to persist.",
- "type": {
+ "doc": "Deprecated, signedMembers should be used instead. List of MemberInfos to persist.",
+ "type": ["null", {
  "type": "array",
  "items": "net.corda.data.membership.PersistentSignedMemberInfo"
- }
+ }],
+ "default": null
+ },
+ {
+ "name": "signedMembers",
+ "doc": "List of MemberInfos to persist.",
+ "type": ["null", {
+ "type": "array",
+ "items": "net.corda.data.membership.PersistentMemberInfo"
+ }],
+ "default": null
  }
  ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/membership/db/request/query/QueryMemberInfo.avsc

@@ -11,6 +11,18 @@
  "type": "array",
  "items": "net.corda.data.identity.HoldingIdentity"
  }
+ },
+ {
+ "name": "queryStatuses",
+ "doc": "Statuses of the members to retrieve.",
+ "type": [
+ "null",
+ {
+ "type": "array",
+ "items": "string"
+ }
+ ],
+ "default": null
  }
  ]
 }

data/avro-schema/src/main/resources/avro/net/corda/data/membership/db/request/query/QueryMemberSignature.avsc

@@ -2,7 +2,7 @@
  "type": "record",
  "name": "QueryMemberSignature",
  "namespace": "net.corda.data.membership.db.request.query",
- "doc": "Query for one or more member signatures",
+ "doc": "Deprecated schema, QueryMemberInfo should be used instead. Query for one or more member signatures",
  "fields": [
  {
  "name": "queryIdentities",

data/avro-schema/src/main/resources/avro/net/corda/data/membership/db/response/query/MemberSignatureQueryResponse.avsc

@@ -2,7 +2,7 @@
  "type": "record",
  "name": "MemberSignatureQueryResponse",
  "namespace": "net.corda.data.membership.db.response.query",
- "doc": "Response to a query for one or more member infos",
+ "doc": "Deprecated schema, MemberInfoQueryResponse should be used instead. Response to a query for one or more member signatures",
  "fields": [
  {
  "name": "membersSignatures",

data/config-schema/src/main/java/net/corda/schema/configuration/LedgerConfig.java

@@ -10,5 +10,6 @@ private LedgerConfig() {
  public static final String UTXO_TOKEN_PERIODIC_CHECK_BLOCK_SIZE = "tokens.periodCheckBlockSize";
  public static final String UTXO_TOKEN_SEND_WAKEUP_MAX_RETRY_ATTEMPTS = "tokens.sendWakeUpMaxRetryAttempts";
  public static final String UTXO_TOKEN_SEND_WAKEUP_MAX_RETRY_DELAY = "tokens.sendWakeUpMaxRetryDelay";
+ public static final String UTXO_TOKEN_CACHED_TOKEN_PAGE_SIZE= "tokens.cachedTokenPageSize";
  public static final String UTXO_BACKCHAIN_BATCH_SIZE = "backchain.batchSize";
 }

data/config-schema/src/main/java/net/corda/schema/configuration/ReconciliationConfig.java

@@ -12,4 +12,6 @@ private ReconciliationConfig() {
  public static final String RECONCILIATION_VNODE_INFO_INTERVAL_MS ="vnodeInfoIntervalMs";
  public static final String RECONCILIATION_GROUP_PARAMS_INTERVAL_MS = "groupParamsIntervalMs";
  public static final String RECONCILIATION_MTLS_MGM_ALLOWED_LIST_INTERVAL_MS = "mtlsMgmAllowedCertificateSubjectsIntervalMs";
+
+ public static final String RECONCILIATION_MEMBER_INFO_INTERVAL_MS = "memberInfoIntervalMs";
 }

data/config-schema/src/main/resources/net/corda/schema/configuration/flow/1.0/corda.flow.json

@@ -106,7 +106,7 @@
  }
  },
  "additionalProperties": false
- },
-  "additionalProperties": false
- }
+ }
+ },
+ "additionalProperties": false
 }

data/config-schema/src/main/resources/net/corda/schema/configuration/ledger.utxo/1.0/corda.ledger.utxo.json

@@ -46,6 +46,12 @@
  "type": "integer",
  "minimum": 1,
  "default": 10
+ },
+ "cachedTokenPageSize": {
+ "description": "The page size of the query that retrieves tokens from the database",
+ "type": "integer",
+ "minimum": 0,
+ "default": 1500
  }
  }
  },

data/config-schema/src/main/resources/net/corda/schema/configuration/reconciliation/1.0/corda.reconciliation.json

@@ -54,6 +54,13 @@
  "minimum": 5000,
  "maximum": 2147483647,
  "default": 120000
+ },
+ "memberInfoIntervalMs": {
+ "description": "The interval in milliseconds between aligning the Kafka Member Info with the DB Member Info.",
+ "type": "integer",
+ "minimum": 5000,
+ "maximum": 2147483647,
+ "default": 120000
  }
  }
 }

data/db-schema/src/main/resources/net/corda/db/schema/config/migration/config-creation-v1.0.xml

@@ -113,6 +113,17 @@
  <column name="update_actor" value="admin"/>
  </insert>
 
+ <insert tableName="config">
+ <column name="section" value="corda.ledger.utxo"/>
+ <column name="config" value=""/>
+ <column name="schema_version_major" value="1"/>
+ <column name="schema_version_minor" value="0"/>
+ <column name="version" value="0"/>
+ <column name="is_deleted" value="false"/>
+ <column name="update_ts" valueDate="${now}"/>
+ <column name="update_actor" value="admin"/>
+ </insert>
+
  <insert tableName="config">
  <column name="section" value="corda.flow"/>
  <column name="config" value=""/>

data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/db.changelog-master.xml

@@ -5,4 +5,6 @@
  <include file="net/corda/db/schema/vnode-vault/migration/vnode-vault-creation-v1.0.xml"/>
  <include file="net/corda/db/schema/vnode-vault/migration/ledger-consensual-creation-v1.0.xml"/>
  <include file="net/corda/db/schema/vnode-vault/migration/ledger-utxo-creation-v1.0.xml"/>
+
+ <include file="net/corda/db/schema/vnode-vault/migration/vnode-vault-creation-v5.1.xml"/>
 </databaseChangeLog>

data/db-schema/src/main/resources/net/corda/db/schema/vnode-vault/migration/vnode-vault-creation-v5.1.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
+ <changeSet author="R3.Corda" id="vnode-vault-creation-v5.1">
+ <addColumn tableName="vnode_member_info">
+ <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>

data/topic-schema/src/main/resources/net/corda/schema/Membership.yaml

@@ -39,6 +39,7 @@ topics:
  producers:
  - membership
  - rest
+ - db
  config:
  MembershipRegistrationStateTopic:
  name: membership.registration.state
@@ -61,6 +62,7 @@ topics:
  - membership
  - rest
  - flow
+ - db
  producers:
  - membership
  - db
@@ -93,6 +95,7 @@ topics:
  - link-manager
  - membership
  - rest
+ - db
  config:
  MembershipDBRpcOpsResponseTopic:
  name: membership.db.rpc.ops.resp
@@ -101,6 +104,7 @@ topics:
  - membership
  - rest
  - flow
+ - db
  producers:
  - db
  config:
@@ -141,6 +145,7 @@ topics:
  producers:
  - rest
  - membership
+ - db
  MembershipAsyncRequestRetriesTopic:
  name: membership.async.request.retries
  consumers:

gradle.properties

@@ -9,7 +9,7 @@ cordaProductVersion = 5.1.0
 # NOTE: update this each time this module contains a breaking change
 ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to
 ## a per module property in which case module versions can change independently.
-cordaApiRevision = 12
+cordaApiRevision = 15
 
 # Main
 kotlinVersion = 1.8.21
@@ -41,7 +41,7 @@ slf4jVersion = 1.7.36
 
 # Main implementation dependencies
 avroGradlePluginVersion=1.3.0
-avroVersion = 1.11.1
+avroVersion = 1.11.2
 bouncycastleVersion = 1.73
 grgitPluginVersion = 5.2.0
 taskTreePluginVersion = 2.1.1
@@ -50,7 +50,7 @@ jacksonVersion = 2.15.2
 
 # Testing
 assertjVersion = 3.24.+
-junitVersion = 5.9.+
+junitVersion = 5.10.0
 mockitoVersion = 5.3.+
 mockitoKotlinVersion = 4.1.+
 
@@ -61,7 +61,7 @@ osgiVersion = 8.0.0
 osgiAnnotationVersion = 8.1.0
 osgiScrAnnotationVersion = 1.5.1
 
-gradleEnterpriseVersion = 3.12.2
+gradleEnterpriseVersion = 3.14.1
 gradleDataPlugin = 1.8.2
 org.gradle.caching = true
 gradleEnterpriseUrl = https://gradle.dev.r3.com

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.