@atomicfinance/bitcoin-js-wallet-provider 3.5.3 → 3.6.1

package/dist/BitcoinJsWalletProvider.d.ts

@@ -1,11 +1,9 @@
 /// <reference types="node" />
-import Provider from '@atomicfinance/provider';
-import { Address, bitcoin as bT, CreateMultisigResponse, finalizePSBTResponse, Input, Output, Transaction } from '@atomicfinance/types';
+import { bitcoin as bT, CreateMultisigResponse, finalizePSBTResponse, Input, Output, Transaction } from '@atomicfinance/types';
 import { BIP32Interface } from 'bip32';
 import { BitcoinNetwork } from 'bitcoin-networks';
 import * as bitcoin from 'bitcoinjs-lib';
-import { ECPairInterface } from 'bitcoinjs-lib';
-type WalletProviderConstructor<T = Provider> = new (...args: any[]) => T;
+import { ECPairInterface } from 'ecpair';
 interface BitcoinJsWalletProviderOptions {
     network: BitcoinNetwork;
     mnemonic: string;
@@ -14,101 +12,8 @@ interface BitcoinJsWalletProviderOptions {
     addressIndex?: number;
     changeAddressIndex?: number;
 }
-declare const BitcoinJsWalletProvider_base: (abstract new (...args: any[]) => {
-    _network: BitcoinNetwork;
-    _unusedAddressesBlacklist: {
-        [address: string]: true;
-    };
-    _maxAddressesToDerive: number;
-    _baseDerivationPath: string;
-    _addressType: bT.AddressType;
-    _addressIndex: number;
-    _changeAddressIndex: number;
-    _derivationCache: {
-        [index: string]: Address;
-    };
-    baseDerivationNode(): Promise<BIP32Interface>;
-    _buildTransaction(targets: bT.OutputTarget[], feePerByte?: number, fixedInputs?: bT.Input[]): Promise<{
-        hex: string;
-        fee: number;
-    }>;
-    _buildSweepTransaction(externalChangeAddress: string, feePerByte?: number): Promise<{
-        hex: string;
-        fee: number;
-    }>;
-    signPSBT(data: string, inputs: bT.PsbtInputTarget[]): Promise<string>;
-    signBatchP2SHTransaction(inputs: [{
-        inputTxHex: string;
-        index: number;
-        vout: any;
-        outputScript: Buffer;
-    }], addresses: string, tx: any, lockTime?: number, segwit?: boolean): Promise<Buffer[]>;
-    getDerivationCache(): {
-        [index: string]: Address;
-    };
-    setDerivationCache(derivationCache: {
-        [index: string]: Address;
-    }): Promise<void>;
-    sendOptionsToOutputs(transactions: import("@atomicfinance/types").SendOptions[]): bT.OutputTarget[];
-    buildTransaction(output: bT.OutputTarget, feePerByte: number): Promise<{
-        hex: string;
-        fee: number;
-    }>;
-    buildBatchTransaction(outputs: bT.OutputTarget[]): Promise<{
-        hex: string;
-        fee: number;
-    }>;
-    _sendTransaction(transactions: bT.OutputTarget[], feePerByte?: number): Promise<Transaction<bT.Transaction>>;
-    sendTransaction(options: import("@atomicfinance/types").SendOptions): Promise<Transaction<bT.Transaction>>;
-    sendBatchTransaction(transactions: import("@atomicfinance/types").SendOptions[]): Promise<Transaction<bT.Transaction>>;
-    buildSweepTransaction(externalChangeAddress: string, feePerByte: number): Promise<{
-        hex: string;
-        fee: number;
-    }>;
-    sendSweepTransaction(externalChangeAddress: string | Address, feePerByte: number): Promise<Transaction<bT.Transaction>>;
-    getUnusedAddressesBlacklist(): {
-        [address: string]: true;
-    };
-    setUnusedAddressesBlacklist(unusedAddressesBlacklist: {
-        [address: string]: true;
-    }): void;
-    setMaxAddressesToDerive(maxAddressesToDerive: number): void;
-    getMaxAddressesToDerive(): number;
-    updateTransactionFee(tx: string | Transaction<bitcoin.Transaction>, newFeePerByte: number): Promise<Transaction<bT.Transaction>>;
-    getUnusedAddress(change?: boolean, numAddressPerCall?: number): Promise<any>;
-    _getUsedUnusedAddresses(numAddressPerCall: number, addressType: any): Promise<{
-        usedAddresses: any[];
-        unusedAddress: {
-            change: any;
-            nonChange: any;
-        };
-        firstUnusedAddress: any;
-    }>;
-    getWalletAddress(address: string): Promise<Address>;
-    getAddressFromPublicKey(publicKey: Buffer): string;
-    getPaymentVariantFromPublicKey(publicKey: Buffer): bitcoin.payments.Payment;
-    getDerivationPathAddress(path: string): Promise<Address>;
-    getAddresses(startingIndex?: number, numAddresses?: number, change?: boolean): Promise<Address[]>;
-    findAddress(addresses: string[], change?: boolean): Promise<Address>;
-    getUsedAddresses(numAddressPerCall?: number): Promise<any[]>;
-    withCachedUtxos(func: () => any): Promise<any>;
-    getTotalFee(opts: import("@atomicfinance/types").SendOptions, max: boolean): Promise<number>;
-    getTotalFees(transactions: import("@atomicfinance/types").SendOptions[], max: boolean): Promise<any>;
-    getInputsForAmount(_targets: bT.OutputTarget[], feePerByte?: number, fixedInputs?: bT.Input[], numAddressPerCall?: number, sweep?: boolean): Promise<{
-        inputs: bT.UTXO[];
-        change: import("@atomicfinance/bitcoin-utils").CoinSelectTarget;
-        outputs: import("@atomicfinance/bitcoin-utils").CoinSelectTarget[];
-        fee: number;
-    }>;
-    getInputsForDualFunding(collaterals: number[], feePerByte?: number, fixedInputs?: bT.Input[], numAddressPerCall?: number): Promise<{
-        inputs: import("@node-dlc/core").UTXO[];
-        fee: bigint;
-    }>;
-    client: import("@atomicfinance/types").IClient;
-    setClient(client?: import("@atomicfinance/types").IClient): void;
-    getMethod(method: string, requestor?: any): (...args: any[]) => any;
-}) & WalletProviderConstructor<Provider>;
-export default class BitcoinJsWalletProvider extends BitcoinJsWalletProvider_base {
+declare const BaseProvider: any;
+export default class BitcoinJsWalletProvider extends BaseProvider {
     _mnemonic: string;
     _seedNode: BIP32Interface;
     _baseDerivationNode: BIP32Interface;
@@ -182,11 +87,11 @@ export default class BitcoinJsWalletProvider extends BitcoinJsWalletProvider_bas
     }>;
     _buildTransaction(targets: bT.OutputTarget[], feePerByte?: number, fixedInputs?: bT.Input[]): Promise<{
         hex: string;
-        fee: number;
+        fee: any;
     }>;
     _buildSweepTransaction(externalChangeAddress: string, feePerByte: number): Promise<{
         hex: string;
-        fee: number;
+        fee: any;
     }>;
     signPSBT(data: string, inputs: bT.PsbtInputTarget[]): Promise<string>;
     signBatchP2SHTransaction(inputs: [
@@ -198,8 +103,8 @@ export default class BitcoinJsWalletProvider extends BitcoinJsWalletProvider_bas
             txInputIndex?: number;
         }
     ], addresses: string, tx: any, _lockTime?: number, segwit?: boolean): Promise<Buffer[]>;
-    getScriptType(): "p2wpkh" | "p2pkh" | "p2sh-p2wpkh";
-    getConnectedNetwork(): Promise<BitcoinNetwork>;
+    getScriptType(): "p2pkh" | "p2sh-p2wpkh" | "p2wpkh";
+    getConnectedNetwork(): Promise<any>;
     isWalletAvailable(): Promise<boolean>;
 }
 export {};

package/dist/BitcoinJsWalletProvider.js

@@ -35,10 +35,16 @@ const bip32_1 = require("bip32");
 const bip39_1 = require("bip39");
 const bitcoin = __importStar(require("bitcoinjs-lib"));
 const bitcoinjs_lib_1 = require("bitcoinjs-lib");
+const ecpair_1 = require("ecpair");
+const ecc = __importStar(require("tiny-secp256k1"));
+const ECPair = (0, ecpair_1.ECPairFactory)(ecc);
 const bitcoinjs_message_1 = require("bitcoinjs-message");
 const secp256k1_1 = __importDefault(require("secp256k1"));
 const FEE_PER_BYTE_FALLBACK = 5;
-class BitcoinJsWalletProvider extends (0, bitcoin_wallet_provider_1.default)(provider_1.default) {
+// TypeScript has difficulty inferring the complex return type of the mixin pattern
+// Using 'any' here is safe as we know the mixin returns the correct enhanced class
+const BaseProvider = (0, bitcoin_wallet_provider_1.default)(provider_1.default);
+class BitcoinJsWalletProvider extends BaseProvider {
     constructor(options) {
         const { network, mnemonic, baseDerivationPath, addressType = types_1.bitcoin.AddressType.BECH32, addressIndex = 0, changeAddressIndex = 0, } = options;
         super({
@@ -68,7 +74,7 @@ class BitcoinJsWalletProvider extends (0, bitcoin_wallet_provider_1.default)(pro
     }
     async keyPair(derivationPath) {
         const wif = await this._toWIF(derivationPath);
-        return bitcoinjs_lib_1.ECPair.fromWIF(wif, this._network);
+        return ECPair.fromWIF(wif, this._network);
     }
     async _toWIF(derivationPath) {
         const node = await this.seedNode();
@@ -178,7 +184,7 @@ class BitcoinJsWalletProvider extends (0, bitcoin_wallet_provider_1.default)(pro
                 psbt.signInput(i, keyPair);
             }));
         }));
-        psbt.validateSignaturesOfAllInputs(); // ensure all signatures are valid!
+        psbt.validateSignaturesOfAllInputs((pubkey, msghash, signature) => ecc.verify(msghash, pubkey, signature)); // ensure all signatures are valid!
         return psbt.toBase64();
     }
     /**
@@ -192,7 +198,7 @@ class BitcoinJsWalletProvider extends (0, bitcoin_wallet_provider_1.default)(pro
     finalizePSBT(psbtString) {
         const psbt = bitcoin.Psbt.fromBase64(psbtString);
         try {
-            psbt.validateSignaturesOfAllInputs(); // ensure all signatures are valid!
+            psbt.validateSignaturesOfAllInputs((pubkey, msghash, signature) => ecc.verify(msghash, pubkey, signature)); // ensure all signatures are valid!
             psbt.finalizeAllInputs();
         }
         catch (error) {
@@ -265,35 +271,49 @@ class BitcoinJsWalletProvider extends (0, bitcoin_wallet_provider_1.default)(pro
         const network = this._network;
         const { fee } = this._getInputForAmountWithoutUtxoCheck(outputs, feePerByte, fixedInputs);
         const inputs = fixedInputs;
-        const txb = new bitcoin.TransactionBuilder(network);
-        for (const output of outputs) {
-            const to = output.to; // Allow for OP_RETURN
-            txb.addOutput(to, output.value);
-        }
-        const prevOutScriptType = 'p2wpkh';
+        const psbt = new bitcoinjs_lib_1.Psbt({ network });
+        const needsWitness = [
+            types_1.bitcoin.AddressType.BECH32,
+            types_1.bitcoin.AddressType.P2SH_SEGWIT,
+        ].includes(this._addressType);
         for (let i = 0; i < inputs.length; i++) {
             const wallet = await this.getWalletAddress(inputs[i].address);
             const keyPair = await this.keyPair(wallet.derivationPath);
             const paymentVariant = this.getPaymentVariantFromPublicKey(keyPair.publicKey);
-            txb.addInput(inputs[i].txid, inputs[i].vout, 0, paymentVariant.output);
+            const psbtInput = {
+                hash: inputs[i].txid,
+                index: inputs[i].vout,
+                sequence: 0,
+            };
+            if (needsWitness) {
+                psbtInput.witnessUtxo = {
+                    script: paymentVariant.output,
+                    value: inputs[i].value,
+                };
+            }
+            else {
+                const inputTxRaw = await this.getMethod('getRawTransactionByHash')(inputs[i].txid);
+                psbtInput.nonWitnessUtxo = Buffer.from(inputTxRaw, 'hex');
+            }
+            if (this._addressType === types_1.bitcoin.AddressType.P2SH_SEGWIT) {
+                psbtInput.redeemScript = paymentVariant.redeem.output;
+            }
+            psbt.addInput(psbtInput);
+        }
+        for (const output of outputs) {
+            psbt.addOutput({
+                value: output.value,
+                address: output.to,
+            });
         }
         for (let i = 0; i < inputs.length; i++) {
             const wallet = await this.getWalletAddress(inputs[i].address);
             const keyPair = await this.keyPair(wallet.derivationPath);
-            const paymentVariant = this.getPaymentVariantFromPublicKey(keyPair.publicKey);
-            const needsWitness = true;
-            const signParams = {
-                prevOutScriptType,
-                vin: i,
-                keyPair,
-                witnessValue: 0,
-            };
-            if (needsWitness) {
-                signParams.witnessValue = inputs[i].value;
-            }
-            txb.sign(signParams);
+            psbt.signInput(i, keyPair);
+            psbt.validateSignaturesOfInput(i, (pubkey, msghash, signature) => ecc.verify(msghash, pubkey, signature));
         }
-        return { hex: txb.build().toHex(), fee };
+        psbt.finalizeAllInputs();
+        return { hex: psbt.extractTransaction().toHex(), fee };
     }
     async _buildTransaction(targets, feePerByte, fixedInputs) {
         const network = this._network;
@@ -352,7 +372,7 @@ class BitcoinJsWalletProvider extends (0, bitcoin_wallet_provider_1.default)(pro
             const wallet = await this.getWalletAddress(inputs[i].address);
             const keyPair = await this.keyPair(wallet.derivationPath);
             psbt.signInput(i, keyPair);
-            psbt.validateSignaturesOfInput(i);
+            psbt.validateSignaturesOfInput(i, (pubkey, msghash, signature) => ecc.verify(msghash, pubkey, signature));
         }
         psbt.finalizeAllInputs();
         return { hex: psbt.extractTransaction().toHex(), fee };

package/dist/BitcoinJsWalletProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"BitcoinJsWalletProvider.js","sourceRoot":"","sources":["../lib/BitcoinJsWalletProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BitcoinJsWalletProvider.js","sourceRoot":"","sources":["../lib/BitcoinJsWalletProvider.ts"],"names":[],"mappings":"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"}

package/lib/BitcoinJsWalletProvider.ts

@@ -20,12 +20,14 @@ import { mnemonicToSeed } from 'bip39';
 import { BitcoinNetwork } from 'bitcoin-networks';
 import * as bitcoin from 'bitcoinjs-lib';
 import {
-  ECPair,
-  ECPairInterface,
   Psbt,
   script,
   Transaction as BitcoinJsTransaction,
 } from 'bitcoinjs-lib';
+import { ECPairFactory, ECPairInterface } from 'ecpair';
+import * as ecc from 'tiny-secp256k1';
+
+const ECPair = ECPairFactory(ecc);
 import { signAsync as signBitcoinMessage } from 'bitcoinjs-message';
 import secp256k1 from 'secp256k1';
 
@@ -33,6 +35,8 @@ const FEE_PER_BYTE_FALLBACK = 5;
 
 type WalletProviderConstructor<T = Provider> = new (...args: any[]) => T;
 
+type BaseWalletProvider = ReturnType<typeof BitcoinWalletProvider>;
+
 interface BitcoinJsWalletProviderOptions {
   network: BitcoinNetwork;
   mnemonic: string;
@@ -42,9 +46,13 @@ interface BitcoinJsWalletProviderOptions {
   changeAddressIndex?: number;
 }
 
-export default class BitcoinJsWalletProvider extends BitcoinWalletProvider(
+// TypeScript has difficulty inferring the complex return type of the mixin pattern
+// Using 'any' here is safe as we know the mixin returns the correct enhanced class
+const BaseProvider: any = BitcoinWalletProvider(
   Provider as WalletProviderConstructor,
-) {
+);
+
+export default class BitcoinJsWalletProvider extends BaseProvider {
   _mnemonic: string;
   _seedNode: BIP32Interface;
   _baseDerivationNode: BIP32Interface;
@@ -248,7 +256,10 @@ export default class BitcoinJsWalletProvider extends BitcoinWalletProvider(
       }),
     );
 
-    psbt.validateSignaturesOfAllInputs(); // ensure all signatures are valid!
+    psbt.validateSignaturesOfAllInputs(
+      (pubkey: Buffer, msghash: Buffer, signature: Buffer) =>
+        ecc.verify(msghash, pubkey, signature),
+    ); // ensure all signatures are valid!
     return psbt.toBase64();
   }
 
@@ -264,7 +275,10 @@ export default class BitcoinJsWalletProvider extends BitcoinWalletProvider(
     const psbt = bitcoin.Psbt.fromBase64(psbtString);
 
     try {
-      psbt.validateSignaturesOfAllInputs(); // ensure all signatures are valid!
+      psbt.validateSignaturesOfAllInputs(
+        (pubkey: Buffer, msghash: Buffer, signature: Buffer) =>
+          ecc.verify(msghash, pubkey, signature),
+      ); // ensure all signatures are valid!
       psbt.finalizeAllInputs();
     } catch (error) {
       return {
@@ -423,14 +437,12 @@ export default class BitcoinJsWalletProvider extends BitcoinWalletProvider(
     );
     const inputs = fixedInputs;
 
-    const txb = new bitcoin.TransactionBuilder(network);
-
-    for (const output of outputs) {
-      const to = output.to; // Allow for OP_RETURN
-      txb.addOutput(to, output.value);
-    }
+    const psbt = new Psbt({ network });
 
-    const prevOutScriptType = 'p2wpkh';
+    const needsWitness = [
+      bT.AddressType.BECH32,
+      bT.AddressType.P2SH_SEGWIT,
+    ].includes(this._addressType);
 
     for (let i = 0; i < inputs.length; i++) {
       const wallet = await this.getWalletAddress(inputs[i].address);
@@ -439,32 +451,52 @@ export default class BitcoinJsWalletProvider extends BitcoinWalletProvider(
         keyPair.publicKey,
       );
 
-      txb.addInput(inputs[i].txid, inputs[i].vout, 0, paymentVariant.output);
+      const psbtInput: any = {
+        hash: inputs[i].txid,
+        index: inputs[i].vout,
+        sequence: 0,
+      };
+
+      if (needsWitness) {
+        psbtInput.witnessUtxo = {
+          script: paymentVariant.output,
+          value: inputs[i].value,
+        };
+      } else {
+        const inputTxRaw = await this.getMethod('getRawTransactionByHash')(
+          inputs[i].txid,
+        );
+        psbtInput.nonWitnessUtxo = Buffer.from(inputTxRaw, 'hex');
+      }
+
+      if (this._addressType === bT.AddressType.P2SH_SEGWIT) {
+        psbtInput.redeemScript = paymentVariant.redeem.output;
+      }
+
+      psbt.addInput(psbtInput);
+    }
+
+    for (const output of outputs) {
+      psbt.addOutput({
+        value: output.value,
+        address: output.to,
+      });
     }
 
     for (let i = 0; i < inputs.length; i++) {
       const wallet = await this.getWalletAddress(inputs[i].address);
       const keyPair = await this.keyPair(wallet.derivationPath);
-      const paymentVariant = this.getPaymentVariantFromPublicKey(
-        keyPair.publicKey,
+      psbt.signInput(i, keyPair);
+      psbt.validateSignaturesOfInput(
+        i,
+        (pubkey: Buffer, msghash: Buffer, signature: Buffer) =>
+          ecc.verify(msghash, pubkey, signature),
       );
-      const needsWitness = true;
-
-      const signParams = {
-        prevOutScriptType,
-        vin: i,
-        keyPair,
-        witnessValue: 0,
-      };
-
-      if (needsWitness) {
-        signParams.witnessValue = inputs[i].value;
-      }
-
-      txb.sign(signParams);
     }
 
-    return { hex: txb.build().toHex(), fee };
+    psbt.finalizeAllInputs();
+
+    return { hex: psbt.extractTransaction().toHex(), fee };
   }
 
   async _buildTransaction(
@@ -545,7 +577,11 @@ export default class BitcoinJsWalletProvider extends BitcoinWalletProvider(
       const wallet = await this.getWalletAddress(inputs[i].address);
       const keyPair = await this.keyPair(wallet.derivationPath);
       psbt.signInput(i, keyPair);
-      psbt.validateSignaturesOfInput(i);
+      psbt.validateSignaturesOfInput(
+        i,
+        (pubkey: Buffer, msghash: Buffer, signature: Buffer) =>
+          ecc.verify(msghash, pubkey, signature),
+      );
     }
 
     psbt.finalizeAllInputs();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomicfinance/bitcoin-js-wallet-provider",
-  "version": "3.5.3",
+  "version": "3.6.1",
   "description": "",
   "module": "dist/index.js",
   "main": "dist/index.js",
@@ -24,18 +24,20 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@atomicfinance/bitcoin-utils": "^3.5.3",
-    "@atomicfinance/bitcoin-wallet-provider": "^3.5.3",
-    "@atomicfinance/types": "^3.5.3",
-    "@atomicfinance/utils": "^3.5.3",
+    "@atomicfinance/bitcoin-utils": "^3.6.1",
+    "@atomicfinance/bitcoin-wallet-provider": "^3.6.1",
+    "@atomicfinance/types": "^3.6.1",
+    "@atomicfinance/utils": "^3.6.1",
     "@babel/runtime": "^7.12.1",
-    "@node-dlc/core": "0.23.6",
+    "@node-dlc/core": "0.24.0",
     "bip32": "^2.0.6",
     "bip39": "^3.0.2",
     "bitcoin-networks": "^1.0.0",
-    "bitcoinjs-lib": "5.2.0",
+    "bitcoinjs-lib": "6.1.7",
     "bitcoinjs-message": "^2.1.0",
-    "secp256k1": "^4.0.3"
+    "ecpair": "^2.1.0",
+    "secp256k1": "^4.0.3",
+    "tiny-secp256k1": "^2.2.0"
   },
   "publishConfig": {
     "access": "public"

package/lib/BitcoinJsWalletProvider.js

@@ -1,424 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const bitcoin_utils_1 = require("@atomicfinance/bitcoin-utils");
-const bitcoin_wallet_provider_1 = __importDefault(require("@atomicfinance/bitcoin-wallet-provider"));
-const provider_1 = __importDefault(require("@atomicfinance/provider"));
-const types_1 = require("@atomicfinance/types");
-const assert_1 = __importDefault(require("assert"));
-const bip32_1 = require("bip32");
-const bip39_1 = require("bip39");
-const bitcoin = __importStar(require("bitcoinjs-lib"));
-const bitcoinjs_lib_1 = require("bitcoinjs-lib");
-const bitcoinjs_message_1 = require("bitcoinjs-message");
-const secp256k1_1 = __importDefault(require("secp256k1"));
-const FEE_PER_BYTE_FALLBACK = 5;
-class BitcoinJsWalletProvider extends (0, bitcoin_wallet_provider_1.default)(provider_1.default) {
-    constructor(options) {
-        const { network, mnemonic, baseDerivationPath, addressType = types_1.bitcoin.AddressType.BECH32, addressIndex = 0, changeAddressIndex = 0, } = options;
-        super({
-            network,
-            baseDerivationPath,
-            addressType,
-            addressIndex,
-            changeAddressIndex,
-        });
-        if (!mnemonic)
-            throw new Error('Mnemonic should not be empty');
-        this._mnemonic = mnemonic;
-    }
-    async seedNode() {
-        if (this._seedNode)
-            return this._seedNode;
-        const seed = await (0, bip39_1.mnemonicToSeed)(this._mnemonic);
-        this._seedNode = (0, bip32_1.fromSeed)(seed, this._network);
-        return this._seedNode;
-    }
-    async baseDerivationNode() {
-        if (this._baseDerivationNode)
-            return this._baseDerivationNode;
-        const baseNode = await this.seedNode();
-        this._baseDerivationNode = baseNode.derivePath(this._baseDerivationPath);
-        return this._baseDerivationNode;
-    }
-    async keyPair(derivationPath) {
-        const wif = await this._toWIF(derivationPath);
-        return bitcoinjs_lib_1.ECPair.fromWIF(wif, this._network);
-    }
-    async _toWIF(derivationPath) {
-        const node = await this.seedNode();
-        return node.derivePath(derivationPath).toWIF();
-    }
-    async exportPrivateKey() {
-        return this._toWIF(this._baseDerivationPath);
-    }
-    async signMessage(message, from) {
-        const address = await this.getWalletAddress(from);
-        const keyPair = await this.keyPair(address.derivationPath);
-        const signature = await (0, bitcoinjs_message_1.signAsync)(message, keyPair.privateKey, keyPair.compressed);
-        return signature.toString('hex');
-    }
-    _createMultisigPayment(m, pubkeys) {
-        if (m > pubkeys.length) {
-            throw new Error(`not enough keys supplied (got ${pubkeys.length} keys, but need at least ${m} to redeem)`);
-        }
-        // Create m-of-n multisig
-        const p2ms = bitcoin.payments.p2ms({
-            m: m,
-            pubkeys: pubkeys.map((key) => Buffer.from(key, 'hex')),
-            network: this._network,
-        });
-        // Create p2wsh for multisig
-        const p2wsh = bitcoin.payments.p2wsh({
-            redeem: p2ms,
-            network: this._network,
-        });
-        return p2wsh;
-    }
-    /**
-     * Creates a native-segwit multi-signature address (P2MS in P2WSH) with n signatures of m required keys
-     * https://developer.bitcoin.org/reference/rpc/createmultisig.html
-     * @param m the number of required signatures
-     * @param pubkeys n possible pubkeys in total
-     * @returns a json object containing the `address` and `redeemScript`
-     */
-    createMultisig(m, pubkeys) {
-        const p2wsh = this._createMultisigPayment(m, pubkeys);
-        return {
-            address: p2wsh.address,
-            redeemScript: p2wsh.redeem?.output?.toString('hex'),
-        };
-    }
-    /**
-     * Creates a PSBT of a native-segwit multi-signature address (P2MS in P2WSH) with n signatures of m required keys
-     * https://developer.bitcoin.org/reference/rpc/createmultisig.html
-     * https://developer.bitcoin.org/reference/rpc/createpsbt.html
-     * @param m the number of required signatures
-     * @param pubkeys n possible pubkeys in total
-     * @param inputs the Inputs to the PSBT
-     * @param ouputs the Outputs to the PSBT
-     * @returns a base64 encoded psbt string
-     */
-    buildMultisigPSBT(m, pubkeys, inputs, outputs) {
-        (0, assert_1.default)(inputs.length > 0, 'no inputs found');
-        (0, assert_1.default)(outputs.length > 0, 'no outputs found');
-        const p2wsh = this._createMultisigPayment(m, pubkeys);
-        // Verify pubkeyhash for all inputs matches the p2wsh hash
-        (0, assert_1.default)(inputs.every((input) => p2wsh.output.toString('hex') === input.scriptPubKey), 'address pubkeyhash does not match input scriptPubKey');
-        // creator
-        const psbt = new bitcoin.Psbt({ network: this._network });
-        // updater
-        inputs.forEach((input) => {
-            psbt.addInput({
-                hash: input.txid,
-                index: input.vout,
-                witnessUtxo: { script: p2wsh.output, value: input.value },
-                witnessScript: p2wsh.redeem.output,
-            });
-        });
-        outputs.forEach((output) => {
-            psbt.addOutput({
-                address: output.to,
-                value: output.value,
-            });
-        });
-        return psbt.toBase64();
-    }
-    /**
-     * Update a PSBT with input information from our wallet and then sign inputs that we can sign for
-     * https://developer.bitcoin.org/reference/rpc/walletprocesspsbt.html
-     * @param psbt a base64 encoded psbt string (P2WSH only)
-     * @returns a base64 encoded signed psbt string
-     */
-    async walletProcessPSBT(psbtString) {
-        const psbt = bitcoin.Psbt.fromBase64(psbtString);
-        await Promise.all(psbt.data.inputs.map(async (input, i) => {
-            (0, assert_1.default)(psbt.getInputType(i).slice(0, 5) === 'p2wsh', 'only accepts P2WSH inputs');
-            const scriptStack = bitcoin.script.decompile(input.witnessScript);
-            const pubkeys = scriptStack.filter((data) => Buffer.isBuffer(data) && secp256k1_1.default.publicKeyVerify(data));
-            await Promise.all(pubkeys.map(async (key) => {
-                // create address using pubkey
-                const { address: addressString } = bitcoin.payments.p2wpkh({
-                    pubkey: key,
-                    network: this._network,
-                });
-                // Retrieve address object from wallet using address
-                const address = await this.findAddress([addressString]);
-                // exit if address doesn't exist in wallet
-                if (!address)
-                    return;
-                // derive keypair
-                const keyPair = await this.keyPair(address.derivationPath);
-                // sign PSBT using keypair
-                psbt.signInput(i, keyPair);
-            }));
-        }));
-        psbt.validateSignaturesOfAllInputs(); // ensure all signatures are valid!
-        return psbt.toBase64();
-    }
-    /**
-     * Finalize the inputs of a PSBT. If the transaction is fully signed, it will
-     * produce a network serialized transaction which can be broadcast with sendrawtransaction
-     * https://developer.bitcoin.org/reference/rpc/finalizepsbt.html
-     * @param psbt a base64 encoded psbt string
-     * @returns a json object containing `psbt` in base64, `hex` for transaction and `complete` for if
-     * the transaction has a complete set of signatures
-     */
-    finalizePSBT(psbtString) {
-        const psbt = bitcoin.Psbt.fromBase64(psbtString);
-        try {
-            psbt.validateSignaturesOfAllInputs(); // ensure all signatures are valid!
-            psbt.finalizeAllInputs();
-        }
-        catch (error) {
-            return {
-                psbt: psbt.toBase64(),
-                complete: false,
-            };
-        }
-        return {
-            psbt: psbt.toBase64(),
-            hex: psbt.extractTransaction().toHex(),
-            complete: true,
-        };
-    }
-    async sendSweepTransactionWithSetOutputs(externalChangeAddress, feePerByte, _outputs, fixedInputs) {
-        const { hex, fee } = await this._buildSweepTransactionWithSetOutputs(externalChangeAddress, feePerByte, _outputs, fixedInputs);
-        await this.getMethod('sendRawTransaction')(hex);
-        return (0, bitcoin_utils_1.normalizeTransactionObject)((0, bitcoin_utils_1.decodeRawTransaction)(hex, this._network), fee);
-    }
-    async buildSweepTransactionWithSetOutputs(externalChangeAddress, feePerByte, _outputs, fixedInputs) {
-        return this._buildSweepTransactionWithSetOutputs(externalChangeAddress, feePerByte, _outputs, fixedInputs);
-    }
-    async _buildSweepTransactionWithSetOutputs(externalChangeAddress, feePerByte, _outputs = [], fixedInputs) {
-        const _feePerByte = feePerByte ||
-            (await this.getMethod('getFeePerByte')()) ||
-            FEE_PER_BYTE_FALLBACK;
-        const inputs = [];
-        const outputs = [];
-        try {
-            const inputsForAmount = await this.getInputsForAmount(_outputs, _feePerByte, fixedInputs, 100, true);
-            if (inputsForAmount.change) {
-                throw Error('There should not be any change for sweeping transaction');
-            }
-            inputs.push(...(inputsForAmount.inputs || []));
-            outputs.push(...(inputsForAmount.outputs || []));
-        }
-        catch (e) {
-            if (fixedInputs.length === 0) {
-                throw Error(`Inputs for amount doesn't exist and no fixedInputs provided`);
-            }
-            const inputsForAmount = await this._getInputForAmountWithoutUtxoCheck(_outputs, _feePerByte, fixedInputs);
-            inputs.push(...(inputsForAmount.inputs.map((utxo) => types_1.Input.fromUTXO(utxo)) || []));
-            outputs.push(...(inputsForAmount.outputs || []));
-        }
-        _outputs.forEach((output) => {
-            const spliceIndex = outputs.findIndex((sweepOutput) => output.value === sweepOutput.value);
-            outputs.splice(spliceIndex, 1);
-        });
-        _outputs.push({
-            to: externalChangeAddress,
-            value: outputs[0].value,
-        });
-        return this._buildTransactionWithoutUtxoCheck(_outputs, _feePerByte, inputs);
-    }
-    _getInputForAmountWithoutUtxoCheck(_outputs, _feePerByte, fixedInputs) {
-        const utxoBalance = fixedInputs.reduce((a, b) => a + (b['value'] || 0), 0);
-        const outputBalance = _outputs.reduce((a, b) => a + (b['value'] || 0), 0);
-        const amountToSend = utxoBalance -
-            _feePerByte * ((_outputs.length + 1) * 39 + fixedInputs.length * 153); // todo better calculation
-        const targets = _outputs.map((target, i) => ({
-            id: 'main',
-            value: target.value,
-        }));
-        if (amountToSend - outputBalance > 0) {
-            targets.push({ id: 'main', value: amountToSend - outputBalance });
-        }
-        return (0, bitcoin_utils_1.selectCoins)(fixedInputs, targets, Math.ceil(_feePerByte), fixedInputs);
-    }
-    async _buildTransactionWithoutUtxoCheck(outputs, feePerByte, fixedInputs) {
-        const network = this._network;
-        const { fee } = this._getInputForAmountWithoutUtxoCheck(outputs, feePerByte, fixedInputs);
-        const inputs = fixedInputs;
-        const txb = new bitcoin.TransactionBuilder(network);
-        for (const output of outputs) {
-            const to = output.to; // Allow for OP_RETURN
-            txb.addOutput(to, output.value);
-        }
-        const prevOutScriptType = 'p2wpkh';
-        for (let i = 0; i < inputs.length; i++) {
-            const wallet = await this.getWalletAddress(inputs[i].address);
-            const keyPair = await this.keyPair(wallet.derivationPath);
-            const paymentVariant = this.getPaymentVariantFromPublicKey(keyPair.publicKey);
-            txb.addInput(inputs[i].txid, inputs[i].vout, 0, paymentVariant.output);
-        }
-        for (let i = 0; i < inputs.length; i++) {
-            const wallet = await this.getWalletAddress(inputs[i].address);
-            const keyPair = await this.keyPair(wallet.derivationPath);
-            const paymentVariant = this.getPaymentVariantFromPublicKey(keyPair.publicKey);
-            const needsWitness = true;
-            const signParams = {
-                prevOutScriptType,
-                vin: i,
-                keyPair,
-                witnessValue: 0,
-            };
-            if (needsWitness) {
-                signParams.witnessValue = inputs[i].value;
-            }
-            txb.sign(signParams);
-        }
-        return { hex: txb.build().toHex(), fee };
-    }
-    async _buildTransaction(targets, feePerByte, fixedInputs) {
-        const network = this._network;
-        const unusedAddress = await this.getUnusedAddress(true);
-        const { inputs, change, fee } = await this.getInputsForAmount(targets, feePerByte, fixedInputs);
-        if (change) {
-            targets.push({
-                address: unusedAddress.address,
-                value: change.value,
-            });
-        }
-        const psbt = new bitcoinjs_lib_1.Psbt({ network });
-        const needsWitness = [
-            types_1.bitcoin.AddressType.BECH32,
-            types_1.bitcoin.AddressType.P2SH_SEGWIT,
-        ].includes(this._addressType);
-        for (let i = 0; i < inputs.length; i++) {
-            const wallet = await this.getWalletAddress(inputs[i].address);
-            const keyPair = await this.keyPair(wallet.derivationPath);
-            const paymentVariant = this.getPaymentVariantFromPublicKey(keyPair.publicKey);
-            const psbtInput = {
-                hash: inputs[i].txid,
-                index: inputs[i].vout,
-                sequence: 0,
-            };
-            if (needsWitness) {
-                psbtInput.witnessUtxo = {
-                    script: paymentVariant.output,
-                    value: inputs[i].value,
-                };
-            }
-            else {
-                const inputTxRaw = await this.getMethod('getRawTransactionByHash')(inputs[i].txid);
-                psbtInput.nonWitnessUtxo = Buffer.from(inputTxRaw, 'hex');
-            }
-            if (this._addressType === types_1.bitcoin.AddressType.P2SH_SEGWIT) {
-                psbtInput.redeemScript = paymentVariant.redeem.output;
-            }
-            psbt.addInput(psbtInput);
-        }
-        for (const output of targets) {
-            if (output.script) {
-                psbt.addOutput({
-                    value: output.value,
-                    script: output.script,
-                });
-            }
-            else {
-                psbt.addOutput({
-                    value: output.value,
-                    address: output.address,
-                });
-            }
-        }
-        for (let i = 0; i < inputs.length; i++) {
-            const wallet = await this.getWalletAddress(inputs[i].address);
-            const keyPair = await this.keyPair(wallet.derivationPath);
-            psbt.signInput(i, keyPair);
-            psbt.validateSignaturesOfInput(i);
-        }
-        psbt.finalizeAllInputs();
-        return { hex: psbt.extractTransaction().toHex(), fee };
-    }
-    async _buildSweepTransaction(externalChangeAddress, feePerByte) {
-        let _feePerByte = feePerByte || null;
-        if (!_feePerByte)
-            _feePerByte = await this.getMethod('getFeePerByte')();
-        const { inputs, outputs, change } = await this.getInputsForAmount([], _feePerByte, [], 100, true);
-        if (change) {
-            throw new Error('There should not be any change for sweeping transaction');
-        }
-        const _outputs = [
-            {
-                address: externalChangeAddress,
-                value: outputs[0].value,
-            },
-        ];
-        return this._buildTransaction(_outputs, feePerByte, inputs);
-    }
-    async signPSBT(data, inputs) {
-        const psbt = bitcoinjs_lib_1.Psbt.fromBase64(data, { network: this._network });
-        for (const input of inputs) {
-            const keyPair = await this.keyPair(input.derivationPath);
-            psbt.signInput(input.index, keyPair);
-        }
-        return psbt.toBase64();
-    }
-    async signBatchP2SHTransaction(inputs, addresses, tx, _lockTime, segwit) {
-        const keyPairs = [];
-        for (const address of addresses) {
-            const wallet = await this.getWalletAddress(address);
-            const keyPair = await this.keyPair(wallet.derivationPath);
-            keyPairs.push(keyPair);
-        }
-        const sigs = [];
-        for (let i = 0; i < inputs.length; i++) {
-            const index = inputs[i].txInputIndex
-                ? inputs[i].txInputIndex
-                : inputs[i].index;
-            let sigHash;
-            if (segwit) {
-                sigHash = tx.hashForWitnessV0(index, inputs[i].outputScript, inputs[i].vout.vSat, bitcoinjs_lib_1.Transaction.SIGHASH_ALL);
-            }
-            else {
-                sigHash = tx.hashForSignature(index, inputs[i].outputScript, bitcoinjs_lib_1.Transaction.SIGHASH_ALL);
-            }
-            const sig = bitcoinjs_lib_1.script.signature.encode(keyPairs[i].sign(sigHash), bitcoinjs_lib_1.Transaction.SIGHASH_ALL);
-            sigs.push(sig);
-        }
-        return sigs;
-    }
-    getScriptType() {
-        if (this._addressType === types_1.bitcoin.AddressType.LEGACY)
-            return 'p2pkh';
-        else if (this._addressType === types_1.bitcoin.AddressType.P2SH_SEGWIT)
-            return 'p2sh-p2wpkh';
-        else if (this._addressType === types_1.bitcoin.AddressType.BECH32)
-            return 'p2wpkh';
-    }
-    async getConnectedNetwork() {
-        return this._network;
-    }
-    async isWalletAvailable() {
-        return true;
-    }
-}
-exports.default = BitcoinJsWalletProvider;
-//# sourceMappingURL=BitcoinJsWalletProvider.js.map

package/lib/index.js

@@ -1,9 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BitcoinJsWalletProvider = void 0;
-const BitcoinJsWalletProvider_1 = __importDefault(require("./BitcoinJsWalletProvider"));
-exports.BitcoinJsWalletProvider = BitcoinJsWalletProvider_1.default;
-//# sourceMappingURL=index.js.map