Add support for Core 22.0 & 23.0

rust-bitcoin · Jun 13, 2022 · 9aa1ec2 · 9aa1ec2
1 parent 6030b61
commit 9aa1ec2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -46,6 +46,8 @@ jobs:
                         "0.20.0",
                         "0.20.1",
                         "0.21.0",
+                        "22.0",
+                        "23.0",
                     ]
         steps:
             - name: Checkout Crate

diff --git a/README.md b/README.md
@@ -45,6 +45,8 @@ The following versions are officially supported and automatically tested:
 * 0.20.0
 * 0.20.1
 * 0.21.0
+* 22.0
+* 23.0
 
 # Minimum Supported Rust Version (MSRV)
 This library should always compile with any combination of features on **Rust 1.29**.

diff --git a/integration_test/run.sh b/integration_test/run.sh
@@ -28,7 +28,12 @@ if bitcoind -version | grep -q "v0\.2"; then
     FALLBACKFEEARG="-fallbackfee=0.00001000"
 fi
 
-bitcoind -regtest $BLOCKFILTERARG $FALLBACKFEEARG \
+COINSTATSINDEXARG=""
+if bitcoind -version | grep -q "v[2-9]"; then
+    COINSTATSINDEXARG="-coinstatsindex=1"
+fi
+
+bitcoind -regtest $BLOCKFILTERARG $FALLBACKFEEARG $COINSTATSINDEXARG \
     -datadir=${TESTDIR}/2 \
     -connect=127.0.0.1:12348 \
     -rpcport=12349 \

diff --git a/integration_test/src/main.rs b/integration_test/src/main.rs
@@ -1030,7 +1030,11 @@ fn test_create_wallet(cl: &Client) {
 }
 
 fn test_get_tx_out_set_info(cl: &Client) {
-    cl.get_tx_out_set_info(None, None, None).unwrap();
+    if version() >= 220000 {
+        cl.get_tx_out_set_info(Some(json::TxOutSetHashType::Muhash), None, Some(true)).unwrap();
+    } else {
+        cl.get_tx_out_set_info(None, None, None).unwrap();
+    }
 }
 
 fn test_get_chain_tips(cl: &Client) {