Skip to content
This repository was archived by the owner on Nov 26, 2024. It is now read-only.

Commit 9b2f429

Browse files
committed
Support latest Bitcoin Core v26 minor version
Bitcoin Core versions `26.1` and `26.2` are out, we should support both.
1 parent 73be7c9 commit 9b2f429

File tree

6 files changed

+44
-13
lines changed

6 files changed

+44
-13
lines changed

client/src/client_sync/v26.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ crate::impl_client_v17__generatetoaddress!();
2626

2727
// == Network ==
2828
crate::impl_client_v17__getnetworkinfo!();
29-
crate::impl_client_check_expected_server_version!({ [260000] });
29+
crate::impl_client_check_expected_server_version!({ [260200] });
3030

3131
// == Rawtransactions ==
3232
crate::impl_client_v17__sendrawtransaction!();

integration_test/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ edition = "2021"
88

99
# Please note, in this crate the version features are mutally exclusive.
1010
#
11-
# - `cargo test --all-features` is the same as `cargo test --features=v26_0`
11+
# - `cargo test --all-features` is the same as `cargo test --features=v26_2`
1212
# - `cargo test --no-default-features` skips all tests.
1313
[features]
1414
# Enable the same feature in `bitcoind` and the version feature here.
1515
# All minor releases (but only the latest patch release).
16+
"26_2" = ["v26", "bitcoind/26_2"]
17+
"26_1" = ["v26", "bitcoind/26_1"]
1618
"26_0" = ["v26", "bitcoind/26_0"]
1719
"25_2" = ["v25", "bitcoind/25_2"]
1820
"25_1" = ["v25", "bitcoind/25_1"]

regtest/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@ anyhow = "1.0.66"
3535

3636
# Please note, in this crate the version features are mutally exclusive.
3737
#
38-
# - `cargo test --all-features` is the same as `cargo test --features=v26_0`
39-
# - `cargo test --no-default-features` uses `v26_0` also.
38+
# - `cargo test --all-features` is the same as `cargo test --features=v26_2`
39+
# - `cargo test --no-default-features` uses `v26_2` also.
4040
[features]
4141
# download is not supposed to be used directly only through selecting one of the version feature
4242
"download" = ["bitcoin_hashes", "flate2", "tar", "minreq", "zip"]
4343

4444
# We support all minor releases (but only the latest patch release).
45+
"26_2" = ["download", "26_1"]
46+
"26_1" = ["download", "26_0"]
4547
"26_0" = ["download", "25_2"]
4648
"25_2" = ["download", "25_1"]
4749
"25_1" = ["download", "25_0"]
@@ -65,7 +67,7 @@ anyhow = "1.0.66"
6567

6668

6769
[package.metadata.docs.rs]
68-
features = ["download", "doc", "26_0"]
70+
features = ["download", "doc", "26_2"]
6971
rustdoc-args = ["--cfg", "docsrs"]
7072

7173
[patch.crates-io.bitcoind-json-rpc-client]
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
49521ec94ebb523b49007a96eb18c1ab7c650c28222203104d17cdb569c58ded bitcoin-26.2-aarch64-linux-gnu-debug.tar.gz
2+
f9d723aec022b9a857f27a76fc3500f8d82ce02ca496e0d907c07081437204c8 bitcoin-26.2-aarch64-linux-gnu.tar.gz
3+
b5bc5a35e3bef4ee2633563df57e38b83cd1103f259a7844dc7e283049986fb0 bitcoin-26.2-arm-linux-gnueabihf-debug.tar.gz
4+
4b767fe48867825b9e1efa8ef16570410adeb099869103eaec99b664708118d6 bitcoin-26.2-arm-linux-gnueabihf.tar.gz
5+
d3f8f9a8da2ff6c0f7d29646c23c0028c6042bbcda35c28830ce6511c840d9c0 bitcoin-26.2-arm64-apple-darwin.zip
6+
0d104144ee3888fbf4ac0cb01c087966625025a70394852a9db33425debce4e9 bitcoin-26.2-arm64-apple-darwin-unsigned.tar.gz
7+
edd5e07d0b99a05d88b79f6f19e8619a24a27e27225232f3b904db567644a7d5 bitcoin-26.2-arm64-apple-darwin-unsigned.zip
8+
863960b4f78130ebb9a5e7f68e5cc021778892ff9b3f8b060056c485470640d5 bitcoin-26.2-arm64-apple-darwin.tar.gz
9+
633fa765be8b371ef9dc174803dd7b2d716855f4c87e8f27e9ade0b588b9030a bitcoin-26.2-codesignatures-26.2.tar.gz
10+
78d59418741f45cbdaa9bf20ebc49a5e95ff9f7172f72fc78d14307eaf341b3c bitcoin-26.2.tar.gz
11+
a4cebb8873f05609b10763c35a32da8f798db55676c669e3d64249fecc7f1409 bitcoin-26.2-powerpc64-linux-gnu-debug.tar.gz
12+
3fe1350951e72be109ce28d679776cb8f630d0db39a5b1c342856e0527478142 bitcoin-26.2-powerpc64-linux-gnu.tar.gz
13+
015b925c04590fbe8d198e5bf2d5a5903efdbd71a052df94a836390cbbd9283b bitcoin-26.2-powerpc64le-linux-gnu-debug.tar.gz
14+
0344a286b16c117d486dcd2e721a055072b77bab7cfa542ab6c22268591de1f6 bitcoin-26.2-powerpc64le-linux-gnu.tar.gz
15+
bf12bcc0aeae60abf51841a14b67c48fdca5ee8e276d1bd72a76867e5825cc45 bitcoin-26.2-riscv64-linux-gnu-debug.tar.gz
16+
60bf104a6467d105439507526be0ebee47cc0436a831562a4253e4e113af3a21 bitcoin-26.2-riscv64-linux-gnu.tar.gz
17+
dd83901d294e7d9de150a85cffd1aadb2d674c15e8b23473e8d3770e21df5ef5 bitcoin-26.2-x86_64-apple-darwin.zip
18+
f238818530a9c0cbc1ad6d5ece3099a3eb324a407b4742ab9baf127e084e1774 bitcoin-26.2-x86_64-apple-darwin-unsigned.tar.gz
19+
a6efec89816073246d40b29b5bb4ec3426f624c7e1a16252cba3f60ca8cac896 bitcoin-26.2-x86_64-apple-darwin-unsigned.zip
20+
8a15491cb1ea1a11c667b31606563e3a325e0ae1ff250e86a8453630f3c966f1 bitcoin-26.2-x86_64-apple-darwin.tar.gz
21+
bb60a33684301e5848f21e573f18440ac1a8cc5ed711372766c8174b4f33ba04 bitcoin-26.2-x86_64-linux-gnu-debug.tar.gz
22+
77c63bec845b318c07f3a7660c579f63da18b58d25699ab8b8df6034e8ed55c0 bitcoin-26.2-x86_64-linux-gnu.tar.gz
23+
f9e359602e138681cb652013901dd9c5d9341b9da2507e7180bc35c8db13e288 bitcoin-26.2-win64-setup.exe
24+
0ec3e2e1c3a198612c3ce97b279fdebe85cf47ac8caf3e34395988d51e8249b2 bitcoin-26.2-win64-debug.zip
25+
1d9d030f1b7f105ed3d58a52c9285d4f175f9d89b1eedacb0515c55a01b7023c bitcoin-26.2-win64-setup-unsigned.exe
26+
0232ae5c288a1c2ccc3d0966da2162f7f9998f5fc947a3febf2f1f9ec77fbea0 bitcoin-26.2-win64-unsigned.tar.gz
27+
9251aa806244ac176d09bbe0a3808247d791e48ce3a6b6256adfdd14d9135e0f bitcoin-26.2-win64.zip

regtest/src/client_versions.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
// All features uses 26_0
1+
// All features uses 26_2
22
/// The version specific client and json types.
33
///
44
/// **THIS IS AVAILABLE FOR ALL VERSION NUMBER FEATURES** (eg `25_0`, `24_2` etc). This crate is
55
/// unusual in that it expects exactly one version number feature to be selected, docs.rs is not set
66
/// up to handle such oddity.
77
///
8-
#[cfg(feature = "26_0")]
8+
#[cfg(feature = "26_2")]
99
#[allow(unused_imports)] // Not all users need the json types.
1010
pub use bitcoind_json_rpc_client::{client_sync::v26::{Client, AddressType}, json::v26 as json};
1111

12-
#[cfg(all(feature = "25_2", not(feature = "26_0")))]
12+
#[cfg(all(feature = "25_2", not(feature = "26_2")))]
1313
#[allow(unused_imports)] // Not all users need the json types.
1414
pub use bitcoind_json_rpc_client::{client_sync::v25::{Client, AddressType}, json::v25 as json};
1515

@@ -74,6 +74,6 @@ pub use bitcoind_json_rpc_client::{client_sync::v18::{Client, AddressType}, json
7474
pub use bitcoind_json_rpc_client::{client_sync::v17::{Client, AddressType}, json::v17 as json};
7575

7676
// To make --no-default-features work we have to re-export a the types, use most recent version same as we do for all features.
77-
#[cfg(all(not(feature = "26_0"), not(feature = "25_2"), not(feature = "25_1"), not(feature = "25_0"), not(feature = "24_2"),not(feature = "24_1"), not(feature = "24_0_1"), not(feature = "23_2"), not(feature = "23_1"), not(feature = "23_0"), not(feature = "22_1"), not(feature = "22_0"), not(feature = "0_21_2"), not(feature = "0_20_2"), not(feature = "0_19_1"), not(feature = "0_18_1"), not(feature = "0_17_1")))]
77+
#[cfg(all(not(feature = "26_2"), not(feature = "25_2"), not(feature = "25_1"), not(feature = "25_0"), not(feature = "24_2"),not(feature = "24_1"), not(feature = "24_0_1"), not(feature = "23_2"), not(feature = "23_1"), not(feature = "23_0"), not(feature = "22_1"), not(feature = "22_0"), not(feature = "0_21_2"), not(feature = "0_20_2"), not(feature = "0_19_1"), not(feature = "0_18_1"), not(feature = "0_17_1")))]
7878
#[allow(unused_imports)] // Not all users need the json types.
7979
pub use bitcoind_json_rpc_client::{client_sync::v26::{Client, AddressType}, json::v26 as json};

regtest/src/versions.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#[cfg(feature = "26_0")]
2-
pub const VERSION: &str = "26.0";
1+
#[cfg(feature = "26_2")]
2+
pub const VERSION: &str = "26.2";
33

4-
#[cfg(all(feature = "25_2", not(feature = "26_0")))]
4+
#[cfg(all(feature = "25_2", not(feature = "26_2")))]
55
pub const VERSION: &str = "25.2";
66

77
#[cfg(all(feature = "25_1", not(feature = "25_2")))]
@@ -50,6 +50,6 @@ pub const VERSION: &str = "0.18.1";
5050
pub const VERSION: &str = "0.17.1";
5151

5252
// To make --no-default-features work we have to enable some feature, use most recent version same as for default.
53-
#[cfg(all(not(feature = "26_0"), not(feature = "25_2"), not(feature = "25_1"), not(feature = "25_0"), not(feature = "24_2"),not(feature = "24_1"), not(feature = "24_0_1"), not(feature = "23_2"), not(feature = "23_1"), not(feature = "23_0"), not(feature = "22_1"), not(feature = "22_0"), not(feature = "0_21_2"), not(feature = "0_20_2"), not(feature = "0_19_1"), not(feature = "0_18_1"), not(feature = "0_17_1")))]
53+
#[cfg(all(not(feature = "26_2"), not(feature = "25_2"), not(feature = "25_1"), not(feature = "25_0"), not(feature = "24_2"),not(feature = "24_1"), not(feature = "24_0_1"), not(feature = "23_2"), not(feature = "23_1"), not(feature = "23_0"), not(feature = "22_1"), not(feature = "22_0"), not(feature = "0_21_2"), not(feature = "0_20_2"), not(feature = "0_19_1"), not(feature = "0_18_1"), not(feature = "0_17_1")))]
5454
#[allow(dead_code)] // for --no-default-features
5555
pub const VERSION: &str = "26.0";

0 commit comments

Comments
 (0)