Fixed failure to spend utxos from v2 wallets

paytaca · Sep 13, 2021 · 490e92e · 490e92e
1 parent f877ff4
commit 490e92e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "watchtower-cash-js",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "Library for building Javascript applications that integrate with Watchtower.cash",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/bch/index.js b/src/bch/index.js
@@ -37,7 +37,8 @@ class BCH {
           tx_hash: item.txid,
           tx_pos: item.vout,
           value: new BigNumber(item.value),
-          wallet_index: item.wallet_index
+          wallet_index: item.wallet_index,
+          address_path: item.address_path
         }
       })
     }
@@ -102,6 +103,7 @@ class BCH {
     for (let i = 0; i < bchUtxos.utxos.length; i++) {
       transactionBuilder.addInput(bchUtxos.utxos[i].tx_hash, bchUtxos.utxos[i].tx_pos)
       totalInput = totalInput.plus(bchUtxos.utxos[i].value)
+      let utxoKeyPair
       if (walletHash) {
         let addressPath
         if (bchUtxos.utxos[i].address_path) {

diff --git a/src/slp/nft1/child/index.js b/src/slp/nft1/child/index.js
@@ -21,7 +21,6 @@ class SlpNft1Child {
     } else {
       resp = await this._api.get(`utxo/slp/${handle}/${tokenId}/?token_type=65`)
     }
-    console.log(resp.data)
     let cumulativeAmount = new BigNumber(0)
     let tokenDecimals = 0
     let filteredUtxos = []
@@ -54,7 +53,8 @@ class SlpNft1Child {
         tx_pos: item.vout,
         amount: amount,
         value: dustLimit,
-        wallet_index: item.wallet_index
+        wallet_index: item.wallet_index,
+        address_path: item.address_path
       }
     })
     return {
@@ -89,7 +89,8 @@ class SlpNft1Child {
           tx_hash: item.txid,
           tx_pos: item.vout,
           value: new BigNumber(item.value),
-          wallet_index: item.wallet_index
+          wallet_index: item.wallet_index,
+          address_path: item.address_path
         }
       })
     }

diff --git a/src/slp/type1/index.js b/src/slp/type1/index.js
@@ -53,7 +53,8 @@ class SlpType1 {
         tx_pos: item.vout,
         amount: amount,
         value: dustLimit,
-        wallet_index: item.wallet_index
+        wallet_index: item.wallet_index,
+        address_path: item.address_path
       }
     })
     return {
@@ -88,7 +89,8 @@ class SlpType1 {
           tx_hash: item.txid,
           tx_pos: item.vout,
           value: new BigNumber(item.value),
-          wallet_index: item.wallet_index
+          wallet_index: item.wallet_index,
+          address_path: item.address_path
         }
       })
     }