chore: Upgrade bitcoin to version 0.32.2

Cargo.toml

@@ -26,14 +26,15 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-bitcoin = "0.28.1"
+bitcoin = "0.32.2"
 byteorder = "1.4.3"
 canbench-rs = { version = "0.1.1" }
 candid = "0.10.6"
 candid_parser = { version = "0.1.4" }
 ciborium = "0.2.1"
 clap = { version = "4.0.11", features = ["derive"] }
 futures = "0.3.28"
+getrandom = { version = "0.2", default-features = false, features = ["custom"] }
 hex = "0.4.3"
 ic-btc-canister = { path = "./canister" }
 ic-btc-interface = { path = "./interface" }
@@ -46,6 +47,7 @@ ic-http = { path = "./ic-http" }
 ic-metrics-encoder = "1.0.0"
 ic-stable-structures = "0.5.2"
 lazy_static = "1.4.0"
+primitive-types = "0.12"
 serde = "1.0.171"
 serde_bytes = "0.11"
 serde_json = "1.0.94"

benchmarks/Cargo.toml

@@ -9,9 +9,10 @@ path = "src/main.rs"
 bench = false
 
 [dependencies]
-bitcoin = { workspace = true, features = ["use-serde"]}
+bitcoin = { workspace = true, features = ["serde"]}
 canbench-rs = { workspace = true }
 candid = { workspace = true }
+getrandom = { workspace = true }
 hex = { workspace = true }
 ic-cdk = { workspace = true }
 ic-cdk-macros = { workspace = true }

benchmarks/src/main.rs

@@ -1,5 +1,5 @@
 use bitcoin::consensus::Decodable;
-use bitcoin::{consensus::Encodable, Block as BitcoinBlock, BlockHeader};
+use bitcoin::{block::Header as BlockHeader, consensus::Encodable, Block as BitcoinBlock};
 use canbench_rs::{bench, bench_fn, BenchResult};
 use ic_btc_canister::{types::BlockHeaderBlob, with_state_mut};
 use ic_btc_interface::{InitConfig, Network};
@@ -22,7 +22,7 @@ fn init() {
                 .split('\n')
                 .map(|block_hex| {
                     let block_bytes = hex::decode(block_hex).unwrap();
-                    Block::new(BitcoinBlock::consensus_decode(block_bytes.as_slice()).unwrap())
+                    Block::new(BitcoinBlock::consensus_decode(&mut block_bytes.as_slice()).unwrap())
                 })
                 .collect(),
         );
@@ -173,3 +173,8 @@ fn pre_upgrade_with_many_unstable_blocks() -> BenchResult {
 }
 
 fn main() {}
+
+getrandom::register_custom_getrandom!(always_fail);
+pub fn always_fail(_buf: &mut [u8]) -> Result<(), getrandom::Error> {
+    Err(getrandom::Error::UNSUPPORTED)
+}

bootstrap/main-state-builder/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bitcoin = "0.28.1"
+bitcoin = "0.32.2"
 clap = { version = "4.0.11", features = ["derive"] }
 ciborium = "0.2.1"
 hex = "0.4.3"

bootstrap/main-state-builder/src/main.rs

@@ -61,7 +61,7 @@ fn read_block(reader: &mut BufReader<File>) -> Block {
     let mut block = String::new();
     reader.read_line(&mut block).unwrap();
     let block = hex::decode(block.replace('\n', "")).unwrap();
-    Block::new(BitcoinBlock::consensus_decode(block.as_slice()).unwrap())
+    Block::new(BitcoinBlock::consensus_decode(&mut block.as_slice()).unwrap())
 }
 
 fn main() {

bootstrap/state-builder/src/build_address_utxos.rs

@@ -6,7 +6,7 @@
 //!   --network testnet \
 //!   --output balances.bin \
 //!   --utxos-dump-path utxos-dump.csv
-use bitcoin::{Address as BitcoinAddress, Script, Txid as BitcoinTxid};
+use bitcoin::{Address as BitcoinAddress, ScriptBuf, Txid as BitcoinTxid};
 use clap::Parser;
 use ic_btc_canister::types::{into_bitcoin_network, Address, AddressUtxo};
 use ic_btc_interface::Network;
@@ -51,7 +51,7 @@ fn main() {
         let line = line.unwrap();
         let parts: Vec<_> = line.split(',').collect();
 
-        let txid = Txid::from(BitcoinTxid::from_str(parts[1]).unwrap().to_vec());
+        let txid = Txid::from(BitcoinTxid::from_str(parts[1]).unwrap().as_ref());
         let vout: u32 = parts[2].parse().unwrap();
         let address_str = parts[5];
         let height: u32 = parts[0].parse().unwrap();
@@ -63,16 +63,16 @@ fn main() {
 
         // Load the address. The UTXO dump tool we use doesn't output all the addresses
         // we support, so if parsing the address itself fails, we try parsing the script directly.
-        let address = if let Ok(address) = BitcoinAddress::from_str(address_str) {
-            Some(address)
-        } else {
-            BitcoinAddress::from_script(
-                &Script::from(hex::decode(script).expect("script must be valid hex")),
-                into_bitcoin_network(args.network),
-            )
-        };
+        let address = BitcoinAddress::from_str(address_str)
+            .map(|address| address.assume_checked())
+            .or_else(|_| {
+                BitcoinAddress::from_script(
+                    &ScriptBuf::from(hex::decode(script).expect("script must be valid hex")),
+                    into_bitcoin_network(args.network),
+                )
+            });
 
-        if let Some(address) = address {
+        if let Ok(address) = address {
             let address: Address = address.into();
 
             address_utxos

bootstrap/state-builder/src/build_balances.rs

@@ -6,7 +6,7 @@
 //!   --network testnet \
 //!   --output balances.bin \
 //!   --utxos-dump-path utxos-dump.csv
-use bitcoin::{Address as BitcoinAddress, Script};
+use bitcoin::{Address as BitcoinAddress, ScriptBuf};
 use clap::Parser;
 use ic_btc_canister::types::{into_bitcoin_network, Address};
 use ic_btc_interface::Network;
@@ -59,16 +59,16 @@ fn main() {
 
         // Load the address. The UTXO dump tool we use doesn't output all the addresses
         // we support, so if parsing the address itself fails, we try parsing the script directly.
-        let address = if let Ok(address) = BitcoinAddress::from_str(address_str) {
-            Some(address)
-        } else {
-            BitcoinAddress::from_script(
-                &Script::from(hex::decode(script).expect("script must be valid hex")),
-                into_bitcoin_network(args.network),
-            )
-        };
-
-        if let Some(address) = address {
+        let address = BitcoinAddress::from_str(address_str)
+            .map(|address| address.assume_checked())
+            .or_else(|_| {
+                BitcoinAddress::from_script(
+                    &ScriptBuf::from(hex::decode(script).expect("script must be valid hex")),
+                    into_bitcoin_network(args.network),
+                )
+            });
+
+        if let Ok(address) = address {
             let address: Address = address.into();
 
             // Update the balance of the address.

bootstrap/state-builder/src/build_utxos.rs

@@ -6,7 +6,7 @@
 //!   --network testnet \
 //!   --output output-dir \
 //!   --utxos-dump-path utxos-dump.csv
-use bitcoin::{Address, Txid as BitcoinTxid};
+use bitcoin::{Address, Amount, Txid as BitcoinTxid};
 use clap::Parser;
 use ic_btc_canister::{types::TxOut, with_state, with_state_mut};
 use ic_btc_interface::{Flag, InitConfig, Network};
@@ -81,7 +81,7 @@ fn main() {
             let line = line.unwrap();
             let parts: Vec<_> = line.split(',').collect();
 
-            let txid = Txid::from(BitcoinTxid::from_str(parts[1]).unwrap().to_vec());
+            let txid = Txid::from(BitcoinTxid::from_str(parts[1]).unwrap().as_ref());
             let vout: u32 = parts[2].parse().unwrap();
             let amount: u64 = parts[3].parse().unwrap();
             let script = parts[6];
@@ -96,15 +96,15 @@ fn main() {
             // Instead of using the scripts from the database, we can infer the script from the
             // address. Otherwise, we use the script in the chainstate database as-is.
             let script = match Address::from_str(address_str) {
-                Ok(address) => address.script_pubkey().as_bytes().to_vec(),
+                Ok(address) => address.assume_checked().script_pubkey().as_bytes().to_vec(),
                 Err(_) => hex::decode(script).unwrap(),
             };
 
             // Insert the UTXO
             let outpoint = OutPoint { txid, vout };
-            if !bitcoin::Script::from(script.clone()).is_provably_unspendable() {
+            if !bitcoin::ScriptBuf::from(script.clone()).is_op_return() {
                 let txout = TxOut {
-                    value: amount,
+                    value: Amount::from_sat(amount),
                     script_pubkey: script,
                 };
 

bootstrap/state-builder/src/main.rs

@@ -7,7 +7,7 @@
 //!     --network testnet \
 //!     --blocks-path /path/to/data/testnet3 \
 //!     --tip 000000002ce019cc4a8f2af62b3ecf7c30a19d29828b25268a0194dbac3cac50
-use bitcoin::{consensus::Decodable, BlockHash, BlockHeader};
+use bitcoin::{block::Header as BlockHeader, consensus::Decodable, io::Cursor, BlockHash};
 use byteorder::{LittleEndian, ReadBytesExt};
 use clap::Parser;
 use ic_btc_canister::{
@@ -21,7 +21,7 @@ use rusty_leveldb::{Options, DB};
 use std::{
     collections::BTreeMap,
     fs::File,
-    io::{Cursor, Read, Seek, SeekFrom, Write},
+    io::{Read, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
     str::FromStr,
 };
@@ -50,7 +50,7 @@ struct Args {
 }
 
 // How to read Bitcoin's varint format.
-trait VarIntRead: std::io::Read {
+trait VarIntRead: bitcoin::io::Read {
     fn read_varint(&mut self) -> usize {
         let mut n = 0;
         loop {
@@ -100,7 +100,7 @@ fn get_block_info(
     block_hash: &BlockHash,
 ) -> Option<(Height, FileNumber, FileOffset, BlockHash)> {
     let mut key: Vec<u8> = vec![98];
-    key.extend(block_hash.to_vec());
+    key.extend((block_hash.as_ref() as &[u8]).to_vec());
 
     let value = db.get(&key).unwrap();