From c28a9aa58a4966977589c9b228270589a2f90cfa Mon Sep 17 00:00:00 2001 From: pclaura Date: Thu, 7 Apr 2022 10:32:56 +0100 Subject: [PATCH] Serialization changes required for Conclave integration --- constants.properties | 2 +- .../net/corda/core/conclave/common/EnclaveMessage.kt | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/constants.properties b/constants.properties index 51b52f9e68..9b23511259 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.22-CONCLAVE-SNAPSHOT +cordaVersion=4.8.5.23-CONCLAVE-SNAPSHOT versionSuffix= gradlePluginsVersion=5.0.12 kotlinVersion=1.2.71 diff --git a/core/src/main/kotlin/net/corda/core/conclave/common/EnclaveMessage.kt b/core/src/main/kotlin/net/corda/core/conclave/common/EnclaveMessage.kt index 0419d47dff..4f028e1076 100644 --- a/core/src/main/kotlin/net/corda/core/conclave/common/EnclaveMessage.kt +++ b/core/src/main/kotlin/net/corda/core/conclave/common/EnclaveMessage.kt @@ -1,10 +1,17 @@ package net.corda.core.conclave.common +import net.corda.core.identity.CordaX500Name import net.corda.core.serialization.CordaSerializable import java.util.* @CordaSerializable -data class EnclaveMessage(val invocationId: UUID, val command: EnclaveCommand, val message: ByteArray, val remoteAttestation: ByteArray? = null) { +data class EnclaveMessage( + val invocationId: UUID, + val command: EnclaveCommand, + val message: ByteArray, + val remoteAttestation: ByteArray? = null, + val callingParty: CordaX500Name? = null +) { override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false