From 8389256fa2f2570a1e6d2c308bf47cf1633ac991 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Sun, 5 May 2024 06:58:41 +1000 Subject: [PATCH 1/2] json: Enable base64 feature We need base64 encoding in `bitcoin` to in order to stringify the `sign_message::MessageSignature`. Note also that the `Psbt` type is encoded/decoded in base64 and we would like to support that by default also. Enable the "base64" feature unconditionally for the `json` crate. --- json/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/Cargo.toml b/json/Cargo.toml index 8f3d67cc..c4006e9b 100644 --- a/json/Cargo.toml +++ b/json/Cargo.toml @@ -23,4 +23,4 @@ path = "src/lib.rs" serde = { version = "1", features = [ "derive" ] } serde_json = "1" -bitcoin = { version = "0.31.0", features = ["serde", "rand-std"]} +bitcoin = { version = "0.31.0", features = ["serde", "rand-std", "base64"]} From 24a549e257546328bb439b51343b79797f92081f Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Wed, 1 May 2024 12:55:42 +1000 Subject: [PATCH 2/2] CI: Fix pinning MSRV build just broke because of a bunch of dependencies. I did not investigate why I just found a set of versions that builds. --- contrib/test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/test.sh b/contrib/test.sh index e308ce3c..2aa5a279 100755 --- a/contrib/test.sh +++ b/contrib/test.sh @@ -16,7 +16,10 @@ fi # Test pinned versions. if cargo --version | grep ${MSRV}; then cargo update -p tempfile --precise 3.3.0 + cargo update -p cc --precise 1.0.79 cargo update -p log --precise 0.4.18 + cargo update -p serde_json --precise 1.0.96 + cargo update -p serde --precise 1.0.156 fi # Integration test.