@scure/btc-signer 1.6.0 → 1.8.0

package/p2p.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scure/btc-signer",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "Audited & minimal library for Bitcoin. Handle transactions, Schnorr, Taproot, UTXO & PSBT",
   "files": [
     "esm",
@@ -14,18 +14,18 @@
   "module": "./esm/index.js",
   "types": "./index.d.ts",
   "dependencies": {
-    "@noble/curves": "~1.8.1",
-    "@noble/hashes": "~1.7.1",
-    "@scure/base": "~1.2.2",
-    "micro-packed": "~0.7.2"
+    "@noble/curves": "~1.9.0",
+    "@noble/hashes": "~1.8.0",
+    "@scure/base": "~1.2.5",
+    "micro-packed": "~0.7.3"
   },
   "devDependencies": {
-    "@paulmillr/jsbt": "0.3.1",
-    "@scure/bip32": "~1.6.1",
-    "micro-bmark": "0.4.0",
-    "micro-should": "0.5.1",
-    "prettier": "3.3.2",
-    "typescript": "5.5.2"
+    "@paulmillr/jsbt": "0.3.3",
+    "@scure/bip32": "~1.7.0",
+    "micro-bmark": "0.4.1",
+    "micro-should": "0.5.2",
+    "prettier": "3.5.3",
+    "typescript": "5.8.3"
   },
   "exports": {
     ".": {
@@ -36,6 +36,10 @@
       "import": "./esm/index.js",
       "require": "./index.js"
     },
+    "./musig2": {
+      "import": "./esm/musig2.js",
+      "require": "./musig2.js"
+    },
     "./payment": {
       "import": "./esm/payment.js",
       "require": "./payment.js"

package/payment.d.ts

@@ -1,14 +1,15 @@
 import { type Coder } from '@scure/base';
 import * as P from 'micro-packed';
-import { type TransactionInput } from './psbt.js';
-import { type ScriptType } from './script.js';
-import { type BTC_NETWORK, type Bytes } from './utils.js';
+import { type TransactionInput } from './psbt.ts';
+import { type ScriptType } from './script.ts';
+import { type BTC_NETWORK, type Bytes } from './utils.ts';
 export type P2Ret = {
     type: string;
     script: Bytes;
     address?: string;
     redeemScript?: Bytes;
     witnessScript?: Bytes;
+    hash?: Bytes;
 };
 type OutP2AType = {
     type: 'p2a';
@@ -70,12 +71,54 @@ export type CustomScript = Coder<OptScript, CustomScriptOut | undefined> & {
 export declare const OutScript: P.CoderType<NonNullable<OutP2AType | OutPKType | OutPKHType | OutSHType | OutWSHType | OutWPKHType | OutMSType | OutTRType | OutTRNSType | OutTRMSType | OutUnknownType | undefined>>;
 export type OutScriptType = typeof OutScript;
 export declare function checkScript(script?: Bytes, redeemScript?: Bytes, witnessScript?: Bytes): void;
-export declare const p2pk: (pubkey: Bytes, network?: BTC_NETWORK) => P2Ret;
-export declare const p2pkh: (publicKey: Bytes, network?: BTC_NETWORK) => P2Ret;
-export declare const p2sh: (child: P2Ret, network?: BTC_NETWORK) => P2Ret;
-export declare const p2wsh: (child: P2Ret, network?: BTC_NETWORK) => P2Ret;
-export declare const p2wpkh: (publicKey: Bytes, network?: BTC_NETWORK) => P2Ret;
-export declare const p2ms: (m: number, pubkeys: Bytes[], allowSamePubkeys?: boolean) => P2Ret;
+type Extends<T, U> = T extends U ? T : never;
+export type P2PK = {
+    type: 'pk';
+    script: Bytes;
+};
+export declare const p2pk: (pubkey: Bytes, _network?: BTC_NETWORK) => Extends<P2PK, P2Ret>;
+export type P2PKH = {
+    type: 'pkh';
+    script: Bytes;
+    address: string;
+    hash: Bytes;
+};
+export declare const p2pkh: (publicKey: Bytes, network?: BTC_NETWORK) => Extends<P2PKH, P2Ret>;
+export type P2SHBase = {
+    type: 'sh';
+    redeemScript: Bytes;
+    script: Bytes;
+    address: string;
+    hash: Bytes;
+};
+export type P2SHWithWitness = P2SHBase & {
+    witnessScript: Bytes;
+};
+export type P2SHWithoutWitness = Omit<P2SHBase, 'witnessScript'>;
+export type P2SHReturn<T extends P2Ret> = T extends {
+    witnessScript: Bytes;
+} ? P2SHWithWitness : P2SHWithoutWitness;
+export declare const p2sh: <T extends P2Ret>(child: T, network?: BTC_NETWORK) => Extends<P2SHReturn<T>, P2Ret>;
+export type P2WSH = {
+    type: 'wsh';
+    witnessScript: Bytes;
+    script: Bytes;
+    address: string;
+    hash: Bytes;
+};
+export declare const p2wsh: (child: P2Ret, network?: BTC_NETWORK) => Extends<P2WSH, P2Ret>;
+export type P2WPKH = {
+    type: 'wpkh';
+    script: Bytes;
+    address: string;
+    hash: Bytes;
+};
+export declare const p2wpkh: (publicKey: Bytes, network?: BTC_NETWORK) => Extends<P2WPKH, P2Ret>;
+export type P2MS = {
+    type: 'ms';
+    script: Bytes;
+};
+export declare const p2ms: (m: number, pubkeys: Bytes[], allowSamePubkeys?: boolean) => Extends<P2MS, P2Ret>;
 export type HashedTree = {
     type: 'leaf';
     version?: number;
@@ -87,18 +130,23 @@ export type HashedTree = {
     right: HashedTree;
     hash: Bytes;
 };
-export type P2TROut = P2Ret & {
+export type P2TR = {
+    type: 'tr';
+    script: Bytes;
+    address: string;
     tweakedPubkey: Bytes;
     tapInternalKey: Bytes;
-    tapMerkleRoot?: Bytes;
-    tapLeafScript?: TransactionInput['tapLeafScript'];
-    leaves?: TaprootLeaf[];
+};
+export type P2TR_TREE = P2TR & {
+    tapMerkleRoot: Bytes;
+    tapLeafScript: TransactionInput['tapLeafScript'];
+    leaves: TaprootLeaf[];
 };
 export type TaprootNode = {
     script: Bytes | string;
     leafVersion?: number;
     weight?: number;
-} & Partial<P2TROut>;
+} & Partial<P2TR_TREE>;
 export type TaprootScriptTree = TaprootNode | TaprootScriptTree[];
 export type TaprootScriptList = TaprootNode[];
 export declare function taprootListToTree(taprootList: TaprootScriptList): TaprootScriptTree;
@@ -118,21 +166,29 @@ export type HashedTreeWithPath = TaprootLeaf | {
 };
 export declare const TAP_LEAF_VERSION = 192;
 export declare const tapLeafHash: (script: Bytes, version?: number) => Bytes;
-export declare function p2tr(internalPubKey?: Bytes | string, tree?: TaprootScriptTree, network?: BTC_NETWORK, allowUnknownOutputs?: boolean, customScripts?: CustomScript[]): P2TROut;
+export type P2TRRet<T> = T extends TaprootScriptTree ? P2TR_TREE : P2TR;
+export declare function p2tr(internalPubKey: Bytes | string, tree?: undefined, network?: BTC_NETWORK, allowUnknownOutputs?: boolean, customScripts?: CustomScript[]): Extends<P2TR, P2Ret>;
+export declare function p2tr(internalPubKey: Bytes | string, tree: TaprootScriptTree, network?: BTC_NETWORK, allowUnknownOutputs?: boolean, customScripts?: CustomScript[]): Extends<P2TR_TREE, P2Ret>;
 export declare function combinations<T>(m: number, list: T[]): T[][];
 /**
  * M-of-N multi-leaf wallet via p2tr_ns. If m == n, single script is emitted.
  * Takes O(n^2) if m != n. 99-of-100 is ok, 5-of-100 is not.
  * `2-of-[A,B,C] => [A,B] | [A,C] | [B,C]`
  */
-export declare const p2tr_ns: (m: number, pubkeys: Bytes[], allowSamePubkeys?: boolean) => P2Ret[];
-export declare const p2tr_pk: (pubkey: Bytes) => P2Ret;
-export declare function p2tr_ms(m: number, pubkeys: Bytes[], allowSamePubkeys?: boolean): {
-    type: string;
-    script: Uint8Array;
+export type P2TR_NS = {
+    type: 'tr_ns';
+    script: Bytes;
+};
+export declare const p2tr_ns: (m: number, pubkeys: Bytes[], allowSamePubkeys?: boolean) => Extends<P2TR_NS, P2Ret>[];
+export type P2TR_PK = P2TR_NS;
+export declare const p2tr_pk: (pubkey: Bytes) => Extends<P2TR_PK, P2Ret>;
+export type P2TR_MS = {
+    type: 'tr_ms';
+    script: Bytes;
 };
+export declare function p2tr_ms(m: number, pubkeys: Bytes[], allowSamePubkeys?: boolean): Extends<P2TR_MS, P2Ret>;
 export declare function getAddress(type: 'pkh' | 'wpkh' | 'tr', privKey: Bytes, network?: BTC_NETWORK): string | undefined;
-export declare const _sortPubkeys: (pubkeys: Bytes[]) => Uint8Array[];
+export declare const _sortPubkeys: (pubkeys: Bytes[]) => Bytes[];
 export declare function multisig(m: number, pubkeys: Bytes[], sorted?: boolean, witness?: boolean, network?: BTC_NETWORK): P2Ret;
 export declare function sortedMultisig(m: number, pubkeys: Bytes[], witness?: boolean, network?: BTC_NETWORK): P2Ret;
 export declare function WIF(network?: BTC_NETWORK): Coder<Bytes, string>;

package/payment.d.ts.map

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

package/payment.js

@@ -13,15 +13,15 @@ exports.WIF = WIF;
 exports.Address = Address;
 const base_1 = require("@scure/base");
 const P = require("micro-packed");
-const psbt_js_1 = require("./psbt.js");
-const script_js_1 = require("./script.js");
+const psbt_ts_1 = require("./psbt.js");
+const script_ts_1 = require("./script.js");
 const u = require("./utils.js");
-const utils_js_1 = require("./utils.js");
+const utils_ts_1 = require("./utils.js");
 const OutP2A = {
     encode(from) {
         if (from.length !== 2 || from[0] !== 1 || !u.isBytes(from[1]) || base_1.hex.encode(from[1]) !== '4e73')
             return;
-        return { type: 'p2a', script: script_js_1.Script.encode(from) };
+        return { type: 'p2a', script: script_ts_1.Script.encode(from) };
     },
     decode: (to) => {
         if (to.type !== 'p2a')
@@ -151,7 +151,7 @@ const OutTRMS = {
         if (from[last] !== 'NUMEQUAL' || from[1] !== 'CHECKSIG')
             return;
         const pubkeys = [];
-        const m = (0, script_js_1.OpToNum)(from[last - 1]);
+        const m = (0, script_ts_1.OpToNum)(from[last - 1]);
         if (typeof m !== 'number')
             return;
         for (let i = 0; i < last - 1; i++) {
@@ -179,9 +179,9 @@ const OutTRMS = {
 };
 const OutUnknown = {
     encode(from) {
-        return { type: 'unknown', script: script_js_1.Script.encode(from) };
+        return { type: 'unknown', script: script_ts_1.Script.encode(from) };
     },
-    decode: (to) => to.type === 'unknown' ? script_js_1.Script.decode(to.script) : undefined,
+    decode: (to) => to.type === 'unknown' ? script_ts_1.Script.decode(to.script) : undefined,
 };
 // /Payments
 const OutScripts = [
@@ -202,7 +202,7 @@ const OutScripts = [
 // - removeOutScript
 // - We can do that as log we modify array in-place
 // - Actually is very hard, since there is sign/finalize logic
-const _OutScript = P.apply(script_js_1.Script, P.coders.match(OutScripts));
+const _OutScript = P.apply(script_ts_1.Script, P.coders.match(OutScripts));
 // We can validate this once, because of packed & coders
 exports.OutScript = P.validate(_OutScript, (i) => {
     if (i.type === 'pk' && !isValidPubkey(i.pubkey, u.PubT.ecdsa))
@@ -281,18 +281,14 @@ function uniqPubkey(pubkeys) {
         map[key] = true;
     }
 }
-// @ts-ignore
-const p2pk = (pubkey, network = utils_js_1.NETWORK) => {
+const p2pk = (pubkey, _network = utils_ts_1.NETWORK) => {
     // network is unused
     if (!isValidPubkey(pubkey, u.PubT.ecdsa))
         throw new Error('P2PK: invalid publicKey');
-    return {
-        type: 'pk',
-        script: exports.OutScript.encode({ type: 'pk', pubkey }),
-    };
+    return { type: 'pk', script: exports.OutScript.encode({ type: 'pk', pubkey }) };
 };
 exports.p2pk = p2pk;
-const p2pkh = (publicKey, network = utils_js_1.NETWORK) => {
+const p2pkh = (publicKey, network = utils_ts_1.NETWORK) => {
     if (!isValidPubkey(publicKey, u.PubT.ecdsa))
         throw new Error('P2PKH: invalid publicKey');
     const hash = u.hash160(publicKey);
@@ -300,10 +296,11 @@ const p2pkh = (publicKey, network = utils_js_1.NETWORK) => {
         type: 'pkh',
         script: exports.OutScript.encode({ type: 'pkh', hash }),
         address: Address(network).encode({ type: 'pkh', hash }),
+        hash,
     };
 };
 exports.p2pkh = p2pkh;
-const p2sh = (child, network = utils_js_1.NETWORK) => {
+const p2sh = (child, network = utils_ts_1.NETWORK) => {
     // It is already tested inside noble-hashes and checkScript
     const cs = child.script;
     if (!u.isBytes(cs))
@@ -311,18 +308,28 @@ const p2sh = (child, network = utils_js_1.NETWORK) => {
     const hash = u.hash160(cs);
     const script = exports.OutScript.encode({ type: 'sh', hash });
     checkScript(script, cs, child.witnessScript);
-    const res = {
-        type: 'sh',
-        redeemScript: cs,
-        script: exports.OutScript.encode({ type: 'sh', hash }),
-        address: Address(network).encode({ type: 'sh', hash }),
-    };
-    if (child.witnessScript)
-        res.witnessScript = child.witnessScript;
-    return res;
+    if (child.witnessScript) {
+        return {
+            type: 'sh',
+            redeemScript: cs,
+            script: exports.OutScript.encode({ type: 'sh', hash }),
+            address: Address(network).encode({ type: 'sh', hash }),
+            hash,
+            witnessScript: child.witnessScript,
+        };
+    }
+    else {
+        return {
+            type: 'sh',
+            redeemScript: cs,
+            script: exports.OutScript.encode({ type: 'sh', hash }),
+            address: Address(network).encode({ type: 'sh', hash }),
+            hash,
+        };
+    }
 };
 exports.p2sh = p2sh;
-const p2wsh = (child, network = utils_js_1.NETWORK) => {
+const p2wsh = (child, network = utils_ts_1.NETWORK) => {
     const cs = child.script;
     if (!u.isBytes(cs))
         throw new Error(`Wrong script: ${typeof cs}, expected Uint8Array`);
@@ -334,10 +341,11 @@ const p2wsh = (child, network = utils_js_1.NETWORK) => {
         witnessScript: cs,
         script: exports.OutScript.encode({ type: 'wsh', hash }),
         address: Address(network).encode({ type: 'wsh', hash }),
+        hash,
     };
 };
 exports.p2wsh = p2wsh;
-const p2wpkh = (publicKey, network = utils_js_1.NETWORK) => {
+const p2wpkh = (publicKey, network = utils_ts_1.NETWORK) => {
     if (!isValidPubkey(publicKey, u.PubT.ecdsa))
         throw new Error('P2WPKH: invalid publicKey');
     if (publicKey.length === 65)
@@ -347,13 +355,17 @@ const p2wpkh = (publicKey, network = utils_js_1.NETWORK) => {
         type: 'wpkh',
         script: exports.OutScript.encode({ type: 'wpkh', hash }),
         address: Address(network).encode({ type: 'wpkh', hash }),
+        hash,
     };
 };
 exports.p2wpkh = p2wpkh;
 const p2ms = (m, pubkeys, allowSamePubkeys = false) => {
     if (!allowSamePubkeys)
         uniqPubkey(pubkeys);
-    return { type: 'ms', script: exports.OutScript.encode({ type: 'ms', pubkeys, m }) };
+    return {
+        type: 'ms',
+        script: exports.OutScript.encode({ type: 'ms', pubkeys, m }),
+    };
 };
 exports.p2ms = p2ms;
 function checkTaprootScript(script, internalPubKey, allowUnknownOutputs = false, customScripts) {
@@ -362,7 +374,7 @@ function checkTaprootScript(script, internalPubKey, allowUnknownOutputs = false,
         // NOTE: this check should be before allowUnknownOutputs, otherwise it will
         // disable custom. All custom scripts for taproot should have prefix 'tr_'
         if (customScripts) {
-            const cs = P.apply(script_js_1.Script, P.coders.match(customScripts));
+            const cs = P.apply(script_ts_1.Script, P.coders.match(customScripts));
             const c = cs.decode(script);
             if (c !== undefined) {
                 if (typeof c.type !== 'string' || !c.type.startsWith('tr_'))
@@ -477,12 +489,9 @@ function taprootHashTree(tree, internalPubKey, allowUnknownOutputs = false, cust
     return { type: 'branch', left, right, hash: u.tagSchnorr('TapBranch', lH, rH) };
 }
 exports.TAP_LEAF_VERSION = 0xc0;
-const tapLeafHash = (script, version = exports.TAP_LEAF_VERSION) => u.tagSchnorr('TapLeaf', new Uint8Array([version]), script_js_1.VarBytes.encode(script));
+const tapLeafHash = (script, version = exports.TAP_LEAF_VERSION) => u.tagSchnorr('TapLeaf', new Uint8Array([version]), script_ts_1.VarBytes.encode(script));
 exports.tapLeafHash = tapLeafHash;
-// Works as key OR tree.
-// If we only have tree, need to add unspendable key, otherwise
-// complex multisig wallet can be spent by owner of key only. See TAPROOT_UNSPENDABLE_KEY
-function p2tr(internalPubKey, tree, network = utils_js_1.NETWORK, allowUnknownOutputs = false, customScripts) {
+function p2tr(internalPubKey, tree, network = utils_ts_1.NETWORK, allowUnknownOutputs = false, customScripts) {
     // Unspendable
     if (!internalPubKey && !tree)
         throw new Error('p2tr: should have pubKey or scriptTree (or both)');
@@ -491,46 +500,46 @@ function p2tr(internalPubKey, tree, network = utils_js_1.NETWORK, allowUnknownOu
         : internalPubKey || u.TAPROOT_UNSPENDABLE_KEY;
     if (!isValidPubkey(pubKey, u.PubT.schnorr))
         throw new Error('p2tr: non-schnorr pubkey');
-    let hashedTree = tree
-        ? taprootAddPath(taprootHashTree(tree, pubKey, allowUnknownOutputs, customScripts))
-        : undefined;
-    const tapMerkleRoot = hashedTree ? hashedTree.hash : undefined;
-    const [tweakedPubkey, parity] = u.taprootTweakPubkey(pubKey, tapMerkleRoot || P.EMPTY);
-    let leaves;
-    if (hashedTree) {
-        leaves = taprootWalkTree(hashedTree).map((l) => ({
+    if (tree) {
+        let hashedTree = taprootAddPath(taprootHashTree(tree, pubKey, allowUnknownOutputs, customScripts));
+        const tapMerkleRoot = hashedTree.hash;
+        const [tweakedPubkey, parity] = u.taprootTweakPubkey(pubKey, tapMerkleRoot);
+        const leaves = taprootWalkTree(hashedTree).map((l) => ({
             ...l,
-            controlBlock: psbt_js_1.TaprootControlBlock.encode({
+            controlBlock: psbt_ts_1.TaprootControlBlock.encode({
                 version: (l.version || exports.TAP_LEAF_VERSION) + parity,
                 internalKey: pubKey,
                 merklePath: l.path,
             }),
         }));
+        return {
+            type: 'tr',
+            script: exports.OutScript.encode({ type: 'tr', pubkey: tweakedPubkey }),
+            address: Address(network).encode({ type: 'tr', pubkey: tweakedPubkey }),
+            // For tests
+            tweakedPubkey,
+            // PSBT stuff
+            tapInternalKey: pubKey,
+            leaves,
+            tapLeafScript: leaves.map((l) => [
+                psbt_ts_1.TaprootControlBlock.decode(l.controlBlock),
+                u.concatBytes(l.script, new Uint8Array([l.version || exports.TAP_LEAF_VERSION])),
+            ]),
+            tapMerkleRoot,
+        };
     }
-    let tapLeafScript;
-    if (leaves) {
-        tapLeafScript = leaves.map((l) => [
-            psbt_js_1.TaprootControlBlock.decode(l.controlBlock),
-            u.concatBytes(l.script, new Uint8Array([l.version || exports.TAP_LEAF_VERSION])),
-        ]);
+    else {
+        const tweakedPubkey = u.taprootTweakPubkey(pubKey, P.EMPTY)[0];
+        return {
+            type: 'tr',
+            script: exports.OutScript.encode({ type: 'tr', pubkey: tweakedPubkey }),
+            address: Address(network).encode({ type: 'tr', pubkey: tweakedPubkey }),
+            // For tests
+            tweakedPubkey,
+            // PSBT stuff
+            tapInternalKey: pubKey,
+        };
     }
-    const res = {
-        type: 'tr',
-        script: exports.OutScript.encode({ type: 'tr', pubkey: tweakedPubkey }),
-        address: Address(network).encode({ type: 'tr', pubkey: tweakedPubkey }),
-        // For tests
-        tweakedPubkey,
-        // PSBT stuff
-        tapInternalKey: pubKey,
-    };
-    // Just in case someone would want to select a specific script
-    if (leaves)
-        res.leaves = leaves;
-    if (tapLeafScript)
-        res.tapLeafScript = tapLeafScript;
-    if (tapMerkleRoot)
-        res.tapMerkleRoot = tapMerkleRoot;
-    return res;
 }
 // Returns all combinations of size M from lst
 function combinations(m, list) {
@@ -566,11 +575,6 @@ function combinations(m, list) {
     }
     return res;
 }
-/**
- * M-of-N multi-leaf wallet via p2tr_ns. If m == n, single script is emitted.
- * Takes O(n^2) if m != n. 99-of-100 is ok, 5-of-100 is not.
- * `2-of-[A,B,C] => [A,B] | [A,C] | [B,C]`
- */
 const p2tr_ns = (m, pubkeys, allowSamePubkeys = false) => {
     if (!allowSamePubkeys)
         uniqPubkey(pubkeys);
@@ -580,7 +584,6 @@ const p2tr_ns = (m, pubkeys, allowSamePubkeys = false) => {
     }));
 };
 exports.p2tr_ns = p2tr_ns;
-// Taproot public key (case of p2tr_ns)
 const p2tr_pk = (pubkey) => (0, exports.p2tr_ns)(1, [pubkey], undefined)[0];
 exports.p2tr_pk = p2tr_pk;
 function p2tr_ms(m, pubkeys, allowSamePubkeys = false) {
@@ -592,7 +595,7 @@ function p2tr_ms(m, pubkeys, allowSamePubkeys = false) {
     };
 }
 // Simple pubkey address, without complex scripts
-function getAddress(type, privKey, network = utils_js_1.NETWORK) {
+function getAddress(type, privKey, network = utils_ts_1.NETWORK) {
     if (type === 'tr') {
         return p2tr(u.pubSchnorr(privKey), undefined, network).address;
     }
@@ -605,11 +608,11 @@ function getAddress(type, privKey, network = utils_js_1.NETWORK) {
 }
 const _sortPubkeys = (pubkeys) => Array.from(pubkeys).sort(u.compareBytes);
 exports._sortPubkeys = _sortPubkeys;
-function multisig(m, pubkeys, sorted = false, witness = false, network = utils_js_1.NETWORK) {
+function multisig(m, pubkeys, sorted = false, witness = false, network = utils_ts_1.NETWORK) {
     const ms = (0, exports.p2ms)(m, sorted ? (0, exports._sortPubkeys)(pubkeys) : pubkeys);
     return witness ? (0, exports.p2wsh)(ms, network) : (0, exports.p2sh)(ms, network);
 }
-function sortedMultisig(m, pubkeys, witness = false, network = utils_js_1.NETWORK) {
+function sortedMultisig(m, pubkeys, witness = false, network = utils_ts_1.NETWORK) {
     return multisig(m, pubkeys, true, witness, network);
 }
 const base58check = (0, base_1.createBase58check)(u.sha256);
@@ -621,7 +624,7 @@ function validateWitness(version, data) {
     if (version === 0 && !(data.length === 20 || data.length === 32))
         throw new Error('Witness: invalid length for version');
 }
-function programToWitness(version, data, network = utils_js_1.NETWORK) {
+function programToWitness(version, data, network = utils_ts_1.NETWORK) {
     validateWitness(version, data);
     const coder = version === 0 ? base_1.bech32 : base_1.bech32m;
     return coder.encode(network.bech32, [version].concat(coder.toWords(data)));
@@ -629,7 +632,7 @@ function programToWitness(version, data, network = utils_js_1.NETWORK) {
 function formatKey(hashed, prefix) {
     return base58check.encode(u.concatBytes(Uint8Array.from(prefix), hashed));
 }
-function WIF(network = utils_js_1.NETWORK) {
+function WIF(network = utils_ts_1.NETWORK) {
     return {
         encode(privKey) {
             const compressed = u.concatBytes(privKey, new Uint8Array([0x01]));
@@ -650,7 +653,7 @@ function WIF(network = utils_js_1.NETWORK) {
     };
 }
 // Returns OutType, which can be used to create outscript
-function Address(network = utils_js_1.NETWORK) {
+function Address(network = utils_ts_1.NETWORK) {
     return {
         encode(from) {
             const { type } = from;