ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 05:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add service hub

Browse Source
This commit is contained in:
vanjatomic 2022-03-30 13:21:02 +01:00
parent fe15d9c0c8
commit 13a3bfb981
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants.properties
View File

@ -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.9-CONCLAVE-SNAPSHOT
cordaVersion=4.8.5.10-CONCLAVE-SNAPSHOT
versionSuffix=
gradlePluginsVersion=5.0.12
kotlinVersion=1.2.71

21
core/src/main/kotlin/net/corda/core/conclave/common/CordaEnclaveClient.kt
View File

@ -6,6 +6,7 @@ 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.node.ServiceHub
import net.corda.core.serialization.SingletonSerializeAsToken
import net.corda.core.transactions.EncryptedTransaction
import java.util.*
@ -15,7 +16,7 @@ import java.util.*
* data to arrive in a single ByteArray
*/
interface CordaEnclaveClient {
abstract class CordaEnclaveClient(val x500: CordaX500Name, val serviceHub: ServiceHub? = null): SingletonSerializeAsToken() {
// Some exceptions we could throw [TBD - do we want this?]
class RemoteAttestationException(description: String) : FlowException(description)
@ -30,7 +31,7 @@ interface CordaEnclaveClient {
* our own mock [EnclaveInstanceInfo] objects. In theory this could be generalised to exchange a generic set of 'handshake' bytes,
* of which an enclave instance info is just one type of handshake
*/
fun getEnclaveInstanceInfo() : ByteArray
abstract fun getEnclaveInstanceInfo() : ByteArray
/**
* Register a remote enclave's [EnclaveInstanceInfo] with our own enclave. From this point on, our enclave will cache this information,
@ -41,7 +42,7 @@ interface CordaEnclaveClient {
* @throws [RemoteAttestationException] if our enclave does not accept the attestation
*/
@Throws(RemoteAttestationException::class)
fun registerRemoteEnclaveInstanceInfo(invokeId: UUID, payload: ByteArray)
abstract fun registerRemoteEnclaveInstanceInfo(invokeId: UUID, payload: ByteArray)
/**
* Verify an encrypted transaction (supplied with its dependencies), without checking the signatures. This would be used during
@ -56,7 +57,7 @@ interface CordaEnclaveClient {
* @throws [VerificationException] if verification failed
*/
@Throws(VerificationException::class)
fun enclaveVerifyWithoutSignatures(invokeId: UUID, encryptedTxAndDependencies: EncryptedVerifiableTxAndDependencies)
abstract fun enclaveVerifyWithoutSignatures(invokeId: UUID, encryptedTxAndDependencies: EncryptedVerifiableTxAndDependencies)
/**
* Verify an encrypted transaction (supplied with its dependencies) and also check the signatures. This would be used during
@ -75,7 +76,7 @@ interface CordaEnclaveClient {
* @throws [VerificationException] if verification failed
*/
@Throws(VerificationException::class)
fun enclaveVerifyWithSignatures(invokeId: UUID, encryptedTxAndDependencies: EncryptedVerifiableTxAndDependencies): EncryptedTransaction
abstract fun enclaveVerifyWithSignatures(invokeId: UUID, encryptedTxAndDependencies: EncryptedVerifiableTxAndDependencies): EncryptedTransaction
/**
* When we receive an encrypted transaction from another node, before we store it we will want to encrypt it with our long term
@ -86,7 +87,7 @@ interface CordaEnclaveClient {
*
* @return an [EncryptedTransaction] the transaction encrypted with our enclave's long term storage key
*/
fun encryptTransactionForLocal(invokeId: UUID, remoteEncryptedTransaction: EncryptedTransaction): EncryptedTransaction
abstract fun encryptTransactionForLocal(invokeId: UUID, remoteEncryptedTransaction: EncryptedTransaction): EncryptedTransaction
/**
* During backchain resolution, when we send an transaction to another node, we need to encrypt it with a post office related to their
@ -99,7 +100,7 @@ interface CordaEnclaveClient {
* @return an [EncryptedTransaction] the transaction encrypted according to the remote enclave's remote attestation. Note that we do
* not need our enclave to sign this encrypted transaction, as our signature is only relevant to our own enclave.
*/
fun encryptConclaveLedgerTxForRemote(invokeId: UUID, conclaveLedgerTx: ConclaveLedgerTxModel, theirAttestationBytes: ByteArray): EncryptedTransaction
abstract fun encryptConclaveLedgerTxForRemote(invokeId: UUID, conclaveLedgerTx: ConclaveLedgerTxModel, theirAttestationBytes: ByteArray): EncryptedTransaction
/**
* During backchain resolution, when we send an transaction to another node, we need to encrypt it with a post office related to their
@ -112,7 +113,7 @@ interface CordaEnclaveClient {
* @return an [EncryptedTransaction] the transaction re-encrypted according to the remote enclave's remote attestation. Note that we do
* 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
abstract 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
@ -122,10 +123,10 @@ interface CordaEnclaveClient {
*
* @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>>>
abstract fun decryptInputAndRefsForNode(encryptedTransaction: EncryptedTransaction): Pair<Array<StateAndRef<ContractState>>, Array<StateAndRef<ContractState>>>
}
class DummyCordaEnclaveClient(val x500: CordaX500Name): CordaEnclaveClient, SingletonSerializeAsToken() {
class DummyCordaEnclaveClient(x500: CordaX500Name, serviceHub: ServiceHub?): CordaEnclaveClient(x500, serviceHub) {
override fun getEnclaveInstanceInfo(): ByteArray {
throw UnsupportedOperationException("Add your custom enclave client implementation")

2
node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
View File

@ -1065,7 +1065,7 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
null
}
return clazz?.let {
EncryptedTransactionService(Class.forName(it).getDeclaredConstructor(CordaX500Name::class.java).newInstance(configuration.myLegalName) as CordaEnclaveClient)
EncryptedTransactionService(Class.forName(it).getDeclaredConstructor(CordaX500Name::class.java, ServiceHub::class.java).newInstance(configuration.myLegalName, services) as CordaEnclaveClient)
} ?: run {
EncryptedTransactionService()
}

2
testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
View File

@ -297,7 +297,7 @@ open class MockServices private constructor(
}
return clazz?.let {
EncryptedTransactionService(Class.forName(it).getDeclaredConstructor(CordaX500Name::class.java).newInstance(initialIdentity.name) as CordaEnclaveClient)
EncryptedTransactionService(Class.forName(it).getDeclaredConstructor(CordaX500Name::class.java, ServiceHub::class.java).newInstance(initialIdentity.name, null) as CordaEnclaveClient)
} ?: run {
EncryptedTransactionService()
}