Upgrade to ConsensusJ 0.5.4

OmniLayer · Jul 4, 2020 · debb420 · debb420
1 parent cd84318
commit debb420
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -55,7 +55,7 @@ Work-in-progress (but pretty much ready at this point)
 * Use Gradle `java-library` plugin and declare `api` dependencies
 * Gradle: Set `reproducibleFileOrder`, `preserveFileTimestamps` (helps make builds reproducible)
 * TravisCI: Full build in addition to running `regTest`
-* Update to ConsensusJ 0.5.2
+* Update to ConsensusJ 0.5.4
 * Update to bitcoinj 0.15.7 (Guava 28.2-android)
 * Update to Java Money BP 1.4 (API BP 1.0.4)
 * Update to Gradle 6.5

diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ consensusjBtcJsonRpcArtifact = cj-btc-jsonrpc
 consensusjBtcJsonRpcGvyArtifact = cj-btc-jsonrpc-gvy
 consensusjBtcCliArtifact = cj-btc-cli
 consensusjBtcDslArtifact = bitcoinj-dsl
-consensusjVersion = 0.5.2
+consensusjVersion = 0.5.4
 slf4jVersion = 1.7.30
 groovyVersion = 3.0.4
 spockVersion = 2.0-M3-groovy-3.0

diff --git a/omnij-rpc/src/integ/groovy/foundation/omni/BaseRegTestSpec.groovy b/omnij-rpc/src/integ/groovy/foundation/omni/BaseRegTestSpec.groovy
@@ -34,6 +34,7 @@ abstract class BaseRegTestSpec extends Specification implements OmniTestClientDe
         URI regTestRpcUri = recentBitcoinCore ? RpcURI.defaultRegTestURI : RpcURI.defaultTestNetURI
         client = new OmniTestClient(RegTestParams.get(), regTestRpcUri, rpcTestUser, rpcTestPassword)
         fundingSource = new RegTestFundingSource(client)
+        ((RegTestFundingSource) fundingSource).checkForLegacyBitcoinCore() // Remove once we're using Bitcoin Core 0.19+
     }
 
     void setupSpec() {

diff --git a/omnij-rpc/src/main/groovy/foundation/omni/test/RegTestContext.groovy b/omnij-rpc/src/main/groovy/foundation/omni/test/RegTestContext.groovy
@@ -20,6 +20,7 @@ class RegTestContext {
         def client = new OmniTestClient(RegTestParams.get(), regTestRpcUri, user, pass)
         def env = new RegTestEnvironment(client)
         def funder = new RegTestOmniFundingSource(client)
+        funder.checkForLegacyBitcoinCore() // Remove this line after we're based on Bitcoin Core 0.19+
         return [client, env, funder]
     }
 }