Skip to content

Commit 7ff86ae

Browse files
rustaceanrobrustaceanrob
authored
Merge pull request #13 from 2140-dev/bitcoin-7-17
Bump `bitcoin` version
2 parents de5cb7f + 7945f3e commit 7ff86ae

File tree

11 files changed

+43
-37
lines changed

11 files changed

+43
-37
lines changed

‎accumulator/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ version = "0.1.0"
44
edition = "2024"
55

66
[dependencies]
7-
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = false, rev = "2b07f59545de16b66b3bf8ee988757c2d0c14afb" }
7+
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = false, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
88

99
[dev-dependencies]
10-
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2b07f59545de16b66b3bf8ee988757c2d0c14afb" }
10+
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
1111
rusqlite = { version = "0.36.0", features = ["bundled"] }

‎p2p/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ categories = ["cryptography::cryptocurrencies"]
99
rust-version = "1.75.0"
1010

1111
[dependencies]
12-
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2b07f59545de16b66b3bf8ee988757c2d0c14afb" }
12+
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
13+
p2p = { package = "bitcoin-p2p-messages", git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
1314
tokio = { version = "1", default-features = false, optional = true, features = [
1415
"sync",
1516
"io-util",

‎p2p/examples/update_accumulator.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ use std::{
66
use accumulator::Accumulator;
77
use bitcoin::{
88
block::BlockUncheckedExt,
9-
p2p::{
10-
message::NetworkMessage,
11-
message_blockdata::{GetBlocksMessage, Inventory},
12-
ServiceFlags,
13-
},
149
secp256k1::rand::{seq::SliceRandom, thread_rng},
1510
BlockHash, Network, OutPoint,
1611
};
12+
use p2p::{
13+
message::NetworkMessage,
14+
message_blockdata::{GetBlocksMessage, Inventory},
15+
ServiceFlags,
16+
};
1717
use peers::{
1818
dns::{DnsQuery, TokioDnsExt},
1919
PortExt,

‎p2p/src/lib.rs‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ use std::{
33
time::{Duration, Instant, SystemTime, UNIX_EPOCH},
44
};
55

6-
use bitcoin::{
7-
consensus,
8-
p2p::{
9-
message::{CommandString, NetworkMessage, RawNetworkMessage},
10-
message_network::VersionMessage,
11-
Address, Magic, ServiceFlags,
12-
},
13-
FeeRate, Network,
6+
use bitcoin::{consensus, FeeRate, Network};
7+
use p2p::{
8+
message::{CommandString, NetworkMessage, RawNetworkMessage},
9+
message_network::VersionMessage,
10+
Address, Magic, ServiceFlags,
1411
};
1512
use validation::ValidationExt;
1613

@@ -648,7 +645,7 @@ macro_rules! define_version_message_logic {
648645
}
649646

650647
let mut negotiation = Negotiation::default();
651-
let magic = Magic::from_params($conn.network);
648+
let magic = Magic::from_params($conn.network).expect("unknown network");
652649
let mut write_half = WriteHalf::V1(magic);
653650
let mut read_half = ReadHalf::V1(magic);
654651
let nonce = rand::random();
@@ -744,6 +741,7 @@ macro_rules! define_version_message_logic {
744741
}};
745742
}
746743

744+
#[cfg(feature = "tokio")]
747745
macro_rules! async_awaiter {
748746
($e:expr) => {
749747
$e.await
@@ -756,6 +754,7 @@ macro_rules! blocking_awaiter {
756754
};
757755
}
758756

757+
#[cfg(feature = "tokio")]
759758
macro_rules! read_message_async {
760759
($reader:expr, $magic:expr) => {
761760
$crate::define_read_message_logic!(async_awaiter, $reader, $magic)
@@ -774,15 +773,19 @@ macro_rules! version_handshake_blocking {
774773
};
775774
}
776775

776+
#[cfg(feature = "tokio")]
777777
macro_rules! version_handshake_async {
778778
($reader:expr, $conn:ident) => {
779779
$crate::define_version_message_logic!(async_awaiter, $reader, $conn)
780780
};
781781
}
782782

783+
#[cfg(feature = "tokio")]
783784
pub(crate) use async_awaiter;
784785
pub(crate) use blocking_awaiter;
786+
#[cfg(feature = "tokio")]
785787
pub(crate) use read_message_async;
786788
pub(crate) use read_message_blocking;
789+
#[cfg(feature = "tokio")]
787790
pub(crate) use version_handshake_async;
788791
pub(crate) use version_handshake_blocking;

‎p2p/src/net.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ use std::{
33
net::{SocketAddr, TcpStream},
44
};
55

6-
use bitcoin::p2p::message::NetworkMessage;
7-
use bitcoin::p2p::message::RawNetworkMessage;
8-
use bitcoin::p2p::Magic;
6+
use bitcoin::consensus;
97
use bitcoin::secp256k1::rand;
10-
use bitcoin::{consensus, p2p::message_compact_blocks::SendCmpct};
8+
use p2p::message::NetworkMessage;
9+
use p2p::message::RawNetworkMessage;
10+
use p2p::message_compact_blocks::SendCmpct;
11+
use p2p::Magic;
1112

1213
use crate::{
1314
blocking_awaiter, interpret_first_message, make_version, version_handshake_blocking,

‎p2p/src/tokio_ext.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
use ::std::fmt::{Debug, Display};
22
use std::net::SocketAddr;
33

4-
use bitcoin::p2p::message::{NetworkMessage, RawNetworkMessage};
5-
use bitcoin::p2p::message_compact_blocks::SendCmpct;
4+
use bitcoin::consensus;
65
use bitcoin::secp256k1::rand;
7-
use bitcoin::{consensus, p2p::Magic};
6+
use p2p::message::{NetworkMessage, RawNetworkMessage};
7+
use p2p::message_compact_blocks::SendCmpct;
8+
use p2p::Magic;
89
use tokio::io::AsyncWriteExt;
910
use tokio::net::tcp::{OwnedReadHalf, OwnedWriteHalf};
1011
use tokio::{

‎p2p/src/validation.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use bitcoin::{block::HeaderExt, p2p::message_blockdata::Inventory, BlockHeader};
1+
use bitcoin::{block::HeaderExt, BlockHeader};
2+
use p2p::message_blockdata::Inventory;
23

34
pub(crate) trait ValidationExt {
45
fn is_valid(&self) -> bool;

‎p2p/tests/tests.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
use std::net::SocketAddrV4;
22

3-
use bitcoin::{
4-
p2p::{message::NetworkMessage, ServiceFlags},
5-
BlockHash, Network,
6-
};
3+
use bitcoin::{BlockHash, Network};
74
use corepc_node::{exe_path, P2P};
5+
use p2p::{message::NetworkMessage, ServiceFlags};
86
use swiftsync_p2p::ConnectionBuilder;
97

108
#[derive(Debug, Clone)]
@@ -61,7 +59,7 @@ fn filters_unsupported_messages() {
6159
let err = tcp_stream.write_message(NetworkMessage::MemPool, &mut ctx);
6260
assert!(err.is_err());
6361
let err = tcp_stream.write_message(
64-
NetworkMessage::GetCFilters(bitcoin::p2p::message_filter::GetCFilters {
62+
NetworkMessage::GetCFilters(p2p::message_filter::GetCFilters {
6563
filter_type: 0x00,
6664
start_height: 0.into(),
6765
stop_hash: BlockHash::from_byte_array([0; 32]),

‎peers/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2024"
55

66
[dependencies]
7-
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2b07f59545de16b66b3bf8ee988757c2d0c14afb" }
7+
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
88
tokio = { version = "1", default-features = false, optional = true, features = [
99
"io-util",
1010
"net",

‎utxo_verifier/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ edition = "2024"
55

66
[dependencies]
77
accumulator = { path = "../accumulator/" }
8-
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2b07f59545de16b66b3bf8ee988757c2d0c14afb" }
8+
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
99
peers = { path = "../peers/", default-features = false }
1010
p2p = { path = "../p2p/", package = "swiftsync-p2p", default-features = false }
11+
p2p-messages = { package = "bitcoin-p2p-messages", git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
1112
tracing = "0.1"
1213
tracing-subscriber = "0.3"
1314
rusqlite = { version = "0.36.0", features = ["bundled"] }

0 commit comments

Comments
 (0)