From 8f684106ebd3e50b6e2fbbc996f3384267d1101b Mon Sep 17 00:00:00 2001
From: DanGould <d@ngould.dev>
Date: Wed, 13 Nov 2024 13:09:41 -0500
Subject: [PATCH] Depend on bitcoin-ffi types

Import types from UDL and re-export as bitcoin_ffi to replace the
bitcoin module.
---
 Cargo.lock                    |  57 +++++++-----
 Cargo.toml                    |   7 +-
 src/bitcoin.rs                | 163 ----------------------------------
 src/bitcoin_ffi.rs            |  58 ++++++++++++
 src/lib.rs                    |   4 +-
 src/receive/mod.rs            |   6 +-
 src/receive/uni.rs            |  21 +++--
 src/send/mod.rs               |   5 +-
 src/send/uni.rs               |   2 +-
 src/uri.rs                    |  10 +--
 tests/bdk_integration_test.rs |   6 +-
 11 files changed, 122 insertions(+), 217 deletions(-)
 delete mode 100644 src/bitcoin.rs
 create mode 100644 src/bitcoin_ffi.rs

diff --git a/Cargo.lock b/Cargo.lock
index a0e384b..15b45eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -166,7 +166,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -183,7 +183,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -371,6 +371,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bitcoin-ffi"
+version = "0.1.2"
+source = "git+https://github.com/bitcoindevkit/bitcoin-ffi.git?rev=4cd8e644dbf4e001d71d5fffb232480fa5ff2246#4cd8e644dbf4e001d71d5fffb232480fa5ff2246"
+dependencies = [
+ "bitcoin 0.32.2",
+ "thiserror",
+ "uniffi",
+]
+
 [[package]]
 name = "bitcoin-hpke"
 version = "0.13.0"
@@ -748,7 +758,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1130,7 +1140,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1851,6 +1861,7 @@ version = "0.20.0"
 dependencies = [
  "base64 0.22.1",
  "bdk",
+ "bitcoin-ffi",
  "bitcoin-ohttp",
  "bitcoincore-rpc",
  "bitcoind",
@@ -1921,7 +1932,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1996,9 +2007,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.76"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -2340,7 +2351,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2444,7 +2455,7 @@ checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2669,9 +2680,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2744,22 +2755,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2833,7 +2844,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2927,7 +2938,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3087,7 +3098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fcfa22f55829d3aaa7acfb1c5150224188fe0f27c59a8a3eddcaa24d1ffbe58"
 dependencies = [
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3118,7 +3129,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.48",
+ "syn 2.0.87",
  "toml",
  "uniffi_meta",
 ]
@@ -3284,7 +3295,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -3318,7 +3329,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3611,7 +3622,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.87",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index cd3651c..cb492cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
@@ -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", rev = "4cd8e644dbf4e001d71d5fffb232480fa5ff2246" }
 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"
@@ -51,5 +50,5 @@ strip = true
 
 
 [features]
-uniffi = ["uniffi/cli"]
+uniffi = ["uniffi/cli", "bitcoin-ffi/default"]
 danger-local-https = ["payjoin/danger-local-https"]
diff --git a/src/bitcoin.rs b/src/bitcoin.rs
deleted file mode 100644
index 2b51a19..0000000
--- a/src/bitcoin.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use std::str::FromStr;
-use std::sync::Arc;
-
-use payjoin::bitcoin;
-
-/// A reference to a transaction output.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
-pub struct OutPoint {
-    /// The referenced transaction's txid.
-    pub txid: String,
-    /// The index of the referenced output in its transaction's vout.
-    pub vout: u32,
-}
-
-impl From<OutPoint> for bitcoin::OutPoint {
-    fn from(outpoint: OutPoint) -> Self {
-        bitcoin::OutPoint {
-            txid: bitcoin::Txid::from_str(&outpoint.txid).expect("Invalid txid"),
-            vout: outpoint.vout,
-        }
-    }
-}
-
-impl From<bitcoin::OutPoint> for OutPoint {
-    fn from(outpoint: bitcoin::OutPoint) -> Self {
-        OutPoint { txid: outpoint.txid.to_string(), vout: outpoint.vout }
-    }
-}
-
-#[derive(Debug, Clone)]
-#[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
-pub struct PsbtInput {
-    pub witness_utxo: Option<TxOut>,
-    pub redeem_script: Option<Arc<Script>>,
-    pub witness_script: Option<Arc<Script>>,
-}
-
-impl PsbtInput {
-    pub fn new(
-        witness_utxo: Option<TxOut>,
-        redeem_script: Option<Arc<Script>>,
-        witness_script: Option<Arc<Script>>,
-    ) -> Self {
-        Self { witness_utxo, redeem_script, witness_script }
-    }
-}
-
-impl From<bitcoin::psbt::Input> for PsbtInput {
-    fn from(psbt_input: bitcoin::psbt::Input) -> Self {
-        Self {
-            witness_utxo: psbt_input.witness_utxo.map(|s| s.into()),
-            redeem_script: psbt_input.redeem_script.clone().map(|s| Arc::new(s.into())),
-            witness_script: psbt_input.witness_script.clone().map(|s| Arc::new(s.into())),
-        }
-    }
-}
-
-impl From<PsbtInput> for bitcoin::psbt::Input {
-    fn from(psbt_input: PsbtInput) -> Self {
-        Self {
-            witness_utxo: psbt_input.witness_utxo.map(|s| s.into()),
-            redeem_script: psbt_input.redeem_script.map(|s| Arc::unwrap_or_clone(s).into()),
-            witness_script: psbt_input.witness_script.map(|s| Arc::unwrap_or_clone(s).into()),
-            ..Default::default()
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-#[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
-pub struct TxIn {
-    pub previous_output: OutPoint,
-}
-
-impl From<TxIn> for bitcoin::TxIn {
-    fn from(tx_in: TxIn) -> Self {
-        bitcoin::TxIn { previous_output: tx_in.previous_output.into(), ..Default::default() }
-    }
-}
-
-impl From<bitcoin::TxIn> for TxIn {
-    fn from(tx_in: bitcoin::TxIn) -> Self {
-        TxIn { previous_output: tx_in.previous_output.into() }
-    }
-}
-
-#[derive(Debug, Clone)]
-#[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
-pub struct TxOut {
-    /// The value of the output, in satoshis.
-    pub value: u64,
-    /// The address of the output.
-    pub script_pubkey: Vec<u8>,
-}
-
-impl From<TxOut> for bitcoin::TxOut {
-    fn from(tx_out: TxOut) -> Self {
-        bitcoin::TxOut {
-            value: bitcoin::amount::Amount::from_sat(tx_out.value),
-            script_pubkey: bitcoin::ScriptBuf::from_bytes(tx_out.script_pubkey),
-        }
-    }
-}
-
-impl From<bitcoin::TxOut> for TxOut {
-    fn from(tx_out: bitcoin::TxOut) -> Self {
-        TxOut { value: tx_out.value.to_sat(), script_pubkey: tx_out.script_pubkey.to_bytes() }
-    }
-}
-
-#[derive(Clone, Default)]
-#[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
-pub enum Network {
-    ///Bitcoin’s testnet
-    Testnet,
-    ///Bitcoin’s regtest
-    Regtest,
-    #[default]
-    ///Classic Bitcoin
-    Bitcoin,
-    ///Bitcoin’s signet
-    Signet,
-}
-
-impl From<Network> for bitcoin::Network {
-    fn from(network: Network) -> Self {
-        match network {
-            Network::Signet => bitcoin::Network::Signet,
-            Network::Testnet => bitcoin::Network::Testnet,
-            Network::Regtest => bitcoin::Network::Regtest,
-            Network::Bitcoin => bitcoin::Network::Bitcoin,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-#[cfg_attr(feature = "uniffi", derive(uniffi::Object))]
-pub struct Script(pub payjoin::bitcoin::ScriptBuf);
-
-#[cfg_attr(feature = "uniffi", uniffi::export)]
-impl Script {
-    #[cfg_attr(feature = "uniffi", uniffi::constructor)]
-    pub fn new(script: Vec<u8>) -> Self {
-        Self(payjoin::bitcoin::ScriptBuf::from_bytes(script))
-    }
-
-    pub fn to_bytes(&self) -> Vec<u8> {
-        self.0.to_bytes()
-    }
-}
-
-impl From<payjoin::bitcoin::ScriptBuf> for Script {
-    fn from(value: payjoin::bitcoin::ScriptBuf) -> Self {
-        Self(value)
-    }
-}
-
-impl From<Script> for payjoin::bitcoin::ScriptBuf {
-    fn from(value: Script) -> Self {
-        value.0
-    }
-}
diff --git a/src/bitcoin_ffi.rs b/src/bitcoin_ffi.rs
new file mode 100644
index 0000000..ca6fe46
--- /dev/null
+++ b/src/bitcoin_ffi.rs
@@ -0,0 +1,58 @@
+use std::sync::Arc;
+
+pub use bitcoin_ffi::*;
+use payjoin::bitcoin;
+
+#[cfg(feature = "uniffi")]
+mod uni {
+    use super::*;
+
+    uniffi::use_udl_object!(bitcoin_ffi, Script);
+    uniffi::use_udl_record!(bitcoin_ffi, TxOut);
+    uniffi::use_udl_record!(bitcoin_ffi, TxIn);
+    uniffi::use_udl_enum!(bitcoin_ffi, Network);
+    uniffi::use_udl_record!(bitcoin_ffi, OutPoint);
+}
+
+#[derive(Debug, Clone)]
+#[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
+pub struct PsbtInput {
+    pub witness_utxo: Option<TxOut>,
+    pub redeem_script: Option<Arc<Script>>,
+    pub witness_script: Option<Arc<Script>>,
+}
+
+impl PsbtInput {
+    pub fn new(
+        witness_utxo: Option<TxOut>,
+        redeem_script: Option<Arc<Script>>,
+        witness_script: Option<Arc<Script>>,
+    ) -> Self {
+        Self { witness_utxo, redeem_script, witness_script }
+    }
+}
+
+impl From<bitcoin::psbt::Input> for PsbtInput {
+    fn from(psbt_input: bitcoin::psbt::Input) -> Self {
+        Self {
+            witness_utxo: psbt_input.witness_utxo.map(|s| s.into()),
+            redeem_script: psbt_input.redeem_script.clone().map(|s| Arc::new(s.into())),
+            witness_script: psbt_input.witness_script.clone().map(|s| Arc::new(s.into())),
+        }
+    }
+}
+
+impl From<PsbtInput> for bitcoin::psbt::Input {
+    fn from(psbt_input: PsbtInput) -> Self {
+        Self {
+            witness_utxo: psbt_input.witness_utxo.map(|s| s.into()),
+            redeem_script: psbt_input
+                .redeem_script
+                .map(|s| Arc::try_unwrap(s).unwrap_or_else(|arc| (*arc).clone()).into()),
+            witness_script: psbt_input
+                .witness_script
+                .map(|s| Arc::try_unwrap(s).unwrap_or_else(|arc| (*arc).clone()).into()),
+            ..Default::default()
+        }
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 318e846..4d5520e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,6 @@
 #![crate_name = "payjoin_ffi"]
 
-pub mod bitcoin;
+pub mod bitcoin_ffi;
 pub mod error;
 pub mod io;
 pub mod ohttp;
@@ -9,7 +9,7 @@ pub mod request;
 pub mod send;
 pub mod uri;
 
-pub use crate::bitcoin::*;
+pub use crate::bitcoin_ffi::*;
 pub use crate::error::PayjoinError;
 pub use crate::ohttp::*;
 #[cfg(feature = "uniffi")]
diff --git a/src/receive/mod.rs b/src/receive/mod.rs
index c73da77..0fe1f22 100644
--- a/src/receive/mod.rs
+++ b/src/receive/mod.rs
@@ -3,11 +3,11 @@ use std::io::Cursor;
 use std::str::FromStr;
 use std::time::Duration;
 
+use bitcoin_ffi::{Network, OutPoint, Script, TxOut};
 use payjoin::bitcoin::psbt::Psbt;
 use payjoin::bitcoin::FeeRate;
 use payjoin::receive as pdk;
 
-use crate::bitcoin::{Network, OutPoint, Script, TxOut};
 use crate::error::PayjoinError;
 use crate::ohttp::OhttpKeys;
 use crate::uri::PjUriBuilder;
@@ -350,8 +350,8 @@ pub struct InputPair(payjoin::receive::InputPair);
 impl InputPair {
     #[cfg_attr(feature = "uniffi", uniffi::constructor)]
     pub fn new(
-        txin: crate::bitcoin::TxIn,
-        psbtin: crate::bitcoin::PsbtInput,
+        txin: bitcoin_ffi::TxIn,
+        psbtin: crate::bitcoin_ffi::PsbtInput,
     ) -> Result<Self, PayjoinError> {
         Ok(Self(payjoin::receive::InputPair::new(txin.into(), psbtin.into())?))
     }
diff --git a/src/receive/uni.rs b/src/receive/uni.rs
index 879a08e..4f3db96 100644
--- a/src/receive/uni.rs
+++ b/src/receive/uni.rs
@@ -1,10 +1,9 @@
 use std::sync::Arc;
 
 use super::InputPair;
+use crate::bitcoin_ffi::{Network, OutPoint, Script, TxOut};
 use crate::error::PayjoinError;
-use crate::{
-    ClientResponse, Network, OhttpKeys, OutPoint, PjUriBuilder, Request, Script, TxOut, Url,
-};
+use crate::{ClientResponse, OhttpKeys, PjUriBuilder, Request, Url};
 
 #[derive(Clone, Debug, uniffi::Object)]
 pub struct Receiver(pub super::Receiver);
@@ -307,8 +306,10 @@ impl WantsInputs {
         &self,
         candidate_inputs: Vec<Arc<InputPair>>,
     ) -> Result<Arc<InputPair>, PayjoinError> {
-        let candidate_inputs: Vec<InputPair> =
-            candidate_inputs.into_iter().map(|pair| Arc::unwrap_or_clone(pair).into()).collect();
+        let candidate_inputs: Vec<InputPair> = candidate_inputs
+            .into_iter()
+            .map(|pair| Arc::try_unwrap(pair).unwrap_or_else(|arc| (*arc).clone()).into())
+            .collect();
 
         self.0.try_preserving_privacy(candidate_inputs).map(|t| Arc::new(t.into()))
     }
@@ -317,8 +318,10 @@ impl WantsInputs {
         &self,
         replacement_inputs: Vec<Arc<InputPair>>,
     ) -> Result<Arc<WantsInputs>, PayjoinError> {
-        let replacement_inputs: Vec<InputPair> =
-            replacement_inputs.into_iter().map(|pair| Arc::unwrap_or_clone(pair).into()).collect();
+        let replacement_inputs: Vec<InputPair> = replacement_inputs
+            .into_iter()
+            .map(|pair| Arc::try_unwrap(pair).unwrap_or_else(|arc| (*arc).clone()).into())
+            .collect();
         self.0
             .contribute_inputs(replacement_inputs)
             .map(|t| Arc::new(t.into()))
@@ -381,8 +384,8 @@ impl From<super::PayjoinProposal> for PayjoinProposal {
 
 #[uniffi::export]
 impl PayjoinProposal {
-    pub fn utxos_to_be_locked(&self) -> Vec<OutPoint> {
-        let mut outpoints: Vec<OutPoint> = Vec::new();
+    pub fn utxos_to_be_locked(&self) -> Vec<crate::OutPoint> {
+        let mut outpoints: Vec<crate::OutPoint> = Vec::new();
         for e in <PayjoinProposal as Into<super::PayjoinProposal>>::into(self.clone())
             .utxos_to_be_locked()
         {
diff --git a/src/send/mod.rs b/src/send/mod.rs
index 4235e20..7eb502a 100644
--- a/src/send/mod.rs
+++ b/src/send/mod.rs
@@ -118,10 +118,7 @@ impl Sender {
     }
 
     /// Extract serialized Request and Context from a Payjoin Proposal.
-    pub fn extract_v2(
-        &self,
-        ohttp_relay: Url,
-    ) -> Result<(Request, V2PostContext), PayjoinError> {
+    pub fn extract_v2(&self, ohttp_relay: Url) -> Result<(Request, V2PostContext), PayjoinError> {
         match self.0.extract_v2(ohttp_relay.into()) {
             Ok((req, ctx)) => Ok((req.into(), ctx.into())),
             Err(e) => Err(e.into()),
diff --git a/src/send/uni.rs b/src/send/uni.rs
index 3ff766e..505b032 100644
--- a/src/send/uni.rs
+++ b/src/send/uni.rs
@@ -199,7 +199,7 @@ impl From<super::V2GetContext> for V2GetContext {
 impl V2GetContext {
     pub fn extract_req(&self, ohttp_relay: Arc<Url>) -> Result<RequestOhttpContext, PayjoinError> {
         self.0
-            .extract_req(Arc::unwrap_or_clone(ohttp_relay.into()))
+            .extract_req(Arc::try_unwrap(ohttp_relay).unwrap_or_else(|arc| (*arc).clone()))
             .map(|(request, ctx)| RequestOhttpContext { request, ohttp_ctx: Arc::new(ctx.into()) })
     }
 
diff --git a/src/uri.rs b/src/uri.rs
index e9ac0f1..2fb188e 100644
--- a/src/uri.rs
+++ b/src/uri.rs
@@ -160,7 +160,7 @@ impl PjUriBuilder {
         )
         .into())
     }
-    ///Accepts the amount you want to receive in sats and sets it in btc .
+    /// Accepts the amount you want to receive in sats and sets it in btc .
     pub fn amount(&self, amount: u64) -> Arc<Self> {
         let amount = payjoin::bitcoin::Amount::from_sat(amount);
         Arc::new(self.0.clone().amount(amount).into())
@@ -204,10 +204,10 @@ impl PjUriBuilder {
         )
         .into())
     }
-    ///Accepts the amount you want to receive in sats and sets it in btc .
-    pub fn amount(&self, amount: u64) -> Self {
-        let amount = payjoin::bitcoin::Amount::from_sat(amount);
-        self.0.clone().amount(amount).into()
+    /// Accepts the amount you want to receive in sats and sets it in btc .
+    pub fn amount(&self, _amount: u64) -> Self {
+        //let amount = payjoin::bitcoin::Amount::from_sat(amount);
+        self.0.clone().amount(payjoin::bitcoin::Amount::ZERO).into()
     }
     /// Set the message.
     pub fn message(&self, message: String) -> Self {
diff --git a/tests/bdk_integration_test.rs b/tests/bdk_integration_test.rs
index 66d8967..2736049 100644
--- a/tests/bdk_integration_test.rs
+++ b/tests/bdk_integration_test.rs
@@ -221,8 +221,8 @@ mod v2 {
 
     use bdk::bitcoin::Address;
     use bdk::wallet::AddressIndex;
+    use bitcoin_ffi::Network;
     use http::StatusCode;
-    use payjoin_ffi::bitcoin::Network;
     use payjoin_ffi::error::PayjoinError;
     use payjoin_ffi::receive::{PayjoinProposal, Receiver, UncheckedProposal};
     use payjoin_ffi::send::SenderBuilder;
@@ -389,7 +389,7 @@ mod v2 {
             .unwrap()
             .identify_receiver_outputs(|script| is_script_owned(&receiver, script.clone()))
             .expect("Receiver should have at least one output");
-        _ = wants_outputs.substitute_receiver_script(&payjoin_ffi::Script::new(
+        _ = wants_outputs.substitute_receiver_script(&bitcoin_ffi::Script::new(
             receiver.get_address(AddressIndex::New).script_pubkey().into_bytes(),
         ));
         let wants_inputs = wants_outputs.commit_outputs();
@@ -480,7 +480,7 @@ fn is_script_owned(wallet: &Wallet, script: Vec<u8>) -> Result<bool, PayjoinErro
         .map_err(|x| PayjoinError::UnexpectedError { message: x.to_string() })
 }
 
-fn mock_is_output_known(_: payjoin_ffi::OutPoint) -> Result<bool, PayjoinError> {
+fn mock_is_output_known(_: bitcoin_ffi::OutPoint) -> Result<bool, PayjoinError> {
     Ok(false)
 }