2022 11 11 sbt 1.8.0 (#4883)

* upgrade to scala 2.13.10

* Remove 2.13.8 from CI

* Try upgrading to sbt 1.8.0-RC1 to see if build works on CI

* Try to update scoverage to 2.0.6

* Upgrade sbt native packager to 1.9.11

* Upgrade to sbt 1.8.0

.github/workflows/Linux_2.13_App_Chain_Core_Tests.yml

@@ -32,4 +32,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt ++2.13.8 coverage dbCommonsTest/test chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls cryptoTestJVM/test cryptoJVM/test cryptoJVM/coverageReport cryptoJVM/coverageAggregate cryptoJVM/coveralls coreTestJVM/test coreJVM/coverageReport coreJVM/coverageAggregate coreJVM/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test oracleServerTest/test lnurlTest/test
+        run: sbt coverage dbCommonsTest/test chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls cryptoTestJVM/test cryptoJVM/test cryptoJVM/coverageReport cryptoJVM/coverageAggregate cryptoJVM/coveralls coreTestJVM/test coreJVM/coverageReport coreJVM/coverageAggregate coreJVM/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test oracleServerTest/test lnurlTest/test

.github/workflows/Linux_2.13_KeyManager_Wallet_DLC_Tests.yml

@@ -30,4 +30,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt ++2.13.8 coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls feeProviderTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test asyncUtilsTestJVM/test oracleExplorerClient/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls
+        run: sbt coverage keyManagerTest/test keyManager/coverageReport keyManager/coverageAggregate keyManager/coveralls feeProviderTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls dlcOracleTest/test asyncUtilsTestJVM/test oracleExplorerClient/test dlcOracle/coverageReport dlcOracle/coverageAggregate dlcOracle/coveralls

.github/workflows/Linux_2.13_Node_Tests.yml

@@ -30,4 +30,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt -J-Xmx2g ++2.13.8 cryptoTestJS/test coreJS/test 'set scalaJSStage in Global := FullOptStage' cryptoTestJS/test coreJS/test asyncUtilsTestJS/test coverage nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcNodeTest/test
+        run: sbt -J-Xmx2g cryptoTestJS/test coreJS/test 'set scalaJSStage in Global := FullOptStage' cryptoTestJS/test coreJS/test asyncUtilsTestJS/test coverage nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcNodeTest/test

.github/workflows/Linux_2.13_RPC_Tests.yml

@@ -30,4 +30,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt ++2.13.8 coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test clightningRpcTest/test esploraTest/test
+        run: sbt coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test clightningRpcTest/test esploraTest/test

.github/workflows/Mac_2.13_RPC_Tests.yml

@@ -30,4 +30,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt ++2.13.8 coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test esploraTest/test
+        run: sbt coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test esploraTest/test

.github/workflows/Mac_2.13_Wallet_Node_DLC_Tests.yml

@@ -30,4 +30,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt ++2.13.8 coverage cryptoTestJVM/test coreTestJVM/test secp256k1jni/test appCommonsTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test asyncUtilsTestJVM/test dlcOracle/coverageReport dlcOracle/coveralls dlcNodeTest/test appServerTest/test
+        run: sbt coverage cryptoTestJVM/test coreTestJVM/test secp256k1jni/test appCommonsTest/test walletTest/test dlcWalletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcOracleTest/test asyncUtilsTestJVM/test dlcOracle/coverageReport dlcOracle/coveralls dlcNodeTest/test appServerTest/test

.github/workflows/PostgresTests.yml

@@ -34,4 +34,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt ++2.13.8 dbCommonsTest/test walletTest/test dlcWalletTest/test chainTest/test dlcOracleTest/test nodeTest/test
+        run: sbt dbCommonsTest/test walletTest/test dlcWalletTest/test chainTest/test dlcOracleTest/test nodeTest/test

.github/workflows/Secp_Disabled_Tests.yml

@@ -32,4 +32,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt ++2.13.8 cryptoTestJVM/test coreTestJVM/test
+        run: sbt cryptoTestJVM/test coreTestJVM/test

.github/workflows/TorTests.yml

@@ -32,4 +32,4 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: run tests
-        run: sbt ++2.13.8 torTest/test
+        run: sbt torTest/test

.github/workflows/Windows.yml

@@ -35,5 +35,5 @@ jobs:
             ~/.bitcoin-s/binaries
           key: ${{ runner.os }}-cache
       - name: Windows Crypto, Core, and Database tests
-        run: sbt ++2.13.8 cryptoTestJVM/test coreTestJVM/test secp256k1jni/test appCommonsTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test appServerTest/test
+        run: sbt cryptoTestJVM/test coreTestJVM/test secp256k1jni/test appCommonsTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test appServerTest/test
         shell: bash

.github/workflows/docker-publish.yml

@@ -25,4 +25,4 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push
-        run: sbt ++2.13.8 "oracleServer/docker:publish;appServer/docker:publish"
+        run: sbt "oracleServer/docker:publish;appServer/docker:publish"

bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MiningRpcTest.scala

@@ -9,7 +9,6 @@ import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil
 import org.bitcoins.testkit.util.BitcoindRpcTest
 
 import scala.concurrent.Future
-import org.bitcoins.rpc.BitcoindP2PException.NotConnected
 
 class MiningRpcTest extends BitcoindRpcTest {
 
@@ -28,12 +27,6 @@ class MiningRpcTest extends BitcoindRpcTest {
         )
       val getBlockF = client.getBlockTemplate(Some(opts))
       getBlockF
-        .recover {
-          // getblocktemplate is having a bad time on regtest
-          // https://github.com/bitcoin/bitcoin/issues/11379
-          case NotConnected(_)  => succeed
-          case other: Throwable => throw other
-        }
         .map(_ => succeed)
     }
   }

chain/src/main/scala/org/bitcoins/chain/blockchain/BlockchainUpdate.scala

@@ -52,7 +52,7 @@ object BlockchainUpdate {
       tipUpdateFailure: TipUpdateResult.Failure)
       extends BlockchainUpdate {
     require(
-      !blockchain.contains(failedHeader),
+      !blockchain.exists(_.blockHeader == failedHeader),
       s"Our blockchain should not contain the failed header=${failedHeader}")
 
     if (successfulHeaders.nonEmpty) {

dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala

@@ -267,7 +267,9 @@ abstract class DLCWallet
       inputs <- dlcInputsDAO.findByDLCId(dlcId, dlcDb.isInitiator)
       dbs <- spendingInfoDAO.findByOutPoints(inputs.map(_.outPoint))
       // allow this to fail in the case they have already been unreserved
-      _ <- unmarkUTXOsAsReserved(dbs).recover { case _: Throwable => () }
+      _ <- unmarkUTXOsAsReserved(dbs).recoverWith {
+        case scala.util.control.NonFatal(_) => Future.successful(Vector.empty)
+      }
       action = actionBuilder.deleteDLCAction(dlcId)
       _ <- safeDLCDatabase.run(action)
     } yield ()

esplora-test/src/test/scala/org/bitcoins/esplora/EsploraClientTest.scala

@@ -37,9 +37,9 @@ class EsploraClientTest extends BitcoinSAsyncTest {
         assert(details.locktime == UInt32.zero)
         assert(details.txid == txId)
         assert(details.status.confirmed)
-        assert(details.status.block_height.contains(720542))
-        assert(details.status.block_time.contains(1643245253))
-        assert(details.status.block_hash.contains(DoubleSha256DigestBE(
+        assert(details.status.block_height.exists(_ == 720542))
+        assert(details.status.block_time.exists(_ == 1643245253))
+        assert(details.status.block_hash.exists(_ == DoubleSha256DigestBE(
           "000000000000000000074110fd51c9e34b9ea10ea88ce7fa43bf2cf80a3c2185")))
       }
   }
@@ -50,9 +50,9 @@ class EsploraClientTest extends BitcoinSAsyncTest {
     client
       .getTransactionStatus(txId)
       .map { status =>
-        assert(status.block_height.contains(720542))
-        assert(status.block_time.contains(1643245253))
-        assert(status.block_hash.contains(DoubleSha256DigestBE(
+        assert(status.block_height.exists(_ == 720542))
+        assert(status.block_time.exists(_ == 1643245253))
+        assert(status.block_hash.exists(_ == DoubleSha256DigestBE(
           "000000000000000000074110fd51c9e34b9ea10ea88ce7fa43bf2cf80a3c2185")))
       }
   }

inThisBuild.sbt

@@ -1,8 +1,9 @@
 import sbt.Keys.excludeLintKeys
 
+
 import scala.util.Properties
 
-val scala2_13 = "2.13.8"
+val scala2_13 = "2.13.10"
 
 ThisBuild / scalafmtOnCompile := !Properties.envOrNone("CI").contains("true")
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.3
+sbt.version=1.8.0

project/plugins.sbt

@@ -1,11 +1,13 @@
+ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
+
 // bundle up Scala applications into packaging formats such as Docker,
 // GraalVM native-image, executable JARs etc
 // https://github.com/sbt/sbt-native-packager
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.9")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11")
 
 // collect code coverage when executing tests
 //https://github.com/scoverage/sbt-scoverage
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
 
 // report code coverage to Coveralls
 //https://github.com/scoverage/sbt-coveralls