Merge branch 'master' of https://github.com/RCasatta/bitcoind into fe…

…ature/proxy
rust-bitcoin · Jun 20, 2022 · 6e8ba5e · 6e8ba5e
2 parents faa9230 + bd952c1
commit 6e8ba5e
Show file tree

Hide file tree

Showing 7 changed files with 196 additions and 41 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-20.04 ]
-        feature: [ "22_0", "0_21_1", "0_21_0", "0_20_1", "0_20_0", "0_19_1", "0_19_0_1", "0_18_1", "0_18_0", "0_17_1"]
+        feature: [ "23_0", "22_0", "0_21_1", "0_21_0", "0_20_1", "0_20_0", "0_19_1", "0_19_0_1", "0_18_1", "0_18_0", "0_17_1"]
         include:
           - os: "macos-10.15"
             feature: "0_21_1"
@@ -31,7 +31,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - run: echo "TEMPDIR_ROOT=/dev/shm" >> $GITHUB_ENV
+      #- run: echo "TEMPDIR_ROOT=/dev/shm" >> $GITHUB_ENV # conflicts with test `test_data_persistence`
         if: ${{ matrix.os != 'macos-10.15' }}
       - uses: actions-rs/cargo@v1
         with:

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bitcoind"
-version = "0.24.0"
+version = "0.26.1"
 authors = ["Riccardo Casatta <riccardo@casatta.it>"]
 description = "Utility to run a regtest bitcoind process, useful in integration testing environment"
 license = "MIT"
@@ -9,21 +9,24 @@ documentation = "https://docs.rs/bitcoind/"
 edition = "2018"
 
 [dependencies]
-bitcoincore-rpc = "0.14.0"
+bitcoincore-rpc = "0.15.0"
 tempfile = "3.1"
 log = "0.4"
 home = "0.5.3"  # use same ver in build-dep
+which = "4.2.5"
 
 [dev-dependencies]
 env_logger = "0.8"
 
 [build-dependencies]
 ureq = "2.1"
 bitcoin_hashes = "0.10"
-flate2 = "1.0"
 tar = "0.4"
+filetime = "=0.2.15"
+flate2 = "=1.0.22"
 
 [features]
+"23_0" = []
 "22_0" = []
 "0_21_1" = []
 "0_21_0" = []

diff --git a/Readme.md → README.md b/Readme.md → README.md
@@ -7,7 +7,8 @@ Utility to run a regtest bitcoind process, useful in integration testing environ
 
 ```rust
 use bitcoincore_rpc::RpcApi;
-let bitcoind = bitcoind::BitcoinD::new("/usr/local/bin/bitcoind").unwrap();
+let exe_path = exe_path().expect("bitcoind executable must be provided in BITCOIND_EXE, or with a feature like '22_0', or be in PATH");
+let bitcoind = bitcoind::BitcoinD::new(exe_path).unwrap();
 assert_eq!(0, bitcoind.client.get_blockchain_info().unwrap().blocks);
 ```
 

diff --git a/build.rs b/build.rs
@@ -21,6 +21,11 @@ fn download_filename() -> String {
     format!("bitcoin-{}-x86_64-linux-gnu.tar.gz", &VERSION)
 }
 
+#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
+fn download_filename() -> String {
+    format!("bitcoin-{}-aarch64-linux-gnu.tar.gz", &VERSION)
+}
+
 fn get_expected_sha256(filename: &str) -> Result<sha256::Hash, ()> {
     let sha256sums_filename = format!("sha256/bitcoin-core-{}-SHA256SUMS", &VERSION);
     #[cfg(any(

diff --git a/sha256/bitcoin-core-23.0-SHA256SUMS b/sha256/bitcoin-core-23.0-SHA256SUMS
@@ -0,0 +1,27 @@
+868d4be1f776a4d5e3230d9d6067bc5a6cbe094e6fbc270f567786e253cdc8d1  bitcoin-23.0-aarch64-linux-gnu-debug.tar.gz
+06f4c78271a77752ba5990d60d81b1751507f77efda1e5981b4e92fd4d9969fb  bitcoin-23.0-aarch64-linux-gnu.tar.gz
+198c575150de5501940a120ecfb49670a7ac94d95bd875a854efd54a527f83fe  bitcoin-23.0-arm-linux-gnueabihf-debug.tar.gz
+952c574366aff76f6d6ad1c9ee45a361d64fa04155e973e926dfe7e26f9703a3  bitcoin-23.0-arm-linux-gnueabihf.tar.gz
+a3059280451d17a77d2260e4671c884be93a14dbff6b6cd19a3c9c8c54421e97  bitcoin-23.0-arm64-apple-darwin.dmg
+c991de5922cb2880f0f54a7f21ba650da40872b4a6dad73fae09d7a89d8c8f28  bitcoin-23.0-arm64-apple-darwin-unsigned.dmg
+cdb380556e9858b22d9e9bfe3c2200f2d7efdc12af505390ca7798d97f6cd57c  bitcoin-23.0-arm64-apple-darwin-unsigned.tar.gz
+7c8bc63731aa872b7b334a8a7d96e33536ad77d49029bad179b09dca32cd77ac  bitcoin-23.0-arm64-apple-darwin.tar.gz
+a382c13777c090fbe1353f19a579c5f79a07285c6d7b04176180c1ce829cd7f7  bitcoin-23.0-codesignatures-e36a046909ad.tar.gz
+26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05  bitcoin-23.0.tar.gz
+7815a86a30bcebe10b0c27e465172b2bc79e93ea1ddda724eb33508685a02fe9  bitcoin-23.0-powerpc64-linux-gnu-debug.tar.gz
+2caa5898399e415f61d9af80a366a3008e5856efa15aaff74b88acf429674c99  bitcoin-23.0-powerpc64-linux-gnu.tar.gz
+dda063652da7cad4839c11dff7a815a78ed8cd0f97dfdc6b10708cecb701085e  bitcoin-23.0-powerpc64le-linux-gnu-debug.tar.gz
+217dd0469d0f4962d22818c368358575f6a0abcba8804807bb75325eb2f28b19  bitcoin-23.0-powerpc64le-linux-gnu.tar.gz
+5faabaec6e217bdea1b1f85b116659692a2f0e437767d35d17eb4b0e5c04c09c  bitcoin-23.0-riscv64-linux-gnu-debug.tar.gz
+078f96b1e92895009c798ab827fb3fde5f6719eee886bd0c0e93acab18ea4865  bitcoin-23.0-riscv64-linux-gnu.tar.gz
+52eefbaf8cfd292822e470a48a51e1eb51081d43a0a16db7441f34a017ff6097  bitcoin-23.0-x86_64-apple-darwin.dmg
+050eb122ef226ab9cfd6fe19a71c0a49029b9eac13faf033dbb60cdfa3a55c65  bitcoin-23.0-x86_64-apple-darwin-unsigned.dmg
+ac43412ba3fea4436a90ada71decb25ee122b60396ce6a67f933424dc3dceb17  bitcoin-23.0-x86_64-apple-darwin-unsigned.tar.gz
+c816780583009a9dad426dc0c183c89be9da98906e1e2c7ebae91041c1aaaaf3  bitcoin-23.0-x86_64-apple-darwin.tar.gz
+a5a86632775fb2c1db4235bd56396ecfeb233bfa24431baf936c41e51cc24fdf  bitcoin-23.0-x86_64-linux-gnu-debug.tar.gz
+2cca490c1f2842884a3c5b0606f179f9f937177da4eadd628e3f7fd7e25d26d0  bitcoin-23.0-x86_64-linux-gnu.tar.gz
+4198eba8ac326d8746ab43364a44a5f20c157b6701f8c35b80d639a676df9011  bitcoin-23.0-win64-setup.exe
+02f6c3bde5448527282aafafe7fdb80f35d4f984d9b012a9cb5e5efd28861614  bitcoin-23.0-win64-debug.zip
+beb4e86f629048e1a6616a882a2d66407ca6f368c9bc63cf117f2fb291ce1ced  bitcoin-23.0-win64-setup-unsigned.exe
+39a7b022b38f301029ee9d5732ed7e77851d465d44177b4c734cdcc33e6763b6  bitcoin-23.0-win64-unsigned.tar.gz
+004b2e25b21e0f14cbcce6acec37f221447abbb3ea7931c689e508054bfc6cf6  bitcoin-23.0-win64.zip