@ledgerhq/hw-app-btc 6.7.0 → 6.9.1-6.9.1-taproot.0.0

package/lib-es/newops/merkelizedPsbt.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="node" />
+import { MerkleMap } from "./merkleMap";
+import { PsbtV2 } from "./psbtv2";
+export declare class MerkelizedPsbt extends PsbtV2 {
+    globalMerkleMap: MerkleMap;
+    inputMerkleMaps: MerkleMap[];
+    outputMerkleMaps: MerkleMap[];
+    inputMapCommitments: Buffer[];
+    outputMapCommitments: Buffer[];
+    constructor(psbt: PsbtV2);
+    getGlobalSize(): number;
+    getGlobalKeysValuesRoot(): Buffer;
+    private static createMerkleMap;
+}
+//# sourceMappingURL=merkelizedPsbt.d.ts.map

package/lib-es/newops/merkelizedPsbt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merkelizedPsbt.d.ts","sourceRoot":"","sources":["../../src/newops/merkelizedPsbt.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,cAAe,SAAQ,MAAM;IACjC,eAAe,EAAE,SAAS,CAAC;IAC3B,eAAe,EAAE,SAAS,EAAE,CAAM;IAClC,gBAAgB,EAAE,SAAS,EAAE,CAAM;IACnC,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;gBAC1B,IAAI,EAAE,MAAM;IAwBxB,aAAa,IAAI,MAAM;IAGvB,uBAAuB,IAAI,MAAM;IAIjC,OAAO,CAAC,MAAM,CAAC,eAAe;CAc/B"}

package/lib-es/newops/merkelizedPsbt.js

@@ -0,0 +1,88 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { MerkleMap } from "./merkleMap";
+import { PsbtV2 } from "./psbtv2";
+var MerkelizedPsbt = /** @class */ (function (_super) {
+    __extends(MerkelizedPsbt, _super);
+    function MerkelizedPsbt(psbt) {
+        var _this = _super.call(this) || this;
+        _this.inputMerkleMaps = [];
+        _this.outputMerkleMaps = [];
+        psbt.copy(_this);
+        _this.globalMerkleMap = MerkelizedPsbt.createMerkleMap(_this.globalMap);
+        for (var i = 0; i < _this.getGlobalInputCount(); i++) {
+            _this.inputMerkleMaps.push(MerkelizedPsbt.createMerkleMap(_this.inputMaps[i]));
+        }
+        _this.inputMapCommitments = __spreadArray([], __read(_this.inputMerkleMaps.values()), false).map(function (v) {
+            return v.commitment();
+        });
+        for (var i = 0; i < _this.getGlobalOutputCount(); i++) {
+            _this.outputMerkleMaps.push(MerkelizedPsbt.createMerkleMap(_this.outputMaps[i]));
+        }
+        _this.outputMapCommitments = __spreadArray([], __read(_this.outputMerkleMaps.values()), false).map(function (v) {
+            return v.commitment();
+        });
+        return _this;
+    }
+    // These public functions are for MerkelizedPsbt.
+    MerkelizedPsbt.prototype.getGlobalSize = function () {
+        return this.globalMap.size;
+    };
+    MerkelizedPsbt.prototype.getGlobalKeysValuesRoot = function () {
+        return this.globalMerkleMap.commitment();
+    };
+    MerkelizedPsbt.createMerkleMap = function (map) {
+        var sortedKeysStrings = __spreadArray([], __read(map.keys()), false).sort();
+        var values = sortedKeysStrings.map(function (k) {
+            var v = map.get(k);
+            if (!v) {
+                throw new Error("No value for key " + k);
+            }
+            return v;
+        });
+        var sortedKeys = sortedKeysStrings.map(function (k) { return Buffer.from(k, "hex"); });
+        var merkleMap = new MerkleMap(sortedKeys, values);
+        return merkleMap;
+    };
+    return MerkelizedPsbt;
+}(PsbtV2));
+export { MerkelizedPsbt };
+//# sourceMappingURL=merkelizedPsbt.js.map

package/lib-es/newops/merkelizedPsbt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merkelizedPsbt.js","sourceRoot":"","sources":["../../src/newops/merkelizedPsbt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;IAAoC,kCAAM;IAMxC,wBAAY,IAAY;QAAxB,YACE,iBAAO,SAqBR;QA1BM,qBAAe,GAAgB,EAAE,CAAC;QAClC,sBAAgB,GAAgB,EAAE,CAAC;QAKxC,IAAI,CAAC,IAAI,CAAC,KAAI,CAAC,CAAC;QAChB,KAAI,CAAC,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC,KAAI,CAAC,SAAS,CAAC,CAAC;QAEtE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE;YACnD,KAAI,CAAC,eAAe,CAAC,IAAI,CACvB,cAAc,CAAC,eAAe,CAAC,KAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAClD,CAAC;SACH;QACD,KAAI,CAAC,mBAAmB,GAAG,yBAAI,KAAI,CAAC,eAAe,CAAC,MAAM,EAAE,UAAE,GAAG,CAAC,UAAC,CAAC;YAClE,OAAA,CAAC,CAAC,UAAU,EAAE;QAAd,CAAc,CACf,CAAC;QAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;YACpD,KAAI,CAAC,gBAAgB,CAAC,IAAI,CACxB,cAAc,CAAC,eAAe,CAAC,KAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CACnD,CAAC;SACH;QACD,KAAI,CAAC,oBAAoB,GAAG,yBAAI,KAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAE,GAAG,CAAC,UAAC,CAAC;YACpE,OAAA,CAAC,CAAC,UAAU,EAAE;QAAd,CAAc,CACf,CAAC;;IACJ,CAAC;IACD,iDAAiD;IACjD,sCAAa,GAAb;QACE,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;IAC7B,CAAC;IACD,gDAAuB,GAAvB;QACE,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;IAC3C,CAAC;IAEc,8BAAe,GAA9B,UAA+B,GAAwB;QACrD,IAAM,iBAAiB,GAAG,yBAAI,GAAG,CAAC,IAAI,EAAE,UAAE,IAAI,EAAE,CAAC;QACjD,IAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,UAAC,CAAC;YACrC,IAAM,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,CAAC,CAAC,EAAE;gBACN,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAC;aAC1C;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QACH,IAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,EAArB,CAAqB,CAAC,CAAC;QAEvE,IAAM,SAAS,GAAG,IAAI,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,SAAS,CAAC;IACnB,CAAC;IACH,qBAAC;AAAD,CAAC,AAnDD,CAAoC,MAAM,GAmDzC"}

package/lib-es/newops/merkle.d.ts

@@ -0,0 +1,29 @@
+/// <reference types="node" />
+export declare class Merkle {
+    private leaves;
+    private rootNode;
+    private leafNodes;
+    private h;
+    constructor(leaves: Buffer[], hasher?: (buf: Buffer) => Buffer);
+    getRoot(): Buffer;
+    size(): number;
+    getLeaves(): Buffer[];
+    getLeafHash(index: number): Buffer;
+    getProof(index: number): Buffer[];
+    calculateRoot(leaves: Buffer[]): {
+        root: Node;
+        leaves: Node[];
+    };
+    hashNode(left: Buffer, right: Buffer): Buffer;
+}
+export declare function hashLeaf(buf: Buffer, hashFunction?: (buf: Buffer) => Buffer): Buffer;
+declare class Node {
+    leftChild?: Node;
+    rightChild?: Node;
+    parent?: Node;
+    hash: Buffer;
+    constructor(left: Node | undefined, right: Node | undefined, hash: Buffer);
+    isLeaf(): boolean;
+}
+export {};
+//# sourceMappingURL=merkle.d.ts.map

package/lib-es/newops/merkle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merkle.d.ts","sourceRoot":"","sources":["../../src/newops/merkle.ts"],"names":[],"mappings":";AAEA,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,QAAQ,CAAO;IACvB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,CAAC,CAA0B;gBAEjC,MAAM,EAAE,MAAM,EAAE,EAChB,MAAM,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAsB;IAQjD,OAAO,IAAI,MAAM;IAGjB,IAAI,IAAI,MAAM;IAGd,SAAS,IAAI,MAAM,EAAE;IAGrB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAGlC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAKjC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,IAAI,EAAE,CAAA;KAAE;IAwB/D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAG9C;AAED,wBAAgB,QAAQ,CACtB,GAAG,EAAE,MAAM,EACX,YAAY,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAsB,GACpD,MAAM,CAER;AAUD,cAAM,IAAI;IACR,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;gBACD,IAAI,EAAE,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM;IAKzE,MAAM,IAAI,OAAO;CAGlB"}

package/lib-es/newops/merkle.js

@@ -0,0 +1,129 @@
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { crypto } from "bitcoinjs-lib";
+var Merkle = /** @class */ (function () {
+    function Merkle(leaves, hasher) {
+        if (hasher === void 0) { hasher = crypto.sha256; }
+        this.leaves = leaves;
+        this.h = hasher;
+        var nodes = this.calculateRoot(leaves);
+        this.rootNode = nodes.root;
+        this.leafNodes = nodes.leaves;
+    }
+    Merkle.prototype.getRoot = function () {
+        return this.rootNode.hash;
+    };
+    Merkle.prototype.size = function () {
+        return this.leaves.length;
+    };
+    Merkle.prototype.getLeaves = function () {
+        return this.leaves;
+    };
+    Merkle.prototype.getLeafHash = function (index) {
+        return this.leafNodes[index].hash;
+    };
+    Merkle.prototype.getProof = function (index) {
+        if (index >= this.leaves.length)
+            throw Error("Index out of bounds");
+        return proveNode(this.leafNodes[index]);
+    };
+    Merkle.prototype.calculateRoot = function (leaves) {
+        var n = leaves.length;
+        if (n == 0) {
+            return {
+                root: new Node(undefined, undefined, Buffer.alloc(32, 0)),
+                leaves: []
+            };
+        }
+        if (n == 1) {
+            var newNode = new Node(undefined, undefined, leaves[0]);
+            return { root: newNode, leaves: [newNode] };
+        }
+        var leftCount = highestPowerOf2LessThan(n);
+        var leftBranch = this.calculateRoot(leaves.slice(0, leftCount));
+        var rightBranch = this.calculateRoot(leaves.slice(leftCount));
+        var leftChild = leftBranch.root;
+        var rightChild = rightBranch.root;
+        var hash = this.hashNode(leftChild.hash, rightChild.hash);
+        var node = new Node(leftChild, rightChild, hash);
+        leftChild.parent = node;
+        rightChild.parent = node;
+        return { root: node, leaves: leftBranch.leaves.concat(rightBranch.leaves) };
+    };
+    Merkle.prototype.hashNode = function (left, right) {
+        return this.h(Buffer.concat([Buffer.of(1), left, right]));
+    };
+    return Merkle;
+}());
+export { Merkle };
+export function hashLeaf(buf, hashFunction) {
+    if (hashFunction === void 0) { hashFunction = crypto.sha256; }
+    return hashConcat(Buffer.of(0), buf, hashFunction);
+}
+function hashConcat(bufA, bufB, hashFunction) {
+    return hashFunction(Buffer.concat([bufA, bufB]));
+}
+var Node = /** @class */ (function () {
+    function Node(left, right, hash) {
+        this.leftChild = left;
+        this.rightChild = right;
+        this.hash = hash;
+    }
+    Node.prototype.isLeaf = function () {
+        return this.leftChild == undefined;
+    };
+    return Node;
+}());
+function proveNode(node) {
+    if (!node.parent) {
+        return [];
+    }
+    if (node.parent.leftChild == node) {
+        if (!node.parent.rightChild) {
+            throw new Error("Expected right child to exist");
+        }
+        return __spreadArray([node.parent.rightChild.hash], __read(proveNode(node.parent)), false);
+    }
+    else {
+        if (!node.parent.leftChild) {
+            throw new Error("Expected left child to exist");
+        }
+        return __spreadArray([node.parent.leftChild.hash], __read(proveNode(node.parent)), false);
+    }
+}
+function highestPowerOf2LessThan(n) {
+    if (n < 2) {
+        throw Error("Expected n >= 2");
+    }
+    if (isPowerOf2(n)) {
+        return n / 2;
+    }
+    return 1 << Math.floor(Math.log2(n));
+}
+function isPowerOf2(n) {
+    return (n & (n - 1)) == 0;
+}
+//# sourceMappingURL=merkle.js.map

package/lib-es/newops/merkle.js.map

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

package/lib-es/newops/merkleMap.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="node" />
+import { Merkle } from "./merkle";
+export declare class MerkleMap {
+    keys: Buffer[];
+    keysTree: Merkle;
+    values: Buffer[];
+    valuesTree: Merkle;
+    /**
+     * @param keys Sorted list of (unhashed) keys
+     * @param values values, in corresponding order as the keys, and of equal length
+     */
+    constructor(keys: Buffer[], values: Buffer[]);
+    commitment(): Buffer;
+}
+//# sourceMappingURL=merkleMap.d.ts.map

package/lib-es/newops/merkleMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merkleMap.d.ts","sourceRoot":"","sources":["../../src/newops/merkleMap.ts"],"names":[],"mappings":";AACA,OAAO,EAAY,MAAM,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,SAAS;IACpB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB;;;OAGG;gBACS,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;IAkB5C,UAAU,IAAI,MAAM;CAQrB"}

package/lib-es/newops/merkleMap.js

@@ -0,0 +1,34 @@
+import { createVarint } from "../varint";
+import { hashLeaf, Merkle } from "./merkle";
+var MerkleMap = /** @class */ (function () {
+    /**
+     * @param keys Sorted list of (unhashed) keys
+     * @param values values, in corresponding order as the keys, and of equal length
+     */
+    function MerkleMap(keys, values) {
+        if (keys.length != values.length) {
+            throw new Error("keys and values should have the same length");
+        }
+        // Sanity check: verify that keys are actually sorted and with no duplicates
+        for (var i = 0; i < keys.length - 1; i++) {
+            if (keys[i].toString("hex") >= keys[i + 1].toString("hex")) {
+                throw new Error("keys must be in strictly increasing order");
+            }
+        }
+        this.keys = keys;
+        this.keysTree = new Merkle(keys.map(function (k) { return hashLeaf(k); }));
+        this.values = values;
+        this.valuesTree = new Merkle(values.map(function (v) { return hashLeaf(v); }));
+    }
+    MerkleMap.prototype.commitment = function () {
+        // returns a buffer between 65 and 73 (included) bytes long
+        return Buffer.concat([
+            createVarint(this.keys.length),
+            this.keysTree.getRoot(),
+            this.valuesTree.getRoot(),
+        ]);
+    };
+    return MerkleMap;
+}());
+export { MerkleMap };
+//# sourceMappingURL=merkleMap.js.map

package/lib-es/newops/merkleMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merkleMap.js","sourceRoot":"","sources":["../../src/newops/merkleMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAE5C;IAKE;;;OAGG;IACH,mBAAY,IAAc,EAAE,MAAgB;QAC1C,IAAI,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QAED,4EAA4E;QAC5E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACxC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC1D,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;aAC9D;SACF;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,QAAQ,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,QAAQ,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,8BAAU,GAAV;QACE,2DAA2D;QAC3D,OAAO,MAAM,CAAC,MAAM,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC9B,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;YACvB,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;SAC1B,CAAC,CAAC;IACL,CAAC;IACH,gBAAC;AAAD,CAAC,AAnCD,IAmCC"}

package/lib-es/newops/policy.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+export declare type DefaultDescriptorTemplate = "pkh(@0)" | "sh(wpkh(@0))" | "wpkh(@0)" | "tr(@0)";
+export declare class WalletPolicy {
+    descriptorTemplate: string;
+    keys: string[];
+    /**
+     * For now, we only support default descriptor templates.
+     */
+    constructor(descriptorTemplate: DefaultDescriptorTemplate, key: string);
+    getWalletId(): Buffer;
+    serialize(): Buffer;
+}
+export declare function createKey(masterFingerprint: Buffer, path: number[], xpub: string): string;
+//# sourceMappingURL=policy.d.ts.map

package/lib-es/newops/policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../src/newops/policy.ts"],"names":[],"mappings":";AAKA,oBAAY,yBAAyB,GACjC,SAAS,GACT,cAAc,GACd,UAAU,GACV,QAAQ,CAAC;AAEb,qBAAa,YAAY;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;OAEG;gBACS,kBAAkB,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM;IAKtE,WAAW,IAAI,MAAM;IAKrB,SAAS,IAAI,MAAM;CAapB;AAED,wBAAgB,SAAS,CACvB,iBAAiB,EAAE,MAAM,EACzB,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,MAAM,GACX,MAAM,CAKR"}

package/lib-es/newops/policy.js

@@ -0,0 +1,36 @@
+import { pathArrayToString } from "../bip32";
+import { BufferWriter } from "../buffertools";
+import { crypto } from "bitcoinjs-lib";
+import { Merkle, hashLeaf } from "./merkle";
+var WalletPolicy = /** @class */ (function () {
+    /**
+     * For now, we only support default descriptor templates.
+     */
+    function WalletPolicy(descriptorTemplate, key) {
+        this.descriptorTemplate = descriptorTemplate;
+        this.keys = [key];
+    }
+    WalletPolicy.prototype.getWalletId = function () {
+        // wallet_id (sha256 of the wallet serialization),
+        return crypto.sha256(this.serialize());
+    };
+    WalletPolicy.prototype.serialize = function () {
+        var keyBuffers = this.keys.map(function (k) {
+            return Buffer.from(k, "ascii");
+        });
+        var m = new Merkle(keyBuffers.map(function (k) { return hashLeaf(k); }));
+        var buf = new BufferWriter();
+        buf.writeUInt8(0x01); // wallet type (policy map)
+        buf.writeUInt8(0); // length of wallet name (empty string for default wallets)
+        buf.writeVarSlice(Buffer.from(this.descriptorTemplate, "ascii"));
+        buf.writeVarInt(this.keys.length), buf.writeSlice(m.getRoot());
+        return buf.buffer();
+    };
+    return WalletPolicy;
+}());
+export { WalletPolicy };
+export function createKey(masterFingerprint, path, xpub) {
+    var accountPath = pathArrayToString(path);
+    return "[" + masterFingerprint.toString("hex") + accountPath.substring(1) + "]" + xpub + "/**";
+}
+//# sourceMappingURL=policy.js.map

package/lib-es/newops/policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../src/newops/policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAQ5C;IAGE;;OAEG;IACH,sBAAY,kBAA6C,EAAE,GAAW;QACpE,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAED,kCAAW,GAAX;QACE,kDAAkD;QAClD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,gCAAS,GAAT;QACE,IAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,CAAC;YACjC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,IAAM,CAAC,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,QAAQ,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC,CAAC,CAAC;QAEzD,IAAM,GAAG,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,2BAA2B;QACjD,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,2DAA2D;QAC9E,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,CAAC;QACjE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/D,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IACH,mBAAC;AAAD,CAAC,AA7BD,IA6BC;;AAED,MAAM,UAAU,SAAS,CACvB,iBAAyB,EACzB,IAAc,EACd,IAAY;IAEZ,IAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC5C,OAAO,MAAI,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,SAAS,CAClE,CAAC,CACF,SAAI,IAAI,QAAK,CAAC;AACjB,CAAC"}

package/lib-es/newops/psbtExtractor.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="node" />
+import { PsbtV2 } from "./psbtv2";
+export declare function extract(psbt: PsbtV2): Buffer;
+//# sourceMappingURL=psbtExtractor.d.ts.map

package/lib-es/newops/psbtExtractor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"psbtExtractor.d.ts","sourceRoot":"","sources":["../../src/newops/psbtExtractor.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA6B5C"}

package/lib-es/newops/psbtExtractor.js

@@ -0,0 +1,32 @@
+import { BufferWriter } from "../buffertools";
+export function extract(psbt) {
+    var _a, _b;
+    var tx = new BufferWriter();
+    tx.writeUInt32(psbt.getGlobalTxVersion());
+    var isSegwit = !!psbt.getInputWitnessUtxo(0);
+    if (isSegwit) {
+        tx.writeSlice(Buffer.of(0, 1));
+    }
+    var inputCount = psbt.getGlobalInputCount();
+    tx.writeVarInt(inputCount);
+    var witnessWriter = new BufferWriter();
+    for (var i = 0; i < inputCount; i++) {
+        tx.writeSlice(psbt.getInputPreviousTxid(i));
+        tx.writeUInt32(psbt.getInputOutputIndex(i));
+        tx.writeVarSlice((_a = psbt.getInputFinalScriptsig(i)) !== null && _a !== void 0 ? _a : Buffer.of());
+        tx.writeUInt32(psbt.getInputSequence(i));
+        if (isSegwit) {
+            witnessWriter.writeSlice(psbt.getInputFinalScriptwitness(i));
+        }
+    }
+    var outputCount = psbt.getGlobalOutputCount();
+    tx.writeVarInt(outputCount);
+    for (var i = 0; i < outputCount; i++) {
+        tx.writeUInt64(BigInt(psbt.getOutputAmount(i)));
+        tx.writeVarSlice(psbt.getOutputScript(i));
+    }
+    tx.writeSlice(witnessWriter.buffer());
+    tx.writeUInt32((_b = psbt.getGlobalFallbackLocktime()) !== null && _b !== void 0 ? _b : 0);
+    return tx.buffer();
+}
+//# sourceMappingURL=psbtExtractor.js.map

package/lib-es/newops/psbtExtractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"psbtExtractor.js","sourceRoot":"","sources":["../../src/newops/psbtExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,MAAM,UAAU,OAAO,CAAC,IAAY;;IAClC,IAAM,EAAE,GAAG,IAAI,YAAY,EAAE,CAAC;IAC9B,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAE1C,IAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAC/C,IAAI,QAAQ,EAAE;QACZ,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAChC;IACD,IAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC9C,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC3B,IAAM,aAAa,GAAG,IAAI,YAAY,EAAE,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE;QACnC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,EAAE,CAAC,aAAa,CAAC,MAAA,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,mCAAI,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAChE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,QAAQ,EAAE;YACZ,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9D;KACF;IACD,IAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAChD,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;QACpC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;KAC3C;IACD,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IACtC,EAAE,CAAC,WAAW,CAAC,MAAA,IAAI,CAAC,yBAAyB,EAAE,mCAAI,CAAC,CAAC,CAAC;IACtD,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC;AACrB,CAAC"}

package/lib-es/newops/psbtFinalizer.d.ts

@@ -0,0 +1,7 @@
+import { PsbtV2 } from "./psbtv2";
+/**
+ *
+ * @param psbt The psbt with all signatures added as partial sigs, either through PSBT_IN_PARTIAL_SIG or PSBT_IN_TAP_KEY_SIG
+ */
+export declare function finalize(psbt: PsbtV2): void;
+//# sourceMappingURL=psbtFinalizer.d.ts.map

package/lib-es/newops/psbtFinalizer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"psbtFinalizer.d.ts","sourceRoot":"","sources":["../../src/newops/psbtFinalizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,MAAM,EAAE,MAAM,UAAU,CAAC;AAE1C;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAqE3C"}

package/lib-es/newops/psbtFinalizer.js

@@ -0,0 +1,107 @@
+import { BufferWriter } from "../buffertools";
+import { psbtIn } from "./psbtv2";
+/**
+ *
+ * @param psbt The psbt with all signatures added as partial sigs, either through PSBT_IN_PARTIAL_SIG or PSBT_IN_TAP_KEY_SIG
+ */
+export function finalize(psbt) {
+    // First check that each input has a signature
+    var inputCount = psbt.getGlobalInputCount();
+    for (var i = 0; i < inputCount; i++) {
+        var legacyPubkeys = psbt.getInputKeyDatas(i, psbtIn.PARTIAL_SIG);
+        var taprootSig = psbt.getInputTapKeySig(i);
+        if (legacyPubkeys.length == 0 && !taprootSig) {
+            throw Error("No signature for input " + i + " present");
+        }
+        if (legacyPubkeys.length > 0) {
+            if (legacyPubkeys.length > 1) {
+                throw Error("Expected exactly one signature, got " + legacyPubkeys.length);
+            }
+            if (taprootSig) {
+                throw Error("Both taproot and non-taproot signatures present.");
+            }
+            var isSegwitV0 = !!psbt.getInputWitnessUtxo(i);
+            var redeemScript = psbt.getInputRedeemScript(i);
+            var isWrappedSegwit = !!redeemScript;
+            var signature = psbt.getInputPartialSig(i, legacyPubkeys[0]);
+            if (!signature)
+                throw new Error("Expected partial signature for input " + i);
+            if (isSegwitV0) {
+                var witnessBuf = new BufferWriter();
+                witnessBuf.writeVarInt(2);
+                witnessBuf.writeVarInt(signature.length);
+                witnessBuf.writeSlice(signature);
+                witnessBuf.writeVarInt(legacyPubkeys[0].length);
+                witnessBuf.writeSlice(legacyPubkeys[0]);
+                psbt.setInputFinalScriptwitness(i, witnessBuf.buffer());
+                if (isWrappedSegwit) {
+                    if (!redeemScript || redeemScript.length == 0) {
+                        throw new Error("Expected non-empty redeemscript. Can't finalize intput " + i);
+                    }
+                    var scriptSigBuf = new BufferWriter();
+                    // Push redeemScript length
+                    scriptSigBuf.writeUInt8(redeemScript.length);
+                    scriptSigBuf.writeSlice(redeemScript);
+                    psbt.setInputFinalScriptsig(i, scriptSigBuf.buffer());
+                }
+            }
+            else {
+                // Legacy input
+                var scriptSig = new BufferWriter();
+                writePush(scriptSig, signature);
+                writePush(scriptSig, legacyPubkeys[0]);
+                psbt.setInputFinalScriptsig(i, scriptSig.buffer());
+            }
+        }
+        else {
+            // Taproot input
+            var signature = psbt.getInputTapKeySig(i);
+            if (!signature) {
+                throw Error("No taproot signature found");
+            }
+            if (signature.length != 64) {
+                throw Error("Unexpected length of schnorr signature.");
+            }
+            var witnessBuf = new BufferWriter();
+            witnessBuf.writeVarInt(1);
+            witnessBuf.writeVarInt(64);
+            witnessBuf.writeSlice(signature);
+            psbt.setInputFinalScriptwitness(i, witnessBuf.buffer());
+        }
+        clearFinalizedInput(psbt, i);
+    }
+}
+function clearFinalizedInput(psbt, inputIndex) {
+    var keyTypes = [
+        psbtIn.BIP32_DERIVATION,
+        psbtIn.PARTIAL_SIG,
+        psbtIn.TAP_BIP32_DERIVATION,
+        psbtIn.TAP_KEY_SIG,
+    ];
+    var witnessUtxoAvailable = !!psbt.getInputWitnessUtxo(inputIndex);
+    var nonWitnessUtxoAvailable = !!psbt.getInputNonWitnessUtxo(inputIndex);
+    if (witnessUtxoAvailable && nonWitnessUtxoAvailable) {
+        // Remove NON_WITNESS_UTXO for segwit v0 as it's only needed while signing.
+        // Segwit v1 doesn't have NON_WITNESS_UTXO set.
+        // See https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki#cite_note-7
+        keyTypes.push(psbtIn.NON_WITNESS_UTXO);
+    }
+    psbt.deleteInputEntries(inputIndex, keyTypes);
+}
+function writePush(buf, data) {
+    if (data.length <= 75) {
+        buf.writeUInt8(data.length);
+    }
+    else if (data.length <= 256) {
+        buf.writeUInt8(76);
+        buf.writeUInt8(data.length);
+    }
+    else if (data.length <= 256 * 256) {
+        buf.writeUInt8(77);
+        var b = Buffer.alloc(2);
+        b.writeUInt16LE(data.length, 0);
+        buf.writeSlice(b);
+    }
+    buf.writeSlice(data);
+}
+//# sourceMappingURL=psbtFinalizer.js.map

package/lib-es/newops/psbtFinalizer.js.map

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