Upgrade bitcoin

Upgrade dependencies required to use the recently released `rust-bitcoin v0.31.0` release. Co-authored-by: Roman Zeyde <[email protected]>
romanz · Nov 15, 2023 · b6271ba · b6271ba
1 parent 56aad37
commit b6271ba
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,9 +22,9 @@ spec = "internal/config_specification.toml"
 
 [dependencies]
 anyhow = "1.0"
-bitcoin = { version = "0.30.0", features = ["serde", "rand-std"] }
-bitcoin_slices = { version = "0.6", features =["bitcoin", "sha2"] }
-bitcoincore-rpc = "0.17.0"
+bitcoin = { version = "0.31.0", features = ["serde", "rand-std"] }
+bitcoin_slices = { version = "0.7", features = ["bitcoin", "sha2"] }
+bitcoincore-rpc = { version = "0.18" }
 configure_me = "0.4"
 crossbeam-channel = "0.5"
 dirs-next = "2.0"

diff --git a/internal/config_specification.toml b/internal/config_specification.toml
@@ -52,7 +52,7 @@ doc = "JSONRPC authentication cookie file (default: ~/.bitcoin/.cookie)"
 [[param]]
 name = "network"
 type = "crate::config::BitcoinNetwork"
-convert_into = "::bitcoin::network::constants::Network"
+convert_into = "::bitcoin::Network"
 doc = "Select Bitcoin network type ('bitcoin', 'testnet', 'regtest' or 'signet')"
 default = "Default::default()"
 

diff --git a/src/cache.rs b/src/cache.rs
@@ -29,7 +29,7 @@ impl Cache {
     pub fn add_tx(&self, txid: Txid, f: impl FnOnce() -> Transaction) {
         self.txs.write().entry(txid).or_insert_with(|| {
             let tx = f();
-            self.txs_size.observe("serialized", tx.size() as f64);
+            self.txs_size.observe("serialized", tx.total_size() as f64);
             tx
         });
     }

diff --git a/src/chain.rs b/src/chain.rs
@@ -1,8 +1,7 @@
 use std::collections::HashMap;
 
 use bitcoin::blockdata::block::Header as BlockHeader;
-use bitcoin::network::constants;
-use bitcoin::BlockHash;
+use bitcoin::{BlockHash, Network};
 
 /// A new header found, to be added to the chain at specific height
 pub(crate) struct NewHeader {
@@ -37,7 +36,7 @@ pub struct Chain {
 
 impl Chain {
     // create an empty chain
-    pub fn new(network: constants::Network) -> Self {
+    pub fn new(network: Network) -> Self {
         let genesis = bitcoin::blockdata::constants::genesis_block(network);
         let genesis_hash = genesis.block_hash();
         Self {
@@ -148,7 +147,7 @@ mod tests {
     use super::{Chain, NewHeader};
     use bitcoin::blockdata::block::Header as BlockHeader;
     use bitcoin::consensus::deserialize;
-    use bitcoin::network::constants::Network::Regtest;
+    use bitcoin::Network::Regtest;
     use hex_lit::hex;
 
     #[test]

diff --git a/src/config.rs b/src/config.rs
@@ -1,4 +1,5 @@
-use bitcoin::network::constants::{Magic, Network};
+use bitcoin::p2p::Magic;
+use bitcoin::Network;
 use bitcoincore_rpc::Auth;
 use dirs_next::home_dir;
 

diff --git a/src/p2p.rs b/src/p2p.rs
@@ -7,12 +7,11 @@ use bitcoin::{
         Decodable,
     },
     hashes::Hash,
-    network::{
-        address,
-        constants::{self, Magic},
+    p2p::{
+        self, address,
         message::{self, CommandString, NetworkMessage},
         message_blockdata::{GetHeadersMessage, Inventory},
-        message_network,
+        message_network, Magic,
     },
     secp256k1::{self, rand::Rng},
     Block, BlockHash, Network,
@@ -199,10 +198,7 @@ impl Connection {
             };
             send_duration.observe_duration("send", || {
                 trace!("send: {:?}", msg);
-                let raw_msg = message::RawNetworkMessage {
-                    magic,
-                    payload: msg,
-                };
+                let raw_msg = message::RawNetworkMessage::new(magic, msg);
                 buffer.clear();
                 raw_msg
                     .consensus_encode(&mut buffer)
@@ -331,10 +327,10 @@ fn build_version_message() -> NetworkMessage {
         .expect("Time error")
         .as_secs() as i64;
 
-    let services = constants::ServiceFlags::NONE;
+    let services = p2p::ServiceFlags::NONE;
 
     NetworkMessage::Version(message_network::VersionMessage {
-        version: constants::PROTOCOL_VERSION,
+        version: p2p::PROTOCOL_VERSION,
         services,
         timestamp,
         receiver: address::Address::new(&addr, services),

diff --git a/src/status.rs b/src/status.rs
@@ -467,7 +467,7 @@ fn filter_outputs(tx: &Transaction, scripthash: ScriptHash) -> Vec<TxOutput> {
             if ScriptHash::new(&txo.script_pubkey) == scripthash {
                 Some(TxOutput {
                     index: vout,
-                    value: Amount::from_sat(txo.value),
+                    value: txo.value,
                 })
             } else {
                 None