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
8 changes: 0 additions & 8 deletions Cargo-minimal.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2473,22 +2473,18 @@ dependencies = [
"clap",
"config",
"dirs",
"futures",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-util",
"nix",
"payjoin",
"payjoin-test-utils",
"r2d2",
"r2d2_sqlite",
"rcgen 0.14.3",
"reqwest",
"rusqlite",
"serde",
"serde_json",
"sled",
"tempfile",
"tokio",
"tokio-rustls",
Expand All @@ -2510,7 +2506,6 @@ dependencies = [
"futures",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-util",
"payjoin",
"prometheus",
Expand All @@ -2529,12 +2524,10 @@ dependencies = [
name = "payjoin-ffi"
version = "0.24.0"
dependencies = [
"base64 0.22.1",
"bdk",
"bitcoin-ffi",
"bitcoin-ohttp",
"getrandom 0.2.15",
"hex",
"lazy_static",
"payjoin",
"payjoin-test-utils",
Expand All @@ -2555,7 +2548,6 @@ dependencies = [
"bitcoin-ohttp",
"corepc-node",
"http",
"log",
"ohttp-relay",
"once_cell",
"payjoin",
Expand Down
8 changes: 0 additions & 8 deletions Cargo-recent.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2473,22 +2473,18 @@ dependencies = [
"clap",
"config",
"dirs",
"futures",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-util",
"nix",
"payjoin",
"payjoin-test-utils",
"r2d2",
"r2d2_sqlite",
"rcgen 0.14.3",
"reqwest",
"rusqlite",
"serde",
"serde_json",
"sled",
"tempfile",
"tokio",
"tokio-rustls",
Expand All @@ -2510,7 +2506,6 @@ dependencies = [
"futures",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-util",
"payjoin",
"prometheus",
Expand All @@ -2529,12 +2524,10 @@ dependencies = [
name = "payjoin-ffi"
version = "0.24.0"
dependencies = [
"base64 0.22.1",
"bdk",
"bitcoin-ffi",
"bitcoin-ohttp",
"getrandom 0.2.15",
"hex",
"lazy_static",
"payjoin",
"payjoin-test-utils",
Expand All @@ -2555,7 +2548,6 @@ dependencies = [
"bitcoin-ohttp",
"corepc-node",
"http",
"log",
"ohttp-relay",
"once_cell",
"payjoin",
Expand Down
16 changes: 13 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@
src = ./.;
filter =
path: type:
(builtins.match ".*.udl$" path != null)
|| (builtins.match ".*nginx.conf.template$" path != null)
|| (craneLib.filterCargoSources path type);
(builtins.match ".*nginx.conf.template$" path != null) || (craneLib.filterCargoSources path type);
name = "source";
};
commonArgs = {
Expand Down Expand Up @@ -188,6 +186,18 @@
}
);

payjoin-workspace-machete = craneLib.mkCargoDerivation (
commonArgs
// {
pname = "payjoin-workspace-machete";
inherit cargoArtifacts;
nativeBuildInputs = [ pkgs.cargo-machete ];
buildPhaseCargoCommand = "";
checkPhaseCargoCommand = "cargo machete";
doCheck = true;
}
);

payjoin-workspace-clippy = craneLib.cargoClippy (
commonArgs
// {
Expand Down
6 changes: 1 addition & 5 deletions payjoin-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ path = "src/main.rs"
[features]
default = ["v2"]
native-certs = ["reqwest/rustls-tls-native-roots"]
_manual-tls = ["rcgen", "reqwest/rustls-tls", "hyper-rustls", "payjoin/_manual-tls", "tokio-rustls"]
_manual-tls = ["reqwest/rustls-tls", "payjoin/_manual-tls", "tokio-rustls"]
v1 = ["payjoin/v1","hyper", "hyper-util", "http-body-util"]
v2 = ["payjoin/v2", "payjoin/io"]

Expand All @@ -31,20 +31,16 @@ async-trait = "0.1.89"
bitcoind-async-client = {git = "https://github.com/arminsabouri/bitcoind-async-client", rev = "956ca693e4263c003eaa4fa938d909d24acac5fa"}
clap = { version = "4.5.45", features = ["derive"] }
config = "0.15.14"
futures = "0.3.31"
http-body-util = { version = "0.1.3", optional = true }
hyper = { version = "1.6.0", features = ["http1", "server"], optional = true }
hyper-rustls = { version = "0.27.7", default-features=false, features = ["ring"], optional = true }
hyper-util = { version = "0.1.16", optional = true }
payjoin = { version = "1.0.0-rc.1", default-features = false }
r2d2 = "0.8.10"
r2d2_sqlite = "0.22.0"
rcgen = { version = "0.14.3", optional = true }
reqwest = { version = "0.12.23", default-features = false, features = ["json", "rustls-tls"] }
rusqlite = { version = "0.29.0", features = ["bundled"] }
serde_json = "1.0.142"
serde = { version = "1.0.219", features = ["derive"] }
sled = "0.34.7"
tokio = { version = "1.47.1", features = ["full"] }
tokio-rustls = { version = "0.26.2", features = ["ring"], default-features = false, optional = true }
url = { version = "2.5.4", features = ["serde"] }
Expand Down
3 changes: 1 addition & 2 deletions payjoin-directory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[features]
_manual-tls = ["hyper-rustls", "tokio-rustls"]
_manual-tls = ["tokio-rustls"]
acme = ["tokio-rustls-acme"]

[dependencies]
Expand All @@ -25,7 +25,6 @@ bhttp = { version = "0.6.1", features = ["http"] }
futures = "0.3.31"
http-body-util = "0.1.3"
hyper = { version = "1.6.0", features = ["http1", "server"] }
hyper-rustls = { version = "0.27.7", default-features=false, features = ["webpki-roots", "http1", "ring"], optional=true }
hyper-util = { version = "0.1.16", features = ["tokio"] }
ohttp = { package = "bitcoin-ohttp", version = "0.6.0"}
payjoin = { version = "1.0.0-rc.1", features = ["directory"], default-features = false }
Expand Down
7 changes: 5 additions & 2 deletions payjoin-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ name = "uniffi-bindgen"
path = "uniffi-bindgen.rs"

[dependencies]
base64 = "0.22.1"
bitcoin-ffi = { git = "https://github.com/bitcoindevkit/bitcoin-ffi", rev = "39cc12b" }
getrandom = "0.2"
hex = "0.4.3"
lazy_static = "1.5.0"
ohttp = { package = "bitcoin-ohttp", version = "0.6.0" }
payjoin = { version = "1.0.0-rc.1", features = ["v1", "v2"] }
Expand All @@ -38,5 +36,10 @@ uniffi-dart = { git = "https://github.com/Uniffi-Dart/uniffi-dart.git", rev = "5
uniffi = { version = "0.30.0" }
url = "2.5.4"

# getrandom is ignored here because it's required by the wasm_js feature
# Even though it may appear unused in the default feature set, it's a legitimate dependency for WASM builds.
[package.metadata.cargo-machete]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain why this is necessary here instead of a removal?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I kept getrandom because the wasm_js feature requires getrandom/js so it’s an actual dependency.
If you remove it and run cargo check you’ll see this.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps this exclusion should be explained in a code comment here

ignored = ["getrandom"]

[dev-dependencies]
bdk = { version = "0.29.0", features = ["all-keys", "use-esplora-ureq", "keys-bip39", "rpc"] }
2 changes: 0 additions & 2 deletions payjoin-ffi/dart/native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ crate-type = ["staticlib", "cdylib"]

[dependencies]
payjoin-ffi = { git = "https://github.com/payjoin/rust-payjoin.git", branch = "master", features = ["dart"] }
# pinned version for MSRV 1.85 compatibility
home = "=0.5.11"

[patch."https://github.com/payjoin/rust-payjoin.git"]
payjoin-ffi = { path = "../.." }
Expand Down
1 change: 0 additions & 1 deletion payjoin-test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ license = "MIT"
bitcoin = { version = "0.32.7", features = ["base64"] }
corepc-node = { version = "0.10.0", features = ["download", "29_0"] }
http = "1.3.1"
log = "0.4.27"
ohttp = { package = "bitcoin-ohttp", version = "0.6.0" }
ohttp-relay = { version = "0.0.11", features = ["_test-util"] }
once_cell = "1.21.3"
Expand Down
Loading