Merge #184: Add support for Core version 28.1

1b24ece Add support for Core version 28.1 (Jamil Lambert, PhD)

Pull request description:

  Add v28.1 to all locations it is required including features.

  Closes #171
  Closes #172

ACKs for top commit:
  tcharding:
    ACK 1b24ece

Tree-SHA512: b114ae2b80dca6ad4d582d0f4e80d76856562e0c983bed4c27230bd1822d5e2a5619a9cd996ce06dd149b610a6a7fa4b908a8360bc0741d98c9abc49752b90c4

Author: tcharding

.github/workflows/rust.yaml

@@ -210,6 +210,7 @@ jobs:
       matrix:
         feature:
           [
+            "28_1",
             "28_0",
             "27_2",
             "27_1",

client/src/client_sync/v28/mod.rs

@@ -22,7 +22,7 @@ pub use crate::client_sync::{
 };
 
 crate::define_jsonrpc_minreq_client!("v28");
-crate::impl_client_check_expected_server_version!({ [280000] });
+crate::impl_client_check_expected_server_version!({ [280000, 280100] });
 
 // == Blockchain ==
 crate::impl_client_v17__getbestblockhash!();

contrib/run-bitcoind.sh

@@ -42,7 +42,7 @@ CONFIGURATION
 
 - Examples
 
-    v28 28.1 281 /opt/bitcoin-28.0/bin/bitcoind
+    v28 28.1 281 /opt/bitcoin-28.1/bin/bitcoind
     v24 24.2 242 /opt/bitcoin-24.2/bin/bitcoind
     v21 0.21.2 212 /opt/bitcoin-0.21.2/bin/bitcoind
 
@@ -158,7 +158,7 @@ start() {
 
 run_bitcoind() {
     local version="$1"              # e.g., v28
-    local version_number="$2"       # e.g., 28.1.0
+    local version_number="$2"       # e.g., 28.1
     local version_id="$3"           # e.g., 281
     local bitcoind="$4"
 

integration_test/Cargo.toml

@@ -13,6 +13,7 @@ edition = "2021"
 [features]
 # Enable the same feature in `node` and the version feature here.
 # All minor releases of the latest three versions.
+28_1 = ["v28", "node/28_1"]
 28_0 = ["v28", "node/28_0"]
 27_2 = ["v27", "node/27_2"]
 27_1 = ["v27", "node/27_1"]

node/Cargo.toml

@@ -45,6 +45,7 @@ default = ["0_17_2"]
 download = ["anyhow", "bitcoin_hashes", "flate2", "tar", "minreq", "zip"]
 
 # We support all minor releases of the latest three versions.
+28_1 = ["28_0"]
 28_0 = ["27_2"]
 27_2 = ["27_1"]
 27_1 = ["27_0"]
@@ -65,5 +66,5 @@ download = ["anyhow", "bitcoin_hashes", "flate2", "tar", "minreq", "zip"]
 0_17_2 = []
 
 [package.metadata.docs.rs]
-features = ["28_0"]
+features = ["28_1"]
 rustdoc-args = ["--cfg", "docsrs"]

node/contrib/extra_tests.sh

@@ -14,7 +14,7 @@
 
 set -euox pipefail
 
-FEATURES=("28_0" "27_1" "27_0" "26_2" "26_1" "26_0" "25_2" "24_2"  \
+FEATURES=("28_1" "28_0" "27_1" "27_0" "26_2" "26_1" "26_0" "25_2" "24_2"  \
           "23_2" "22_1" "0_21_2" "0_20_2" "0_19_1" "0_18_1" "0_17_2")
 
 # Use the current `Cargo.lock` file without updating it.

node/contrib/test_vars.sh

@@ -15,4 +15,4 @@ EXAMPLES=""
 
 # Just check the latest minor version of the last three supported Core versions.
 # This is mainly for docs and MSRV - integration tests will catch any other errors.
-EXACT_FEATURES=("download,28_0" "download,27_2" "download,26_2")
+EXACT_FEATURES=("download,28_1" "download,27_2" "download,26_2")

node/sha256/bitcoin-core-28.1-SHA256SUMS

@@ -0,0 +1,25 @@
+ccdee686cf3bec3456e167f0efb63eda38a3c02bd4267cb4e86714e9fb11e329  bitcoin-28.1-aarch64-linux-gnu-debug.tar.gz
+6ddb6990690bd4c9a9f4319ed6f6e9c995c85ce5530ee9f120e80ce09e090c44  bitcoin-28.1-aarch64-linux-gnu.tar.gz
+42a7c1ce49a6073c1cd8d22501605c868de7ffd06e9e5746995e403b4eccd2e0  bitcoin-28.1-arm-linux-gnueabihf-debug.tar.gz
+6448274420ac632c528bbd4da7198692232cef7bd16d101febc5d05f7d4af1d2  bitcoin-28.1-arm-linux-gnueabihf.tar.gz
+6279d0f4b085e4aed1503024d48c1fdca6c4ea3d143292e64516b4c15cd30334  bitcoin-28.1-arm64-apple-darwin.zip
+1cafc19a111174929c925e2745e61a8bafec8501b244478eeb712b2d426a515b  bitcoin-28.1-arm64-apple-darwin-unsigned.tar.gz
+2cd15a8cd7edd5bea17124e68ddc4126d9ca175fc3b43fd507e06b430dfe42df  bitcoin-28.1-arm64-apple-darwin-unsigned.zip
+abf4d2f7ebda6284e2246bce3591bcf161c114e370c0443ccc049b2728dc7e20  bitcoin-28.1-arm64-apple-darwin.tar.gz
+4068c0c78902df70d0d186de146776d38ccc25de6d76eb1171933a810e4a1dd1  bitcoin-28.1-codesignatures-28.1.tar.gz
+c5ae2dd041c7f9d9b7c722490ba5a9d624f7e9a089c67090615e1ba4ad0883ba  bitcoin-28.1.tar.gz
+6017c4affb5a10f83f58ae14e99d4102792f01c0196b4ec5e36781cedfd5f177  bitcoin-28.1-powerpc64-linux-gnu-debug.tar.gz
+fb32e82104db9e86a5826a0d2ebdfa2d1e1085e1f4e127960106bce21f1c6ac2  bitcoin-28.1-powerpc64-linux-gnu.tar.gz
+21aa7fb88885804629d0507b2879cfd99c14f75bd77d48740ec7b7a87e09c99b  bitcoin-28.1-riscv64-linux-gnu-debug.tar.gz
+0d3dce8b2602910874d417eaf2fda231297e3718acbfcbf08bbe516cf28540a9  bitcoin-28.1-riscv64-linux-gnu.tar.gz
+03d65a5d31d35d4d8850f43ca2adab98c93b5a623f99d4c31d9f1ee4ff7f3b9b  bitcoin-28.1-x86_64-apple-darwin.zip
+251d4dfdced96898382a343b8a703c2456d915a2a21d69bf23e66914b4da8235  bitcoin-28.1-x86_64-apple-darwin-unsigned.tar.gz
+46f2c8c7f9a081579f505c5dd89f7b2e0a5cc511455e6feda7d73dba8c0b256f  bitcoin-28.1-x86_64-apple-darwin-unsigned.zip
+c85d1a0ebedeff43b99db2c906b50f14547b84175a4d0ebb039a9809789af280  bitcoin-28.1-x86_64-apple-darwin.tar.gz
+c8bd98d7fd31a554b9859e188e89c425f770f22b536b2d4b9ee1c21c47da2822  bitcoin-28.1-x86_64-linux-gnu-debug.tar.gz
+07f77afd326639145b9ba9562912b2ad2ccec47b8a305bd075b4f4cb127b7ed7  bitcoin-28.1-x86_64-linux-gnu.tar.gz
+e48722e54b0ac61c296371aa940d61ff8fbc0a5a3f14fd41b3218179e73fff84  bitcoin-28.1-win64-setup.exe
+0a334e4ddc996bc0faee95c59d95de5d5474d7007f4a222d49affb7622dfc928  bitcoin-28.1-win64-debug.zip
+3cc071e939bef7437544d73d3c539ff6bc14c03fff555b4ef3d524d4a347f805  bitcoin-28.1-win64-setup-unsigned.exe
+029b54a0181e7892f445113f6d8989aee06c096f6db3ce60ba2b2e877150b76c  bitcoin-28.1-win64-unsigned.tar.gz
+2d636ad562b347c96d36870d6ed810f4a364f446ca208258299f41048b35eab0  bitcoin-28.1-win64.zip

node/src/client_versions.rs

@@ -6,7 +6,10 @@
 
 #![allow(unused_imports)] // Not all users need the json types.
 
-#[cfg(feature = "28_0")]
+#[cfg(feature = "28_1")]
+pub use corepc_client::{client_sync::v28::*, types::v28 as vtype};
+
+#[cfg(all(feature = "28_0", not(feature = "28_1")))]
 pub use corepc_client::{client_sync::v28::*, types::v28 as vtype};
 
 #[cfg(all(feature = "27_2", not(feature = "28_0")))]
@@ -57,6 +60,7 @@ pub use corepc_client::{client_sync::v17::*, types::v17 as vtype};
 /// This is meaningless but we need it otherwise we can't get far enough into
 /// the build process to trigger the `compile_error!` in `./versions.rs`.
 #[cfg(all(
+    not(feature = "28_1"),
     not(feature = "28_0"),
     not(feature = "27_2"),
     not(feature = "27_1"),

node/src/versions.rs

@@ -1,6 +1,7 @@
 // An explicit version of Bitcoin Core must be selected by enabling some feature.
 // We check this here instead of in `lib.rs` because this file is included in `build.rs`.
 #[cfg(all(
+    not(feature = "28_1"),
     not(feature = "28_0"),
     not(feature = "27_2"),
     not(feature = "27_1"),
@@ -20,8 +21,11 @@
 ))]
 compile_error!("enable a feature in order to select the version of Bitcoin Core to use");
 
-#[cfg(feature = "28_0")]
+#[cfg(feature = "28_1")]
 #[allow(dead_code)] // Triggers in --all-features builds.
+pub const VERSION: &str = "28.1";
+
+#[cfg(all(feature = "28_0", not(feature = "28_1")))]
 pub const VERSION: &str = "28.0";
 
 #[cfg(all(feature = "27_2", not(feature = "28_0")))]
@@ -72,6 +76,7 @@ pub const VERSION: &str = "0.17.2";
 /// This is meaningless but we need it otherwise we can't get far enough into
 /// the build process to trigger the `compile_error!` in `./versions.rs`.
 #[cfg(all(
+    not(feature = "28_1"),
     not(feature = "28_0"),
     not(feature = "27_2"),
     not(feature = "27_1"),