Merge branch 'prevtx'

CHANGELOG-npm.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## 0.7.0
+- btc: handle error when an input's previous transaction is required but missing
+
 ## 0.6.0
 
 - btc: add support for multisig script configs

CHANGELOG-rust.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## 0.6.0
+- btc: handle error when an input's previous transaction is required but missing
+
 ## 0.5.0
 
 - btc: add `make_script_config_multisig()`

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bitbox-api"
 authors = ["Marko Bencun <[email protected]>"]
-version = "0.5.0"
+version = "0.6.0"
 homepage = "https://bitbox.swiss/"
 repository = "https://github.com/BitBoxSwiss/bitbox-api-rs/"
 readme = "README-rust.md"

NPM_VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

src/btc.rs

@@ -135,6 +135,14 @@ pub struct TxInput {
     pub prev_tx: Option<PrevTx>,
 }
 
+impl TxInput {
+    fn get_prev_tx(&self) -> Result<&PrevTx, Error> {
+        self.prev_tx.as_ref().ok_or(Error::BtcSign(
+            "input's previous transaction required but missing".into(),
+        ))
+    }
+}
+
 #[derive(Debug, PartialEq)]
 pub struct TxInternalOutput {
     pub keypath: Keypath,
@@ -767,11 +775,8 @@ impl<R: Runtime> PairedBitBox<R> {
                     }
                 }
                 pb::btc_sign_next_response::Type::PrevtxInit => {
-                    // TODO handle error
-                    let prevtx: &PrevTx = transaction.inputs[next_response.index as usize]
-                        .prev_tx
-                        .as_ref()
-                        .unwrap();
+                    let prevtx: &PrevTx =
+                        transaction.inputs[next_response.index as usize].get_prev_tx()?;
                     next_response = self
                         .get_next_response_nested(pb::btc_request::Request::PrevtxInit(
                             pb::BtcPrevTxInitRequest {
@@ -784,11 +789,8 @@ impl<R: Runtime> PairedBitBox<R> {
                         .await?;
                 }
                 pb::btc_sign_next_response::Type::PrevtxInput => {
-                    // TODO handle error
-                    let prevtx: &PrevTx = transaction.inputs[next_response.index as usize]
-                        .prev_tx
-                        .as_ref()
-                        .unwrap();
+                    let prevtx: &PrevTx =
+                        transaction.inputs[next_response.index as usize].get_prev_tx()?;
                     let prevtx_input: &PrevTxInput =
                         &prevtx.inputs[next_response.prev_index as usize];
                     next_response = self
@@ -803,11 +805,8 @@ impl<R: Runtime> PairedBitBox<R> {
                         .await?;
                 }
                 pb::btc_sign_next_response::Type::PrevtxOutput => {
-                    // TODO handle error
-                    let prevtx: &PrevTx = transaction.inputs[next_response.index as usize]
-                        .prev_tx
-                        .as_ref()
-                        .unwrap();
+                    let prevtx: &PrevTx =
+                        transaction.inputs[next_response.index as usize].get_prev_tx()?;
                     let prevtx_output: &PrevTxOutput =
                         &prevtx.outputs[next_response.prev_index as usize];
                     next_response = self

src/error.rs

@@ -91,6 +91,9 @@ pub enum Error {
     #[error("EIP-712 typed message processing error: {0}")]
     #[cfg_attr(feature = "wasm", assoc(js_code = "eth-typed-message".into()))]
     EthTypedMessage(String),
+    #[error("Bitcoin transaction signing error: {0}")]
+    #[cfg_attr(feature = "wasm", assoc(js_code = "btc-sign".into()))]
+    BtcSign(String),
 }
 
 impl From<communication::Error> for Error {