diff --git a/constants.properties b/constants.properties index e617824046..9f1693df9a 100644 --- a/constants.properties +++ b/constants.properties @@ -2,7 +2,7 @@ # because some versions here need to be matched by app authors in # their own projects. So don't get fancy with syntax! -cordaVersion=4.8.5.10-CONCLAVE-SNAPSHOT +cordaVersion=4.8.5.11-CONCLAVE-SNAPSHOT versionSuffix= gradlePluginsVersion=5.0.12 kotlinVersion=1.2.71 diff --git a/core/src/main/kotlin/net/corda/core/conclave/common/CordaEnclaveClient.kt b/core/src/main/kotlin/net/corda/core/conclave/common/CordaEnclaveClient.kt index ffa8894a13..ae9f8215d0 100644 --- a/core/src/main/kotlin/net/corda/core/conclave/common/CordaEnclaveClient.kt +++ b/core/src/main/kotlin/net/corda/core/conclave/common/CordaEnclaveClient.kt @@ -2,6 +2,7 @@ package net.corda.core.conclave.common import net.corda.core.conclave.common.dto.ConclaveLedgerTxModel import net.corda.core.conclave.common.dto.EncryptedVerifiableTxAndDependencies +import net.corda.core.conclave.common.dto.InputsAndRefsForNode import net.corda.core.contracts.ContractState import net.corda.core.contracts.StateAndRef import net.corda.core.flows.FlowException @@ -121,9 +122,9 @@ abstract class CordaEnclaveClient(val x500: CordaX500Name, val serviceHub: Servi * * @param encryptedTransaction The [EncryptedTransaction] for which registered node requests decryption from enclave. * - * @return Pair of arrays of input states and reference states. Input states are filtered by the list of registered participants. + * @return [InputsAndRefsForNode] as arrays of input states and reference states. Input states are filtered by the list of registered participants. */ - abstract fun decryptInputAndRefsForNode(encryptedTransaction: EncryptedTransaction): Pair>, Array>> + abstract fun decryptInputAndRefsForNode(encryptedTransaction: EncryptedTransaction): InputsAndRefsForNode } class DummyCordaEnclaveClient(x500: CordaX500Name, serviceHub: ServiceHub? = null): CordaEnclaveClient(x500, serviceHub) { @@ -156,7 +157,7 @@ class DummyCordaEnclaveClient(x500: CordaX500Name, serviceHub: ServiceHub? = nul throw UnsupportedOperationException("Add your custom enclave client implementation") } - override fun decryptInputAndRefsForNode(encryptedTransaction: EncryptedTransaction): Pair>, Array>> { + override fun decryptInputAndRefsForNode(encryptedTransaction: EncryptedTransaction): InputsAndRefsForNode { throw UnsupportedOperationException("Add your custom enclave client implementation") } } \ No newline at end of file