Depend on payjoin taproot spend fix

MutinyWallet · Jan 6, 2024 · d629f0c · d629f0c
1 parent 4f2941f
commit d629f0c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mutiny-core/Cargo.toml b/mutiny-core/Cargo.toml
@@ -44,7 +44,7 @@ cbc = { version = "0.1", features = ["alloc"] }
 aes = { version = "0.8" }
 jwt-compact = { version = "0.8.0-beta.1", features = ["es256k"] }
 argon2 = { version = "0.5.0", features = ["password-hash", "alloc"] }
-payjoin = { version = "0.12.0", features = ["v2", "send", "receive", "base64"] }
+payjoin = { version = "0.13.0", features = ["v2", "send", "receive", "base64"] }
 gluesql = { version = "0.15", default-features = false, features = ["memory-storage"] }
 gluesql-core = "0.15.0"
 bincode = "1.3.3"

diff --git a/mutiny-core/src/error.rs b/mutiny-core/src/error.rs
@@ -147,9 +147,9 @@ pub enum MutinyError {
     /// Payjoin request creation failed.
     #[error("Failed to create payjoin request.")]
     PayjoinCreateRequest,
-    /// Payjoin response validation failed.
-    #[error("Failed to validate payjoin response.")]
-    PayjoinValidateResponse(payjoin::send::ValidationError),
+    /// Payjoin request failed.
+    #[error("Payjoin response error.")]
+    PayjoinResponse(payjoin::send::ResponseError),
     /// Payjoin configuration error
     #[error("Payjoin configuration failed.")]
     PayjoinConfigError,
@@ -471,8 +471,8 @@ impl From<payjoin::send::CreateRequestError> for MutinyError {
     }
 }
 
-impl From<payjoin::send::ValidationError> for MutinyError {
-    fn from(e: payjoin::send::ValidationError) -> Self {
-        Self::PayjoinValidateResponse(e)
+impl From<payjoin::send::ResponseError> for MutinyError {
+    fn from(e: payjoin::send::ResponseError) -> Self {
+        Self::PayjoinResponse(e)
     }
 }
diff --git a/mutiny-wasm/Cargo.toml b/mutiny-wasm/Cargo.toml
@@ -41,7 +41,7 @@ getrandom = { version = "0.2", features = ["js"] }
 futures = "0.3.25"
 urlencoding = "2.1.2"
 once_cell = "1.18.0"
-payjoin = { version = "0.12.0", features = ["send", "base64"] }
+payjoin = { version = "0.13.0", features = ["send", "base64"] }
 fedimint-core = "0.2.1"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by

diff --git a/mutiny-wasm/src/error.rs b/mutiny-wasm/src/error.rs
@@ -147,9 +147,9 @@ pub enum MutinyJsError {
     /// Payjoin request creation failed.
     #[error("Failed to create payjoin request.")]
     PayjoinCreateRequest,
-    /// Payjoin response validation failed.
-    #[error("Failed to validate payjoin response.")]
-    PayjoinValidateResponse,
+    /// Payjoin request failed.
+    #[error("Payjoin response error.")]
+    PayjoinResponse,
     /// Payjoin configuration error
     #[error("Payjoin configuration failed.")]
     PayjoinConfigError,
@@ -209,7 +209,7 @@ impl From<MutinyError> for MutinyJsError {
             MutinyError::NetworkMismatch => MutinyJsError::NetworkMismatch,
             MutinyError::PayjoinConfigError => MutinyJsError::PayjoinConfigError,
             MutinyError::PayjoinCreateRequest => MutinyJsError::PayjoinCreateRequest,
-            MutinyError::PayjoinValidateResponse(_) => MutinyJsError::PayjoinValidateResponse,
+            MutinyError::PayjoinResponse(_) => MutinyJsError::PayjoinResponse,
         }
     }
 }