Remove imported bitcoin_ffi package

chavic · chavic · commit 318753349028 · 2025-12-16T21:36:06.000+02:00
After migrating to primitive types on the FFI layer we no longer need to import the bitcoin_ffi package. Also cleans up any API changes made during the transition.
diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock
@@ -470,16 +470,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bitcoin-ffi"
-version = "0.1.3"
-source = "git+https://github.com/bitcoindevkit/bitcoin-ffi?rev=39cc12b#39cc12bd32d6adf889b48354adcdb0f3c475aad2"
-dependencies = [
- "bitcoin 0.32.7",
- "thiserror 1.0.63",
- "uniffi",
-]
-
 [[package]]
 name = "bitcoin-hpke"
 version = "0.13.0"
@@ -2525,7 +2515,6 @@ name = "payjoin-ffi"
 version = "0.24.0"
 dependencies = [
  "bdk",
- "bitcoin-ffi",
  "bitcoin-ohttp",
  "getrandom 0.2.15",
  "lazy_static",
diff --git a/Cargo-recent.lock b/Cargo-recent.lock
@@ -470,16 +470,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bitcoin-ffi"
-version = "0.1.3"
-source = "git+https://github.com/bitcoindevkit/bitcoin-ffi?rev=39cc12b#39cc12bd32d6adf889b48354adcdb0f3c475aad2"
-dependencies = [
- "bitcoin 0.32.7",
- "thiserror 1.0.63",
- "uniffi",
-]
-
 [[package]]
 name = "bitcoin-hpke"
 version = "0.13.0"
@@ -2525,7 +2515,6 @@ name = "payjoin-ffi"
 version = "0.24.0"
 dependencies = [
  "bdk",
- "bitcoin-ffi",
  "bitcoin-ohttp",
  "getrandom 0.2.15",
  "lazy_static",
diff --git a/payjoin-ffi/Cargo.toml b/payjoin-ffi/Cargo.toml
@@ -22,7 +22,6 @@ name = "uniffi-bindgen"
 path = "uniffi-bindgen.rs"
 
 [dependencies]
-bitcoin-ffi = { git = "https://github.com/bitcoindevkit/bitcoin-ffi", rev = "39cc12b" }
 getrandom = "0.2"
 lazy_static = "1.5.0"
 ohttp = { package = "bitcoin-ohttp", version = "0.6.0" }
@@ -32,7 +31,7 @@ serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
 thiserror = "2.0.14"
 tokio = { version = "1.47.1", features = ["full"], optional = true }
-uniffi = { version = "0.30.0" }
+uniffi = { version = "0.30.0", features = ["cli"] }
 uniffi-dart = { git = "https://github.com/Uniffi-Dart/uniffi-dart.git", rev = "5bdcc79", optional = true }
 url = "2.5.4"
 
diff --git a/payjoin-ffi/javascript/src/index.ts b/payjoin-ffi/javascript/src/index.ts
@@ -1,11 +1,9 @@
 // Export the generated bindings to the app.
 export * as payjoin from "./generated/payjoin.js";
-export * as bitcoin from "./generated/bitcoin.js";
 
 // Now import the bindings so we can:
 // - initialize them
 // - export them as namespaced objects as the default export.
-import * as bitcoin from "./generated/bitcoin.js";
 import * as payjoin from "./generated/payjoin.js";
 
 let initialized = false;
@@ -19,14 +17,12 @@ export async function uniffiInitAsync() {
     // Initialize the generated bindings: mostly checksums, but also callbacks.
     // - the boolean flag ensures this loads exactly once, even if the JS code
     //   is reloaded (e.g. during development with metro).
-    bitcoin.default.initialize();
     payjoin.default.initialize();
 
     initialized = true;
 }
 
 // Export the crates as individually namespaced objects.
 export default {
-    bitcoin,
     payjoin,
 };
diff --git a/payjoin-ffi/src/bitcoin_ffi.rs b/payjoin-ffi/src/bitcoin_ffi.rs
diff --git a/payjoin-ffi/src/lib.rs b/payjoin-ffi/src/lib.rs
@@ -1,6 +1,5 @@
 #![crate_name = "payjoin_ffi"]
 
-pub mod bitcoin_ffi;
 pub mod error;
 #[cfg(feature = "io")]
 pub mod io;
@@ -15,7 +14,6 @@ pub mod uri;
 
 pub use payjoin::persist::NoopSessionPersister;
 
-pub use crate::bitcoin_ffi::*;
 pub use crate::ohttp::*;
 pub use crate::output_substitution::*;
 pub use crate::receive::*;
diff --git a/payjoin-ffi/src/receive/mod.rs b/payjoin-ffi/src/receive/mod.rs
@@ -16,7 +16,7 @@ use crate::error::ForeignError;
 pub use crate::error::{ImplementationError, SerdeJsonError};
 use crate::ohttp::OhttpKeys;
 use crate::receive::error::{ReceiverPersistedError, ReceiverReplayError};
-use crate::uri::error::PayjoinFeeRateError;
+use crate::uri::error::FeeRateError;
 use crate::{ClientResponse, OutputSubstitution, Request};
 
 pub mod error;
@@ -366,9 +366,9 @@ impl ReceiverBuilder {
     pub fn with_max_fee_rate(
         &self,
         max_effective_fee_rate_sat_per_vb: u64,
-    ) -> Result<Self, PayjoinFeeRateError> {
+    ) -> Result<Self, FeeRateError> {
         let fee_rate = FeeRate::from_sat_per_vb(max_effective_fee_rate_sat_per_vb)
-            .ok_or_else(|| PayjoinFeeRateError::overflow(max_effective_fee_rate_sat_per_vb))?;
+            .ok_or_else(|| FeeRateError::overflow(max_effective_fee_rate_sat_per_vb))?;
         Ok(Self(self.0.clone().with_max_fee_rate(fee_rate)))
     }
 
diff --git a/payjoin-ffi/src/test_utils.rs b/payjoin-ffi/src/test_utils.rs
@@ -1,12 +1,10 @@
 use std::io;
 use std::sync::Arc;
 
-use bitcoin_ffi::Psbt;
 use lazy_static::lazy_static;
 use payjoin_test_utils::corepc_node::AddressType;
 use payjoin_test_utils::{
-    corepc_node, EXAMPLE_URL, INVALID_PSBT, ORIGINAL_PSBT, PARSED_ORIGINAL_PSBT,
-    PARSED_PAYJOIN_PROPOSAL, PARSED_PAYJOIN_PROPOSAL_WITH_SENDER_INFO, PAYJOIN_PROPOSAL,
+    corepc_node, EXAMPLE_URL, INVALID_PSBT, ORIGINAL_PSBT, PAYJOIN_PROPOSAL,
     PAYJOIN_PROPOSAL_WITH_SENDER_INFO, QUERY_PARAMS, RECEIVER_INPUT_CONTRIBUTION,
 };
 use serde_json::Value;
@@ -210,14 +208,3 @@ pub fn payjoin_proposal_with_sender_info() -> String {
 
 #[uniffi::export]
 pub fn receiver_input_contribution() -> String { RECEIVER_INPUT_CONTRIBUTION.to_string() }
-
-#[uniffi::export]
-pub fn parsed_original_psbt() -> Psbt { PARSED_ORIGINAL_PSBT.clone().into() }
-
-#[uniffi::export]
-pub fn parsed_payjoin_proposal() -> Psbt { PARSED_PAYJOIN_PROPOSAL.clone().into() }
-
-#[uniffi::export]
-pub fn parsed_payjoin_proposal_with_sender_info() -> Psbt {
-    PARSED_PAYJOIN_PROPOSAL_WITH_SENDER_INFO.clone().into()
-}
diff --git a/payjoin-ffi/src/uri/error.rs b/payjoin-ffi/src/uri/error.rs
@@ -28,33 +28,13 @@ pub struct UrlParseError(#[from] url::ParseError);
 #[error(transparent)]
 pub struct IntoUrlError(#[from] payjoin::IntoUrlError);
 
-#[derive(Debug, thiserror::Error, uniffi::Object)]
-#[error(transparent)]
-pub struct FeeRateError(#[from] bitcoin_ffi::error::FeeRateError);
-
-#[derive(Debug, thiserror::Error, uniffi::Object)]
-#[error("{msg}")]
-pub struct PayjoinFeeRateError {
-    msg: String,
-}
-
-impl PayjoinFeeRateError {
-    pub(crate) fn overflow(value_sat_per_vb: u64) -> Self {
-        Self {
-            msg: format!(
-                "Fee rate {value_sat_per_vb} sat/vB exceeds the supported range for this platform"
-            ),
-        }
-    }
-}
-
 #[derive(Debug, thiserror::Error, uniffi::Object)]
 #[error("{msg}")]
-pub struct PayjoinFeeRateError {
+pub struct FeeRateError {
     msg: String,
 }
 
-impl PayjoinFeeRateError {
+impl FeeRateError {
     pub(crate) fn overflow(value_sat_per_vb: u64) -> Self {
         Self {
             msg: format!(
