Merge pull request #188 from ElementsProject/2024-01--bitcoin31

Update rust-bitcoin to 0.31.0, and associated dependencies

Author: delta1

.github/workflows/rust.yml

@@ -49,15 +49,15 @@ jobs:
         run: ./contrib/test.sh
 
   MSRV:
-    name: Test - 1.48.0 toolchain
+    name: Test - 1.56.1 toolchain
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
       - name: Checkout Crate
         uses: actions/checkout@v3
       - name: Checkout Toolchain
-        uses: dtolnay/rust-toolchain@1.48.0
+        uses: dtolnay/rust-toolchain@1.56.1
       - name: Running test script
         env:
           DO_DOCS: false

Cargo.toml

@@ -22,8 +22,8 @@ json-contract = [ "serde_json" ]
 base64 = ["bitcoin/base64"]
 
 [dependencies]
-bitcoin = "0.30.0"
-secp256k1-zkp = { version = "0.9.2", features = [ "global-context", "bitcoin_hashes" ] }
+bitcoin = "0.31.0"
+secp256k1-zkp = { version = "0.10.0", features = [ "global-context", "hashes" ] }
 
 # Used for ContractHash::from_json_contract.
 serde_json = { version = "1.0", optional = true }

clippy.toml

@@ -1 +1 @@
-msrv = "1.48.0"
+msrv = "1.56.1"

contrib/test.sh

@@ -3,17 +3,10 @@
 FEATURES="serde"
 
 # Pin dependencies as required if we are using MSRV toolchain.
-if cargo --version | grep "1\.48"; then
-    cargo update -p serde_json --precise 1.0.99
-    # 1.0.157 uses syn 2.0 which requires edition 2018
-    cargo update -p serde --precise 1.0.156
-    cargo update -p once_cell --precise 1.13.1
-    cargo update -p quote --precise 1.0.28
-    cargo update -p proc-macro2 --precise 1.0.63
-    cargo update -p serde_test --precise 1.0.156
-
-    cargo update -p log --precise 0.4.18
+if cargo --version | grep "1\.56"; then
     cargo update -p tempfile --precise 3.6.0
+    cargo update -p once_cell --precise 1.13.1
+    cargo update -p which --precise 4.4.0
     cargo update -p byteorder --precise 1.4.3
 fi
 

elementsd-tests/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bitcoin = "0.30.0"
+bitcoin = "0.31.0"
 elements = {path = "../", features = ["base64"]}
-elementsd = "0.8.0"
+elementsd = "0.9.0"
 rand = "0.8"
 

elementsd-tests/src/pset.rs

@@ -136,11 +136,12 @@ fn rtt(base64: &str) -> String {
 }
 
 fn psbt_rtt(elementsd: &ElementsD, base64: &str) {
+    use bitcoin::base64::prelude::{Engine as _, BASE64_STANDARD};
     let a = elementsd.decode_psbt(&base64).unwrap();
 
     let b_psbt: PartiallySignedTransaction = base64.parse().unwrap();
     let mut b_bytes = serialize(&b_psbt);
-    let b_base64 = bitcoin::base64::encode(&b_bytes);
+    let b_base64 = BASE64_STANDARD.encode(&b_bytes);
     let b = elementsd.decode_psbt(&b_base64).unwrap();
 
     assert_eq!(a, b);
@@ -152,7 +153,7 @@ fn psbt_rtt(elementsd: &ElementsD, base64: &str) {
         // ensuring decode prints all data inside psbt, randomly changing a byte,
         // if the results is still decodable it should not be equal to initial value
         b_bytes[i] = b_bytes[i].wrapping_add(1);
-        let base64 = bitcoin::base64::encode(&b_bytes);
+        let base64 = BASE64_STANDARD.encode(&b_bytes);
         if let Some(decoded) = elementsd.decode_psbt(&base64) {
             assert_ne!(a, decoded, "{} with changed byte {}", b_bytes.to_hex(), i);
         }

elementsd-tests/src/taproot.rs

@@ -5,7 +5,7 @@ extern crate rand;
 
 use crate::{Call, setup};
 
-use bitcoin::key::{XOnlyPublicKey, KeyPair};
+use bitcoin::key::{XOnlyPublicKey, Keypair};
 use bitcoin::Amount;
 use elements::hex::FromHex;
 use elements::confidential::{AssetBlindingFactor, ValueBlindingFactor};
@@ -31,8 +31,8 @@ static PARAMS: AddressParams = AddressParams::ELEMENTS;
 fn gen_keypair(
     secp: &secp256k1_zkp::Secp256k1<secp256k1_zkp::All>,
     rng: &mut rngs::ThreadRng,
-) -> (XOnlyPublicKey, KeyPair) {
-    let keypair = KeyPair::new(secp, rng);
+) -> (XOnlyPublicKey, Keypair) {
+    let keypair = Keypair::new(secp, rng);
     let (pk, _) = XOnlyPublicKey::from_keypair(&keypair);
     (pk, keypair)
 }
@@ -42,10 +42,10 @@ fn gen_keypair(
 struct TapTxOutData {
     _blind_sk: Option<secp256k1_zkp::SecretKey>,
     _blind_pk: Option<secp256k1_zkp::PublicKey>,
-    leaf1_keypair: KeyPair,
+    leaf1_keypair: Keypair,
     _leaf1_pk: XOnlyPublicKey,
     leaf1_script: Script,
-    internal_keypair: KeyPair,
+    internal_keypair: Keypair,
     internal_pk: XOnlyPublicKey,
     spend_info: TaprootSpendInfo,
     utxo: TxOut,
@@ -215,7 +215,7 @@ fn taproot_spend_test(
         );
         let tweak = secp256k1_zkp::Scalar::from_be_bytes(tweak.to_byte_array()).expect("hash value greater than curve order");
         let sig = secp.sign_schnorr(
-            &secp256k1_zkp::Message::from_slice(&sighash_msg[..]).unwrap(),
+            &secp256k1_zkp::Message::from_digest_slice(&sighash_msg[..]).unwrap(),
             &output_keypair.add_xonly_tweak(&secp, &tweak).unwrap(),
         );
 
@@ -239,7 +239,7 @@ fn taproot_spend_test(
             .unwrap();
 
         let sig = secp.sign_schnorr(
-            &secp256k1_zkp::Message::from_slice(&sighash_msg[..]).unwrap(),
+            &secp256k1_zkp::Message::from_digest_slice(&sighash_msg[..]).unwrap(),
             &test_data.leaf1_keypair,
         );