Skip to content

Commit 18a00ad

Browse files
committed
Add support for bitcoin core 28.2
1 parent b32a91d commit 18a00ad

File tree

9 files changed

+47
-7
lines changed

9 files changed

+47
-7
lines changed

.github/workflows/rust.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ jobs:
214214
feature:
215215
[
216216
"29_0,download",
217+
"28_2,download",
217218
"28_1,download",
218219
"28_0,download",
219220
"27_2,download",

client/src/client_sync/v28/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub use crate::client_sync::{
2525
};
2626

2727
crate::define_jsonrpc_minreq_client!("v28");
28-
crate::impl_client_check_expected_server_version!({ [280000, 280100] });
28+
crate::impl_client_check_expected_server_version!({ [280000, 280100, 280200] });
2929

3030
// == Blockchain ==
3131
crate::impl_client_v17__get_best_block_hash!();

integration_test/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ download = ["node/download"]
1616
# Enable the same feature in `node` and the version feature here.
1717
# All minor releases of the latest three versions.
1818
29_0 = ["v29_and_below", "node/29_0"]
19+
28_2 = ["v28_and_below", "node/28_2"]
1920
28_1 = ["v28_and_below", "node/28_1"]
2021
28_0 = ["v28_and_below", "node/28_0"]
2122
27_2 = ["v27_and_below", "node/27_2"]

node/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ default = ["0_17_2"]
4545
download = ["anyhow", "bitcoin_hashes", "flate2", "tar", "minreq", "zip"]
4646

4747
# We support all minor releases of the latest three versions.
48-
29_0 = ["28_1"]
48+
29_0 = ["28_2"]
49+
28_2 = ["28_1"]
4950
28_1 = ["28_0"]
5051
28_0 = ["27_2"]
5152
27_2 = ["27_1"]
@@ -65,5 +66,5 @@ download = ["anyhow", "bitcoin_hashes", "flate2", "tar", "minreq", "zip"]
6566
0_17_2 = []
6667

6768
[package.metadata.docs.rs]
68-
features = ["28_1"]
69+
features = ["28_2"]
6970
rustdoc-args = ["--cfg", "docsrs"]

node/contrib/extra_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
set -euox pipefail
1616

17-
FEATURES=("29_0" "28_1" "28_0" "27_1" "27_0" "26_2" "25_2" "24_2" \
17+
FEATURES=("29_0" "28_2" "28_1" "28_0" "27_1" "27_0" "26_2" "25_2" "24_2" \
1818
"23_2" "22_1" "0_21_2" "0_20_2" "0_19_1" "0_18_1" "0_17_2")
1919

2020
# Use the current `Cargo.lock` file without updating it.

node/contrib/test_vars.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ EXAMPLES=""
1515

1616
# Just check the latest minor version of the last three supported Core versions.
1717
# This is mainly for docs and MSRV - integration tests will catch any other errors.
18-
EXACT_FEATURES=("download,28_1" "download,27_2" "download,26_2")
18+
EXACT_FEATURES=("download,28_2" "download,27_2" "download,26_2")
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
a7223bd6557c06ff189361f16a97ba8890258397cdf8820eaff6fe6160300405 bitcoin-28.2-aarch64-linux-gnu-debug.tar.gz
2+
10581b6d4aeb091c08c9e69eb4e4ced000038c009286dc1edb8a876656ccf6df bitcoin-28.2-aarch64-linux-gnu.tar.gz
3+
df83120e335a418cfab94c78e0bbc93f61e91706ea0857da31c956dc5bd0bdfc bitcoin-28.2-arm-linux-gnueabihf-debug.tar.gz
4+
c08135c249688438b1ed6f48a2f192ffaae7c7111ffee5cfad59fdae355bb47f bitcoin-28.2-arm-linux-gnueabihf.tar.gz
5+
c0270ed50effc174f7ff3332dba5183a8693999dac2ba78b37d8c8797b3ea2b2 bitcoin-28.2-arm64-apple-darwin.tar.gz
6+
dbfefb51128b061f67289b28fad45d4fc8d63979f1df386d9e37078dbee90822 bitcoin-28.2-arm64-apple-darwin.zip
7+
a1f7b67fcfcd304af027134736ab5ed799f7596e9a9912c8a6e1afb9683f4814 bitcoin-28.2-arm64-apple-darwin-codesigning.tar.gz
8+
83ce1c49e649df9c1613ea532bbc7b17483d319bdfdb3eb55077d64eea00f4ee bitcoin-28.2-arm64-apple-darwin-unsigned.tar.gz
9+
a0ed24f33040aa3662ece4f68b382dc5e34e5c9a6d6dd10ce4705e04078367ae bitcoin-28.2-arm64-apple-darwin-unsigned.zip
10+
f0b75ad690b0f4ed8f748bfd5eb72794f012fb0a9eb75d3d7ad777786d0a690b bitcoin-28.2-codesignatures-28.2.tar.gz
11+
5977daf9d58793cd4f34083e37f04c3fb505ff5b67356afb736617f181734350 bitcoin-28.2.tar.gz
12+
ae15dd98cd7155f4f92a1855073bb7334ac4b6197b3f7e03c2f6fa9f5de08306 bitcoin-28.2-powerpc64-linux-gnu-debug.tar.gz
13+
21c54bc7520e873c8b52c817af257a8a4aee15d81bb2492e5bd51af055ae4469 bitcoin-28.2-powerpc64-linux-gnu.tar.gz
14+
1b46348a9646718a3a8af5015b064ced3919fd5b1148456600e33b6e07790cab bitcoin-28.2-riscv64-linux-gnu-debug.tar.gz
15+
8ad2bf5dd0a7fd04afa9cd2b1309621f8662f00c799f1971cd44ba9eb9d18ef1 bitcoin-28.2-riscv64-linux-gnu.tar.gz
16+
866a4b703a2095301151c17dcc753e19e4dba61ec68d19709ec4f81ff4320103 bitcoin-28.2-x86_64-apple-darwin.tar.gz
17+
b7408ba00c2a9cf1f7b94b8f027517f30d527e166cafd95b733db5a8a280fa4d bitcoin-28.2-x86_64-apple-darwin.zip
18+
7baa2c976e5cde8389d267877e95df92c3ce702f8f66d37eea22f436ffacc9f0 bitcoin-28.2-x86_64-apple-darwin-codesigning.tar.gz
19+
2fbb8599fd6b96b2af441c018371bf498cce451ef97402c36cf2592ec9f6fb97 bitcoin-28.2-x86_64-apple-darwin-unsigned.tar.gz
20+
6161124ef6d6019dbf7494e88616b583c7c3f82361fe8e08c5b8caf505462540 bitcoin-28.2-x86_64-apple-darwin-unsigned.zip
21+
a979dac5711e7d55c618292149214bd593b29409b035afac08af73dad99d55ae bitcoin-28.2-x86_64-linux-gnu-debug.tar.gz
22+
98add5f220c01b387343b70edeb6273403fe081e22cd85fda132704cdcaa98aa bitcoin-28.2-x86_64-linux-gnu.tar.gz
23+
aef8cb840a84c1599302b6a838ca25752f1567728c16696211111f4a3b3abf50 bitcoin-28.2-win64-setup.exe
24+
da0869639c323bbf6f264f1829083b9514e10179b90c34b09d8cbcab8a1897e3 bitcoin-28.2-win64.zip
25+
10a118ad19500244f46a3abf5ce421157ebf00a635a3273c52eadb163c70e094 bitcoin-28.2-win64-codesigning.tar.gz
26+
22476d0d055f120e73d477fa12284d8320501718c05465b6018bc8164f6bc913 bitcoin-28.2-win64-debug.zip
27+
0e18b2d02c13dbe8c5b1534148b29ae1881005dd89b61a317fb6312dbfc3489b bitcoin-28.2-win64-setup-unsigned.exe
28+
97c25f7c26597cbd38c8470506a673d695f872f8cdd36f27352f6ff116c29895 bitcoin-28.2-win64-unsigned.zip

node/src/client_versions.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
#[cfg(feature = "29_0")]
1010
pub use corepc_client::{client_sync::v29::*, types::v29 as vtype};
1111

12-
#[cfg(all(feature = "28_1", not(feature = "29_0")))]
12+
#[cfg(all(feature = "28_2", not(feature = "29_0")))]
13+
pub use corepc_client::{client_sync::v28::*, types::v28 as vtype};
14+
15+
#[cfg(all(feature = "28_1", not(feature = "28_2")))]
1316
pub use corepc_client::{client_sync::v28::*, types::v28 as vtype};
1417

1518
#[cfg(all(feature = "28_0", not(feature = "28_1")))]
@@ -58,6 +61,7 @@ pub use corepc_client::{client_sync::v17::*, types::v17 as vtype};
5861
/// the build process to trigger the `compile_error!` in `./versions.rs`.
5962
#[cfg(all(
6063
not(feature = "29_0"),
64+
not(feature = "28_2"),
6165
not(feature = "28_1"),
6266
not(feature = "28_0"),
6367
not(feature = "27_2"),

node/src/versions.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// We check this here instead of in `lib.rs` because this file is included in `build.rs`.
33
#[cfg(all(
44
not(feature = "29_0"),
5+
not(feature = "28_2"),
56
not(feature = "28_1"),
67
not(feature = "28_0"),
78
not(feature = "27_2"),
@@ -24,7 +25,10 @@ compile_error!("enable a feature in order to select the version of Bitcoin Core
2425
#[allow(dead_code)] // Triggers in --all-features builds.
2526
pub const VERSION: &str = "29.0";
2627

27-
#[cfg(all(feature = "28_1", not(feature = "29_0")))]
28+
#[cfg(all(feature = "28_2", not(feature = "29_0")))]
29+
pub const VERSION: &str = "28.2";
30+
31+
#[cfg(all(feature = "28_1", not(feature = "28_2")))]
2832
pub const VERSION: &str = "28.1";
2933

3034
#[cfg(all(feature = "28_0", not(feature = "28_1")))]
@@ -73,6 +77,7 @@ pub const VERSION: &str = "0.17.2";
7377
/// the build process to trigger the `compile_error!` in `./versions.rs`.
7478
#[cfg(all(
7579
not(feature = "29_0"),
80+
not(feature = "28_2"),
7681
not(feature = "28_1"),
7782
not(feature = "28_0"),
7883
not(feature = "27_2"),

0 commit comments

Comments
 (0)