@exodus/bitcoin-api 2.18.0 → 2.18.2

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.18.2](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.18.1...@exodus/bitcoin-api@2.18.2) (2024-06-18)
+
+
+### Bug Fixes
+
+* correctly sign psbts ([#2587](https://github.com/ExodusMovement/assets/issues/2587)) ([81e5cc5](https://github.com/ExodusMovement/assets/commit/81e5cc50773b392d5f126133c0f8a1ec8ebd7eb1))
+
+
+
+## [2.18.1](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.18.0...@exodus/bitcoin-api@2.18.1) (2024-06-13)
+
+
+### Bug Fixes
+
+* allow undefined/null addressIndex for xverse compat ([#2553](https://github.com/ExodusMovement/assets/issues/2553)) ([5ff013e](https://github.com/ExodusMovement/assets/commit/5ff013e1129f027dfff58cacebefc76dbcebb401))
+
+
+
 ## [2.18.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.17.1...@exodus/bitcoin-api@2.18.0) (2024-06-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.18.0",
+  "version": "2.18.2",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/bip322-js": "^1.1.0-exodus.4",
     "@exodus/bip44-constants": "^195.0.0",
-    "@exodus/bitcoin-lib": "^2.3.0",
+    "@exodus/bitcoin-lib": "^2.4.1",
     "@exodus/bitcoinerlab-secp256k1": "^1.0.5-exodus.1",
     "@exodus/bitcoinjs-lib": "^6.1.5-exodus.1",
     "@exodus/currency": "^2.3.2",
@@ -67,5 +67,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "b2c0bfc107ce9686d2f9a91386ffe2f43e48ed2d"
+  "gitHead": "fb7b6fa3c13387a821628ce7577951571471b353"
 }

package/src/tx-log/bitcoin-monitor.js

@@ -84,15 +84,21 @@ export class Monitor extends BaseMonitor {
       Object.create(null),
       Object.fromEntries(
         await Promise.all(
-          walletAccounts.map(async (walletAccount) => [
-            walletAccount,
-            await this.aci.getReceiveAddresses({
-              multiAddressMode: true,
+          walletAccounts.map(async (walletAccount) => {
+            const config = await this.aci.getAssetConfig({
               assetName: this.asset.name,
               walletAccount,
-              useCache: true,
-            }),
-          ])
+            })
+            return [
+              walletAccount,
+              await this.aci.getReceiveAddresses({
+                multiAddressMode: config.multiAddressMode ?? true,
+                assetName: this.asset.name,
+                walletAccount,
+                useCache: true,
+              }),
+            ]
+          })
         )
       )
     )

package/src/tx-sign/create-sign-with-wallet.js

@@ -1,8 +1,9 @@
 import { Transaction, payments } from '@exodus/bitcoinjs-lib'
+import * as bip371 from '@exodus/bitcoinjs-lib/src/psbt/bip371'
 
 import { toXOnly } from '../bitcoinjs-lib/ecc-utils'
 import { createGetKeyWithMetadata } from './create-get-key-and-purpose'
-import { toAsyncSigner, toAsyncBufferSigner, isTaprootPurpose } from './taproot'
+import { toAsyncSigner, toAsyncBufferSigner } from './taproot'
 
 export function createSignWithWallet({
   signer,
@@ -44,11 +45,17 @@ export function createSignWithWallet({
           : [sigHash, Transaction.SIGHASH_ALL]
       const { key, purpose, keyId, publicKey } = await getKeyWithMetadata(address)
 
-      const hasTapLeafScript = input.tapLeafScript && input.tapLeafScript.length > 0
-      const isP2SH = purpose === 49 && !hasTapLeafScript
-      const isTaprootKeySpend = isTaprootPurpose(purpose) && !hasTapLeafScript
+      const isTaprootInput = bip371.isTaprootInput(input)
+      const isTapLeafScriptSpend = input.tapLeafScript && input.tapLeafScript.length > 0
+      const isTaprootKeySpend = isTaprootInput && !isTapLeafScriptSpend
 
-      if (isP2SH) {
+      if (isTaprootInput) {
+        if (isTaprootKeySpend && !Buffer.isBuffer(input.tapInternalKey)) {
+          // tapInternalKey is metadata for signing and not part of the hash to sign.
+          // so modifying it here is fine.
+          psbt.updateInput(index, { tapInternalKey: toXOnly(publicKey) })
+        }
+      } else if (purpose === 49) {
         // If spending from a P2SH address, we assume the address is P2SH wrapping
         // P2WPKH. Exodus doesn't use P2SH addresses so we should only ever be
         // signing a P2SH input if we are importing a private key
@@ -65,10 +72,6 @@ export function createSignWithWallet({
         } else {
           throw new Error('Expected P2SH script to be a nested segwit input')
         }
-      } else if (isTaprootKeySpend && !Buffer.isBuffer(input.tapInternalKey)) {
-        // tapInternalKey is metadata for signing and not part of the hash to sign.
-        // so modifying it here is fine.
-        psbt.updateInput(index, { tapInternalKey: toXOnly(publicKey) })
       }
 
       const asyncSigner = signer

package/src/tx-sign/taproot.js

@@ -42,10 +42,6 @@ export const tapTweakHash = (publicKey, h) => {
   return crypto.taggedHash('TapTweak', Buffer.concat(h ? [xOnlyPoint, h] : [xOnlyPoint]))
 }
 
-export function isTaprootPurpose(purpose) {
-  return purpose === 86
-}
-
 /**
  * Take a sync signer and make it async.
  */