From d5611b36d156e665ca2b8a608d992107142f090e Mon Sep 17 00:00:00 2001
From: vanjatomic <vanja.tomic@r3.com>
Date: Wed, 30 Mar 2022 11:24:18 +0100
Subject: [PATCH] Add key verification commands, add decrypt function to
 interface

---
 .../core/conclave/common/CordaEnclaveClient.kt   | 16 ++++++++++++++++
 .../corda/core/conclave/common/EnclaveCommand.kt |  4 ++++
 2 files changed, 20 insertions(+)

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 33a0ae2f93..f032806e30 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,8 @@ 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.contracts.ContractState
+import net.corda.core.contracts.StateAndRef
 import net.corda.core.flows.FlowException
 import net.corda.core.identity.CordaX500Name
 import net.corda.core.serialization.SingletonSerializeAsToken
@@ -111,6 +113,16 @@ interface CordaEnclaveClient {
      * not need our enclave to sign this encrypted transaction, as our signature is only relevant to our own enclave.
      */
     fun encryptEncryptedTransactionForRemote(invokeId: UUID, locallyEncryptedTx: EncryptedTransaction, theirAttestationBytes: ByteArray): EncryptedTransaction
+
+    /**
+     * Decrypts inputs and reference states from transaction and returns them in clear text. Only input states where registered node is participant
+     * will be returned while all the reference states will be returned.
+     *
+     * @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.
+     */
+    fun decryptInputAndRefsForNode(encryptedTransaction: EncryptedTransaction): Pair<Array<StateAndRef<ContractState>>, Array<StateAndRef<ContractState>>>
 }
 
 class DummyCordaEnclaveClient(val x500: CordaX500Name): CordaEnclaveClient, SingletonSerializeAsToken() {
@@ -142,4 +154,8 @@ class DummyCordaEnclaveClient(val x500: CordaX500Name): CordaEnclaveClient, Sing
     override fun encryptEncryptedTransactionForRemote(invokeId: UUID, locallyEncryptedTx: EncryptedTransaction, theirAttestationBytes: ByteArray): EncryptedTransaction {
         throw UnsupportedOperationException("Add your custom enclave client implementation")
     }
+
+    override fun decryptInputAndRefsForNode(encryptedTransaction: EncryptedTransaction): Pair<Array<StateAndRef<ContractState>>, Array<StateAndRef<ContractState>>> {
+        throw UnsupportedOperationException("Add your custom enclave client implementation")
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/net/corda/core/conclave/common/EnclaveCommand.kt b/core/src/main/kotlin/net/corda/core/conclave/common/EnclaveCommand.kt
index f6dad7f999..4a496013c8 100644
--- a/core/src/main/kotlin/net/corda/core/conclave/common/EnclaveCommand.kt
+++ b/core/src/main/kotlin/net/corda/core/conclave/common/EnclaveCommand.kt
@@ -4,6 +4,10 @@ import net.corda.core.serialization.CordaSerializable
 
 @CordaSerializable
 enum class EnclaveCommand {
+    IsNodeKeyRegisteredWithEnclave,
+    RequestChallenge,
+    VerifyChallenge,
+    DecryptInputsAndRefsForNode,
     InitPostOfficeToRemoteEnclave,
     VerifyTransactionWithSignatures,
     VerifyTransactionWithoutSignatures,