npm - @arkade-os/sdk - Versions diffs - 0.3.0-alpha.6 → 0.3.0-alpha.7 - Mend

@arkade-os/sdk 0.3.0-alpha.6 → 0.3.0-alpha.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/cjs/script/base.js CHANGED Viewed

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VtxoScript = void 0;
 exports.scriptFromTapLeafScript = scriptFromTapLeafScript;
+const btc_signer_1 = require("@scure/btc-signer");
 const payment_js_1 = require("@scure/btc-signer/payment.js");
+const psbt_js_1 = require("@scure/btc-signer/psbt.js");
 const utils_js_1 = require("@scure/btc-signer/utils.js");
-const address_1 = require("./address");
-const script_js_1 = require("@scure/btc-signer/script.js");
 const base_1 = require("@scure/base");
+const address_1 = require("./address");
 const tapscript_1 = require("./tapscript");
+const TapTreeCoder = psbt_js_1.PSBTOutput.tapTree[2];
 function scriptFromTapLeafScript(leaf) {
     return leaf[1].subarray(0, leaf[1].length - 1); // remove the version byte
 }
@@ -21,13 +23,14 @@ function scriptFromTapLeafScript(leaf) {
  */
 class VtxoScript {
     static decode(tapTree) {
-        const leaves = decodeTaprootTree(tapTree);
-        return new VtxoScript(leaves);
+        const leaves = TapTreeCoder.decode(tapTree);
+        const scripts = leaves.map((leaf) => leaf.script);
+        return new VtxoScript(scripts);
     }
     constructor(scripts) {
         this.scripts = scripts;
-        const tapTree = (0, payment_js_1.taprootListToTree)(scripts.map((script) => ({ script, leafVersion: payment_js_1.TAP_LEAF_VERSION })));
-        const payment = (0, payment_js_1.p2tr)(utils_js_1.TAPROOT_UNSPENDABLE_KEY, tapTree, undefined, true);
+        const tapTree = (0, btc_signer_1.taprootListToTree)(scripts.map((script) => ({ script, leafVersion: payment_js_1.TAP_LEAF_VERSION })));
+        const payment = (0, btc_signer_1.p2tr)(utils_js_1.TAPROOT_UNSPENDABLE_KEY, tapTree, undefined, true);
         if (!payment.tapLeafScript ||
             payment.tapLeafScript.length !== scripts.length) {
             throw new Error("invalid scripts");
@@ -36,17 +39,21 @@ class VtxoScript {
         this.tweakedPublicKey = payment.tweakedPubkey;
     }
     encode() {
-        const tapTree = encodeTaprootTree(this.scripts);
+        const tapTree = TapTreeCoder.encode(this.scripts.map((script) => ({
+            depth: 1,
+            version: payment_js_1.TAP_LEAF_VERSION,
+            script,
+        })));
         return tapTree;
     }
     address(prefix, serverPubKey) {
         return new address_1.ArkAddress(serverPubKey, this.tweakedPublicKey, prefix);
     }
     get pkScript() {
-        return script_js_1.Script.encode(["OP_1", this.tweakedPublicKey]);
+        return btc_signer_1.Script.encode(["OP_1", this.tweakedPublicKey]);
     }
     onchainAddress(network) {
-        return (0, payment_js_1.Address)(network).encode({
+        return (0, btc_signer_1.Address)(network).encode({
             type: "tr",
             pubkey: this.tweakedPublicKey,
         });
@@ -80,89 +87,3 @@ class VtxoScript {
     }
 }
 exports.VtxoScript = VtxoScript;
-function decodeTaprootTree(tapTree) {
-    let offset = 0;
-    const scripts = [];
-    // Read number of leaves
-    const [numLeaves, numLeavesSize] = decodeCompactSizeUint(tapTree, offset);
-    offset += numLeavesSize;
-    // Read each leaf
-    for (let i = 0; i < numLeaves; i++) {
-        // Skip depth (1 byte)
-        offset += 1;
-        // Skip leaf version (1 byte)
-        offset += 1;
-        // Read script length
-        const [scriptLength, scriptLengthSize] = decodeCompactSizeUint(tapTree, offset);
-        offset += scriptLengthSize;
-        // Read script content
-        const script = tapTree.slice(offset, offset + scriptLength);
-        scripts.push(script);
-        offset += scriptLength;
-    }
-    return scripts;
-}
-function decodeCompactSizeUint(data, offset) {
-    const firstByte = data[offset];
-    if (firstByte < 0xfd) {
-        return [firstByte, 1];
-    }
-    else if (firstByte === 0xfd) {
-        const value = new DataView(data.buffer).getUint16(offset + 1, true);
-        return [value, 3];
-    }
-    else if (firstByte === 0xfe) {
-        const value = new DataView(data.buffer).getUint32(offset + 1, true);
-        return [value, 5];
-    }
-    else {
-        const value = Number(new DataView(data.buffer).getBigUint64(offset + 1, true));
-        return [value, 9];
-    }
-}
-function encodeTaprootTree(leaves) {
-    const chunks = [];
-    // Write number of leaves as compact size uint
-    chunks.push(encodeCompactSizeUint(leaves.length));
-    for (const tapscript of leaves) {
-        // Write depth (always 1 for now)
-        chunks.push(new Uint8Array([1]));
-        // Write leaf version (0xc0 for tapscript)
-        chunks.push(new Uint8Array([0xc0]));
-        // Write script length and script
-        chunks.push(encodeCompactSizeUint(tapscript.length));
-        chunks.push(tapscript);
-    }
-    // Concatenate all chunks
-    const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
-    const result = new Uint8Array(totalLength);
-    let offset = 0;
-    for (const chunk of chunks) {
-        result.set(chunk, offset);
-        offset += chunk.length;
-    }
-    return result;
-}
-function encodeCompactSizeUint(value) {
-    if (value < 0xfd) {
-        return new Uint8Array([value]);
-    }
-    else if (value <= 0xffff) {
-        const buffer = new Uint8Array(3);
-        buffer[0] = 0xfd;
-        new DataView(buffer.buffer).setUint16(1, value, true);
-        return buffer;
-    }
-    else if (value <= 0xffffffff) {
-        const buffer = new Uint8Array(5);
-        buffer[0] = 0xfe;
-        new DataView(buffer.buffer).setUint32(1, value, true);
-        return buffer;
-    }
-    else {
-        const buffer = new Uint8Array(9);
-        buffer[0] = 0xff;
-        new DataView(buffer.buffer).setBigUint64(1, BigInt(value), true);
-        return buffer;
-    }
-}

package/dist/esm/script/base.js CHANGED Viewed

@@ -1,9 +1,11 @@
-import { Address, p2tr, TAP_LEAF_VERSION, taprootListToTree, } from "@scure/btc-signer/payment.js";
+import { Script, Address, p2tr, taprootListToTree } from "@scure/btc-signer";
+import { TAP_LEAF_VERSION } from "@scure/btc-signer/payment.js";
+import { PSBTOutput } from "@scure/btc-signer/psbt.js";
 import { TAPROOT_UNSPENDABLE_KEY, } from "@scure/btc-signer/utils.js";
-import { ArkAddress } from './address.js';
-import { Script } from "@scure/btc-signer/script.js";
 import { hex } from "@scure/base";
+import { ArkAddress } from './address.js';
 import { ConditionCSVMultisigTapscript, CSVMultisigTapscript, } from './tapscript.js';
+const TapTreeCoder = PSBTOutput.tapTree[2];
 export function scriptFromTapLeafScript(leaf) {
     return leaf[1].subarray(0, leaf[1].length - 1); // remove the version byte
 }
@@ -17,8 +19,9 @@ export function scriptFromTapLeafScript(leaf) {
  */
 export class VtxoScript {
     static decode(tapTree) {
-        const leaves = decodeTaprootTree(tapTree);
-        return new VtxoScript(leaves);
+        const leaves = TapTreeCoder.decode(tapTree);
+        const scripts = leaves.map((leaf) => leaf.script);
+        return new VtxoScript(scripts);
     }
     constructor(scripts) {
         this.scripts = scripts;
@@ -32,7 +35,11 @@ export class VtxoScript {
         this.tweakedPublicKey = payment.tweakedPubkey;
     }
     encode() {
-        const tapTree = encodeTaprootTree(this.scripts);
+        const tapTree = TapTreeCoder.encode(this.scripts.map((script) => ({
+            depth: 1,
+            version: TAP_LEAF_VERSION,
+            script,
+        })));
         return tapTree;
     }
     address(prefix, serverPubKey) {
@@ -75,89 +82,3 @@ export class VtxoScript {
         return paths;
     }
 }
-function decodeTaprootTree(tapTree) {
-    let offset = 0;
-    const scripts = [];
-    // Read number of leaves
-    const [numLeaves, numLeavesSize] = decodeCompactSizeUint(tapTree, offset);
-    offset += numLeavesSize;
-    // Read each leaf
-    for (let i = 0; i < numLeaves; i++) {
-        // Skip depth (1 byte)
-        offset += 1;
-        // Skip leaf version (1 byte)
-        offset += 1;
-        // Read script length
-        const [scriptLength, scriptLengthSize] = decodeCompactSizeUint(tapTree, offset);
-        offset += scriptLengthSize;
-        // Read script content
-        const script = tapTree.slice(offset, offset + scriptLength);
-        scripts.push(script);
-        offset += scriptLength;
-    }
-    return scripts;
-}
-function decodeCompactSizeUint(data, offset) {
-    const firstByte = data[offset];
-    if (firstByte < 0xfd) {
-        return [firstByte, 1];
-    }
-    else if (firstByte === 0xfd) {
-        const value = new DataView(data.buffer).getUint16(offset + 1, true);
-        return [value, 3];
-    }
-    else if (firstByte === 0xfe) {
-        const value = new DataView(data.buffer).getUint32(offset + 1, true);
-        return [value, 5];
-    }
-    else {
-        const value = Number(new DataView(data.buffer).getBigUint64(offset + 1, true));
-        return [value, 9];
-    }
-}
-function encodeTaprootTree(leaves) {
-    const chunks = [];
-    // Write number of leaves as compact size uint
-    chunks.push(encodeCompactSizeUint(leaves.length));
-    for (const tapscript of leaves) {
-        // Write depth (always 1 for now)
-        chunks.push(new Uint8Array([1]));
-        // Write leaf version (0xc0 for tapscript)
-        chunks.push(new Uint8Array([0xc0]));
-        // Write script length and script
-        chunks.push(encodeCompactSizeUint(tapscript.length));
-        chunks.push(tapscript);
-    }
-    // Concatenate all chunks
-    const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
-    const result = new Uint8Array(totalLength);
-    let offset = 0;
-    for (const chunk of chunks) {
-        result.set(chunk, offset);
-        offset += chunk.length;
-    }
-    return result;
-}
-function encodeCompactSizeUint(value) {
-    if (value < 0xfd) {
-        return new Uint8Array([value]);
-    }
-    else if (value <= 0xffff) {
-        const buffer = new Uint8Array(3);
-        buffer[0] = 0xfd;
-        new DataView(buffer.buffer).setUint16(1, value, true);
-        return buffer;
-    }
-    else if (value <= 0xffffffff) {
-        const buffer = new Uint8Array(5);
-        buffer[0] = 0xfe;
-        new DataView(buffer.buffer).setUint32(1, value, true);
-        return buffer;
-    }
-    else {
-        const buffer = new Uint8Array(9);
-        buffer[0] = 0xff;
-        new DataView(buffer.buffer).setBigUint64(1, BigInt(value), true);
-        return buffer;
-    }
-}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.3.0-alpha.6",
+  "version": "0.3.0-alpha.7",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",