Merge pull request fedimint#6313 from tvolk131/bitcoin32_internal

chore(deps): mostly bump bitcoin to v0.32

Cargo.toml

@@ -169,7 +169,6 @@ reqwest = { version = "0.12.9", features = [
 ], default-features = false }
 ring = "0.17.8"
 secp256k1 = { version = "0.29.0", default-features = false }
-secp256k1_27 = { package = "secp256k1", version = "0.27.0", default-features = false }
 semver = "1.0.23"
 serde = { version = "1.0.214", features = ["derive"] }
 serdect = "0.2.0"

crypto/derive-secret/src/lib.rs

@@ -19,9 +19,8 @@ use bls12_381::Scalar;
 use fedimint_core::config::FederationId;
 use fedimint_core::encoding::{Decodable, Encodable};
 use fedimint_core::secp256k1::{Keypair, Secp256k1, Signing};
-use fedimint_core::BitcoinHash;
 use hkdf::hashes::Sha512;
-use hkdf::Hkdf;
+use hkdf::{BitcoinHash, Hkdf};
 use ring::aead;
 
 const CHILD_TAG: &[u8; 8] = b"childkey";

devimint/src/external.rs

@@ -12,12 +12,13 @@ use bitcoincore_rpc::jsonrpc::error::RpcError;
 use bitcoincore_rpc::RpcApi;
 use cln_rpc::primitives::{Amount as ClnRpcAmount, AmountOrAny};
 use cln_rpc::ClnRpc;
-use fedimint_core::bitcoin_migration::bitcoin32_to_bitcoin30_sha256_hash;
+use fedimint_core::bitcoin_migration::{
+    bitcoin30_to_bitcoin32_sha256_hash, bitcoin32_to_bitcoin30_sha256_hash,
+};
 use fedimint_core::encoding::Encodable;
 use fedimint_core::task::jit::{JitTry, JitTryAnyhow};
 use fedimint_core::task::{block_in_place, block_on, sleep, timeout};
 use fedimint_core::util::write_overwrite_async;
-use fedimint_core::BitcoinHash;
 use fedimint_logging::LOG_DEVIMINT;
 use fedimint_testing::gateway::LightningNodeType;
 use futures::StreamExt;
@@ -812,7 +813,9 @@ impl Lnd {
             .invoices_client_lock()
             .await?
             .subscribe_single_invoice(tonic_lnd::invoicesrpc::SubscribeSingleInvoiceRequest {
-                r_hash: payment_hash.to_byte_array().to_vec(),
+                r_hash: bitcoin30_to_bitcoin32_sha256_hash(&payment_hash)
+                    .to_byte_array()
+                    .to_vec(),
             })
             .await?
             .into_inner();

devimint/src/tests.rs

@@ -8,9 +8,6 @@ use std::{env, ffi};
 use anyhow::{anyhow, bail, Context, Result};
 use bitcoin::Txid;
 use clap::Subcommand;
-use fedimint_core::bitcoin_migration::{
-    bitcoin32_to_bitcoin30_script_buf, bitcoin32_to_bitcoin30_tx,
-};
 use fedimint_core::core::LEGACY_HARDCODED_INSTANCE_ID_WALLET;
 use fedimint_core::encoding::Decodable;
 use fedimint_core::envs::is_env_var_set;
@@ -1055,13 +1052,11 @@ pub async fn cli_tests(dev_fed: DevFed) -> Result<()> {
 
     let tx_hex = bitcoind.poll_get_transaction(txid).await?;
 
-    let tx = bitcoin32_to_bitcoin30_tx(&bitcoin::Transaction::consensus_decode_hex(
-        &tx_hex,
-        &ModuleRegistry::default(),
-    )?);
-    assert!(tx.output.iter().any(|o| o.script_pubkey
-        == bitcoin32_to_bitcoin30_script_buf(&address.script_pubkey())
-        && o.value == 50000));
+    let tx = bitcoin::Transaction::consensus_decode_hex(&tx_hex, &ModuleRegistry::default())?;
+    assert!(tx
+        .output
+        .iter()
+        .any(|o| o.script_pubkey == address.script_pubkey() && o.value.to_sat() == 50000));
 
     let post_withdraw_walletng_balance = client.balance().await?;
     let expected_wallet_balance = initial_walletng_balance - 50_000_000 - (fees_sat * 1000);
@@ -2000,25 +1995,19 @@ pub async fn recoverytool_test(dev_fed: DevFed) -> Result<()> {
             .expect("txid should be parsable");
         let tx_hex = bitcoind.poll_get_transaction(txid).await?;
 
-        let tx = bitcoin32_to_bitcoin30_tx(&bitcoin::Transaction::consensus_decode_hex(
-            &tx_hex,
-            &ModuleRegistry::default(),
-        )?);
+        let tx = bitcoin::Transaction::consensus_decode_hex(&tx_hex, &ModuleRegistry::default())?;
         assert_eq!(tx.input.len(), 1);
         assert_eq!(tx.output.len(), 2);
 
         let change_output = tx
             .output
             .iter()
-            .find(|o| {
-                o.to_owned().script_pubkey
-                    != bitcoin32_to_bitcoin30_script_buf(&withdrawal_address.script_pubkey())
-            })
+            .find(|o| o.to_owned().script_pubkey != withdrawal_address.script_pubkey())
             .expect("withdrawal must have change output");
-        assert!(fed_utxos_sats.insert(change_output.value));
+        assert!(fed_utxos_sats.insert(change_output.value.to_sat()));
 
         // Remove the utxo consumed from the withdrawal tx
-        let total_output_sats = tx.output.iter().map(|o| o.value).sum::<u64>();
+        let total_output_sats = tx.output.iter().map(|o| o.value.to_sat()).sum::<u64>();
         let input_sats = total_output_sats + fees_sat;
         assert!(fed_utxos_sats.remove(&input_sats));
 

fedimint-bitcoind/src/esplora.rs

@@ -2,9 +2,6 @@ use std::collections::HashMap;
 
 use anyhow::{bail, format_err};
 use bitcoin::{BlockHash, Network, ScriptBuf, Transaction, Txid};
-use fedimint_core::bitcoin_migration::{
-    bitcoin32_to_bitcoin30_block_header, bitcoin32_to_bitcoin30_partial_merkle_tree,
-};
 use fedimint_core::envs::BitcoinRpcConfig;
 use fedimint_core::task::TaskHandle;
 use fedimint_core::txoproof::TxOutProof;
@@ -164,8 +161,8 @@ impl IBitcoindRpc for EsploraClient {
             .ok_or(format_err!("No merkle proof found"))?;
 
         Ok(TxOutProof {
-            block_header: bitcoin32_to_bitcoin30_block_header(&proof.header),
-            merkle_proof: bitcoin32_to_bitcoin30_partial_merkle_tree(&proof.txn),
+            block_header: proof.header,
+            merkle_proof: proof.txn,
         })
     }
 

fedimint-core/Cargo.toml

@@ -53,7 +53,6 @@ miniscript = { workspace = true, features = ["serde"] }
 parity-scale-codec = { version = "3.6.12", features = ["derive"] }
 rand = { workspace = true }
 secp256k1 = { workspace = true, features = ["global-context", "rand-std"] }
-secp256k1_27 = { workspace = true, features = ["global-context", "rand-std"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serdect = { workspace = true }