From cd4626d8c2b538154530f8074fb2769c1ac77383 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Wed, 22 Jul 2020 08:08:49 +0000 Subject: [PATCH 1/7] CORDA-3917 Update to Jackson 2.9.8 (#6493) * Update to Jackson 2.9.8 to address multiple security issues, and update warning note about updates to clarify that it refers to 2.10+. When the note was added 2.9.7 as the highest available version in the 2.9.x series. * Add PR code checks Jenkinsfile --- .ci/dev/pr-code-checks/Jenkinsfile | 76 ++++++++++++++++++++++++++++++ build.gradle | 4 +- 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 .ci/dev/pr-code-checks/Jenkinsfile diff --git a/.ci/dev/pr-code-checks/Jenkinsfile b/.ci/dev/pr-code-checks/Jenkinsfile new file mode 100644 index 0000000000..a64813c92f --- /dev/null +++ b/.ci/dev/pr-code-checks/Jenkinsfile @@ -0,0 +1,76 @@ +@Library('corda-shared-build-pipeline-steps') +import static com.r3.build.BuildControl.killAllExistingBuildsForJob + +killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger()) + +pipeline { + agent { label 'k8s' } + options { + timestamps() + timeout(time: 3, unit: 'HOURS') + buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14')) + } + + environment { + PR_CONTEXT_STRING = "PR Code Checks" + } + + stages { + stage('Detekt check') { + steps { + script { + pullRequest.createStatus( + status: 'pending', + context: "${PR_CONTEXT_STRING}", + description: "Running code checks", + targetUrl: "${env.BUILD_URL}") + } + sh "./gradlew --no-daemon clean detekt" + } + } + + stage('Compilation warnings check') { + steps { + sh "./gradlew --no-daemon -Pcompilation.warningsAsErrors=true compileAll" + } + } + + stage('No API change check') { + steps { + sh "./gradlew --no-daemon generateApi" + sh ".ci/check-api-changes.sh" + } + } + + stage('Deploy Nodes') { + steps { + sh "./gradlew --no-daemon jar deployNodes" + } + } + } + + post { + success { + script { + pullRequest.createStatus( + status: 'success', + context: "${PR_CONTEXT_STRING}", + description: 'Code checks passed', + targetUrl: "${env.BUILD_URL}") + } + } + + failure { + script { + pullRequest.createStatus( + status: 'failure', + context: "${PR_CONTEXT_STRING}", + description: 'Code checks failed', + targetUrl: "${env.BUILD_URL}") + } + } + cleanup { + deleteDir() /* clean up our workspace */ + } + } +} diff --git a/build.gradle b/build.gradle index e1b3594f59..00cc0470be 100644 --- a/build.gradle +++ b/build.gradle @@ -61,8 +61,8 @@ buildscript { ext.asm_version = '7.1' ext.artemis_version = '2.6.2' - // TODO Upgrade Jackson only when corda is using kotlin 1.3.10 - ext.jackson_version = '2.9.7' + // TODO Upgrade to Jackson 2.10+ only when corda is using kotlin 1.3.10 + ext.jackson_version = '2.9.8' ext.jetty_version = '9.4.19.v20190610' ext.jersey_version = '2.25' ext.servlet_version = '4.0.1' From 8cf3fa4ac85c7a21e34d1602491cac5297fafee3 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Wed, 22 Jul 2020 15:35:03 +0000 Subject: [PATCH 2/7] CORDA-3916 Update to BouncyCastle 1.61 (#6492) Update to BouncyCastle 1.61. Updating one version at a time to mitigate risk of a complex breaking change being introduced. --- constants.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants.properties b/constants.properties index 915b7e141f..6cf6942c4d 100644 --- a/constants.properties +++ b/constants.properties @@ -22,7 +22,7 @@ quasarVersion11=0.8.0 # Specify a classifier for Java 11 built artifacts jdkClassifier11=jdk11 proguardVersion=6.1.1 -bouncycastleVersion=1.60 +bouncycastleVersion=1.61 classgraphVersion=4.8.41 disruptorVersion=3.4.2 typesafeConfigVersion=1.3.4 From 416d27a909ad07f0f2cac5fe2d149a380d8fb210 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Tue, 11 Aug 2020 23:42:00 +0100 Subject: [PATCH 3/7] CORDA-3982 Revert "CORDA-3917 Update to Jackson 2.9.8 (#6493)" (#6615) This reverts commit cd4626d8c2b538154530f8074fb2769c1ac77383. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 00cc0470be..e1b3594f59 100644 --- a/build.gradle +++ b/build.gradle @@ -61,8 +61,8 @@ buildscript { ext.asm_version = '7.1' ext.artemis_version = '2.6.2' - // TODO Upgrade to Jackson 2.10+ only when corda is using kotlin 1.3.10 - ext.jackson_version = '2.9.8' + // TODO Upgrade Jackson only when corda is using kotlin 1.3.10 + ext.jackson_version = '2.9.7' ext.jetty_version = '9.4.19.v20190610' ext.jersey_version = '2.25' ext.servlet_version = '4.0.1' From 21985243159f7797fbd507d96819c531f7f22ee6 Mon Sep 17 00:00:00 2001 From: Joseph Zuniga-Daly <59851625+josephzunigadaly@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:41:51 +0100 Subject: [PATCH 4/7] CORDA-3824: Fix property rename in AMQP object evolution (#6616) * CORDA-3824: Add unit tests * CORDA-3824: Fix property rename in AMQP object evolution * Rename deserializedException to deserializedObject * Rename test class to EvolutionObjectBuilderRenamedPropertyTests * Added descriptions of the different object evolution stages in this test * Rename file containing the serialized object * Regenerate serialized data * Add a comment explaining the commented out code. * Restrict new behaviour to EvolutionObjectBuilder and simplify the loop that builds constructor slots. --- .../internal/amqp/ObjectBuilder.kt | 20 +++- ...lutionObjectBuilderRenamedPropertyTests.kt | 90 ++++++++++++++++++ ...ionObjectBuilderRenamedPropertyTests.Step1 | Bin 0 -> 1437 bytes 3 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionObjectBuilderRenamedPropertyTests.kt create mode 100644 serialization/src/test/resources/net/corda/serialization/internal/amqp/EvolutionObjectBuilderRenamedPropertyTests.Step1 diff --git a/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectBuilder.kt b/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectBuilder.kt index ab1150ffff..056cfc1197 100644 --- a/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectBuilder.kt +++ b/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectBuilder.kt @@ -69,7 +69,7 @@ interface ObjectBuilder { * Create an [ObjectBuilderProvider] for the given [LocalTypeInformation.Composable]. */ fun makeProvider(typeInformation: LocalTypeInformation.Composable): ObjectBuilderProvider = - makeProvider(typeInformation.typeIdentifier, typeInformation.constructor, typeInformation.properties) + makeProvider(typeInformation.typeIdentifier, typeInformation.constructor, typeInformation.properties, false) /** * Create an [ObjectBuilderProvider] for the given type, constructor and set of properties. @@ -79,11 +79,12 @@ interface ObjectBuilder { */ fun makeProvider(typeIdentifier: TypeIdentifier, constructor: LocalConstructorInformation, - properties: Map): ObjectBuilderProvider = - if (constructor.hasParameters) makeConstructorBasedProvider(properties, typeIdentifier, constructor) + properties: Map, + includeAllConstructorParameters: Boolean): ObjectBuilderProvider = + if (constructor.hasParameters) makeConstructorBasedProvider(properties, typeIdentifier, constructor, includeAllConstructorParameters) else makeGetterSetterProvider(properties, typeIdentifier, constructor) - private fun makeConstructorBasedProvider(properties: Map, typeIdentifier: TypeIdentifier, constructor: LocalConstructorInformation): ObjectBuilderProvider { + private fun makeConstructorBasedProvider(properties: Map, typeIdentifier: TypeIdentifier, constructor: LocalConstructorInformation, includeAllConstructorParameters: Boolean): ObjectBuilderProvider { val constructorIndices = properties.mapValues { (name, property) -> when (property) { is LocalPropertyInformation.ConstructorPairedProperty -> property.constructorSlot.parameterIndex @@ -94,6 +95,15 @@ interface ObjectBuilder { "but property $name is not constructor-paired" ) } + }.toMutableMap() + + if (includeAllConstructorParameters) { + // Add constructor parameters not in the list of properties + // so we can use them in object evolution + for ((parameterIndex, parameter) in constructor.parameters.withIndex()) { + // Only use the parameters not already matched to properties + constructorIndices.putIfAbsent(parameter.name, parameterIndex) + } } val propertySlots = constructorIndices.keys.mapIndexed { slot, name -> name to slot }.toMap() @@ -203,7 +213,7 @@ class EvolutionObjectBuilder(private val localBuilder: ObjectBuilder, localProperties: Map, remoteTypeInformation: RemoteTypeInformation.Composable, mustPreserveData: Boolean): () -> ObjectBuilder { - val localBuilderProvider = ObjectBuilder.makeProvider(typeIdentifier, constructor, localProperties) + val localBuilderProvider = ObjectBuilder.makeProvider(typeIdentifier, constructor, localProperties, true) val remotePropertyNames = remoteTypeInformation.properties.keys.sorted() val reroutedIndices = remotePropertyNames.map { propertyName -> diff --git a/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionObjectBuilderRenamedPropertyTests.kt b/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionObjectBuilderRenamedPropertyTests.kt new file mode 100644 index 0000000000..0e7f795839 --- /dev/null +++ b/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionObjectBuilderRenamedPropertyTests.kt @@ -0,0 +1,90 @@ +package net.corda.serialization.internal.amqp + +import net.corda.core.contracts.BelongsToContract +import net.corda.core.contracts.Contract +import net.corda.core.contracts.ContractState +import net.corda.core.identity.AbstractParty +import net.corda.core.serialization.DeprecatedConstructorForDeserialization +import net.corda.core.serialization.SerializedBytes +import net.corda.core.transactions.LedgerTransaction +import net.corda.serialization.internal.amqp.testutils.deserialize +import net.corda.serialization.internal.amqp.testutils.serialize +import net.corda.serialization.internal.amqp.testutils.testDefaultFactory +import net.corda.serialization.internal.amqp.testutils.writeTestResource +import org.assertj.core.api.Assertions +import org.junit.Test + +class EvolutionObjectBuilderRenamedPropertyTests +{ + private val cordappVersionTestValue = 38854445 + private val dataTestValue = "d7af8af0-c10e-45bc-a5f7-92de432be0ef" + private val xTestValue = 7568055 + private val yTestValue = 4113687 + + class TemplateContract : Contract { + override fun verify(tx: LedgerTransaction) { } + } + + /** + * Step 1 + * + * This is the original class definition in object evolution. + */ +// @BelongsToContract(TemplateContract::class) +// data class TemplateState(val cordappVersion: Int, val data: String, val x : Int?, override val participants: List = listOf()) : ContractState + + /** + * Step 2 + * + * This is an intermediate class definition in object evolution. + * The y property has been added and a constructor copies the value of x into y. x is now set to null by the constructor. + */ +// @BelongsToContract(TemplateContract::class) +// data class TemplateState(val cordappVersion: Int, val data: String, val x : Int?, val y : String?, override val participants: List = listOf()) : ContractState { +// @DeprecatedConstructorForDeserialization(1) +// constructor(cordappVersion: Int, data : String, x : Int?, participants: List) +// : this(cordappVersion, data, null, x?.toString(), participants) +// } + + /** + * Step 3 + * + * This is the final class definition in object evolution. + * The x property has been removed but the constructor that copies values of x into y still exists. We expect previous versions of this + * object to pass the value of x to the constructor when deserialized. + */ + @BelongsToContract(TemplateContract::class) + data class TemplateState(val cordappVersion: Int, val data: String, val y : String?, override val participants: List = listOf()) : ContractState { + @DeprecatedConstructorForDeserialization(1) + constructor(cordappVersion: Int, data : String, x : Int?, participants: List) : this(cordappVersion, data, x?.toString(), participants) + } + + @Test(timeout=300_000) + fun `Step 1 to Step 3`() { + + // The next two commented lines are how the serialized data is generated. To regenerate the data, uncomment these along + // with the correct version of the class and rerun the test. This will generate a new file in the project resources. + +// val step1 = TemplateState(cordappVersionTestValue, dataTestValue, xTestValue) +// saveSerializedObject(step1) + + // serialization/src/test/resources/net/corda/serialization/internal/amqp/EvolutionObjectBuilderRenamedPropertyTests.Step1 + val bytes = this::class.java.getResource("EvolutionObjectBuilderRenamedPropertyTests.Step1").readBytes() + + val serializerFactory: SerializerFactory = testDefaultFactory() + val deserializedObject = DeserializationInput(serializerFactory) + .deserialize(SerializedBytes(bytes)) + + Assertions.assertThat(deserializedObject.cordappVersion).isEqualTo(cordappVersionTestValue) + Assertions.assertThat(deserializedObject.data).isEqualTo(dataTestValue) +// Assertions.assertThat(deserializedObject.x).isEqualTo(xTestValue) + Assertions.assertThat(deserializedObject.y).isEqualTo(xTestValue.toString()) + Assertions.assertThat(deserializedObject).isInstanceOf(TemplateState::class.java) + } + + /** + * Write serialized object to resources folder + */ + @Suppress("unused") + fun saveSerializedObject(obj : T) = writeTestResource(SerializationOutput(testDefaultFactory()).serialize(obj)) +} \ No newline at end of file diff --git a/serialization/src/test/resources/net/corda/serialization/internal/amqp/EvolutionObjectBuilderRenamedPropertyTests.Step1 b/serialization/src/test/resources/net/corda/serialization/internal/amqp/EvolutionObjectBuilderRenamedPropertyTests.Step1 new file mode 100644 index 0000000000000000000000000000000000000000..c2a94d7f11f57bc2446a00d6cd6ec0e57d769e78 GIT binary patch literal 1437 zcmb_c%}(1u5VjMW2&qD}46cZ9mpdyuVYDyph11(e>Dy{8xw66bRuY<#> zhpOtmx87ELh+emc-unhz`xxD%)Fe?N(W;l#Xl8c4pIO@sA`9>w$G!V*u#@BX9~>us zU_qYy^2mo+GW#7*(Q!j=dHc;u(&{#Kr*rP0LwToGqvt{=r(YMzqE!X#|`MfoxZcTV)HbSIPz~L3?E6Md}4UY_zu0eaBlp!YObXLAzGdI$V79H6xT`goK|r z%!F$e6tbGgYW#ba63Ls4s}#cs0T*2Xi~?UmK8BGGTnTucP|~`AoAmQXh67EkCdjp5 zbOL?gK}(N<5JtH762>@Qdmm@AN3j*gnQrn#c0dG*KS-fKI{ou88ZOLej%({x z;a!$f%J#3c!=PCQU s4Xs0@mN Date: Wed, 19 Aug 2020 17:18:39 +0100 Subject: [PATCH 5/7] Extract method to fix detekt ComplexMethod failure --- .../serialization/internal/amqp/ObjectBuilder.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectBuilder.kt b/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectBuilder.kt index 373f96ca8f..ffc2fae5b5 100644 --- a/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectBuilder.kt +++ b/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectBuilder.kt @@ -124,12 +124,7 @@ interface ObjectBuilder { }.toMutableMap() if (includeAllConstructorParameters) { - // Add constructor parameters not in the list of properties - // so we can use them in object evolution - for ((parameterIndex, parameter) in constructor.parameters.withIndex()) { - // Only use the parameters not already matched to properties - constructorIndices.putIfAbsent(parameter.name, parameterIndex) - } + addMissingConstructorParameters(constructorIndices, constructor) } val propertySlots = constructorIndices.keys.mapIndexed { slot, name -> name to slot }.toMap() @@ -139,6 +134,15 @@ interface ObjectBuilder { } } + private fun addMissingConstructorParameters(constructorIndices: MutableMap, constructor: LocalConstructorInformation) { + // Add constructor parameters not in the list of properties + // so we can use them in object evolution + for ((parameterIndex, parameter) in constructor.parameters.withIndex()) { + // Only use the parameters not already matched to properties + constructorIndices.putIfAbsent(parameter.name, parameterIndex) + } + } + private fun makeSetterBasedProvider( properties: Map, typeIdentifier: TypeIdentifier, From ab218333903a37b5fd1f81b514868a31077dd4e5 Mon Sep 17 00:00:00 2001 From: Nikolett Nagy <61757742+nikinagy@users.noreply.github.com> Date: Thu, 20 Aug 2020 09:23:03 +0100 Subject: [PATCH 6/7] Re-add lost fix (#6652) --- .../node/services/vault/VaultQueryJoinTest.kt | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryJoinTest.kt b/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryJoinTest.kt index 6bfc1a7874..59d246d3a8 100644 --- a/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryJoinTest.kt +++ b/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryJoinTest.kt @@ -6,6 +6,7 @@ import net.corda.core.contracts.Contract import net.corda.core.contracts.ContractState import net.corda.core.contracts.StateRef import net.corda.core.identity.AbstractParty +import net.corda.core.node.ServiceHub import net.corda.core.node.services.Vault import net.corda.core.node.services.queryBy import net.corda.core.node.services.vault.DEFAULT_PAGE_SIZE @@ -22,7 +23,9 @@ import net.corda.core.transactions.TransactionBuilder import net.corda.testing.core.ALICE_NAME import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetworkParameters +import net.corda.testing.node.StartedMockNode import net.corda.testing.node.internal.cordappsForPackages +import org.junit.AfterClass import org.junit.BeforeClass import org.junit.Test import javax.persistence.Column @@ -33,24 +36,29 @@ import kotlin.test.assertEquals class VaultQueryJoinTest { companion object { - private val mockNetwork = MockNetwork( - MockNetworkParameters( - cordappsForAllNodes = cordappsForPackages( - listOf( - "net.corda.node.services.vault" - ) - ) - ) - ) - private val aliceNode = mockNetwork.createPartyNode(ALICE_NAME) - private val notaryNode = mockNetwork.defaultNotaryNode - private val serviceHubHandle = aliceNode.services + private var mockNetwork: MockNetwork? = null + private lateinit var aliceNode: StartedMockNode + private lateinit var notaryNode: StartedMockNode + private lateinit var serviceHubHandle: ServiceHub private val createdStateRefs = mutableListOf() private const val numObjectsInLedger = DEFAULT_PAGE_SIZE + 1 @BeforeClass @JvmStatic fun setup() { + mockNetwork = MockNetwork( + MockNetworkParameters( + cordappsForAllNodes = cordappsForPackages( + listOf( + "net.corda.node.services.vault" + ) + ) + ) + ).also { mockNetwork -> + aliceNode = mockNetwork.createPartyNode(ALICE_NAME) + notaryNode = mockNetwork.defaultNotaryNode + serviceHubHandle = aliceNode.services + } repeat(numObjectsInLedger) { index -> createdStateRefs.add(addSimpleObjectToLedger(DummyData(index))) } @@ -58,6 +66,13 @@ class VaultQueryJoinTest { System.setProperty("net.corda.vault.query.disable.corda3879", "false"); } + @AfterClass + @JvmStatic + fun teardown() { + mockNetwork?.stopNodes() + mockNetwork = null + } + private fun addSimpleObjectToLedger(dummyObject: DummyData): StateRef { val tx = TransactionBuilder(notaryNode.info.legalIdentities.first()) tx.addOutputState( From df7e3ca184189970e112c601f868f72eb509355a Mon Sep 17 00:00:00 2001 From: Joseph Zuniga-Daly <59851625+josephzunigadaly@users.noreply.github.com> Date: Mon, 24 Aug 2020 14:32:10 +0100 Subject: [PATCH 7/7] CORDA-3908: Update corda-4.5 .ci/api-current.txt to match the previous release (corda-4.4) (#6648) * CORDA-3908: Update corda-4.5 .ci/api-current.txt to match the previous release (corda-4.4) * Reapply changes from PR 5998 https://github.com/corda/corda/pull/5998 --- .ci/api-current.txt | 550 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 550 insertions(+) diff --git a/.ci/api-current.txt b/.ci/api-current.txt index 64e351610e..e60d7ef22c 100644 --- a/.ci/api-current.txt +++ b/.ci/api-current.txt @@ -478,6 +478,8 @@ public interface net.corda.core.contracts.Attachment extends net.corda.core.cont public interface net.corda.core.contracts.AttachmentConstraint public abstract boolean isSatisfiedBy(net.corda.core.contracts.Attachment) ## +public final class net.corda.core.contracts.AttachmentConstraintKt extends java.lang.Object +## @CordaSerializable public final class net.corda.core.contracts.AttachmentResolutionException extends net.corda.core.flows.FlowException public (net.corda.core.crypto.SecureHash) @@ -500,6 +502,12 @@ public @interface net.corda.core.contracts.BelongsToContract public abstract Class value() ## @CordaSerializable +public final class net.corda.core.contracts.BrokenAttachmentException extends net.corda.core.flows.FlowException + public (net.corda.core.crypto.SecureHash, String, Throwable) + @NotNull + public final net.corda.core.crypto.SecureHash getAttachmentId() +## +@CordaSerializable public final class net.corda.core.contracts.Command extends java.lang.Object public (T, java.security.PublicKey) public (T, java.util.List) @@ -569,6 +577,7 @@ public interface net.corda.core.contracts.Contract public abstract void verify(net.corda.core.transactions.LedgerTransaction) ## @DoNotImplement +@CordaSerializable public final class net.corda.core.contracts.ContractAttachment extends java.lang.Object implements net.corda.core.contracts.Attachment public (net.corda.core.contracts.Attachment, String) public (net.corda.core.contracts.Attachment, String, java.util.Set) @@ -647,6 +656,11 @@ public final class net.corda.core.contracts.HashAttachmentConstraint extends jav public boolean isSatisfiedBy(net.corda.core.contracts.Attachment) @NotNull public String toString() + public static final net.corda.core.contracts.HashAttachmentConstraint$Companion Companion +## +public static final class net.corda.core.contracts.HashAttachmentConstraint$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) + public final boolean getDisableHashConstraints() ## @CordaSerializable public final class net.corda.core.contracts.InsufficientBalanceException extends net.corda.core.flows.FlowException @@ -675,15 +689,20 @@ public final class net.corda.core.contracts.Issued extends java.lang.Object public @interface net.corda.core.contracts.LegalProseReference public abstract String uri() ## +@DoNotImplement @CordaSerializable public final class net.corda.core.contracts.LinearPointer extends net.corda.core.contracts.StatePointer + @DeprecatedConstructorForDeserialization public (net.corda.core.contracts.UniqueIdentifier, Class) + public (net.corda.core.contracts.UniqueIdentifier, Class, boolean) + public (net.corda.core.contracts.UniqueIdentifier, Class, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) public boolean equals(Object) @NotNull public net.corda.core.contracts.UniqueIdentifier getPointer() @NotNull public Class getType() public int hashCode() + public boolean isResolved() @NotNull public net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull @@ -871,6 +890,7 @@ public final class net.corda.core.contracts.StateAndRef extends java.lang.Object @NotNull public String toString() ## +@DoNotImplement @CordaSerializable public abstract class net.corda.core.contracts.StatePointer extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) @@ -878,10 +898,15 @@ public abstract class net.corda.core.contracts.StatePointer extends java.lang.Ob public abstract Object getPointer() @NotNull public abstract Class getType() + public abstract boolean isResolved() @NotNull public abstract net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull public abstract net.corda.core.contracts.StateAndRef resolve(net.corda.core.transactions.LedgerTransaction) + public static final net.corda.core.contracts.StatePointer$Companion Companion +## +public static final class net.corda.core.contracts.StatePointer$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) ## @CordaSerializable public final class net.corda.core.contracts.StateRef extends java.lang.Object @@ -899,15 +924,20 @@ public final class net.corda.core.contracts.StateRef extends java.lang.Object @NotNull public String toString() ## +@DoNotImplement @CordaSerializable public final class net.corda.core.contracts.StaticPointer extends net.corda.core.contracts.StatePointer + @DeprecatedConstructorForDeserialization public (net.corda.core.contracts.StateRef, Class) + public (net.corda.core.contracts.StateRef, Class, boolean) + public (net.corda.core.contracts.StateRef, Class, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) public boolean equals(Object) @NotNull public net.corda.core.contracts.StateRef getPointer() @NotNull public Class getType() public int hashCode() + public boolean isResolved() @NotNull public net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull @@ -1010,12 +1040,17 @@ public final class net.corda.core.contracts.TransactionState extends java.lang.O ## public final class net.corda.core.contracts.TransactionStateKt extends java.lang.Object ## +@CordaSerializable public abstract class net.corda.core.contracts.TransactionVerificationException extends net.corda.core.flows.FlowException public (net.corda.core.crypto.SecureHash, String, Throwable) @NotNull public final net.corda.core.crypto.SecureHash getTxId() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$BrokenTransactionException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ConflictingAttachmentsRejection extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, String) @NotNull @@ -1023,6 +1058,7 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ConstraintPropagationRejection extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, String, net.corda.core.contracts.AttachmentConstraint, net.corda.core.contracts.AttachmentConstraint) @NotNull public final String getContractClass() @@ -1035,6 +1071,7 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ContractCreationError extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String, Throwable) public (net.corda.core.crypto.SecureHash, String, Throwable, String) @NotNull public final String getContractClass() @@ -1052,12 +1089,32 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public static net.corda.core.contracts.TransactionVerificationException$Direction[] values() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$DuplicateAttachmentsRejection extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.Attachment) + @NotNull + public final net.corda.core.contracts.Attachment getAttachmentId() +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$DuplicateInputStates extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, net.corda.core.utilities.NonEmptySet) @NotNull public final net.corda.core.utilities.NonEmptySet getDuplicates() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$InvalidAttachmentException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, net.corda.core.crypto.SecureHash) + @NotNull + public final net.corda.core.crypto.SecureHash getAttachmentHash() +## +@CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$InvalidConstraintRejection extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String, String) + @NotNull + public final String getContractClass() + @NotNull + public final String getReason() +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$InvalidNotaryChange extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash) ## @@ -1068,6 +1125,11 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public final String getContractClass() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$MissingNetworkParametersException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) + public (net.corda.core.crypto.SecureHash, net.corda.core.crypto.SecureHash) +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$MoreThanOneNotary extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash) ## @@ -1082,6 +1144,8 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$OverlappingAttachmentsException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, String) + @NotNull + public final String getPath() ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$PackageOwnershipException extends net.corda.core.contracts.TransactionVerificationException @@ -1101,11 +1165,13 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionContractConflictException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.TransactionState, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionDuplicateEncumbranceException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, int) + public (net.corda.core.crypto.SecureHash, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionMissingEncumbranceException extends net.corda.core.contracts.TransactionVerificationException @@ -1115,18 +1181,34 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public final int getMissing() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNetworkParameterOrderingException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) + public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.StateRef, net.corda.core.node.NetworkParameters, net.corda.core.node.NetworkParameters) +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNonMatchingEncumbranceException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, java.util.Collection) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNotaryMismatchEncumbranceException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, int, int, net.corda.core.identity.Party, net.corda.core.identity.Party) + public (net.corda.core.crypto.SecureHash, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionRequiredContractUnspecifiedException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.TransactionState) ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$UntrustedAttachmentsException extends net.corda.core.CordaException + public (net.corda.core.crypto.SecureHash, java.util.List) + @NotNull + public final java.util.List getIds() + @NotNull + public final net.corda.core.crypto.SecureHash getTxId() +## +@CordaSerializable public abstract class net.corda.core.contracts.TypeOnlyCommandData extends java.lang.Object implements net.corda.core.contracts.CommandData public () public boolean equals(Object) @@ -1367,6 +1449,48 @@ public final class net.corda.core.cordapp.CordappContext extends java.lang.Objec public static final class net.corda.core.cordapp.CordappContext$Companion extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) ## +@CordaSerializable +public final class net.corda.core.cordapp.CordappInfo extends java.lang.Object + public (String, String, String, int, int, String, String, String, net.corda.core.crypto.SecureHash$SHA256) + @NotNull + public final String component1() + @NotNull + public final String component2() + @NotNull + public final String component3() + public final int component4() + public final int component5() + @NotNull + public final String component6() + @NotNull + public final String component7() + @NotNull + public final String component8() + @NotNull + public final net.corda.core.crypto.SecureHash$SHA256 component9() + @NotNull + public final net.corda.core.cordapp.CordappInfo copy(String, String, String, int, int, String, String, String, net.corda.core.crypto.SecureHash$SHA256) + public boolean equals(Object) + @NotNull + public final net.corda.core.crypto.SecureHash$SHA256 getJarHash() + @NotNull + public final String getLicence() + public final int getMinimumPlatformVersion() + @NotNull + public final String getName() + @NotNull + public final String getShortName() + public final int getTargetPlatformVersion() + @NotNull + public final String getType() + @NotNull + public final String getVendor() + @NotNull + public final String getVersion() + public int hashCode() + @NotNull + public String toString() +## @DoNotImplement public interface net.corda.core.cordapp.CordappProvider @NotNull @@ -1528,6 +1652,8 @@ public final class net.corda.core.crypto.CordaObjectIdentifier extends java.lang ## public final class net.corda.core.crypto.CordaSecurityProvider extends java.security.Provider public () + @Nullable + public java.security.Provider$Service getService(String, String) public static final net.corda.core.crypto.CordaSecurityProvider$Companion Companion @NotNull public static final String PROVIDER_NAME = "Corda" @@ -1680,6 +1806,9 @@ public static class net.corda.core.crypto.DigitalSignature$WithKey extends net.c @NotNull public final net.corda.core.crypto.DigitalSignature withoutKey() ## +public final class net.corda.core.crypto.DummySecureRandom extends java.security.SecureRandom + public static final net.corda.core.crypto.DummySecureRandom INSTANCE +## public abstract class net.corda.core.crypto.MerkleTree extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) @NotNull @@ -1860,6 +1989,8 @@ public static final class net.corda.core.crypto.SecureHash$Companion extends jav @CordaSerializable public static final class net.corda.core.crypto.SecureHash$SHA256 extends net.corda.core.crypto.SecureHash public (byte[]) + public boolean equals(Object) + public int hashCode() ## public final class net.corda.core.crypto.SecureHashKt extends java.lang.Object @NotNull @@ -2154,11 +2285,17 @@ public class net.corda.core.flows.DataVendingFlow extends net.corda.core.flows.F @Suspendable protected void verifyDataRequest(net.corda.core.internal.FetchDataFlow$Request$Data) ## +@DoNotImplement +public interface net.corda.core.flows.Destination +## @InitiatingFlow public final class net.corda.core.flows.FinalityFlow extends net.corda.core.flows.FlowLogic public (net.corda.core.transactions.SignedTransaction) public (net.corda.core.transactions.SignedTransaction, java.util.Collection) public (net.corda.core.transactions.SignedTransaction, java.util.Collection, java.util.Collection, net.corda.core.utilities.ProgressTracker) + public (net.corda.core.transactions.SignedTransaction, java.util.Collection, net.corda.core.node.StatesToRecord) + public (net.corda.core.transactions.SignedTransaction, java.util.Collection, net.corda.core.node.StatesToRecord, net.corda.core.utilities.ProgressTracker) + public (net.corda.core.transactions.SignedTransaction, java.util.Collection, net.corda.core.node.StatesToRecord, net.corda.core.utilities.ProgressTracker, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.transactions.SignedTransaction, java.util.Collection, net.corda.core.utilities.ProgressTracker) public (net.corda.core.transactions.SignedTransaction, java.util.Collection, net.corda.core.utilities.ProgressTracker, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.transactions.SignedTransaction, java.util.Set) @@ -2338,6 +2475,9 @@ public abstract class net.corda.core.flows.FlowLogic extends java.lang.Object public final net.corda.core.node.ServiceHub getServiceHub() @Suspendable @NotNull + public final net.corda.core.flows.FlowSession initiateFlow(net.corda.core.flows.Destination) + @Suspendable + @NotNull public final net.corda.core.flows.FlowSession initiateFlow(net.corda.core.identity.Party) @Suspendable public final void persistFlowStackSnapshot() @@ -2417,6 +2557,8 @@ public abstract class net.corda.core.flows.FlowSession extends java.lang.Object @Suspendable @NotNull public abstract net.corda.core.flows.FlowInfo getCounterpartyFlowInfo(boolean) + @NotNull + public abstract net.corda.core.flows.Destination getDestination() @Suspendable @NotNull public abstract net.corda.core.utilities.UntrustworthyData receive(Class) @@ -2472,6 +2614,13 @@ public static final class net.corda.core.flows.FlowStackSnapshot$Frame extends j @NotNull public String toString() ## +@CordaSerializable +public class net.corda.core.flows.HospitalizeFlowException extends net.corda.core.CordaRuntimeException + public () + public (String) + public (String, Throwable) + public (Throwable) +## public interface net.corda.core.flows.IdentifiableException @Nullable public Long getErrorId() @@ -2489,6 +2638,22 @@ public @interface net.corda.core.flows.InitiatingFlow public abstract int version() ## @CordaSerializable +public final class net.corda.core.flows.MaybeSerializedSignedTransaction extends java.lang.Object implements net.corda.core.contracts.NamedByHash + public (net.corda.core.crypto.SecureHash, net.corda.core.serialization.SerializedBytes, net.corda.core.transactions.SignedTransaction) + @Nullable + public final net.corda.core.transactions.SignedTransaction get() + @NotNull + public net.corda.core.crypto.SecureHash getId() + @Nullable + public final net.corda.core.transactions.SignedTransaction getNonSerialised() + @Nullable + public final net.corda.core.serialization.SerializedBytes getSerialized() + public final boolean isNull() + @NotNull + public final String payloadContentDescription() + public final int serializedByteCount() +## +@CordaSerializable public final class net.corda.core.flows.NotarisationPayload extends java.lang.Object public (Object, net.corda.core.flows.NotarisationRequestSignature) @NotNull @@ -2562,6 +2727,11 @@ public final class net.corda.core.flows.NotaryChangeFlow extends net.corda.core. @CordaSerializable public abstract class net.corda.core.flows.NotaryError extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) + public static final net.corda.core.flows.NotaryError$Companion Companion + public static final int NUM_STATES = 5 +## +public static final class net.corda.core.flows.NotaryError$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) ## @CordaSerializable public static final class net.corda.core.flows.NotaryError$Conflict extends net.corda.core.flows.NotaryError @@ -2668,6 +2838,10 @@ public final class net.corda.core.flows.NotaryFlow extends java.lang.Object public static class net.corda.core.flows.NotaryFlow$Client extends net.corda.core.internal.BackpressureAwareTimedFlow public (net.corda.core.transactions.SignedTransaction) public (net.corda.core.transactions.SignedTransaction, net.corda.core.utilities.ProgressTracker) + public (net.corda.core.transactions.SignedTransaction, net.corda.core.utilities.ProgressTracker, boolean) + public (net.corda.core.transactions.SignedTransaction, net.corda.core.utilities.ProgressTracker, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.transactions.SignedTransaction, boolean) + public (net.corda.core.transactions.SignedTransaction, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) @Suspendable @NotNull public java.util.List call() @@ -2983,6 +3157,7 @@ public final class net.corda.core.identity.IdentityUtils extends java.lang.Objec public static final java.util.Map> groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection) @NotNull public static final java.util.Map> groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection, boolean) + public static final boolean x500Matches(String, boolean, net.corda.core.identity.CordaX500Name) ## @DoNotImplement @CordaSerializable @@ -3078,6 +3253,8 @@ public interface net.corda.core.messaging.CordaRPCOps extends net.corda.core.mes @NotNull public abstract net.corda.core.messaging.DataFeed networkParametersFeed() @NotNull + public abstract net.corda.core.node.NodeDiagnosticInfo nodeDiagnosticInfo() + @NotNull public abstract net.corda.core.node.NodeInfo nodeInfo() @Nullable public abstract net.corda.core.node.NodeInfo nodeInfoFromParty(net.corda.core.identity.AbstractParty) @@ -3381,10 +3558,23 @@ public static final class net.corda.core.messaging.StateMachineUpdate$Removed ex ## @DoNotImplement public interface net.corda.core.node.AppServiceHub extends net.corda.core.node.ServiceHub + @NotNull + public abstract net.corda.core.node.services.vault.CordaTransactionSupport getDatabase() + public abstract void register(int, kotlin.jvm.functions.Function1) + public abstract void register(int, net.corda.core.node.services.ServiceLifecycleObserver) @NotNull public abstract net.corda.core.messaging.FlowHandle startFlow(net.corda.core.flows.FlowLogic) @NotNull public abstract net.corda.core.messaging.FlowProgressHandle startTrackedFlow(net.corda.core.flows.FlowLogic) + public static final net.corda.core.node.AppServiceHub$Companion Companion + public static final int SERVICE_PRIORITY_HIGH = 200 + public static final int SERVICE_PRIORITY_LOW = 20 + public static final int SERVICE_PRIORITY_NORMAL = 100 +## +public static final class net.corda.core.node.AppServiceHub$Companion extends java.lang.Object + public static final int SERVICE_PRIORITY_HIGH = 200 + public static final int SERVICE_PRIORITY_LOW = 20 + public static final int SERVICE_PRIORITY_NORMAL = 100 ## public @interface net.corda.core.node.AutoAcceptable ## @@ -3435,6 +3625,34 @@ public final class net.corda.core.node.NetworkParameters extends java.lang.Objec public String toString() ## @CordaSerializable +public final class net.corda.core.node.NodeDiagnosticInfo extends java.lang.Object + public (String, String, int, String, java.util.List) + @NotNull + public final String component1() + @NotNull + public final String component2() + public final int component3() + @NotNull + public final String component4() + @NotNull + public final java.util.List component5() + @NotNull + public final net.corda.core.node.NodeDiagnosticInfo copy(String, String, int, String, java.util.List) + public boolean equals(Object) + @NotNull + public final java.util.List getCordapps() + public final int getPlatformVersion() + @NotNull + public final String getRevision() + @NotNull + public final String getVendor() + @NotNull + public final String getVersion() + public int hashCode() + @NotNull + public String toString() +## +@CordaSerializable public final class net.corda.core.node.NodeInfo extends java.lang.Object public (java.util.List, java.util.List, int, long) @NotNull @@ -3459,6 +3677,7 @@ public final class net.corda.core.node.NodeInfo extends java.lang.Object public final net.corda.core.identity.PartyAndCertificate identityAndCertFromX500Name(net.corda.core.identity.CordaX500Name) @NotNull public final net.corda.core.identity.Party identityFromX500Name(net.corda.core.identity.CordaX500Name) + public final boolean isLegalIdentity(net.corda.core.identity.CordaX500Name) public final boolean isLegalIdentity(net.corda.core.identity.Party) @NotNull public String toString() @@ -3502,6 +3721,8 @@ public interface net.corda.core.node.ServiceHub extends net.corda.core.node.Serv @NotNull public abstract net.corda.core.node.services.ContractUpgradeService getContractUpgradeService() @NotNull + public abstract net.corda.core.node.services.diagnostics.DiagnosticsService getDiagnosticsService() + @NotNull public abstract net.corda.core.node.services.KeyManagementService getKeyManagementService() @NotNull public abstract net.corda.core.node.NodeInfo getMyInfo() @@ -3550,6 +3771,8 @@ public interface net.corda.core.node.ServicesForResolution public abstract net.corda.core.contracts.TransactionState loadState(net.corda.core.contracts.StateRef) @NotNull public abstract java.util.Set> loadStates(java.util.Set) + @NotNull + public net.corda.core.transactions.LedgerTransaction specialise(net.corda.core.transactions.LedgerTransaction) ## public final class net.corda.core.node.StatesToRecord extends java.lang.Enum public static net.corda.core.node.StatesToRecord valueOf(String) @@ -3588,11 +3811,18 @@ public interface net.corda.core.node.services.ContractUpgradeService ## public @interface net.corda.core.node.services.CordaService ## +public final class net.corda.core.node.services.CordaServiceCriticalFailureException extends java.lang.Exception + public (String) + public (String, Throwable) +## @DoNotImplement public interface net.corda.core.node.services.IdentityService public abstract void assertOwnership(net.corda.core.identity.Party, net.corda.core.identity.AnonymousParty) @Nullable public abstract net.corda.core.identity.PartyAndCertificate certificateFromKey(java.security.PublicKey) + @Suspendable + @Nullable + public abstract java.util.UUID externalIdForPublicKey(java.security.PublicKey) @NotNull public abstract Iterable getAllIdentities() @NotNull @@ -3606,6 +3836,9 @@ public interface net.corda.core.node.services.IdentityService @Nullable public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey) @NotNull + public abstract Iterable publicKeysForExternalId(java.util.UUID) + public abstract void registerKey(java.security.PublicKey, net.corda.core.identity.Party, java.util.UUID) + @NotNull public abstract net.corda.core.identity.Party requireWellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty) @Nullable public abstract net.corda.core.identity.PartyAndCertificate verifyAndRegisterIdentity(net.corda.core.identity.PartyAndCertificate) @@ -3615,6 +3848,9 @@ public interface net.corda.core.node.services.IdentityService public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty) @Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name) + public static final net.corda.core.node.services.IdentityService$Companion Companion +## +public static final class net.corda.core.node.services.IdentityService$Companion extends java.lang.Object ## @DoNotImplement public interface net.corda.core.node.services.KeyManagementService @@ -3625,7 +3861,13 @@ public interface net.corda.core.node.services.KeyManagementService public abstract java.security.PublicKey freshKey() @Suspendable @NotNull + public abstract java.security.PublicKey freshKey(java.util.UUID) + @Suspendable + @NotNull public abstract net.corda.core.identity.PartyAndCertificate freshKeyAndCert(net.corda.core.identity.PartyAndCertificate, boolean) + @Suspendable + @NotNull + public abstract net.corda.core.identity.PartyAndCertificate freshKeyAndCert(net.corda.core.identity.PartyAndCertificate, boolean, java.util.UUID) @NotNull public abstract java.util.Set getKeys() @Suspendable @@ -3768,6 +4010,10 @@ public static final class net.corda.core.node.services.PartyInfo$SingleNode exte @NotNull public String toString() ## +public final class net.corda.core.node.services.ServiceLifecycleEvent extends java.lang.Enum + public static net.corda.core.node.services.ServiceLifecycleEvent valueOf(String) + public static net.corda.core.node.services.ServiceLifecycleEvent[] values() +## public interface net.corda.core.node.services.ServiceLifecycleObserver public abstract void onServiceLifecycleEvent(net.corda.core.node.services.ServiceLifecycleEvent) ## @@ -3996,6 +4242,8 @@ public static final class net.corda.core.node.services.Vault$UpdateType extends @CordaSerializable public final class net.corda.core.node.services.VaultQueryException extends net.corda.core.flows.FlowException public (String) + public (String, Exception) + public (String, Exception, int, kotlin.jvm.internal.DefaultConstructorMarker) ## @DoNotImplement public interface net.corda.core.node.services.VaultService @@ -4045,6 +4293,34 @@ public interface net.corda.core.node.services.VaultService public final class net.corda.core.node.services.VaultServiceKt extends java.lang.Object public static final int MAX_CONSTRAINT_DATA_SIZE = 20000 ## +@DoNotImplement +public interface net.corda.core.node.services.diagnostics.DiagnosticsService + @NotNull + public abstract net.corda.core.node.services.diagnostics.NodeVersionInfo nodeVersionInfo() +## +public final class net.corda.core.node.services.diagnostics.NodeVersionInfo extends java.lang.Object + public (String, String, int, String) + @NotNull + public final String component1() + @NotNull + public final String component2() + public final int component3() + @NotNull + public final String component4() + @NotNull + public final net.corda.core.node.services.diagnostics.NodeVersionInfo copy(String, String, int, String) + public boolean equals(Object) + public final int getPlatformVersion() + @NotNull + public final String getReleaseVersion() + @NotNull + public final String getRevision() + @NotNull + public final String getVendor() + public int hashCode() + @NotNull + public String toString() +## @CordaSerializable public final class net.corda.core.node.services.vault.AggregateFunctionType extends java.lang.Enum public static net.corda.core.node.services.vault.AggregateFunctionType valueOf(String) @@ -4071,9 +4347,13 @@ public static final class net.corda.core.node.services.vault.AttachmentQueryCrit @CordaSerializable public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria extends net.corda.core.node.services.vault.AttachmentQueryCriteria public () + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate>, net.corda.core.node.services.vault.ColumnPredicate>, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, int, kotlin.jvm.internal.DefaultConstructorMarker) @@ -4582,6 +4862,10 @@ public static final class net.corda.core.node.services.vault.ColumnPredicate$Nul @NotNull public String toString() ## +@DoNotImplement +public interface net.corda.core.node.services.vault.CordaTransactionSupport + public abstract T transaction(kotlin.jvm.functions.Function1) +## @CordaSerializable public abstract class net.corda.core.node.services.vault.CriteriaExpression extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) @@ -4779,6 +5063,10 @@ public abstract static class net.corda.core.node.services.vault.QueryCriteria$Co @Nullable public abstract java.util.Set> getContractStateTypes() @Nullable + public java.util.List getExactParticipants() + @NotNull + public java.util.List getExternalIds() + @Nullable public java.util.List getParticipants() @NotNull public net.corda.core.node.services.Vault$RelevancyStatus getRelevancyStatus() @@ -4789,17 +5077,30 @@ public abstract static class net.corda.core.node.services.vault.QueryCriteria$Co ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria + @DeprecatedConstructorForDeserialization public () + @DeprecatedConstructorForDeserialization public (java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) + public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final java.util.List component1() @Nullable @@ -4816,14 +5117,20 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi public final java.util.Set> component7() @NotNull public final net.corda.core.node.services.Vault$RelevancyStatus component8() + @Nullable + public final java.util.List component9() @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) public boolean equals(Object) @Nullable public java.util.Set> getContractStateTypes() @Nullable + public java.util.List getExactParticipants() + @Nullable public final java.util.List getIssuer() @Nullable public final java.util.List getIssuerRef() @@ -4845,6 +5152,8 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withContractStateTypes(java.util.Set>) @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withExactParticipants(java.util.List) + @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withIssuer(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withOwner(java.util.List) @@ -4905,18 +5214,33 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria + @DeprecatedConstructorForDeserialization public () + @DeprecatedConstructorForDeserialization public (java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) + public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final java.util.List component1() @@ -4930,14 +5254,20 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Linea public final java.util.Set> component5() @NotNull public final net.corda.core.node.services.Vault$RelevancyStatus component6() + @Nullable + public final java.util.List component7() @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) public boolean equals(Object) @Nullable public java.util.Set> getContractStateTypes() @Nullable + public java.util.List getExactParticipants() + @Nullable public final java.util.List getExternalId() @Nullable public java.util.List getParticipants() @@ -4955,6 +5285,8 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Linea @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withContractStateTypes(java.util.Set>) @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withExactParticipants(java.util.List) + @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withExternalId(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withParticipants(java.util.List) @@ -5024,9 +5356,13 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$TimeI ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) @@ -5068,19 +5404,38 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria public () + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization + public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization + public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List) + public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final net.corda.core.node.services.Vault$StateStatus component1() @Nullable public final java.util.List component10() + @NotNull + public final java.util.List component11() + @Nullable + public final java.util.List component12() @Nullable public final java.util.Set> component2() @Nullable @@ -5101,6 +5456,10 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List) public boolean equals(Object) @NotNull public java.util.Set getConstraintTypes() @@ -5109,6 +5468,10 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @Nullable public java.util.Set> getContractStateTypes() @Nullable + public java.util.List getExactParticipants() + @NotNull + public java.util.List getExternalIds() + @Nullable public final java.util.List getNotary() @Nullable public java.util.List getParticipants() @@ -5134,6 +5497,10 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withContractStateTypes(java.util.Set>) @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withExactParticipants(java.util.List) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withExternalIds(java.util.List) + @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withNotary(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withParticipants(java.util.List) @@ -5162,6 +5529,11 @@ public final class net.corda.core.node.services.vault.QueryCriteriaUtils extends public static final int DEFAULT_PAGE_SIZE = 200 public static final int MAX_PAGE_SIZE = 2147483646 ## +@DoNotImplement +public interface net.corda.core.node.services.vault.SessionScope + @NotNull + public abstract org.hibernate.Session getSession() +## @CordaSerializable public final class net.corda.core.node.services.vault.Sort extends net.corda.core.node.services.vault.BaseSort public (java.util.Collection) @@ -5274,6 +5646,10 @@ public static final class net.corda.core.node.services.vault.SortAttribute$Stand @NotNull public String toString() ## +public final class net.corda.core.observable.Observables extends java.lang.Object + @NotNull + public static final rx.Observable continueOnError(rx.Observable) +## public final class net.corda.core.schemas.CommonSchema extends java.lang.Object public static final net.corda.core.schemas.CommonSchema INSTANCE ## @@ -5464,6 +5840,7 @@ public final class net.corda.core.serialization.SerializationAPIKt extends java. ## @DoNotImplement public interface net.corda.core.serialization.SerializationContext + public abstract boolean getCarpenterDisabled() @NotNull public abstract java.util.Set> getCustomSerializers() @NotNull @@ -5504,6 +5881,8 @@ public interface net.corda.core.serialization.SerializationContext @NotNull public abstract net.corda.core.serialization.SerializationContext withWhitelisted(Class) @NotNull + public abstract net.corda.core.serialization.SerializationContext withoutCarpenter() + @NotNull public abstract net.corda.core.serialization.SerializationContext withoutReferences() ## public static final class net.corda.core.serialization.SerializationContext$UseCase extends java.lang.Enum @@ -5706,6 +6085,7 @@ public static final class net.corda.core.transactions.ContractUpgradeFilteredTra @DoNotImplement public final class net.corda.core.transactions.ContractUpgradeLedgerTransaction extends net.corda.core.transactions.FullTransaction implements net.corda.core.transactions.TransactionWithSignatures public (java.util.List>, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, String, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, java.util.List, net.corda.core.node.NetworkParameters) + public (java.util.List, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, java.util.List, net.corda.core.node.NetworkParameters, net.corda.core.contracts.UpgradedContract, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final java.util.List> component1() @NotNull @@ -5756,6 +6136,10 @@ public final class net.corda.core.transactions.ContractUpgradeLedgerTransaction public int hashCode() @NotNull public String toString() + public static final net.corda.core.transactions.ContractUpgradeLedgerTransaction$Companion Companion +## +public static final class net.corda.core.transactions.ContractUpgradeLedgerTransaction$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) ## @DoNotImplement @CordaSerializable @@ -5889,6 +6273,7 @@ public abstract class net.corda.core.transactions.FullTransaction extends net.co public final class net.corda.core.transactions.LedgerTransaction extends net.corda.core.transactions.FullTransaction public (java.util.List>, java.util.List>, java.util.List>, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt) public (java.util.List>, java.util.List>, java.util.List>, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters) + public (java.util.List, java.util.List, java.util.List, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters, java.util.List, java.util.List, java.util.List, java.util.List, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function2, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final java.util.List> commandsOfType(Class) @NotNull @@ -6204,6 +6589,7 @@ public final class net.corda.core.transactions.SignedTransaction extends java.la public final net.corda.core.transactions.SignedTransaction withAdditionalSignatures(Iterable) public static final net.corda.core.transactions.SignedTransaction$Companion Companion ## +@CordaSerializable public static final class net.corda.core.transactions.SignedTransaction$SignaturesMissingException extends java.security.SignatureException implements net.corda.core.CordaThrowable, net.corda.core.contracts.NamedByHash public (java.util.Set, java.util.List, net.corda.core.crypto.SecureHash) public void addSuppressed(Throwable[]) @@ -6251,6 +6637,8 @@ public class net.corda.core.transactions.TransactionBuilder extends java.lang.Ob @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint) @NotNull + public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, net.corda.core.contracts.AttachmentConstraint) + @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, net.corda.core.identity.Party) @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.TransactionState) @@ -6497,6 +6885,8 @@ public final class net.corda.core.utilities.KotlinUtilsKt extends java.lang.Obje @NotNull public static final org.slf4j.Logger contextLogger(Object) public static final void debug(org.slf4j.Logger, kotlin.jvm.functions.Function0) + @NotNull + public static final org.slf4j.Logger detailedLogger() public static final int exactAdd(int, int) public static final long exactAdd(long, long) @NotNull @@ -6643,6 +7033,7 @@ public final class net.corda.core.utilities.ProgressTracker extends java.lang.Ob public final net.corda.core.utilities.ProgressTracker$Step nextStep() public final void setChildProgressTracker(net.corda.core.utilities.ProgressTracker$Step, net.corda.core.utilities.ProgressTracker) public final void setCurrentStep(net.corda.core.utilities.ProgressTracker$Step) + public static final net.corda.core.utilities.ProgressTracker$Companion Companion ## @CordaSerializable public abstract static class net.corda.core.utilities.ProgressTracker$Change extends java.lang.Object @@ -6719,12 +7110,14 @@ public static class net.corda.core.utilities.ProgressTracker$Step extends java.l public (String) @Nullable public net.corda.core.utilities.ProgressTracker childProgressTracker() + public boolean equals(Object) @NotNull public rx.Observable getChanges() @NotNull public java.util.Map getExtraAuditData() @NotNull public String getLabel() + public int hashCode() ## @CordaSerializable public static final class net.corda.core.utilities.ProgressTracker$UNSTARTED extends net.corda.core.utilities.ProgressTracker$Step @@ -6734,6 +7127,10 @@ public static final class net.corda.core.utilities.ProgressTracker$UNSTARTED ext public interface net.corda.core.utilities.PropertyDelegate public abstract T getValue(Object, kotlin.reflect.KProperty) ## +public final class net.corda.core.utilities.SgxSupport extends java.lang.Object + public static final boolean isInsideEnclave() + public static final net.corda.core.utilities.SgxSupport INSTANCE +## @CordaSerializable public abstract class net.corda.core.utilities.Try extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) @@ -6913,6 +7310,10 @@ public final class net.corda.testing.contracts.DummyContractV2 extends java.lang @NotNull public net.corda.core.contracts.AttachmentConstraint getLegacyContractConstraint() @NotNull + public static final net.corda.core.transactions.TransactionBuilder move(java.util.List>, net.corda.core.identity.AbstractParty) + @NotNull + public static final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef, net.corda.core.identity.AbstractParty) + @NotNull public net.corda.testing.contracts.DummyContractV2$State upgrade(net.corda.testing.contracts.DummyContract$State) public void verify(net.corda.core.transactions.LedgerTransaction) public static final net.corda.testing.contracts.DummyContractV2$Companion Companion @@ -6929,6 +7330,10 @@ public static final class net.corda.testing.contracts.DummyContractV2$Commands$M ## public static final class net.corda.testing.contracts.DummyContractV2$Companion extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) + @NotNull + public final net.corda.core.transactions.TransactionBuilder move(java.util.List>, net.corda.core.identity.AbstractParty) + @NotNull + public final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef, net.corda.core.identity.AbstractParty) ## public static final class net.corda.testing.contracts.DummyContractV2$State extends java.lang.Object implements net.corda.core.contracts.ContractState public (int, java.util.List) @@ -6947,6 +7352,8 @@ public static final class net.corda.testing.contracts.DummyContractV2$State exte public int hashCode() @NotNull public String toString() + @NotNull + public final kotlin.Pair withNewOwner(net.corda.core.identity.AbstractParty) ## public final class net.corda.testing.contracts.DummyContractV3 extends java.lang.Object implements net.corda.core.contracts.UpgradedContractWithLegacyConstraint public () @@ -7435,6 +7842,7 @@ public class net.corda.client.jackson.StringToMethodCallParser extends java.lang public final net.corda.client.jackson.StringToMethodCallParser.ParsedMethodCall parse(T, String) @NotNull public final Object[] parseArguments(String, java.util.List>, String) + public final void validateIsMatchingCtor(String, java.util.List>, String) public static final net.corda.client.jackson.StringToMethodCallParser$Companion Companion ## public static final class net.corda.client.jackson.StringToMethodCallParser$Companion extends java.lang.Object @@ -7463,6 +7871,9 @@ public static final class net.corda.client.jackson.StringToMethodCallParser$Unpa @NotNull public final String getParamName() ## +public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$NoSuchFile extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException + public (String) +## public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$ReflectionDataMissing extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException public (String, int) ## @@ -7489,6 +7900,7 @@ public interface net.corda.testing.driver.DriverDSL public abstract net.corda.core.concurrent.CordaFuture getDefaultNotaryNode() @NotNull public abstract java.util.List getNotaryHandles() + public abstract int nextPort() @NotNull public abstract net.corda.core.concurrent.CordaFuture startNode() @NotNull @@ -7496,6 +7908,8 @@ public interface net.corda.testing.driver.DriverDSL @NotNull public abstract net.corda.core.concurrent.CordaFuture startNode(net.corda.testing.driver.NodeParameters, net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) @NotNull + public abstract net.corda.core.concurrent.CordaFuture startNode(net.corda.testing.driver.NodeParameters, net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, String) + @NotNull public abstract net.corda.core.concurrent.CordaFuture startWebserver(net.corda.testing.driver.NodeHandle) @NotNull public abstract net.corda.core.concurrent.CordaFuture startWebserver(net.corda.testing.driver.NodeHandle, String) @@ -7508,6 +7922,8 @@ public final class net.corda.testing.driver.DriverParameters extends java.lang.O public (boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, java.util.Map, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) public (boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, java.util.Map, boolean, java.util.Collection) public (boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, java.util.Map, boolean, java.util.Collection, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, java.util.Map, boolean, java.util.Collection, java.nio.file.Path, java.util.List, java.util.Map) + public (boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, java.util.Map, boolean, java.util.Collection, java.nio.file.Path, java.util.List, java.util.Map, int, kotlin.jvm.internal.DefaultConstructorMarker) public (boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, boolean) public final boolean component1() @NotNull @@ -7521,6 +7937,12 @@ public final class net.corda.testing.driver.DriverParameters extends java.lang.O public final boolean component14() @Nullable public final java.util.Collection component15() + @Nullable + public final java.nio.file.Path component16() + @NotNull + public final java.util.List component17() + @NotNull + public final java.util.Map component18() @NotNull public final java.nio.file.Path component2() @NotNull @@ -7539,15 +7961,23 @@ public final class net.corda.testing.driver.DriverParameters extends java.lang.O @NotNull public final net.corda.testing.driver.DriverParameters copy(boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, java.util.Map, boolean, java.util.Collection) @NotNull + public final net.corda.testing.driver.DriverParameters copy(boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, java.util.Map, boolean, java.util.Collection, java.nio.file.Path, java.util.List, java.util.Map) + @NotNull public final net.corda.testing.driver.DriverParameters copy(boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map, boolean, boolean, boolean, java.util.List, java.util.List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters, java.util.Set) public boolean equals(Object) @Nullable public final java.util.Collection getCordappsForAllNodes() @NotNull public final net.corda.testing.driver.PortAllocation getDebugPortAllocation() + @Nullable + public final java.nio.file.Path getDjvmBootstrapSource() + @NotNull + public final java.util.List getDjvmCordaSource() @NotNull public final java.nio.file.Path getDriverDirectory() @NotNull + public final java.util.Map getEnvironmentVariables() + @NotNull public final java.util.List getExtraCordappPackagesToScan() public final boolean getInMemoryDB() @NotNull @@ -7574,8 +8004,14 @@ public final class net.corda.testing.driver.DriverParameters extends java.lang.O @NotNull public final net.corda.testing.driver.DriverParameters withDebugPortAllocation(net.corda.testing.driver.PortAllocation) @NotNull + public final net.corda.testing.driver.DriverParameters withDjvmBootstrapSource(java.nio.file.Path) + @NotNull + public final net.corda.testing.driver.DriverParameters withDjvmCordaSource(java.util.List) + @NotNull public final net.corda.testing.driver.DriverParameters withDriverDirectory(java.nio.file.Path) @NotNull + public final net.corda.testing.driver.DriverParameters withEnvironmentVariables(java.util.Map) + @NotNull public final net.corda.testing.driver.DriverParameters withExtraCordappPackagesToScan(java.util.List) @NotNull public final net.corda.testing.driver.DriverParameters withInMemoryDB(boolean) @@ -7660,6 +8096,8 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>) public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>, String) + public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map, String, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final net.corda.core.identity.CordaX500Name component1() @NotNull @@ -7676,10 +8114,14 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public final java.util.Collection component7() @NotNull public final java.util.Map>, Class>> component8() + @Nullable + public final String component9() @NotNull public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) @NotNull public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>) + @NotNull + public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>, String) public boolean equals(Object) @NotNull public final java.util.Collection getAdditionalCordapps() @@ -7687,6 +8129,8 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public final java.util.Map getCustomOverrides() @NotNull public final java.util.Map>, Class>> getFlowOverrides() + @Nullable + public final String getLogLevelOverride() @NotNull public final String getMaximumHeapSize() @Nullable @@ -7707,6 +8151,8 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj @NotNull public final net.corda.testing.driver.NodeParameters withFlowOverrides(java.util.Map>, ? extends Class>>) @NotNull + public final net.corda.testing.driver.NodeParameters withLogLevelOverride(String) + @NotNull public final net.corda.testing.driver.NodeParameters withMaximumHeapSize(String) @NotNull public final net.corda.testing.driver.NodeParameters withProvidedName(net.corda.core.identity.CordaX500Name) @@ -7745,8 +8191,18 @@ public interface net.corda.testing.driver.OutOfProcess extends net.corda.testing public abstract class net.corda.testing.driver.PortAllocation extends java.lang.Object public () @NotNull + public static final net.corda.testing.driver.PortAllocation getDefaultAllocator() + @NotNull public final net.corda.core.utilities.NetworkHostAndPort nextHostAndPort() public abstract int nextPort() + public static final net.corda.testing.driver.PortAllocation$Companion Companion + public static final int DEFAULT_START_PORT = 10000 + public static final int FIRST_EPHEMERAL_PORT = 30000 +## +public static final class net.corda.testing.driver.PortAllocation$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) + @NotNull + public final net.corda.testing.driver.PortAllocation getDefaultAllocator() ## @DoNotImplement public static class net.corda.testing.driver.PortAllocation$Incremental extends net.corda.testing.driver.PortAllocation @@ -7755,6 +8211,11 @@ public static class net.corda.testing.driver.PortAllocation$Incremental extends public final java.util.concurrent.atomic.AtomicInteger getPortCounter() public int nextPort() ## +@DoNotImplement +public class net.corda.testing.driver.SharedMemoryIncremental extends net.corda.testing.driver.PortAllocation + public int nextPort() + public static net.corda.testing.driver.SharedMemoryIncremental INSTANCE +## public final class net.corda.testing.driver.VerifierType extends java.lang.Enum public static net.corda.testing.driver.VerifierType valueOf(String) public static net.corda.testing.driver.VerifierType[] values() @@ -7776,6 +8237,22 @@ public final class net.corda.testing.driver.WebserverHandle extends java.lang.Ob @NotNull public String toString() ## +public final class net.corda.testing.flows.FlowTestsUtilsKt extends java.lang.Object + @NotNull + public static final kotlin.Pair from(T, net.corda.core.flows.FlowSession) + @NotNull + public static final R from(java.util.Map>, net.corda.core.flows.FlowSession) + @NotNull + public static final kotlin.Pair> from(kotlin.reflect.KClass, net.corda.core.flows.FlowSession) + @Suspendable + @NotNull + public static final java.util.List> receiveAll(net.corda.core.flows.FlowLogic, Class, net.corda.core.flows.FlowSession, net.corda.core.flows.FlowSession...) + @Suspendable + @NotNull + public static final java.util.Map> receiveAll(net.corda.core.flows.FlowLogic, kotlin.Pair>, kotlin.Pair>...) + @NotNull + public static final rx.Observable registerCoreFlowFactory(net.corda.testing.node.internal.TestStartedNode, Class>, Class, kotlin.jvm.functions.Function1, boolean) +## @DoNotImplement public abstract class net.corda.testing.node.ClusterSpec extends java.lang.Object public () @@ -7969,16 +8446,21 @@ public final class net.corda.testing.node.MockNetworkNotarySpec extends java.lan public (net.corda.core.identity.CordaX500Name) public (net.corda.core.identity.CordaX500Name, boolean) public (net.corda.core.identity.CordaX500Name, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.identity.CordaX500Name, boolean, String) + public (net.corda.core.identity.CordaX500Name, boolean, String, int, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final net.corda.core.identity.CordaX500Name component1() public final boolean component2() @NotNull public final net.corda.testing.node.MockNetworkNotarySpec copy(net.corda.core.identity.CordaX500Name, boolean) public boolean equals(Object) + @Nullable + public final String getClassName() @NotNull public final net.corda.core.identity.CordaX500Name getName() public final boolean getValidating() public int hashCode() + public final void setClassName(String) @NotNull public String toString() ## @@ -8095,6 +8577,7 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public (Iterable, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...) public (Iterable, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, java.security.KeyPair...) + public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, java.security.KeyPair[], net.corda.core.node.services.KeyManagementService) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, java.security.KeyPair...) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) public (Iterable, net.corda.testing.core.TestIdentity, java.security.KeyPair...) @@ -8107,6 +8590,8 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService) public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...) + public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.nodeapi.internal.cordapp.CordappLoader, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, net.corda.testing.core.TestIdentity, java.security.KeyPair[], net.corda.core.node.services.KeyManagementService, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, net.corda.testing.core.TestIdentity...) public (net.corda.testing.core.TestIdentity, net.corda.testing.core.TestIdentity...) public final void addMockCordapp(String) @@ -8137,6 +8622,8 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem @NotNull public net.corda.core.cordapp.CordappProvider getCordappProvider() @NotNull + public net.corda.core.node.services.diagnostics.DiagnosticsService getDiagnosticsService() + @NotNull public net.corda.core.node.services.IdentityService getIdentityService() @NotNull public net.corda.core.node.services.KeyManagementService getKeyManagementService() @@ -8170,6 +8657,12 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public static final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...) @NotNull public static final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...) + @NotNull + public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, java.util.Set, java.util.Set) + @NotNull + public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set) + @NotNull + public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set, net.corda.testing.internal.TestingNamedCacheFactory) public void recordTransactions(Iterable) public void recordTransactions(net.corda.core.node.StatesToRecord, Iterable) public void recordTransactions(net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...) @@ -8198,6 +8691,12 @@ public static final class net.corda.testing.node.MockServices$Companion extends public final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...) @NotNull public final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...) + @NotNull + public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, java.util.Set, java.util.Set) + @NotNull + public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set) + @NotNull + public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set, net.corda.testing.internal.TestingNamedCacheFactory) ## public final class net.corda.testing.node.MockServicesKt extends java.lang.Object @NotNull @@ -8303,6 +8802,8 @@ public final class net.corda.testing.node.UnstartedMockNode extends java.lang.Ob public final int getId() @NotNull public final net.corda.testing.node.StartedMockNode getStarted() + @NotNull + public final T installCordaService(Class) public final boolean isStarted() @NotNull public final net.corda.testing.node.StartedMockNode start() @@ -8339,28 +8840,46 @@ public class net.corda.client.rpc.ConnectionFailureException extends net.corda.c ## public final class net.corda.client.rpc.CordaRPCClient extends java.lang.Object public (java.util.List) + public (java.util.List, java.util.Set>) public (java.util.List, net.corda.client.rpc.CordaRPCClientConfiguration) + public (java.util.List, net.corda.client.rpc.CordaRPCClientConfiguration, java.util.Set>) public (java.util.List, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions) public (java.util.List, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader) public (java.util.List, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (java.util.List, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader, java.util.Set>) + public (java.util.List, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (java.util.List, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, java.util.Set>) public (net.corda.core.utilities.NetworkHostAndPort) + public (net.corda.core.utilities.NetworkHostAndPort, java.util.Set>) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, ClassLoader) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, ClassLoader, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, java.util.Set>) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader, java.util.Set>) + public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration, net.corda.core.messaging.ClientRpcSslOptions, java.util.Set>) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader) public (net.corda.core.utilities.NetworkHostAndPort, net.corda.core.messaging.ClientRpcSslOptions, ClassLoader, int, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String) @NotNull + public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.client.rpc.GracefulReconnect) + @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor) @NotNull + public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.client.rpc.GracefulReconnect) + @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.identity.CordaX500Name) @NotNull + public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.identity.CordaX500Name, net.corda.client.rpc.GracefulReconnect) + @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.identity.CordaX500Name) + @NotNull + public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.identity.CordaX500Name, net.corda.client.rpc.GracefulReconnect) public final A use(String, String, kotlin.jvm.functions.Function1) public static final net.corda.client.rpc.CordaRPCClient$Companion Companion ## @@ -8436,12 +8955,33 @@ public static final class net.corda.client.rpc.CordaRPCClientConfiguration$Compa @DoNotImplement public final class net.corda.client.rpc.CordaRPCConnection extends java.lang.Object implements net.corda.client.rpc.RPCConnection public (net.corda.client.rpc.RPCConnection) + public (net.corda.client.rpc.RPCConnection, java.util.concurrent.ExecutorService, net.corda.client.rpc.internal.ReconnectingCordaRPCOps, kotlin.jvm.internal.DefaultConstructorMarker) public void close() public void forceClose() @NotNull public net.corda.core.messaging.CordaRPCOps getProxy() public int getServerProtocolVersion() public void notifyServerAndClose() + public static final net.corda.client.rpc.CordaRPCConnection$Companion Companion +## +public static final class net.corda.client.rpc.CordaRPCConnection$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) +## +public final class net.corda.client.rpc.GracefulReconnect extends java.lang.Object + public () + public (Runnable, Runnable) + public (Runnable, Runnable, int) + public (Runnable, Runnable, int, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (kotlin.jvm.functions.Function0, kotlin.jvm.functions.Function0, int) + public (kotlin.jvm.functions.Function0, kotlin.jvm.functions.Function0, int, int, kotlin.jvm.internal.DefaultConstructorMarker) + public final int getMaxAttempts() + @NotNull + public final kotlin.jvm.functions.Function0 getOnDisconnect() + @NotNull + public final kotlin.jvm.functions.Function0 getOnReconnect() +## +public final class net.corda.client.rpc.MaxRpcRetryException extends net.corda.client.rpc.RPCException + public (int, reflect.Method, Throwable) ## public final class net.corda.client.rpc.PermissionException extends net.corda.core.CordaRuntimeException implements net.corda.core.ClientRelevantError, net.corda.nodeapi.exceptions.RpcSerializableError public (String) @@ -8450,6 +8990,7 @@ public final class net.corda.client.rpc.PermissionException extends net.corda.co ## @DoNotImplement public interface net.corda.client.rpc.RPCConnection extends java.io.Closeable + public abstract void close() public abstract void forceClose() @NotNull public abstract I getProxy() @@ -8463,9 +9004,18 @@ public class net.corda.client.rpc.RPCException extends net.corda.core.CordaRunti public @interface net.corda.client.rpc.RPCSinceVersion public abstract int version() ## +public class net.corda.client.rpc.UnrecoverableRPCException extends net.corda.client.rpc.RPCException + public (String, Throwable) + public (String, Throwable, int, kotlin.jvm.internal.DefaultConstructorMarker) +## public final class net.corda.client.rpc.UtilsKt extends java.lang.Object public static final void notUsed(rx.Observable) ## +public final class net.corda.client.rpc.reconnect.CouldNotStartFlowException extends net.corda.client.rpc.RPCException + public () + public (Throwable) + public (Throwable, int, kotlin.jvm.internal.DefaultConstructorMarker) +## public final class net.corda.finance.test.CashSchema extends java.lang.Object public static final net.corda.finance.test.CashSchema INSTANCE ##