@argonprotocol/bitcoin 1.4.12 → 1.4.13-dev.94019742

package/lib/index.js

@@ -5,10 +5,10 @@ var __export = (target, all) => {
 };
 
 // ts/index.ts
-import { Transaction as Transaction2, Address as Address2, p2wsh as p2wsh2, p2wpkh as p2wpkh2, p2sh as p2sh2, p2pk, p2pkh as p2pkh2 } from "@scure/btc-signer";
+import { Transaction as Transaction2, Address as Address2, p2wsh, p2wpkh, p2sh, p2pk, p2pkh } from "@scure/btc-signer";
 
 // ts/CosignScript.ts
-import { p2pkh, p2sh, p2wpkh, p2wsh, Transaction } from "@scure/btc-signer";
+import { Transaction } from "@scure/btc-signer";
 import {
   hexToU8a as hexToU8a2,
   u8aEq,
@@ -18,6 +18,7 @@ import {
 // wasm-module:/home/runner/work/mainchain/mainchain/bitcoin/nodejs/ts/wasm/bitcoin_bindings_bg.wasm
 var bitcoin_bindings_bg_exports = {};
 __export(bitcoin_bindings_bg_exports, {
+  __externref_table_alloc: () => __externref_table_alloc,
   __externref_table_dealloc: () => __externref_table_dealloc,
   __wbindgen_externrefs: () => __wbindgen_externrefs,
   __wbindgen_free: () => __wbindgen_free,
@@ -39,7 +40,7 @@ __export(bitcoin_bindings_bg_exports, {
 });
 
 // wasm-deferred:/home/runner/work/mainchain/mainchain/bitcoin/nodejs/ts/wasm/bitcoin_bindings_bg.wasm
-var bitcoin_bindings_bg_default = "./bitcoin_bindings_bg-G57R5LDM.wasm";
+var bitcoin_bindings_bg_default = "./bitcoin_bindings_bg-RU6TWQ7W.wasm";
 
 // ts/wasm/bitcoin_bindings_bg.js
 var BitcoinNetwork = Object.freeze({
@@ -64,7 +65,7 @@ var BitcoinNetwork = Object.freeze({
   Regtest: 3,
   "3": "Regtest"
 });
-function calculateFee(vault_pubkey_hex, vault_claim_pubkey_hex, owner_pubkey_hex, vault_claim_height, open_claim_height, created_at_height, bitcoin_network, fee_rate_sats_per_vb, to_script_pubkey) {
+function calculateFee(vault_pubkey_hex, vault_claim_pubkey_hex, owner_pubkey_hex, vault_claim_height, open_claim_height, created_at_height, bitcoin_network, fee_rate_sats_per_vb, input_count, to_script_pubkey, has_change) {
   const ptr0 = passStringToWasm0(vault_pubkey_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
   const len0 = WASM_VECTOR_LEN;
   const ptr1 = passStringToWasm0(vault_claim_pubkey_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -73,7 +74,7 @@ function calculateFee(vault_pubkey_hex, vault_claim_pubkey_hex, owner_pubkey_hex
   const len2 = WASM_VECTOR_LEN;
   const ptr3 = passStringToWasm0(to_script_pubkey, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
   const len3 = WASM_VECTOR_LEN;
-  const ret = wasm.calculateFee(ptr0, len0, ptr1, len1, ptr2, len2, vault_claim_height, open_claim_height, created_at_height, bitcoin_network, fee_rate_sats_per_vb, ptr3, len3);
+  const ret = wasm.calculateFee(ptr0, len0, ptr1, len1, ptr2, len2, vault_claim_height, open_claim_height, created_at_height, bitcoin_network, fee_rate_sats_per_vb, input_count, ptr3, len3, has_change);
   if (ret[2]) {
     throw takeFromExternrefTable0(ret[1]);
   }
@@ -104,11 +105,11 @@ function createCosignPubkey(vault_pubkey_hex, vault_claim_pubkey_hex, owner_pubk
     wasm.__wbindgen_free(deferred5_0, deferred5_1, 1);
   }
 }
-function getCosignPsbt(txid, vout, satoshis, vault_pubkey_hex, vault_claim_pubkey_hex, owner_pubkey_hex, vault_claim_height, open_claim_height, created_at_height, bitcoin_network, to_script_pubkey_hex, bitcoin_network_fee) {
+function getCosignPsbt(utxos, vault_pubkey_hex, vault_claim_pubkey_hex, owner_pubkey_hex, vault_claim_height, open_claim_height, created_at_height, bitcoin_network, to_script_pubkey_hex, destination_satoshis, change_satoshis, bitcoin_network_fee) {
   let deferred7_0;
   let deferred7_1;
   try {
-    const ptr0 = passStringToWasm0(txid, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr0 = passArrayJsValueToWasm0(utxos, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
     const ptr1 = passStringToWasm0(vault_pubkey_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len1 = WASM_VECTOR_LEN;
@@ -118,7 +119,7 @@ function getCosignPsbt(txid, vout, satoshis, vault_pubkey_hex, vault_claim_pubke
     const len3 = WASM_VECTOR_LEN;
     const ptr4 = passStringToWasm0(to_script_pubkey_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len4 = WASM_VECTOR_LEN;
-    const ret = wasm.getCosignPsbt(ptr0, len0, vout, satoshis, ptr1, len1, ptr2, len2, ptr3, len3, vault_claim_height, open_claim_height, created_at_height, bitcoin_network, ptr4, len4, bitcoin_network_fee);
+    const ret = wasm.getCosignPsbt(ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, vault_claim_height, open_claim_height, created_at_height, bitcoin_network, ptr4, len4, destination_satoshis, change_satoshis, bitcoin_network_fee);
     var ptr6 = ret[0];
     var len6 = ret[1];
     if (ret[3]) {
@@ -199,6 +200,10 @@ function __wbg_new_8a6f238a6ece86ea() {
   const ret = new Error();
   return ret;
 }
+function __wbg_satoshis_653e28e5089976d5(arg0) {
+  const ret = arg0.satoshis;
+  return ret;
+}
 function __wbg_stack_0ed75d68575b0f3c(arg0, arg1) {
   const ret = arg1.stack;
   const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -206,6 +211,17 @@ function __wbg_stack_0ed75d68575b0f3c(arg0, arg1) {
   getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
   getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }
+function __wbg_txid_0d4259ca3791e85a(arg0, arg1) {
+  const ret = arg1.txid;
+  const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+  const len1 = WASM_VECTOR_LEN;
+  getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+  getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+}
+function __wbg_vout_467ff75deafa6784(arg0) {
+  const ret = arg0.vout;
+  return ret;
+}
 function __wbindgen_cast_0000000000000001(arg0, arg1) {
   const ret = getStringFromWasm0(arg0, arg1);
   return ret;
@@ -219,6 +235,11 @@ function __wbindgen_init_externref_table() {
   table.set(offset + 2, true);
   table.set(offset + 3, false);
 }
+function addToExternrefTable0(obj) {
+  const idx = wasm.__externref_table_alloc();
+  wasm.__wbindgen_externrefs.set(idx, obj);
+  return idx;
+}
 var cachedDataViewMemory0 = null;
 function getDataViewMemory0() {
   if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || cachedDataViewMemory0.buffer.detached === void 0 && cachedDataViewMemory0.buffer !== wasm.memory.buffer) {
@@ -237,6 +258,15 @@ function getUint8ArrayMemory0() {
   }
   return cachedUint8ArrayMemory0;
 }
+function passArrayJsValueToWasm0(array, malloc) {
+  const ptr = malloc(array.length * 4, 4) >>> 0;
+  for (let i = 0; i < array.length; i++) {
+    const add = addToExternrefTable0(array[i]);
+    getDataViewMemory0().setUint32(ptr + 4 * i, add, true);
+  }
+  WASM_VECTOR_LEN = array.length;
+  return ptr;
+}
 function passStringToWasm0(arg, malloc, realloc) {
   if (realloc === void 0) {
     const buf = cachedTextEncoder.encode(arg);
@@ -305,6 +335,9 @@ function __wbg_set_wasm(val) {
 // wasm-module:/home/runner/work/mainchain/mainchain/bitcoin/nodejs/ts/wasm/bitcoin_bindings_bg.wasm
 var imports = {
   ["./bitcoin_bindings_bg.js"]: {
+    __wbg_txid_0d4259ca3791e85a,
+    __wbg_vout_467ff75deafa6784,
+    __wbg_satoshis_653e28e5089976d5,
     __wbg_new_8a6f238a6ece86ea,
     __wbg_stack_0ed75d68575b0f3c,
     __wbg_error_7534b8e9a36f1ab4,
@@ -355,6 +388,7 @@ var __wbindgen_malloc = instance.exports.__wbindgen_malloc;
 var __wbindgen_realloc = instance.exports.__wbindgen_realloc;
 var __wbindgen_externrefs = instance.exports.__wbindgen_externrefs;
 var __externref_table_dealloc = instance.exports.__externref_table_dealloc;
+var __externref_table_alloc = instance.exports.__externref_table_alloc;
 var __wbindgen_start = instance.exports.__wbindgen_start;
 
 // ts/wasm/bitcoin_bindings.js
@@ -367,6 +401,7 @@ import { bech32 } from "@scure/base";
 import { HDKey } from "@scure/bip32";
 import { hexToU8a, u8aToHex } from "@argonprotocol/mainchain";
 import * as secp256k1 from "@noble/secp256k1";
+import bs58check from "bs58check";
 function getBip32Version(network) {
   if (!network) {
     return void 0;
@@ -396,6 +431,13 @@ function getChildXpriv(bip39Seed, hdPath, network) {
 function getXpubFromXpriv(xpriv) {
   return xpriv.publicExtendedKey;
 }
+function getXpubBytes(xpub) {
+  const bytes = bs58check.decode(xpub);
+  if (bytes.length !== 78) {
+    throw new Error("Invalid Bitcoin xpub key length, must be 78 bytes");
+  }
+  return bytes;
+}
 function getCompressedPubkey(pubkey) {
   const pubkeyUint8Array = keyToU8a(pubkey);
   if (pubkeyUint8Array.length === 33) {
@@ -455,15 +497,15 @@ var CosignScript = class {
     this.network = network;
   }
   getFundingPsbt() {
-    const { lock, network } = this;
+    const { lock } = this;
     const tx = new Transaction();
     tx.addOutput({
       script: keyToU8a(lock.p2wshScriptHashHex),
-      amount: lock.utxoSatoshis ?? lock.satoshis
+      amount: lock.securitizedSatoshis
     });
     return tx.toPSBT(0);
   }
-  calculateFee(feeRatePerSatVb, toScriptPubkey) {
+  calculateFee(feeRatePerSatVb, inputCount, toScriptPubkey, hasChange) {
     toScriptPubkey = addressBytesHex(toScriptPubkey, this.network);
     const { lock, network } = this;
     return calculateFee(
@@ -475,7 +517,9 @@ var CosignScript = class {
       BigInt(lock.createdAtHeight),
       network,
       feeRatePerSatVb,
-      toScriptPubkey
+      inputCount,
+      toScriptPubkey,
+      hasChange
     );
   }
   calculateScriptPubkey() {
@@ -492,12 +536,14 @@ var CosignScript = class {
   }
   getCosignPsbt(args) {
     const { lock, network } = this;
-    const { releaseRequest, utxoRef, utxoSatoshis } = args;
-    releaseRequest.toScriptPubkey = addressBytesHex(releaseRequest.toScriptPubkey, network);
+    const { releaseRequest, utxos } = args;
+    const toScriptPubkey = addressBytesHex(releaseRequest.toScriptPubkey, network);
     const psbtStr = getCosignPsbt(
-      utxoRef.txid,
-      utxoRef.vout,
-      utxoSatoshis ?? lock.utxoSatoshis ?? lock.satoshis,
+      utxos.map((x) => ({
+        txid: x.utxoRef.txid,
+        vout: x.utxoRef.vout,
+        satoshis: x.satoshis
+      })),
       lock.vaultPubkey,
       lock.vaultClaimPubkey,
       lock.ownerPubkey,
@@ -505,7 +551,9 @@ var CosignScript = class {
       BigInt(lock.openClaimHeight),
       BigInt(lock.createdAtHeight),
       network,
-      releaseRequest.toScriptPubkey,
+      toScriptPubkey,
+      releaseRequest.destinationSatoshis,
+      releaseRequest.changeSatoshis,
       releaseRequest.bitcoinNetworkFee
     );
     return this.psbtFromHex(psbtStr);
@@ -564,10 +612,15 @@ var CosignScript = class {
   cosignAndGenerateTx(args) {
     const { lock } = this;
     const psbt = this.getCosignPsbt(args);
-    const { addTx, vaultCosignature, ownerXpriv, ownerXprivChildHdPath } = args;
-    psbt.updateInput(0, {
-      partialSig: [[keyToU8a(lock.vaultPubkey), vaultCosignature]]
-    });
+    const { vaultCosignatures, ownerXpriv, ownerXprivChildHdPath } = args;
+    if (vaultCosignatures.length !== psbt.inputsLength) {
+      throw new Error("Vault signature count does not match the Bitcoin lock input count");
+    }
+    for (let i = 0; i < vaultCosignatures.length; i++) {
+      psbt.updateInput(i, {
+        partialSig: [[keyToU8a(lock.vaultPubkey), vaultCosignatures[i]]]
+      });
+    }
     const derivePubkey = ownerXprivChildHdPath ? ownerXpriv.derive(ownerXprivChildHdPath).publicKey : ownerXpriv.publicKey;
     if (!derivePubkey) {
       throw new Error("Failed to derive owner public key");
@@ -578,30 +631,6 @@ var CosignScript = class {
         `Owner pubkey ${u8aToHex2(ownerPubkey)} does not match the derived pubkey ${u8aToHex2(derivePubkey)}`
       );
     }
-    if (addTx) {
-      const addTxBytes = hexToU8a2(addTx);
-      const tx = Transaction.fromPSBT(addTxBytes);
-      for (let i = 0; i < tx.outputsLength; i++) {
-        const output = tx.getOutput(i);
-        const network = getScureNetwork(this.network);
-        const scripts = [
-          p2wpkh(ownerPubkey, network).script,
-          p2wsh(p2wpkh(ownerPubkey, network), network).script,
-          p2sh(p2pkh(ownerPubkey, network), network).script,
-          p2pkh(ownerPubkey, network).script
-        ];
-        if (scripts.some((x) => x && output.script && u8aEq(output.script, x))) {
-          psbt.addInput({
-            txid: tx.id,
-            index: i,
-            witnessUtxo: {
-              script: output.script,
-              amount: output.amount
-            }
-          });
-        }
-      }
-    }
     const psbtBytes = u8aToHex2(psbt.toPSBT());
     const signedPsbt = ownerXprivChildHdPath ? signPsbtDerived(psbtBytes, ownerXpriv.privateExtendedKey, ownerXprivChildHdPath, true) : signPsbt(psbtBytes, this.network, u8aToHex2(ownerXpriv.privateKey, void 0, false), true);
     return this.psbtFromHex(signedPsbt);
@@ -636,12 +665,13 @@ export {
   getChildXpriv,
   getCompressedPubkey,
   getScureNetwork,
+  getXpubBytes,
   getXpubFromXpriv,
   keyToU8a,
   p2pk,
-  p2pkh2 as p2pkh,
-  p2sh2 as p2sh,
-  p2wpkh2 as p2wpkh,
-  p2wsh2 as p2wsh,
+  p2pkh,
+  p2sh,
+  p2wpkh,
+  p2wsh,
   p2wshScriptHexToAddress
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argonprotocol/bitcoin",
-  "version": "1.4.12",
+  "version": "1.4.13-dev.94019742",
   "description": "A client for interop with bitcoin in nodejs.",
   "repository": {
     "type": "git",
@@ -51,15 +51,16 @@
     "./browser/index.js"
   ],
   "dependencies": {
-    "@argonprotocol/mainchain": "1.4.12",
+    "@argonprotocol/mainchain": "1.4.13-dev.94019742",
     "@noble/secp256k1": "^2.3.0",
     "@scure/bip32": "^1.7.0",
     "@scure/bip39": "^1.6.0",
     "@scure/btc-signer": "^1.8.1",
-    "bignumber.js": "^9.3.1"
+    "bignumber.js": "^9.3.1",
+    "bs58check": "^4.0.0"
   },
   "devDependencies": {
-    "@argonprotocol/testing": "1.4.12",
+    "@argonprotocol/testing": "1.4.13-dev.94019742",
     "@types/node": "22.17.1",
     "esbuild-plugin-wasm": "^1.1.0",
     "tsup": "^8.5.0",