mirrors/electrs
1
0
Fork 0
mirror of https://github.com/romanz/electrs.git synced 2024-11-19 09:54:09 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade bitcoin

Browse Source 
Upgrade dependencies required to use the recently released
`rust-bitcoin v0.31.0` release.

Co-authored-by: Roman Zeyde <me@romanzey.de>
This commit is contained in:
Tobin C. Harding 2023-10-16 18:11:05 +11:00 committed by Roman Zeyde
parent 56aad37c2b
commit b6271ba3af
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
8 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Cargo.lock generated
View File

@ -37,9 +37,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]] [[package]]
name = "bech32" name = "bech32"
version = "0.9.1" version = "0.10.0-beta"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea"
[[package]] [[package]]
name = "bindgen" name = "bindgen"
@ -63,23 +63,27 @@ dependencies = [
[[package]] [[package]]
name = "bitcoin" name = "bitcoin"
version = "0.30.1" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e99ff7289b20a7385f66a0feda78af2fc119d28fb56aea8886a9cd0a4abdd75" checksum = "5973a027b341b462105675962214dfe3c938ad9afd395d84b28602608bdcec7b"
dependencies = [ dependencies = [
"bech32", "bech32",
"bitcoin-private", "bitcoin-internals",
"bitcoin_hashes", "bitcoin_hashes",
"hex-conservative",
"hex_lit", "hex_lit",
"secp256k1", "secp256k1",
"serde", "serde",
] ]
[[package]] [[package]]
name = "bitcoin-private" name = "bitcoin-internals"
version = "0.1.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "bitcoin-test-data" name = "bitcoin-test-data"
@ -89,19 +93,20 @@ checksum = "0c188654f9dce3bc6ce1bfa9c49777ad514bcad37e421b5f53e9d0ee10603f34"
[[package]] [[package]]
name = "bitcoin_hashes" name = "bitcoin_hashes"
version = "0.12.0" version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
dependencies = [ dependencies = [
"bitcoin-private", "bitcoin-internals",
"hex-conservative",
"serde", "serde",
] ]
[[package]] [[package]]
name = "bitcoin_slices" name = "bitcoin_slices"
version = "0.6.2" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df6bcb852d9bbd32230b600e2633cdd23d6dcdab3116ab53285dc45075b9ce51" checksum = "4b221249ba4685e0f737f0df2c7bb656d527fdd8ede83ac066c4c8ce95898f42"
dependencies = [ dependencies = [
"bitcoin", "bitcoin",
"bitcoin_hashes", "bitcoin_hashes",
@ -110,11 +115,10 @@ dependencies = [
[[package]] [[package]]
name = "bitcoincore-rpc" name = "bitcoincore-rpc"
version = "0.17.0" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d6c0ee9354e3dac217db4cb1dd31941073a87fe53c86bcf3eb2b8bc97f00a08" checksum = "8eb70725a621848c83b3809913d5314c0d20ca84877d99dd909504b564edab00"
dependencies = [ dependencies = [
"bitcoin-private",
"bitcoincore-rpc-json", "bitcoincore-rpc-json",
"jsonrpc", "jsonrpc",
"log", "log",
@ -124,12 +128,11 @@ dependencies = [
[[package]] [[package]]
name = "bitcoincore-rpc-json" name = "bitcoincore-rpc-json"
version = "0.17.0" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d30ce6f40fb0a2e8d98522796219282504b7a4b14e2b4c26139a7bea6aec6586" checksum = "856ffbee2e492c23bca715d72ea34aae80d58400f2bda26a82015d6bc2ec3662"
dependencies = [ dependencies = [
"bitcoin", "bitcoin",
"bitcoin-private",
"serde", "serde",
"serde_json", "serde_json",
] ]
@ -494,6 +497,12 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hex-conservative"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
[[package]] [[package]]
name = "hex_lit" name = "hex_lit"
version = "0.1.1" version = "0.1.1"
@ -923,9 +932,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]] [[package]]
name = "secp256k1" name = "secp256k1"
version = "0.27.0" version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5"
dependencies = [ dependencies = [
"bitcoin_hashes", "bitcoin_hashes",
"rand", "rand",
@ -935,9 +944,9 @@ dependencies = [
[[package]] [[package]]
name = "secp256k1-sys" name = "secp256k1-sys"
version = "0.8.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7"
dependencies = [ dependencies = [
"cc", "cc",
] ]

6
Cargo.toml
View File

@ -22,9 +22,9 @@ spec = "internal/config_specification.toml"
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
bitcoin = { version = "0.30.0", features = ["serde", "rand-std"] } bitcoin = { version = "0.31.0", features = ["serde", "rand-std"] }
bitcoin_slices = { version = "0.6", features =["bitcoin", "sha2"] } bitcoin_slices = { version = "0.7", features = ["bitcoin", "sha2"] }
bitcoincore-rpc = "0.17.0" bitcoincore-rpc = { version = "0.18" }
configure_me = "0.4" configure_me = "0.4"
crossbeam-channel = "0.5" crossbeam-channel = "0.5"
dirs-next = "2.0" dirs-next = "2.0"

2
internal/config_specification.toml
View File

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

2
src/cache.rs
View File

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

7
src/chain.rs
View File

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

3
src/config.rs
View File

@ -1,4 +1,5 @@
use bitcoin::network::constants::{Magic, Network}; use bitcoin::p2p::Magic;
use bitcoin::Network;
use bitcoincore_rpc::Auth; use bitcoincore_rpc::Auth;
use dirs_next::home_dir; use dirs_next::home_dir;

16
src/p2p.rs
View File

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

2
src/status.rs
View File

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