From 7c4e2749533cae2376335d5c2ebdf8b7947aceb8 Mon Sep 17 00:00:00 2001 From: "adam.houston" Date: Tue, 22 Mar 2022 14:21:52 +0000 Subject: [PATCH] Small fixes to encryptedTransactionService access --- constants.properties | 4 ++-- core/src/main/kotlin/net/corda/core/node/ServiceHub.kt | 2 +- node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/constants.properties b/constants.properties index 0d6fa2834b..8e9d67e2b3 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.3-CONCLAVE-SNAPSHOT +cordaVersion=4.8.5.4-CONCLAVE-SNAPSHOT versionSuffix= gradlePluginsVersion=5.0.12 kotlinVersion=1.2.71 @@ -14,7 +14,7 @@ java8MinUpdateVersion=171 platformVersion=11 guavaVersion=28.0-jre # Quasar version to use with Java 8: -quasarVersion=0.7.14_r3 +quasarVersion=0.7.13_r3 # Quasar version to use with Java 11: quasarVersion11=0.8.1_r3 jdkClassifier11=jdk11 diff --git a/core/src/main/kotlin/net/corda/core/node/ServiceHub.kt b/core/src/main/kotlin/net/corda/core/node/ServiceHub.kt index 35c31fd6d1..ba95841ed3 100644 --- a/core/src/main/kotlin/net/corda/core/node/ServiceHub.kt +++ b/core/src/main/kotlin/net/corda/core/node/ServiceHub.kt @@ -124,7 +124,7 @@ interface ServiceHub : ServicesForResolution { // NOTE: Any services exposed to flows (public view) need to implement [SerializeAsToken] or similar to avoid // their internal state from being serialized in checkpoints. - override val encryptedTransactionService: EncryptedTransactionService + //override val encryptedTransactionService: EncryptedTransactionService /** * The vault service lets you observe, soft lock and add notes to states that involve you or are relevant to your diff --git a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt index ccf649f3fb..b8455bf11f 100644 --- a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt +++ b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt @@ -1151,7 +1151,7 @@ abstract class AbstractNode(val configuration: NodeConfiguration, override val diagnosticsService: DiagnosticsService get() = this@AbstractNode.diagnosticsService override val externalOperationExecutor: ExecutorService get() = this@AbstractNode.externalOperationExecutor override val notaryService: NotaryService? get() = this@AbstractNode.notaryService - override val encryptedTransactionService: EncryptedTransactionService = this@AbstractNode.encryptedTransactionService + override val encryptedTransactionService: EncryptedTransactionService get() = this@AbstractNode.encryptedTransactionService private lateinit var _myInfo: NodeInfo override val myInfo: NodeInfo get() = _myInfo