Skip to content

Commit

Permalink
Depend on bitcoin-ffi types
Browse files Browse the repository at this point in the history
Note this requires a change to bitcoin-ffi to use proc-macros so that
payjoin-ffi proc macros know the types are UniFFI compaatible.
  • Loading branch information
DanGould committed Nov 17, 2024
1 parent 8728c2d commit deb22b0
Show file tree
Hide file tree
Showing 11 changed files with 122 additions and 217 deletions.
57 changes: 34 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ uniffi = { version = "0.28.0", features = ["build"] }
[dev-dependencies]
uniffi = { version = "0.28.0", features = ["bindgen-tests"] }
bdk = { version = "0.29.0", features = ["all-keys", "use-esplora-ureq", "keys-bip39", "rpc"] }
#bitcoin-ffi = { git = "https://github.com/bitcoindevkit/bitcoin-ffi" }
bitcoind = { version = "0.36.0", features = ["0_21_2"] }
bitcoincore-rpc = "0.19.0"
http = "1"
Expand All @@ -28,10 +27,10 @@ testcontainers = "0.15.0"
testcontainers-modules = { version = "0.1.3", features = ["redis"] }
tokio = { version = "1.12.0", features = ["full"] }
[dependencies]

bitcoin-ffi = { git = "https://github.com/bitcoindevkit/bitcoin-ffi.git", branch = "master" }
payjoin = { git = "https://github.com/payjoin/rust-payjoin", rev = "ef2ce55a57fe5270bc761bfcda58024ae45a93aa", features = ["send", "receive", "base64", "v2", "io"] }
uniffi = { version = "0.28.0", optional = true }
thiserror = "1.0.47"
thiserror = "1.0.58"
ohttp = { package = "bitcoin-ohttp", version = "0.6.0" }
url = "2.5.0"
base64 = "0.22.1"
Expand All @@ -51,5 +50,5 @@ strip = true


[features]
uniffi = ["uniffi/cli"]
uniffi = ["uniffi/cli", "bitcoin-ffi/default"]
danger-local-https = ["payjoin/danger-local-https"]
163 changes: 0 additions & 163 deletions src/bitcoin.rs

This file was deleted.

Loading

0 comments on commit deb22b0

Please sign in to comment.