WIP: rebased

Author: riverKanies

Cargo.toml

@@ -35,7 +35,7 @@ base64 = "0.22.1"
 bitcoin-ffi = { git = "https://github.com/bitcoindevkit/bitcoin-ffi.git", rev = "4cd8e644dbf4e001d71d5fffb232480fa5ff2246" }
 hex = "0.4.3"
 ohttp = { package = "bitcoin-ohttp", version = "0.6.0" }
-payjoin = { git = "https://github.com/payjoin/rust-payjoin.git", rev = "bb47c8469146f1a9055b7f850d86f58f2b9627c6", features = ["v1", "io"] }
+payjoin = { git = "https://github.com/payjoin/rust-payjoin.git", rev = "bb47c8469146f1a9055b7f850d86f58f2b9627c6", features = ["v1"] }
 serde_json = "1.0.128"
 thiserror = "1.0.58"
 uniffi = { version = "0.28.0", optional = true }

src/receive/wasm.rs

@@ -10,6 +10,7 @@ use crate::bitcoin_ffi::Network;
 use crate::ohttp::OhttpKeys;
 // use crate::uri::PjUriBuilder;
 use crate::Url;
+use crate::error::PayjoinError;
 
 use {
   crate::utils::result::JsResult,
@@ -51,8 +52,8 @@ impl Receiver {
           .map_err(|_| wasm_bindgen::JsError::new("Invalid network"))?;
 
       // Parse URLs
-      let directory = Url::parse(directory)
-          .map_err(|_| wasm_bindgen::JsError::new("Invalid directory URL"))?;
+      // let directory = Url::parse(directory)
+      //     .map_err(|_| wasm_bindgen::JsError::new("Invalid directory URL"))?;
       let ohttp_relay = Url::parse(ohttp_relay)
           .map_err(|_| wasm_bindgen::JsError::new("Invalid relay URL"))?;
 
@@ -66,14 +67,14 @@ impl Receiver {
           .require_network(network)
           .map_err(|_| wasm_bindgen::JsError::new("Address network mismatch"))?;
 
-      Ok(payjoin::receive::v2::Receiver::new(//new_with_time(
+      Ok(payjoin::receive::v2::Receiver::new(
           address,
-          directory.into(),
+          directory,
           ohttp_keys.into(),
-          ohttp_relay.into(),
-          // js_sys::Date::now(),
+          // Date::now(),
           expire_after.map(Duration::from_secs)
       )
+      .map_err(PayjoinError::from)?
       .into())
   }