Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
[workspace]
members = ["accumulator", "p2p", "peers", "utxo_verifier"]
default-members = ["accumulator"]
default-members = ["accumulator", "p2p", "peers", "utxo_verifier"]
resolver = "3"

[workspace.dependencies]
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = false, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
3 changes: 1 addition & 2 deletions accumulator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version = "0.1.0"
edition = "2024"

[dependencies]
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = false, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
bitcoin = { workspace = true }

[dev-dependencies]
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
rusqlite = { version = "0.36.0", features = ["bundled"] }
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
devShells.default = with pkgs; mkShell {
buildInputs = [
pkg-config
rust-bin.beta.latest.default
rust-bin.nightly.latest.default
];
};
}
Expand Down
2 changes: 1 addition & 1 deletion p2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ categories = ["cryptography::cryptocurrencies"]
rust-version = "1.75.0"

[dependencies]
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
bitcoin = { workspace = true, features = ["rand-std"] }
p2p = { package = "bitcoin-p2p-messages", git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
tokio = { version = "1", default-features = false, optional = true, features = [
"sync",
Expand Down
2 changes: 1 addition & 1 deletion p2p/src/tokio_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub trait TokioConnectionExt {
tcp_stream: TcpStream,
) -> Result<(TcpStream, ConnectionContext), Self::Error>;

///
/// Open a feeler to test a node's liveliness
#[allow(async_fn_in_trait)]
async fn open_feeler(self, to: impl Into<SocketAddr>) -> Result<Feeler, Self::Error>;
}
Expand Down
2 changes: 1 addition & 1 deletion peers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2024"

[dependencies]
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
bitcoin = { workspace = true, features = ["rand-std"] }
tokio = { version = "1", default-features = false, optional = true, features = [
"io-util",
"net",
Expand Down
2 changes: 1 addition & 1 deletion utxo_verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2024"

[dependencies]
accumulator = { path = "../accumulator/" }
bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", default-features = true, rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
bitcoin = { workspace = true, features = ["rand-std"] }
peers = { path = "../peers/", default-features = false }
p2p = { path = "../p2p/", package = "swiftsync-p2p", default-features = false }
p2p-messages = { package = "bitcoin-p2p-messages", git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "2bb9bb6bc99ba07ed3d543a512ec3d2a9462770d" }
Expand Down
Loading