Skip to content

Commit 6b8142a

Browse files
committed
Add support for bitcoin core 0.17.2
1 parent e8a9b3f commit 6b8142a

File tree

9 files changed

+43
-45
lines changed

9 files changed

+43
-45
lines changed

.github/workflows/rust.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ jobs:
224224
"0_20_2",
225225
"0_19_1",
226226
"0_18_1",
227-
"0_17_1",
227+
"0_17_2",
228228
]
229229
steps:
230230
- name: "Checkout repo"

client/src/client_sync/v17/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use crate::types::v17::*;
2626
pub use crate::client_sync::WalletCreateFundedPsbtInput;
2727

2828
crate::define_jsonrpc_minreq_client!("v17");
29-
crate::impl_client_check_expected_server_version!({ [170100] });
29+
crate::impl_client_check_expected_server_version!({ [170200] });
3030

3131
// == Blockchain ==
3232
crate::impl_client_v17__getbestblockhash!();

integration_test/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ edition = "2021"
2929
0_20_2 = ["v20", "node/0_20_2"]
3030
0_19_1 = ["v19", "node/0_19_1"]
3131
0_18_1 = ["v18", "node/0_18_1"]
32-
0_17_1 = ["v17", "node/0_17_1"]
32+
0_17_2 = ["v17", "node/0_17_2"]
3333

3434
# These features are just for internal use (feature gating).
3535
# Each major version is tested with the same client.

node/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ zip = { version = "0.5.13", optional = true }
3636
#
3737
# - `cargo test --features=27_2,download` to download Bitcoin Core binary `v27.2`.
3838
# - `cargo test --features=28_0` to use `bitcoind` from the host environment.
39-
# - `cargo test` is equivalent to `cargo test --features=0_17_1`.
39+
# - `cargo test` is equivalent to `cargo test --features=0_17_2`.
4040
# - `cargo test --all-features`: Same as using latest version.
4141
# - `cargo test --no-default-features` does not work, you MUST enable a version feature.
4242
[features]
43-
default = ["0_17_1"]
43+
default = ["0_17_2"]
4444

4545
download = ["anyhow", "bitcoin_hashes", "flate2", "tar", "minreq", "zip"]
4646

@@ -61,8 +61,8 @@ download = ["anyhow", "bitcoin_hashes", "flate2", "tar", "minreq", "zip"]
6161
0_21_2 = ["0_20_2"]
6262
0_20_2 = ["0_19_1"]
6363
0_19_1 = ["0_18_1"]
64-
0_18_1 = ["0_17_1"]
65-
0_17_1 = []
64+
0_18_1 = ["0_17_2"]
65+
0_17_2 = []
6666

6767
[package.metadata.docs.rs]
6868
features = ["28_0"]

node/contrib/extra_tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
set -euox pipefail
1616

1717
FEATURES=("28_0" "27_1" "27_0" "26_2" "26_1" "26_0" "25_2" "24_2" \
18-
"23_2" "22_1" "0_21_2" "0_20_2" "0_19_1" "0_18_1" "0_17_1")
18+
"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.
2121
cargo="cargo --locked"

node/sha256/bitcoin-core-0.17.1-SHA256SUMS.asc

-31
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
-----BEGIN PGP SIGNED MESSAGE-----
2+
Hash: SHA256
3+
4+
5a6b35d1a348a402f2d2d6ab5aed653a1a1f13bc63aaaf51605e3501b0733b7a bitcoin-0.17.2-aarch64-linux-gnu.tar.gz
5+
d1913a5d19c8e8da4a67d1bd5205d03c8614dfd2e02bba2fe3087476643a729e bitcoin-0.17.2-arm-linux-gnueabihf.tar.gz
6+
d295fc93f39bbf0fd937b730a93184899a2eb6c3a6d53f3d857cbe77ef89b98c bitcoin-0.17.2-i686-pc-linux-gnu.tar.gz
7+
a783ba20706dbfd5b47fbedf42165fce70fbbc7d78003305d964f6b3da14887f bitcoin-0.17.2-osx64.tar.gz
8+
095c6c04f3fe6e9cc15347d15f499564bdc7ce68e3266cc8bb52308bdcada070 bitcoin-0.17.2-osx.dmg
9+
df085e04b9d03d6d1592146dc50ac0dfcda267519ba4b586d8707ebe6c7d80da bitcoin-0.17.2.tar.gz
10+
ffe5d457aaa4b7760ab5653c7deae283aaa381baf1e7c4a33099689c7d766187 bitcoin-0.17.2-win64-setup.exe
11+
575d99bf7d4dd93088b3515ebcd2c0c5ecaecb07fbd3bd081c0e18eb56658b4d bitcoin-0.17.2-win64.zip
12+
943f9362b9f11130177839116f48f809d83478b4c28591d486ee9a7e35179da6 bitcoin-0.17.2-x86_64-linux-gnu.tar.gz
13+
-----BEGIN PGP SIGNATURE-----
14+
Version: GnuPG v1.4.11 (GNU/Linux)
15+
16+
iQIcBAEBCAAGBQJd3VEoAAoJEJDIAZ42wulk5cQQAJScPo8adQhjAkad4J7ZSpgy
17+
ISVPn8zoO45ZB+LsEMsAwcnFzw8SKtGuXqJFuzf/+uwprpcIwiFsSSNpNHevWSA1
18+
byMUIFWMvFf253eO1mM+ILpkPtHJGgB5iZjBrhlSR7yQrlIy47A47muyiThYnVAv
19+
HSNEgfhFWGOGJ5uXPggb/alBw9WGLZAP78MKTAutXnNPGlqt28VfuT7gldmNlFj8
20+
Nz0wj0rwKI5ygLjn1wUsFbJzHPAfjNpk42wY3cQKOyu9af4VgRGQntRvm2TgXyOB
21+
qnmf2JFRnca28qM/YlrFjjPLaY3s3ZnUyExs4sAnbmO06KtKWm9jZkLwefW30elv
22+
OdcnmcvliD1wvb7+j5S7Y/N1HLM52feVdt8UNDk65xGBrUIGL5Bf8q3WlrAyz8tC
23+
6NjglZ4NP2sq/i6kVf7Pe3ELMGOquAAFbs+gvOQjg3jqBh+BJREJu+ofiXR4QbIy
24+
qALoUqLnhpvMVuwF9JHeozrc5EThw/2r91lnf5w8gxm9VvJGQ7wB+404XlzSWeSf
25+
q56Ps11U7SMP5QSyDF00wn9Armglg3NgiAKaRf/ziypeyOK2e4sUX4Bf3JcJFix9
26+
+rq2ebHrZLdquDerxFHClTTtmma9hQZrrVzVtbdWCZeb432vW3IsiMJNslTHXrNb
27+
lzFkhWVssVE4EaiSHR+8
28+
=IiEa
29+
-----END PGP SIGNATURE-----

node/src/client_versions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub use corepc_client::{client_sync::v19::{Client, AddressType}, types::v19 as v
5151
#[cfg(all(feature = "0_18_1", not(feature = "0_19_1")))]
5252
pub use corepc_client::{client_sync::v18::{Client, AddressType}, types::v18 as vtype};
5353

54-
#[cfg(all(feature = "0_17_1", not(feature = "0_18_1")))]
54+
#[cfg(all(feature = "0_17_2", not(feature = "0_18_1")))]
5555
pub use corepc_client::{client_sync::v17::{Client, AddressType}, types::v17 as vtype};
5656

5757
/// This is meaningless but we need it otherwise we can't get far enough into
@@ -72,6 +72,6 @@ pub use corepc_client::{client_sync::v17::{Client, AddressType}, types::v17 as v
7272
not(feature = "0_20_2"),
7373
not(feature = "0_19_1"),
7474
not(feature = "0_18_1"),
75-
not(feature = "0_17_1")
75+
not(feature = "0_17_2"),
7676
))]
7777
pub use corepc_client::{client_sync::v28::{Client, AddressType}, types::v28 as vtype};

node/src/versions.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
not(feature = "0_20_2"),
1717
not(feature = "0_19_1"),
1818
not(feature = "0_18_1"),
19-
not(feature = "0_17_1")
19+
not(feature = "0_17_2")
2020
))]
2121
compile_error!("enable a feature in order to select the version of Bitcoin Core to use");
2222

@@ -66,8 +66,8 @@ pub const VERSION: &str = "0.19.1";
6666
#[cfg(all(feature = "0_18_1", not(feature = "0_19_1")))]
6767
pub const VERSION: &str = "0.18.1";
6868

69-
#[cfg(all(feature = "0_17_1", not(feature = "0_18_1")))]
70-
pub const VERSION: &str = "0.17.1";
69+
#[cfg(all(feature = "0_17_2", not(feature = "0_18_1")))]
70+
pub const VERSION: &str = "0.17.2";
7171

7272
/// This is meaningless but we need it otherwise we can't get far enough into
7373
/// the build process to trigger the `compile_error!` in `./versions.rs`.
@@ -87,6 +87,6 @@ pub const VERSION: &str = "0.17.1";
8787
not(feature = "0_20_2"),
8888
not(feature = "0_19_1"),
8989
not(feature = "0_18_1"),
90-
not(feature = "0_17_1")
90+
not(feature = "0_17_2")
9191
))]
9292
pub const VERSION: &str = "never-used";

0 commit comments

Comments
 (0)