xpi-ts 0.2.13 → 0.2.15

package/dist/cjs/lib/bitcore/script.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScriptTypes = exports.Script = void 0;
-exports.toAddress = toAddress;
-exports.empty = empty;
 const preconditions_js_1 = require("./util/preconditions.js");
 const bufferreader_js_1 = require("./encoding/bufferreader.js");
 const bufferwriter_js_1 = require("./encoding/bufferwriter.js");
@@ -13,13 +11,17 @@ const address_js_1 = require("./address.js");
 const errors_js_1 = require("./errors.js");
 const buffer_js_1 = require("./util/buffer.js");
 const signature_js_1 = require("./crypto/signature.js");
-const chunk_js_1 = require("./chunk.js");
-const taproot_js_1 = require("./taproot.js");
+const chunk_js_1 = require("./script/chunk.js");
+const taproot_js_1 = require("./script/taproot.js");
 class Script {
     chunks;
     _network;
     constructor(from) {
-        if (Buffer.isBuffer(from)) {
+        if (!from) {
+            this.chunks = [];
+            return;
+        }
+        if (buffer_js_1.BufferUtil.isBuffer(from)) {
             return Script.fromBuffer(from);
         }
         else if (from instanceof address_js_1.Address) {
@@ -31,14 +33,9 @@ class Script {
         else if (typeof from === 'string') {
             return Script.fromString(from);
         }
-        else if (typeof from === 'object' &&
-            from !== null &&
-            Array.isArray(from.chunks)) {
+        else if (typeof from === 'object' && Array.isArray(from.chunks)) {
             this.set(from);
         }
-        else {
-            this.chunks = [];
-        }
     }
     set(obj) {
         preconditions_js_1.Preconditions.checkArgument(typeof obj === 'object', 'obj', 'Must be an object');
@@ -47,18 +44,25 @@ class Script {
         this._network = obj._network;
         return this;
     }
+    static empty() {
+        return new Script();
+    }
     static fromBuffer(buffer) {
-        const script = new Script();
+        const script = Script.empty();
         script.chunks = [];
         const br = new bufferreader_js_1.BufferReader(buffer);
         while (!br.finished()) {
             try {
                 const opcodenum = br.readUInt8();
                 let len, buf;
-                if (opcodenum > 0 && opcodenum < opcode_js_1.Opcode.OP_PUSHDATA1) {
+                if (opcodenum >= 0 && opcodenum < opcode_js_1.Opcode.OP_PUSHDATA1) {
                     len = opcodenum;
+                    buf = br.read(len);
+                    if (buf.length !== len) {
+                        throw new errors_js_1.BitcoreError.Script.InvalidBuffer(`Push data length mismatch: expected ${len}, got ${buf.length}`);
+                    }
                     script.chunks.push(new chunk_js_1.Chunk({
-                        buf: br.read(len),
+                        buf: buf,
                         len: len,
                         opcodenum: opcodenum,
                     }));
@@ -66,6 +70,9 @@ class Script {
                 else if (opcodenum === opcode_js_1.Opcode.OP_PUSHDATA1) {
                     len = br.readUInt8();
                     buf = br.read(len);
+                    if (buf.length !== len) {
+                        throw new errors_js_1.BitcoreError.Script.InvalidBuffer(`OP_PUSHDATA1 length mismatch: expected ${len}, got ${buf.length}`);
+                    }
                     script.chunks.push(new chunk_js_1.Chunk({
                         buf: buf,
                         len: len,
@@ -75,6 +82,9 @@ class Script {
                 else if (opcodenum === opcode_js_1.Opcode.OP_PUSHDATA2) {
                     len = br.readUInt16LE();
                     buf = br.read(len);
+                    if (buf.length !== len) {
+                        throw new errors_js_1.BitcoreError.Script.InvalidBuffer(`OP_PUSHDATA2 length mismatch: expected ${len}, got ${buf.length}`);
+                    }
                     script.chunks.push(new chunk_js_1.Chunk({
                         buf: buf,
                         len: len,
@@ -84,6 +94,9 @@ class Script {
                 else if (opcodenum === opcode_js_1.Opcode.OP_PUSHDATA4) {
                     len = br.readUInt32LE();
                     buf = br.read(len);
+                    if (buf.length !== len) {
+                        throw new errors_js_1.BitcoreError.Script.InvalidBuffer(`OP_PUSHDATA4 length mismatch: expected ${len}, got ${buf.length}`);
+                    }
                     script.chunks.push(new chunk_js_1.Chunk({
                         buf: buf,
                         len: len,
@@ -111,7 +124,7 @@ class Script {
         if (!/^[0-9a-f]*$/.test(cleanStr)) {
             throw new errors_js_1.BitcoreError.Script.InvalidScriptString(str);
         }
-        const buffer = Buffer.from(cleanStr, 'hex');
+        const buffer = buffer_js_1.BufferUtil.from(cleanStr, 'hex');
         return Script.fromBuffer(buffer);
     }
     static fromASM(str) {
@@ -124,7 +137,7 @@ class Script {
             const opcode = new opcode_js_1.Opcode(token);
             const opcodenum = opcode.num;
             if (opcodenum === undefined) {
-                const buf = Buffer.from(tokens[i], 'hex');
+                const buf = buffer_js_1.BufferUtil.from(tokens[i], 'hex');
                 let opcodenum;
                 const len = buf.length;
                 if (len >= 0 && len < opcode_js_1.Opcode.OP_PUSHDATA1) {
@@ -159,14 +172,14 @@ class Script {
         return script;
     }
     static fromHex(str) {
-        return new Script(Buffer.from(str, 'hex'));
+        return new Script(buffer_js_1.BufferUtil.from(str, 'hex'));
     }
     static fromAddress(address) {
         if (typeof address === 'string') {
             address = address_js_1.Address.fromString(address);
         }
         if (address.isPayToTaproot()) {
-            return Script.buildPayToTaproot(address.hashBuffer);
+            return Script.buildTaprootOut(address.hashBuffer);
         }
         else if (address.isPayToScriptHash()) {
             return Script.buildScriptHashOut(address);
@@ -176,6 +189,55 @@ class Script {
         }
         throw new errors_js_1.BitcoreError.Script.UnrecognizedAddress(address);
     }
+    static fromPayload(scriptType, payload) {
+        const buf = typeof payload === 'string' ? buffer_js_1.BufferUtil.from(payload, 'hex') : payload;
+        switch (scriptType) {
+            case 'p2pk': {
+                if (buf.length !== 33 && buf.length !== 65) {
+                    throw new Error(`Invalid p2pk payload length: expected 33 (compressed) or 65 (uncompressed), got ${buf.length}`);
+                }
+                return Script.buildPublicKeyOut(new publickey_js_1.PublicKey(buf));
+            }
+            case 'p2pkh': {
+                if (buf.length !== 20) {
+                    throw new Error(`Invalid p2pkh payload length: expected 20, got ${buf.length}`);
+                }
+                const p2pkhScript = new Script();
+                p2pkhScript.chunks = [];
+                p2pkhScript
+                    .add(opcode_js_1.Opcode.OP_DUP)
+                    .add(opcode_js_1.Opcode.OP_HASH160)
+                    .add(buf)
+                    .add(opcode_js_1.Opcode.OP_EQUALVERIFY)
+                    .add(opcode_js_1.Opcode.OP_CHECKSIG);
+                return p2pkhScript;
+            }
+            case 'p2sh': {
+                if (buf.length !== 20) {
+                    throw new Error(`Invalid p2sh payload length: expected 20, got ${buf.length}`);
+                }
+                const p2shScript = new Script();
+                p2shScript.add(opcode_js_1.Opcode.OP_HASH160).add(buf).add(opcode_js_1.Opcode.OP_EQUAL);
+                return p2shScript;
+            }
+            case 'p2tr-commitment': {
+                if (buf.length !== 33) {
+                    throw new Error(`Invalid p2tr-commitment payload length: expected 33, got ${buf.length}`);
+                }
+                return Script.buildTaprootOut(buf);
+            }
+            case 'p2tr-state': {
+                throw new Error('Cannot reconstruct full script from p2tr-state payload alone; ' +
+                    'the commitment is required. Use p2tr-commitment payload instead.');
+            }
+            case 'other': {
+                return Script.fromBuffer(buf);
+            }
+            default: {
+                throw new Error(`Unknown script type: ${scriptType}`);
+            }
+        }
+    }
     static buildMultisigOut(publicKeys, threshold, opts = {}) {
         preconditions_js_1.Preconditions.checkArgument(threshold <= publicKeys.length, 'threshold', 'Number of required signatures must be less than or equal to the number of public keys');
         const script = new Script();
@@ -318,13 +380,6 @@ class Script {
         script.add((opts.cachedMultisig || Script.buildMultisigOut(pubkeys, threshold, opts)).toBuffer());
         return script;
     }
-    static buildWitnessMultisigOutFromScript(script) {
-        const scriptHash = hash_js_1.Hash.sha256(script.toBuffer());
-        const witnessScript = new Script();
-        witnessScript.add(opcode_js_1.Opcode.OP_0);
-        witnessScript.add(scriptHash);
-        return witnessScript;
-    }
     static buildPublicKeyOut(pubkey) {
         const script = new Script();
         script.add(pubkey.toBuffer());
@@ -335,10 +390,10 @@ class Script {
         let buffer;
         if (typeof data === 'string') {
             if (encoding === 'hex') {
-                buffer = Buffer.from(data, 'hex');
+                buffer = buffer_js_1.BufferUtil.from(data, 'hex');
             }
             else {
-                buffer = Buffer.from(data, 'utf8');
+                buffer = buffer_js_1.BufferUtil.from(data, 'utf8');
             }
         }
         else {
@@ -394,10 +449,10 @@ class Script {
         script.add(publicKey.toBuffer());
         return script;
     }
-    static buildPayToTaproot(commitment, state) {
+    static buildTaprootOut(commitment, state) {
         preconditions_js_1.Preconditions.checkArgument(commitment !== undefined, 'commitment', 'Must be defined');
         const commitmentBuf = commitment instanceof publickey_js_1.PublicKey ? commitment.toBuffer() : commitment;
-        if (commitmentBuf.length !== 33) {
+        if (commitmentBuf.length !== taproot_js_1.PUBKEY_COMPRESSED_SIZE) {
             throw new Error('Taproot commitment must be 33-byte compressed public key');
         }
         if (state && state.length !== 32) {
@@ -418,7 +473,7 @@ class Script {
                 opcodenum: chunk.num,
             }));
         }
-        else if (Buffer.isBuffer(chunk)) {
+        else if (buffer_js_1.BufferUtil.isBuffer(chunk)) {
             const chunkObj = {
                 buf: chunk,
                 len: chunk.length,
@@ -448,6 +503,17 @@ class Script {
         }
         return this;
     }
+    addTaprootState(state) {
+        if (state.length !== 32) {
+            throw new Error('Taproot state must be exactly 32 bytes');
+        }
+        if (this.chunks[3]) {
+            this.chunks[3].buf = state;
+            return this;
+        }
+        this.add(state);
+        return this;
+    }
     toBuffer() {
         const bw = new bufferwriter_js_1.BufferWriter();
         for (const chunk of this.chunks) {
@@ -470,18 +536,6 @@ class Script {
     toString() {
         return this.toBuffer().toString('hex');
     }
-    toP2PKH() {
-        if (!this.isPayToPublicKeyHash()) {
-            throw new Error('Script is not a P2PKH address');
-        }
-        return this.chunks[2].buf.toString('hex');
-    }
-    toP2SH() {
-        if (!this.isPayToScriptHash()) {
-            throw new Error('Script is not a P2SH address');
-        }
-        return this.chunks[1].buf.toString('hex');
-    }
     toASM() {
         let str = '';
         for (let i = 0; i < this.chunks.length; i++) {
@@ -560,53 +614,37 @@ class Script {
         }
         return str;
     }
-    isPayToPublicKeyHash() {
+    isPublicKeyHashOut() {
         return (this.chunks.length === 5 &&
             this.chunks[0].opcodenum === opcode_js_1.Opcode.OP_DUP &&
             this.chunks[1].opcodenum === opcode_js_1.Opcode.OP_HASH160 &&
             this.chunks[2].opcodenum === 20 &&
-            this.chunks[2].buf.length === 20 &&
-            this.chunks[3].opcodenum === opcode_js_1.Opcode.OP_EQUALVERIFY &&
-            this.chunks[4].opcodenum === opcode_js_1.Opcode.OP_CHECKSIG);
-    }
-    isPublicKeyHashOut() {
-        return !!(this.chunks.length === 5 &&
-            this.chunks[0].opcodenum === opcode_js_1.Opcode.OP_DUP &&
-            this.chunks[1].opcodenum === opcode_js_1.Opcode.OP_HASH160 &&
-            this.chunks[2].buf &&
-            this.chunks[2].buf.length === 20 &&
+            this.chunks[2].buf?.length === 20 &&
             this.chunks[3].opcodenum === opcode_js_1.Opcode.OP_EQUALVERIFY &&
             this.chunks[4].opcodenum === opcode_js_1.Opcode.OP_CHECKSIG);
     }
-    isPayToScriptHash() {
+    isScriptHashOut() {
         return (this.chunks.length === 3 &&
             this.chunks[0].opcodenum === opcode_js_1.Opcode.OP_HASH160 &&
             this.chunks[1].opcodenum === 20 &&
-            this.chunks[1].buf.length === 20 &&
+            this.chunks[1].buf?.length === 20 &&
             this.chunks[2].opcodenum === opcode_js_1.Opcode.OP_EQUAL);
     }
-    isScriptHashOut() {
-        const buf = this.toBuffer();
-        return (buf.length === 23 &&
-            buf[0] === opcode_js_1.Opcode.OP_HASH160 &&
-            buf[1] === 0x14 &&
-            buf[buf.length - 1] === opcode_js_1.Opcode.OP_EQUAL);
-    }
-    isPayToTaproot() {
-        const buf = this.toBuffer();
-        if (buf.length < taproot_js_1.TAPROOT_SIZE_WITHOUT_STATE ||
-            buf[0] !== opcode_js_1.Opcode.OP_SCRIPTTYPE ||
-            buf[1] !== opcode_js_1.Opcode.OP_1 ||
-            buf[2] !== 33) {
+    isTaprootOut() {
+        if (this.chunks[0].opcodenum !== opcode_js_1.Opcode.OP_SCRIPTTYPE ||
+            this.chunks[1].opcodenum !== opcode_js_1.Opcode.OP_1) {
             return false;
         }
-        if (buf.length === taproot_js_1.TAPROOT_SIZE_WITHOUT_STATE) {
-            return true;
+        if (this.chunks.length === 3) {
+            return (this.chunks[2].opcodenum === 33 && this.chunks[2].buf?.length === 33);
         }
-        return buf.length === taproot_js_1.TAPROOT_SIZE_WITH_STATE && buf[36] === 32;
-    }
-    isTaprootOut() {
-        return this.isPayToTaproot();
+        if (this.chunks.length === 4) {
+            return (this.chunks[2].opcodenum === 33 &&
+                this.chunks[2].buf?.length === 33 &&
+                this.chunks[3].opcodenum === 32 &&
+                this.chunks[3].buf?.length === 32);
+        }
+        return false;
     }
     isTaprootIn() {
         if (this.chunks.length === 0) {
@@ -637,20 +675,45 @@ class Script {
     getData() {
         if (this.isScriptHashOut()) {
             if (this.chunks[1] === undefined) {
-                return Buffer.alloc(0);
+                return buffer_js_1.BufferUtil.alloc(0);
             }
             else {
-                return Buffer.from(this.chunks[1].buf);
+                return buffer_js_1.BufferUtil.from(this.chunks[1].buf);
             }
         }
         if (this.isPublicKeyHashOut()) {
-            return Buffer.from(this.chunks[2].buf);
+            return buffer_js_1.BufferUtil.from(this.chunks[2].buf);
         }
-        if (this.isPayToTaproot()) {
-            return Buffer.from(this.chunks[2].buf);
+        if (this.isTaprootOut()) {
+            return buffer_js_1.BufferUtil.from(this.chunks[2].buf);
         }
         throw new Error('Unrecognized script type to get data from');
     }
+    getPayload() {
+        let type;
+        let payload;
+        if (this.isPublicKeyOut()) {
+            type = 'p2pk';
+            payload = buffer_js_1.BufferUtil.from(this.chunks[0].buf);
+        }
+        else if (this.isPublicKeyHashOut()) {
+            type = 'p2pkh';
+            payload = buffer_js_1.BufferUtil.from(this.chunks[2].buf);
+        }
+        else if (this.isScriptHashOut()) {
+            type = 'p2sh';
+            payload = buffer_js_1.BufferUtil.from(this.chunks[1].buf);
+        }
+        else if (this.isTaprootOut()) {
+            type = this.chunks.length === 4 ? 'p2tr-state' : 'p2tr-commitment';
+            payload = buffer_js_1.BufferUtil.from(this.chunks[2].buf);
+        }
+        else {
+            type = 'other';
+            payload = this.toBuffer();
+        }
+        return { type, payload, payloadHex: payload.toString('hex') };
+    }
     getAddressInfo() {
         if (this._isInput) {
             return this._getInputAddressInfo();
@@ -668,7 +731,7 @@ class Script {
     }
     _getOutputAddressInfo() {
         const info = {};
-        if (this.isPayToTaproot()) {
+        if (this.isTaprootOut()) {
             const buf = this.toBuffer();
             info.hashBuffer = buf.slice(3, 36);
             info.type = address_js_1.Address.PayToTaproot;
@@ -708,7 +771,7 @@ class Script {
         }
         if (info instanceof address_js_1.Address) {
             if (network) {
-                if (this.isPayToTaproot()) {
+                if (this.isTaprootOut()) {
                     const buf = this.toBuffer();
                     const commitment = buf.slice(3, 36);
                     return address_js_1.Address.fromTaprootCommitment(commitment, network);
@@ -763,7 +826,16 @@ class Script {
     }
     isValid() {
         try {
-            return this.chunks.length > 0;
+            for (const chunk of this.chunks) {
+                if (chunk.opcodenum === undefined) {
+                    return false;
+                }
+                if (chunk.buf &&
+                    (chunk.len === undefined || chunk.len !== chunk.buf.length)) {
+                    return false;
+                }
+            }
+            return true;
         }
         catch (e) {
             return false;
@@ -773,7 +845,7 @@ class Script {
         const cloned = new Script();
         cloned.chunks = this.chunks.map(chunk => new chunk_js_1.Chunk({
             opcodenum: chunk.opcodenum,
-            buf: chunk.buf ? Buffer.from(chunk.buf) : undefined,
+            buf: chunk.buf ? buffer_js_1.BufferUtil.from(chunk.buf) : undefined,
             len: chunk.len,
         }));
         return cloned;
@@ -864,7 +936,7 @@ class Script {
         return (this.chunks.length > 3 &&
             this._isSmallIntOp(this.chunks[0].opcodenum) &&
             this.chunks.slice(1, this.chunks.length - 2).every(function (obj) {
-                return obj.buf && Buffer.isBuffer(obj.buf);
+                return obj.buf && buffer_js_1.BufferUtil.isBuffer(obj.buf);
             }) &&
             this._isSmallIntOp(this.chunks[this.chunks.length - 2].opcodenum) &&
             this.chunks[this.chunks.length - 1].opcodenum === opcode_js_1.Opcode.OP_CHECKMULTISIG);
@@ -876,7 +948,7 @@ class Script {
         return (this.chunks.length >= 2 &&
             this.chunks[0].opcodenum === 0 &&
             this.chunks.slice(1, this.chunks.length).every(function (obj) {
-                return obj.buf && Buffer.isBuffer(obj.buf) && signature_js_1.Signature.isTxDER(obj.buf);
+                return (obj.buf && buffer_js_1.BufferUtil.isBuffer(obj.buf) && signature_js_1.Signature.isTxDER(obj.buf));
             }));
     }
     isDataOut() {
@@ -946,11 +1018,8 @@ class Script {
         return this.classify() !== exports.ScriptTypes.UNKNOWN;
     }
     getType() {
-        if (this.isPayToTaproot()) {
-            const buf = this.toBuffer();
-            return buf.length === taproot_js_1.TAPROOT_SIZE_WITH_STATE
-                ? 'p2tr-state'
-                : 'p2tr-commitment';
+        if (this.isTaprootOut()) {
+            return this.chunks.length === 4 ? 'p2tr-state' : 'p2tr-commitment';
         }
         else if (this.isPublicKeyOut()) {
             return 'p2pk';
@@ -973,11 +1042,11 @@ class Script {
             return false;
         }
         for (let i = 0; i < this.chunks.length; i++) {
-            if (Buffer.isBuffer(this.chunks[i].buf) &&
-                !Buffer.isBuffer(script.chunks[i].buf)) {
+            if (buffer_js_1.BufferUtil.isBuffer(this.chunks[i].buf) &&
+                !buffer_js_1.BufferUtil.isBuffer(script.chunks[i].buf)) {
                 return false;
             }
-            if (Buffer.isBuffer(this.chunks[i].buf) &&
+            if (buffer_js_1.BufferUtil.isBuffer(this.chunks[i].buf) &&
                 !buffer_js_1.BufferUtil.equals(this.chunks[i].buf, script.chunks[i].buf)) {
                 return false;
             }
@@ -997,7 +1066,7 @@ class Script {
         else if (obj instanceof opcode_js_1.Opcode) {
             this._addOpcode(obj, prepend);
         }
-        else if (Buffer.isBuffer(obj)) {
+        else if (buffer_js_1.BufferUtil.isBuffer(obj)) {
             this._addBuffer(obj, prepend);
         }
         else if (obj instanceof Script) {
@@ -1139,13 +1208,3 @@ exports.ScriptTypes = {
     MULTISIG_IN: 'Spend from multisig',
     DATA_OUT: 'Data push',
 };
-function toAddress(script, network) {
-    const addr = script.toAddress(network);
-    if (!addr || typeof addr === 'boolean') {
-        throw new Error('Cannot convert script to address');
-    }
-    return addr;
-}
-function empty() {
-    return new Script();
-}

package/dist/cjs/lib/bitcore/taproot/musig2.js

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildMuSigTaprootKey = buildMuSigTaprootKey;
-exports.buildMuSigTaprootKeyWithScripts = buildMuSigTaprootKeyWithScripts;
+exports.buildMuSig2TaprootKey = buildMuSig2TaprootKey;
+exports.buildMuSig2TaprootKeyWithScripts = buildMuSig2TaprootKeyWithScripts;
 exports.signTaprootKeyPathWithMuSig2 = signTaprootKeyPathWithMuSig2;
 exports.verifyTaprootKeyPathMuSigPartial = verifyTaprootKeyPathMuSigPartial;
 exports.isMuSigTaprootOutput = isMuSigTaprootOutput;
 exports.createMuSigTaprootAddress = createMuSigTaprootAddress;
-const address_js_1 = require("../address.js");
-const index_js_1 = require("../crypto/index.js");
-const musig2_js_1 = require("../crypto/musig2.js");
-const taproot_js_1 = require("../taproot.js");
-function buildMuSigTaprootKey(signerPubKeys, state) {
-    const keyAggContext = (0, musig2_js_1.musigKeyAgg)(signerPubKeys);
+const address_1 = require("../address");
+const buffer_1 = require("../util/buffer");
+const index_1 = require("../crypto/index");
+const musig2_1 = require("../crypto/musig2");
+const taproot_1 = require("../script/taproot");
+function buildMuSig2TaprootKey(signerPubKeys) {
+    const keyAggContext = (0, musig2_1.muSig2KeyAgg)(signerPubKeys);
     const aggregatedPubKey = keyAggContext.aggregatedPubKey;
-    const merkleRoot = Buffer.alloc(32);
-    const tweak = (0, taproot_js_1.calculateTapTweak)(aggregatedPubKey, merkleRoot);
-    const commitment = (0, taproot_js_1.tweakPublicKey)(aggregatedPubKey, merkleRoot);
-    const script = (0, taproot_js_1.buildKeyPathTaproot)(aggregatedPubKey, state);
+    const merkleRoot = buffer_1.BufferUtil.alloc(32);
+    const tweak = (0, taproot_1.calculateTapTweak)(aggregatedPubKey, merkleRoot);
+    const commitment = (0, taproot_1.tweakPublicKey)(aggregatedPubKey, merkleRoot);
+    const script = (0, taproot_1.buildKeyPathTaproot)(aggregatedPubKey);
     return {
         aggregatedPubKey,
         commitment,
@@ -26,11 +27,11 @@ function buildMuSigTaprootKey(signerPubKeys, state) {
         tweak,
     };
 }
-function buildMuSigTaprootKeyWithScripts(signerPubKeys, scriptTree, state) {
-    const keyAggContext = (0, musig2_js_1.musigKeyAgg)(signerPubKeys);
+function buildMuSig2TaprootKeyWithScripts(signerPubKeys, scriptTree, state) {
+    const keyAggContext = (0, musig2_1.muSig2KeyAgg)(signerPubKeys);
     const aggregatedPubKey = keyAggContext.aggregatedPubKey;
-    const { script, commitment, merkleRoot, leaves } = (0, taproot_js_1.buildScriptPathTaproot)(aggregatedPubKey, scriptTree, state);
-    const tweak = (0, taproot_js_1.calculateTapTweak)(aggregatedPubKey, merkleRoot);
+    const { script, commitment, merkleRoot, leaves } = (0, taproot_1.buildScriptPathTaproot)(aggregatedPubKey, scriptTree, state);
+    const tweak = (0, taproot_1.calculateTapTweak)(aggregatedPubKey, merkleRoot);
     return {
         aggregatedPubKey,
         commitment,
@@ -42,35 +43,39 @@ function buildMuSigTaprootKeyWithScripts(signerPubKeys, scriptTree, state) {
     };
 }
 function signTaprootKeyPathWithMuSig2(secretNonce, privateKey, keyAggContext, signerIndex, aggregatedNonce, message, tweak) {
-    const n = index_js_1.Point.getN();
+    const n = index_1.Point.getN();
     const commitment = keyAggContext.aggregatedPubKey.addScalar(tweak);
     const modifiedKeyAggContext = {
         ...keyAggContext,
         aggregatedPubKey: commitment,
     };
-    const partialSig = (0, musig2_js_1.musigPartialSign)(secretNonce, privateKey, modifiedKeyAggContext, signerIndex, aggregatedNonce, message);
+    const partialSig = (0, musig2_1.muSig2PartialSign)(secretNonce, privateKey, modifiedKeyAggContext, signerIndex, aggregatedNonce, message);
     if (signerIndex === 0) {
         const { R1, R2 } = aggregatedNonce;
-        const nonceCoefData = Buffer.concat([
+        const nonceCoefData = buffer_1.BufferUtil.concat([
             commitment.toBuffer(),
-            index_js_1.Point.pointToCompressed(R1),
-            index_js_1.Point.pointToCompressed(R2),
+            index_1.Point.pointToCompressed(R1),
+            index_1.Point.pointToCompressed(R2),
             message,
         ]);
-        const b = new index_js_1.BN((0, musig2_js_1.musigTaggedHash)(musig2_js_1.MUSIG_TAG_NONCE_COEFF, nonceCoefData), 'be');
+        const b = index_1.BN.fromBuffer((0, musig2_1.muSig2TaggedHash)(musig2_1.MUSIG2_TAG_NONCE_COEFF, nonceCoefData));
         const R = R1.add(R2.mul(b));
-        const R_x = R.getX().toArrayLike(Buffer, 'be', 32);
-        const commitment_compressed = index_js_1.Point.pointToCompressed(commitment.point);
-        const challengeData = Buffer.concat([R_x, commitment_compressed, message]);
-        const e = new index_js_1.BN(index_js_1.Hash.sha256(challengeData), 'be').umod(n);
-        const tweakBN = new index_js_1.BN(tweak, 'be').umod(n);
+        const R_x = R.x.toBuffer({ size: 32 });
+        const commitment_compressed = index_1.Point.pointToCompressed(commitment.point);
+        const challengeData = buffer_1.BufferUtil.concat([
+            R_x,
+            commitment_compressed,
+            message,
+        ]);
+        const e = index_1.BN.fromBuffer(index_1.Hash.sha256(challengeData)).umod(n);
+        const tweakBN = index_1.BN.fromBuffer(tweak).umod(n);
         const tweakTerm = e.mul(tweakBN).umod(n);
         return partialSig.add(tweakTerm).umod(n);
     }
     return partialSig;
 }
 function verifyTaprootKeyPathMuSigPartial(partialSig, publicNonce, publicKey, keyAggContext, signerIndex, aggregatedNonce, message, tweak) {
-    const n = index_js_1.Point.getN();
+    const n = index_1.Point.getN();
     const commitment = keyAggContext.aggregatedPubKey.addScalar(tweak);
     const modifiedKeyAggContext = {
         ...keyAggContext,
@@ -79,28 +84,32 @@ function verifyTaprootKeyPathMuSigPartial(partialSig, publicNonce, publicKey, ke
     let adjustedPartialSig = partialSig;
     if (signerIndex === 0) {
         const { R1, R2 } = aggregatedNonce;
-        const nonceCoefData = Buffer.concat([
+        const nonceCoefData = buffer_1.BufferUtil.concat([
             commitment.toBuffer(),
-            index_js_1.Point.pointToCompressed(R1),
-            index_js_1.Point.pointToCompressed(R2),
+            index_1.Point.pointToCompressed(R1),
+            index_1.Point.pointToCompressed(R2),
             message,
         ]);
-        const b = new index_js_1.BN((0, musig2_js_1.musigTaggedHash)(musig2_js_1.MUSIG_TAG_NONCE_COEFF, nonceCoefData), 'be');
+        const b = index_1.BN.fromBuffer((0, musig2_1.muSig2TaggedHash)(musig2_1.MUSIG2_TAG_NONCE_COEFF, nonceCoefData));
         const R = R1.add(R2.mul(b));
-        const R_x = R.getX().toArrayLike(Buffer, 'be', 32);
-        const commitment_compressed = index_js_1.Point.pointToCompressed(commitment.point);
-        const challengeData = Buffer.concat([R_x, commitment_compressed, message]);
-        const e = new index_js_1.BN(index_js_1.Hash.sha256(challengeData), 'be').umod(n);
-        const tweakBN = new index_js_1.BN(tweak, 'be').umod(n);
+        const R_x = R.x.toBuffer({ size: 32 });
+        const commitment_compressed = index_1.Point.pointToCompressed(commitment.point);
+        const challengeData = buffer_1.BufferUtil.concat([
+            R_x,
+            commitment_compressed,
+            message,
+        ]);
+        const e = index_1.BN.fromBuffer(index_1.Hash.sha256(challengeData)).umod(n);
+        const tweakBN = index_1.BN.fromBuffer(tweak).umod(n);
         const tweakTerm = e.mul(tweakBN).umod(n);
         adjustedPartialSig = partialSig.sub(tweakTerm).umod(n);
     }
-    return (0, musig2_js_1.musigPartialSigVerify)(adjustedPartialSig, publicNonce, publicKey, modifiedKeyAggContext, signerIndex, aggregatedNonce, message);
+    return (0, musig2_1.muSig2PartialSigVerify)(adjustedPartialSig, publicNonce, publicKey, modifiedKeyAggContext, signerIndex, aggregatedNonce, message);
 }
 function isMuSigTaprootOutput(script) {
-    return script.isPayToTaproot();
+    return script.isTaprootOut();
 }
-function createMuSigTaprootAddress(signerPubKeys, network, state) {
+function createMuSigTaprootAddress(signerPubKeys, network) {
     if (signerPubKeys.length === 0) {
         throw new Error('At least one signer public key is required');
     }
@@ -109,8 +118,8 @@ function createMuSigTaprootAddress(signerPubKeys, network, state) {
     if (mismatchedKeyIndex !== -1) {
         throw new Error(`Public key network mismatch at index ${mismatchedKeyIndex}: expected '${inferredNetwork}', got '${signerPubKeys[mismatchedKeyIndex].network.name}'`);
     }
-    const result = buildMuSigTaprootKey(signerPubKeys, state);
-    const address = address_js_1.Address.fromTaprootCommitment(result.commitment, inferredNetwork);
+    const result = buildMuSig2TaprootKey(signerPubKeys);
+    const address = address_1.Address.fromTaprootCommitment(result.commitment, inferredNetwork);
     return {
         address,
         script: result.script,