From fd45b11c5c2d5bb0a1715d3292d379305278984f Mon Sep 17 00:00:00 2001 From: vanjatomic Date: Wed, 6 Apr 2022 16:08:35 +0100 Subject: [PATCH] Fix network param hash check for enclave + re-issuance --- constants.properties | 2 +- .../kotlin/net/corda/core/transactions/SignedTransaction.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/constants.properties b/constants.properties index 40ad93506a..51b52f9e68 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.21-CONCLAVE-SNAPSHOT +cordaVersion=4.8.5.22-CONCLAVE-SNAPSHOT versionSuffix= gradlePluginsVersion=5.0.12 kotlinVersion=1.2.71 diff --git a/core/src/main/kotlin/net/corda/core/transactions/SignedTransaction.kt b/core/src/main/kotlin/net/corda/core/transactions/SignedTransaction.kt index 4026a6cca3..41adc0a8b7 100644 --- a/core/src/main/kotlin/net/corda/core/transactions/SignedTransaction.kt +++ b/core/src/main/kotlin/net/corda/core/transactions/SignedTransaction.kt @@ -198,8 +198,7 @@ constructor(val txBits: SerializedBytes, override val sigs: Lis val groupedInputsAndRefs = (inputs + references).groupBy { it.txhash } groupedInputsAndRefs.map { entry -> val tx = services.validatedTransactions.getTransaction(entry.key)?.coreTransaction - ?: throw TransactionResolutionException(id) - val paramHash = tx.networkParametersHash ?: services.networkParametersService.defaultHash + val paramHash = tx?.networkParametersHash ?: services.networkParametersService.defaultHash val params = services.networkParametersService.lookup(paramHash) ?: throw TransactionResolutionException(id) if (txNetworkParameters.epoch < params.epoch) throw TransactionVerificationException.TransactionNetworkParameterOrderingException(id, entry.value.first(), txNetworkParameters, params)