@scure/btc-signer 1.8.1 → 2.0.0-beta.1

package/README.md

@@ -41,8 +41,6 @@ _Check out all web3 utility libraries:_ [ETH](https://github.com/paulmillr/micro
 
 > `deno add jsr:@scure/btc-signer`
 
-> `deno doc jsr:@scure/btc-signer` # command-line documentation
-
 We support all major platforms and runtimes.
 For [Deno](https://deno.land), ensure to use [npm specifier](https://deno.land/manual@v1.28.0/node/npm_specifiers).
 For React Native, you may need a [polyfill for crypto.getRandomValues](https://github.com/LinusU/react-native-get-random-values).
@@ -89,8 +87,8 @@ BTC has several UTXO types:
 
 - P2PK: Legacy, from 2010
 - P2PKH, P2SH, P2MS: Classic
-- P2WPKH, P2WSH: classic, SegWit
-- P2TR: Taproot, recommended
+- P2WPKH, P2WSH: SegWit (signature is removed from tx hash calculation)
+- P2TR: Taproot (schnorr signatures instead of ECDSA)
 
 For test examples, the usage is as following:
 
@@ -158,7 +156,11 @@ deepStrictEqual(btc.p2sh(btc.p2wsh(btc.p2pkh(PubKey))), {
 
 ### P2WPKH (Witness Public Key Hash)
 
-SegWit V0 version of [P2PKH](#p2pkh-public-key-hash). Basic bech32 address. Can't be wrapped in [P2WSH](#p2wsh-witness-script-hash).
+SegWit V0 version of [P2PKH](#p2pkh-public-key-hash).
+In SegWit, signature is removed from tx hash calculation.
+
+Uses bech32 address.
+Can't be wrapped in [P2WSH](#p2wsh-witness-script-hash).
 
 ```ts
 const PubKey = hex.decode('030000000000000000000000000000000000000000000000000000000000000001');
@@ -196,6 +198,7 @@ deepStrictEqual(btc.p2sh(btc.p2pkh(PubKey)), {
 ### P2WSH (Witness Script Hash)
 
 SegWit V0 version of [P2SH](#p2sh-script-hash).
+In SegWit, signature is removed from tx hash calculation.
 
 Required tx input fields to make it spendable: `witnessScript`
 

package/_type_test.js

@@ -1,15 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const secp256k1_1 = require("@noble/curves/secp256k1");
-const base_1 = require("@scure/base");
-const btc = require("./index.js");
-const privKey1 = base_1.hex.decode('0101010101010101010101010101010101010101010101010101010101010101');
-const P1 = secp256k1_1.secp256k1.getPublicKey(privKey1, true);
+import { secp256k1 as secp } from '@noble/curves/secp256k1.js';
+import { hex } from '@scure/base';
+import * as btc from "./index.js";
+const privKey1 = hex.decode('0101010101010101010101010101010101010101010101010101010101010101');
+const P1 = secp.getPublicKey(privKey1, true);
 const wpkh = btc.p2wpkh(P1);
 const tx = new btc.Transaction();
 // Basic input test
 tx.addInput({
-    txid: base_1.hex.decode('0af50a00a22f74ece24c12cd667c290d3a35d48124a69f4082700589172a3aa2'),
+    txid: hex.decode('0af50a00a22f74ece24c12cd667c290d3a35d48124a69f4082700589172a3aa2'),
     index: 0,
     ...wpkh,
     finalScriptSig: Uint8Array.of(),
@@ -23,16 +21,16 @@ tx.updateInput(0, {
     sequence: 1,
 });
 const nonWitnessUtxo = '0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f618765000000';
-const nonWitnessUtxoB = base_1.hex.decode(nonWitnessUtxo);
+const nonWitnessUtxoB = hex.decode(nonWitnessUtxo);
 tx.updateInput(0, { nonWitnessUtxo: nonWitnessUtxo });
 tx.updateInput(0, { nonWitnessUtxo: nonWitnessUtxoB });
 tx.addInput({
-    txid: base_1.hex.decode('0af50a00a22f74ece24c12cd667c290d3a35d48124a69f4082700589172a3aa2'),
+    txid: hex.decode('0af50a00a22f74ece24c12cd667c290d3a35d48124a69f4082700589172a3aa2'),
     index: 0,
     nonWitnessUtxo: nonWitnessUtxo,
 });
 tx.addInput({
-    txid: base_1.hex.decode('0af50a00a22f74ece24c12cd667c290d3a35d48124a69f4082700589172a3aa2'),
+    txid: hex.decode('0af50a00a22f74ece24c12cd667c290d3a35d48124a69f4082700589172a3aa2'),
     index: 0,
     nonWitnessUtxo: nonWitnessUtxoB,
 });

package/_type_test.js.map

@@ -1 +1 @@
-{"version":3,"file":"_type_test.js","sourceRoot":"","sources":["src/_type_test.ts"],"names":[],"mappings":";;AAAA,uDAA4D;AAC5D,sCAAkC;AAClC,kCAAkC;AAElC,MAAM,QAAQ,GAAG,UAAG,CAAC,MAAM,CAAC,kEAAkE,CAAC,CAAC;AAChG,MAAM,EAAE,GAAG,qBAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAE7C,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAE5B,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;AAEjC,mBAAmB;AACnB,EAAE,CAAC,QAAQ,CAAC;IACV,IAAI,EAAE,UAAG,CAAC,MAAM,CAAC,kEAAkE,CAAC;IACpF,KAAK,EAAE,CAAC;IACR,GAAG,IAAI;IACP,cAAc,EAAE,UAAU,CAAC,EAAE,EAAE;IAC/B,QAAQ,EAAE,CAAC;CACZ,CAAC,CAAC;AAEH,4DAA4D;AAC5D,EAAE,CAAC,QAAQ,CAAC;IACV,QAAQ,EAAE,CAAC;CACZ,CAAC,CAAC;AAEH,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE;IAChB,QAAQ,EAAE,CAAC;CACZ,CAAC,CAAC;AAEH,MAAM,cAAc,GAClB,wXAAwX,CAAC;AAC3X,MAAM,eAAe,GAAG,UAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;AAEnD,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC,CAAC;AACtD,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC,CAAC;AACvD,EAAE,CAAC,QAAQ,CAAC;IACV,IAAI,EAAE,UAAG,CAAC,MAAM,CAAC,kEAAkE,CAAC;IACpF,KAAK,EAAE,CAAC;IACR,cAAc,EAAE,cAAc;CAC/B,CAAC,CAAC;AAEH,EAAE,CAAC,QAAQ,CAAC;IACV,IAAI,EAAE,UAAG,CAAC,MAAM,CAAC,kEAAkE,CAAC;IACpF,KAAK,EAAE,CAAC;IACR,cAAc,EAAE,eAAe;CAChC,CAAC,CAAC;AAEH,eAAe;AACf,sBAAsB;AACtB,uBAAuB;AACvB,MAAM;AACN,UAAU;AACV,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AAC/B,cAAc;AACd,uCAAuC;AACvC,qCAAqC;AACrC,cAAc;AACd,mCAAmC;AACnC,iCAAiC;AAEjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC;IACzC,aAAa;IACb,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1C,aAAa;IACb,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"_type_test.js","sourceRoot":"","sources":["src/_type_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAElC,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,kEAAkE,CAAC,CAAC;AAChG,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAE7C,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAE5B,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;AAEjC,mBAAmB;AACnB,EAAE,CAAC,QAAQ,CAAC;IACV,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,kEAAkE,CAAC;IACpF,KAAK,EAAE,CAAC;IACR,GAAG,IAAI;IACP,cAAc,EAAE,UAAU,CAAC,EAAE,EAAE;IAC/B,QAAQ,EAAE,CAAC;CACZ,CAAC,CAAC;AAEH,4DAA4D;AAC5D,EAAE,CAAC,QAAQ,CAAC;IACV,QAAQ,EAAE,CAAC;CACZ,CAAC,CAAC;AAEH,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE;IAChB,QAAQ,EAAE,CAAC;CACZ,CAAC,CAAC;AAEH,MAAM,cAAc,GAClB,wXAAwX,CAAC;AAC3X,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;AAEnD,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC,CAAC;AACtD,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC,CAAC;AACvD,EAAE,CAAC,QAAQ,CAAC;IACV,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,kEAAkE,CAAC;IACpF,KAAK,EAAE,CAAC;IACR,cAAc,EAAE,cAAc;CAC/B,CAAC,CAAC;AAEH,EAAE,CAAC,QAAQ,CAAC;IACV,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,kEAAkE,CAAC;IACpF,KAAK,EAAE,CAAC;IACR,cAAc,EAAE,eAAe;CAChC,CAAC,CAAC;AAEH,eAAe;AACf,sBAAsB;AACtB,uBAAuB;AACvB,MAAM;AACN,UAAU;AACV,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AAC/B,cAAc;AACd,uCAAuC;AACvC,qCAAqC;AACrC,cAAc;AACd,mCAAmC;AACnC,iCAAiC;AAEjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC;IACzC,aAAa;IACb,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1C,aAAa;IACb,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC"}

package/index.js

@@ -1,66 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._Estimator = exports._cmpBig = exports.SigHash = exports.PSBTCombine = exports.DEFAULT_SEQUENCE = exports.Decimal = exports.bip32Path = exports.TaprootControlBlock = exports._DebugPSBT = exports.WIF = exports.taprootListToTree = exports.sortedMultisig = exports.OutScript = exports.getAddress = exports.combinations = exports.Address = exports._sortPubkeys = exports.utils = exports.selectUTXO = exports.TEST_NETWORK = exports.TAPROOT_UNSPENDABLE_KEY = exports.NETWORK = exports.Transaction = exports.getInputType = exports.ScriptNum = exports.Script = exports.RawWitness = exports.RawTx = exports.OP = exports.MAX_SCRIPT_BYTE_LENGTH = exports.CompactSize = exports.p2wsh = exports.p2wpkh = exports.p2tr_pk = exports.p2tr_ns = exports.p2tr_ms = exports.p2tr = exports.p2sh = exports.p2pkh = exports.p2pk = exports.p2ms = exports.multisig = void 0;
 /*! scure-btc-signer - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-const utils_ts_1 = require("./utils.js");
+import { compareBytes, concatBytes, isBytes, pubSchnorr, randomPrivateKeyBytes, taprootTweakPubkey, } from "./utils.js";
 // should multisig be exported as classicMultisig?
 // prettier-ignore
-var payment_ts_1 = require("./payment.js");
-Object.defineProperty(exports, "multisig", { enumerable: true, get: function () { return payment_ts_1.multisig; } });
-Object.defineProperty(exports, "p2ms", { enumerable: true, get: function () { return payment_ts_1.p2ms; } });
-Object.defineProperty(exports, "p2pk", { enumerable: true, get: function () { return payment_ts_1.p2pk; } });
-Object.defineProperty(exports, "p2pkh", { enumerable: true, get: function () { return payment_ts_1.p2pkh; } });
-Object.defineProperty(exports, "p2sh", { enumerable: true, get: function () { return payment_ts_1.p2sh; } });
-Object.defineProperty(exports, "p2tr", { enumerable: true, get: function () { return payment_ts_1.p2tr; } });
-Object.defineProperty(exports, "p2tr_ms", { enumerable: true, get: function () { return payment_ts_1.p2tr_ms; } });
-Object.defineProperty(exports, "p2tr_ns", { enumerable: true, get: function () { return payment_ts_1.p2tr_ns; } });
-Object.defineProperty(exports, "p2tr_pk", { enumerable: true, get: function () { return payment_ts_1.p2tr_pk; } });
-Object.defineProperty(exports, "p2wpkh", { enumerable: true, get: function () { return payment_ts_1.p2wpkh; } });
-Object.defineProperty(exports, "p2wsh", { enumerable: true, get: function () { return payment_ts_1.p2wsh; } });
-var script_ts_1 = require("./script.js");
-Object.defineProperty(exports, "CompactSize", { enumerable: true, get: function () { return script_ts_1.CompactSize; } });
-Object.defineProperty(exports, "MAX_SCRIPT_BYTE_LENGTH", { enumerable: true, get: function () { return script_ts_1.MAX_SCRIPT_BYTE_LENGTH; } });
-Object.defineProperty(exports, "OP", { enumerable: true, get: function () { return script_ts_1.OP; } });
-Object.defineProperty(exports, "RawTx", { enumerable: true, get: function () { return script_ts_1.RawTx; } });
-Object.defineProperty(exports, "RawWitness", { enumerable: true, get: function () { return script_ts_1.RawWitness; } });
-Object.defineProperty(exports, "Script", { enumerable: true, get: function () { return script_ts_1.Script; } });
-Object.defineProperty(exports, "ScriptNum", { enumerable: true, get: function () { return script_ts_1.ScriptNum; } });
-var transaction_ts_1 = require("./transaction.js");
-Object.defineProperty(exports, "getInputType", { enumerable: true, get: function () { return transaction_ts_1.getInputType; } });
-Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return transaction_ts_1.Transaction; } });
-var utils_ts_2 = require("./utils.js");
-Object.defineProperty(exports, "NETWORK", { enumerable: true, get: function () { return utils_ts_2.NETWORK; } });
-Object.defineProperty(exports, "TAPROOT_UNSPENDABLE_KEY", { enumerable: true, get: function () { return utils_ts_2.TAPROOT_UNSPENDABLE_KEY; } });
-Object.defineProperty(exports, "TEST_NETWORK", { enumerable: true, get: function () { return utils_ts_2.TEST_NETWORK; } });
-var utxo_ts_1 = require("./utxo.js");
-Object.defineProperty(exports, "selectUTXO", { enumerable: true, get: function () { return utxo_ts_1.selectUTXO; } });
-exports.utils = {
-    isBytes: utils_ts_1.isBytes,
-    concatBytes: utils_ts_1.concatBytes,
-    compareBytes: utils_ts_1.compareBytes,
-    pubSchnorr: utils_ts_1.pubSchnorr,
-    randomPrivateKeyBytes: utils_ts_1.randomPrivateKeyBytes,
-    taprootTweakPubkey: utils_ts_1.taprootTweakPubkey,
+export { multisig, p2ms, p2pk, p2pkh, p2sh, p2tr, p2tr_ms, p2tr_ns, p2tr_pk, p2wpkh, p2wsh } from "./payment.js";
+export { CompactSize, MAX_SCRIPT_BYTE_LENGTH, OP, RawTx, RawWitness, Script, ScriptNum, } from "./script.js";
+export { getInputType, Transaction } from "./transaction.js";
+export { NETWORK, TAPROOT_UNSPENDABLE_KEY, TEST_NETWORK } from "./utils.js";
+export { selectUTXO } from "./utxo.js";
+export const utils = {
+    isBytes,
+    concatBytes,
+    compareBytes,
+    pubSchnorr,
+    randomPrivateKeyBytes,
+    taprootTweakPubkey,
 };
-var payment_ts_2 = require("./payment.js"); // remove
-Object.defineProperty(exports, "_sortPubkeys", { enumerable: true, get: function () { return payment_ts_2._sortPubkeys; } });
-Object.defineProperty(exports, "Address", { enumerable: true, get: function () { return payment_ts_2.Address; } });
-Object.defineProperty(exports, "combinations", { enumerable: true, get: function () { return payment_ts_2.combinations; } });
-Object.defineProperty(exports, "getAddress", { enumerable: true, get: function () { return payment_ts_2.getAddress; } });
-Object.defineProperty(exports, "OutScript", { enumerable: true, get: function () { return payment_ts_2.OutScript; } });
-Object.defineProperty(exports, "sortedMultisig", { enumerable: true, get: function () { return payment_ts_2.sortedMultisig; } });
-Object.defineProperty(exports, "taprootListToTree", { enumerable: true, get: function () { return payment_ts_2.taprootListToTree; } });
-Object.defineProperty(exports, "WIF", { enumerable: true, get: function () { return payment_ts_2.WIF; } });
-var psbt_ts_1 = require("./psbt.js"); // remove
-Object.defineProperty(exports, "_DebugPSBT", { enumerable: true, get: function () { return psbt_ts_1._DebugPSBT; } });
-Object.defineProperty(exports, "TaprootControlBlock", { enumerable: true, get: function () { return psbt_ts_1.TaprootControlBlock; } });
-var transaction_ts_2 = require("./transaction.js"); // remove
-Object.defineProperty(exports, "bip32Path", { enumerable: true, get: function () { return transaction_ts_2.bip32Path; } });
-Object.defineProperty(exports, "Decimal", { enumerable: true, get: function () { return transaction_ts_2.Decimal; } });
-Object.defineProperty(exports, "DEFAULT_SEQUENCE", { enumerable: true, get: function () { return transaction_ts_2.DEFAULT_SEQUENCE; } });
-Object.defineProperty(exports, "PSBTCombine", { enumerable: true, get: function () { return transaction_ts_2.PSBTCombine; } });
-Object.defineProperty(exports, "SigHash", { enumerable: true, get: function () { return transaction_ts_2.SigHash; } });
-var utxo_ts_2 = require("./utxo.js");
-Object.defineProperty(exports, "_cmpBig", { enumerable: true, get: function () { return utxo_ts_2._cmpBig; } });
-Object.defineProperty(exports, "_Estimator", { enumerable: true, get: function () { return utxo_ts_2._Estimator; } });
+export { _sortPubkeys, Address, combinations, getAddress, OutScript, sortedMultisig, taprootListToTree, WIF, } from "./payment.js"; // remove
+export { _DebugPSBT, TaprootControlBlock } from "./psbt.js"; // remove
+export { bip32Path, Decimal, DEFAULT_SEQUENCE, PSBTCombine, SigHash } from "./transaction.js"; // remove
+export { _cmpBig, _Estimator } from "./utxo.js";
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";;;AAAA,0EAA0E;AAC1E,yCAOoB;AACpB,kDAAkD;AAClD,kBAAkB;AAClB,2CAGsB;AAFpB,sGAAA,QAAQ,OAAA;AACR,kGAAA,IAAI,OAAA;AAAE,kGAAA,IAAI,OAAA;AAAE,mGAAA,KAAK,OAAA;AAAE,kGAAA,IAAI,OAAA;AAAE,kGAAA,IAAI,OAAA;AAAE,qGAAA,OAAO,OAAA;AAAE,qGAAA,OAAO,OAAA;AAAE,qGAAA,OAAO,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,mGAAA,KAAK,OAAA;AAEzE,yCAQqB;AAPnB,wGAAA,WAAW,OAAA;AACX,mHAAA,sBAAsB,OAAA;AACtB,+FAAA,EAAE,OAAA;AACF,kGAAA,KAAK,OAAA;AACL,uGAAA,UAAU,OAAA;AACV,mGAAA,MAAM,OAAA;AACN,sGAAA,SAAS,OAAA;AAGX,mDAA6D;AAApD,8GAAA,YAAY,OAAA;AAAE,6GAAA,WAAW,OAAA;AAClC,uCAA4E;AAAnE,mGAAA,OAAO,OAAA;AAAE,mHAAA,uBAAuB,OAAA;AAAE,wGAAA,YAAY,OAAA;AACvD,qCAAuC;AAA9B,qGAAA,UAAU,OAAA;AAEN,QAAA,KAAK,GAAG;IACnB,OAAO,EAAP,kBAAO;IACP,WAAW,EAAX,sBAAW;IACX,YAAY,EAAZ,uBAAY;IACZ,UAAU,EAAV,qBAAU;IACV,qBAAqB,EAArB,gCAAqB;IACrB,kBAAkB,EAAlB,6BAAkB;CACnB,CAAC;AAEF,2CASsB,CAAC,SAAS;AAR9B,0GAAA,YAAY,OAAA;AACZ,qGAAA,OAAO,OAAA;AACP,0GAAA,YAAY,OAAA;AACZ,wGAAA,UAAU,OAAA;AACV,uGAAA,SAAS,OAAA;AACT,4GAAA,cAAc,OAAA;AACd,+GAAA,iBAAiB,OAAA;AACjB,iGAAA,GAAG,OAAA;AAIL,qCAA4D,CAAC,SAAS;AAA7D,qGAAA,UAAU,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AACxC,mDAA8F,CAAC,SAAS;AAA/F,2GAAA,SAAS,OAAA;AAAE,yGAAA,OAAO,OAAA;AAAE,kHAAA,gBAAgB,OAAA;AAAE,6GAAA,WAAW,OAAA;AAAE,yGAAA,OAAO,OAAA;AACnE,qCAAgD;AAAvC,kGAAA,OAAO,OAAA;AAAE,qGAAA,UAAU,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,OAAO,EACL,YAAY,EACZ,WAAW,EACX,OAAO,EACP,UAAU,EACV,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,YAAY,CAAC;AACpB,kDAAkD;AAClD,kBAAkB;AAClB,OAAO,EACL,QAAQ,EACR,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EACxE,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,WAAW,EACX,sBAAsB,EACtB,EAAE,EACF,KAAK,EACL,UAAU,EACV,MAAM,EACN,SAAS,GACV,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,OAAO;IACP,WAAW;IACX,YAAY;IACZ,UAAU;IACV,qBAAqB;IACrB,kBAAkB;CACnB,CAAC;AAEF,OAAO,EACL,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACd,iBAAiB,EACjB,GAAG,GACJ,MAAM,cAAc,CAAC,CAAC,SAAS;AAGhC,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC,CAAC,SAAS;AACtE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC,CAAC,SAAS;AACxG,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC"}

package/musig2.d.ts

@@ -38,7 +38,7 @@ export declare function sortKeys(publicKeys: Uint8Array[]): Uint8Array[];
  * @throws {InvalidContributionErr} If any of the public keys are invalid and cannot be processed.
  */
 export declare function keyAggregate(publicKeys: Uint8Array[], tweaks?: Uint8Array[], isXonly?: boolean[]): {
-    aggPublicKey: import("@noble/curves/abstract/weierstrass").ProjPointType<bigint>;
+    aggPublicKey: import("@noble/curves/abstract/weierstrass.js").WeierstrassPoint<bigint>;
     gAcc: bigint;
     tweakAcc: bigint;
 };
@@ -47,7 +47,7 @@ export declare function keyAggregate(publicKeys: Uint8Array[], tweaks?: Uint8Arr
  * @param ctx The result of the keyAggregate function.
  * @returns The aggregate public key as a byte array.
  */
-export declare function keyAggExport(ctx: ReturnType<typeof keyAggregate>): Uint8Array<ArrayBufferLike>;
+export declare function keyAggExport(ctx: ReturnType<typeof keyAggregate>): Uint8Array;
 /**
  * Generates a nonce pair (public and secret) for MuSig2 signing.
  * @param publicKey The individual public key of the signer (Uint8Array).

package/musig2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"musig2.d.ts","sourceRoot":"","sources":["src/musig2.ts"],"names":[],"mappings":"AAyBA;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAChE;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IAAE,WAAW,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AAC3E;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;gBACT,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;CAInC;AA8CD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAE/D;AASD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAG/D;AA0BD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EAAE,EACxB,MAAM,GAAE,UAAU,EAAO,EACzB,OAAO,GAAE,OAAO,EAAO;;;;EAgCxB;AACD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,+BAEhE;AA+BD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CACtB,SAAS,EAAE,UAAU,EACrB,SAAS,CAAC,EAAE,UAAU,EACtB,YAAY,GAAE,UAA8B,EAC5C,GAAG,CAAC,EAAE,UAAU,EAChB,OAAO,GAAE,UAA8B,EACvC,IAAI,GAAE,UAA4B,GACjC,MAAM,CAmBR;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,UAAU,CAgBlE;AAID,qBAAa,OAAO;IAClB,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,CAAC,CAAQ;IACjB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,CAAC,CAAS;IAClB,OAAO,CAAC,CAAC,CAAQ;IACjB,OAAO,CAAC,CAAC,CAAS;IAClB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,CAAC,CAAa;IACtB,OAAO,CAAC,SAAS,CAAa;IAC9B;;;;;;;;;;OAUG;gBAED,QAAQ,EAAE,UAAU,EACpB,UAAU,EAAE,UAAU,EAAE,EACxB,GAAG,EAAE,UAAU,EACf,MAAM,GAAE,UAAU,EAAO,EACzB,OAAO,GAAE,OAAO,EAAO;IAuBzB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,wBAAwB;IAmBhC;;;;;;;;OAQG;IACH,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,UAAQ,GAAG,UAAU;IAiC/E;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO;IAerF;;;;;;OAMG;IACH,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,UAAU;CAarD;AAmBD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,UAAU,EACzB,UAAU,EAAE,UAAU,EAAE,EACxB,GAAG,EAAE,UAAU,EACf,MAAM,GAAE,UAAU,EAAO,EACzB,OAAO,GAAE,OAAO,EAAO,EACvB,IAAI,CAAC,EAAE,UAAU,EACjB,QAAQ,UAAQ,GACf,QAAQ,CAmBV"}
+{"version":3,"file":"musig2.d.ts","sourceRoot":"","sources":["src/musig2.ts"],"names":[],"mappings":"AAkBA;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAChE;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IAAE,WAAW,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AAC3E;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;gBACT,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;CAInC;AA6CD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAE/D;AASD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAG/D;AA0BD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EAAE,EACxB,MAAM,GAAE,UAAU,EAAO,EACzB,OAAO,GAAE,OAAO,EAAO;;;;EA+BxB;AACD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,GAAG,UAAU,CAE7E;AA+BD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CACtB,SAAS,EAAE,UAAU,EACrB,SAAS,CAAC,EAAE,UAAU,EACtB,YAAY,GAAE,UAA8B,EAC5C,GAAG,CAAC,EAAE,UAAU,EAChB,OAAO,GAAE,UAA8B,EACvC,IAAI,GAAE,UAA4B,GACjC,MAAM,CAoBR;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,UAAU,CAgBlE;AAID,qBAAa,OAAO;IAClB,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,CAAC,CAAQ;IACjB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,CAAC,CAAS;IAClB,OAAO,CAAC,CAAC,CAAQ;IACjB,OAAO,CAAC,CAAC,CAAS;IAClB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,CAAC,CAAa;IACtB,OAAO,CAAC,SAAS,CAAa;IAC9B;;;;;;;;;;OAUG;gBAED,QAAQ,EAAE,UAAU,EACpB,UAAU,EAAE,UAAU,EAAE,EACxB,GAAG,EAAE,UAAU,EACf,MAAM,GAAE,UAAU,EAAO,EACzB,OAAO,GAAE,OAAO,EAAO;IAuBzB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,wBAAwB;IAmBhC;;;;;;;;OAQG;IACH,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,UAAQ,GAAG,UAAU;IAkC/E;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO;IAerF;;;;;;OAMG;IACH,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,UAAU;CAarD;AAmBD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,UAAU,EACzB,UAAU,EAAE,UAAU,EAAE,EACxB,GAAG,EAAE,UAAU,EACf,MAAM,GAAE,UAAU,EAAO,EACzB,OAAO,GAAE,OAAO,EAAO,EACvB,IAAI,CAAC,EAAE,UAAU,EACjB,QAAQ,UAAQ,GACf,QAAQ,CAmBV"}

package/musig2.js

@@ -1,56 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Session = exports.InvalidContributionErr = void 0;
-exports.IndividualPubkey = IndividualPubkey;
-exports.sortKeys = sortKeys;
-exports.keyAggregate = keyAggregate;
-exports.keyAggExport = keyAggExport;
-exports.nonceGen = nonceGen;
-exports.nonceAggregate = nonceAggregate;
-exports.deterministicSign = deterministicSign;
-const modular_js_1 = require("@noble/curves/abstract/modular.js");
-const utils_js_1 = require("@noble/curves/abstract/utils.js");
-const secp256k1_js_1 = require("@noble/curves/secp256k1.js");
-const utils_js_2 = require("@noble/hashes/utils.js");
-const P = require("micro-packed");
-const utils_ts_1 = require("./utils.js");
+import { schnorr, secp256k1 } from '@noble/curves/secp256k1.js';
+import { aInRange, concatBytes, equalBytes, numberToBytesBE } from '@noble/curves/utils.js';
+import { abytes, anumber, randomBytes } from '@noble/hashes/utils.js';
+import * as P from 'micro-packed';
+import { compareBytes, hasEven } from "./utils.js";
 /**
  * Represents an error indicating an invalid contribution from a signer.
  * This allows pointing out which participant is malicious and what specifically is wrong.
  */
-class InvalidContributionErr extends Error {
+export class InvalidContributionErr extends Error {
+    idx; // Indice of participant
     constructor(idx, m) {
         super(m);
         this.idx = idx;
     }
 }
-exports.InvalidContributionErr = InvalidContributionErr;
 // Utils
-const { taggedHash, pointToBytes } = secp256k1_js_1.schnorr.utils;
-const Point = secp256k1_js_1.secp256k1.ProjectivePoint;
-const PUBKEY_LEN = 33;
+const { taggedHash, pointToBytes } = schnorr.utils;
+const Point = secp256k1.Point;
+const Fn = Point.Fn;
+const PUBKEY_LEN = secp256k1.lengths.publicKey;
 const ZERO = new Uint8Array(PUBKEY_LEN); // Compressed zero point
-const SECP_N = secp256k1_js_1.secp256k1.CURVE.n;
 // Encoding
 // TODO: re-use in PSBT?
 const compressed = P.apply(P.bytes(33), {
-    decode: (p) => (isZero(p) ? ZERO : p.toRawBytes(true)),
-    encode: (b) => ((0, utils_js_1.equalBytes)(b, ZERO) ? Point.ZERO : Point.fromHex(b)),
+    decode: (p) => (isZero(p) ? ZERO : p.toBytes(true)),
+    encode: (b) => (equalBytes(b, ZERO) ? Point.ZERO : Point.fromBytes(b)),
 });
 const scalar = P.validate(P.U256BE, (n) => {
-    (0, utils_js_1.aInRange)('n', n, 1n, SECP_N);
+    aInRange('n', n, 1n, Fn.ORDER);
     return n;
 });
 const PubNonce = P.struct({ R1: compressed, R2: compressed });
 const SecretNonce = P.struct({ k1: scalar, k2: scalar, publicKey: P.bytes(PUBKEY_LEN) });
 function abytesOptional(b, ...lengths) {
     if (b !== undefined)
-        (0, utils_js_2.abytes)(b, ...lengths);
+        abytes(b, ...lengths);
 }
 function abytesArray(lst, ...lengths) {
     if (!Array.isArray(lst))
         throw new Error('expected array');
-    lst.forEach((i) => (0, utils_js_2.abytes)(i, ...lengths));
+    lst.forEach((i) => abytes(i, ...lengths));
 }
 function aXonly(lst) {
     if (!Array.isArray(lst))
@@ -60,12 +49,11 @@ function aXonly(lst) {
             throw new Error('expected boolean in xOnly array, got' + i + '(' + j + ')');
     });
 }
-const modN = (x) => (0, modular_js_1.mod)(x, SECP_N);
-const taggedInt = (tag, ...messages) => modN((0, utils_js_1.bytesToNumberBE)(taggedHash(tag, ...messages)));
-const evenScalar = (p, n) => (p.hasEvenY() ? n : modN(-n));
+const taggedInt = (tag, ...messages) => Fn.create(Fn.fromBytes(taggedHash(tag, ...messages), true));
+const evenScalar = (p, n) => (hasEven(p.y) ? n : Fn.neg(n));
 // Short utility for compat with reference implementation
-function IndividualPubkey(seckey) {
-    return secp256k1_js_1.secp256k1.getPublicKey(seckey, true);
+export function IndividualPubkey(seckey) {
+    return secp256k1.getPublicKey(seckey, true);
 }
 // Same, but returns Point
 function mulBase(n) {
@@ -80,15 +68,15 @@ function isZero(point) {
  * @returns A new array containing the sorted public keys.
  * @throws {Error} If the input is not an array or if any element is not a Uint8Array of the correct length.
  */
-function sortKeys(publicKeys) {
+export function sortKeys(publicKeys) {
     abytesArray(publicKeys, PUBKEY_LEN);
-    return publicKeys.sort(utils_ts_1.compareBytes);
+    return publicKeys.sort(compareBytes);
 }
 // Finds second distinct key (to make coefficient 1)
 function getSecondKey(publicKeys) {
     abytesArray(publicKeys, PUBKEY_LEN);
     for (let j = 1; j < publicKeys.length; j++)
-        if (!(0, utils_js_1.equalBytes)(publicKeys[j], publicKeys[0]))
+        if (!equalBytes(publicKeys[j], publicKeys[0]))
             return publicKeys[j];
     return ZERO;
 }
@@ -97,9 +85,9 @@ function keyAggL(publicKeys) {
     return taggedHash('KeyAgg list', ...publicKeys);
 }
 function keyAggCoeffInternal(publicKey1, publicKey2, L) {
-    (0, utils_js_2.abytes)(publicKey1, PUBKEY_LEN);
-    (0, utils_js_2.abytes)(publicKey2, PUBKEY_LEN);
-    if ((0, utils_js_1.equalBytes)(publicKey1, publicKey2))
+    abytes(publicKey1, PUBKEY_LEN);
+    abytes(publicKey2, PUBKEY_LEN);
+    if (equalBytes(publicKey1, publicKey2))
         return 1n;
     return taggedInt('KeyAgg coefficient', L, publicKey1);
 }
@@ -112,7 +100,7 @@ function keyAggCoeffInternal(publicKey1, publicKey2, L) {
  * @throws {Error} If the input is invalid, such as non array publicKeys, tweaks and isXonly array length not matching.
  * @throws {InvalidContributionErr} If any of the public keys are invalid and cannot be processed.
  */
-function keyAggregate(publicKeys, tweaks = [], isXonly = []) {
+export function keyAggregate(publicKeys, tweaks = [], isXonly = []) {
     abytesArray(publicKeys, PUBKEY_LEN);
     abytesArray(tweaks, 32);
     if (tweaks.length !== isXonly.length)
@@ -124,25 +112,24 @@ function keyAggregate(publicKeys, tweaks = [], isXonly = []) {
     for (let i = 0; i < publicKeys.length; i++) {
         let Pi;
         try {
-            Pi = Point.fromHex(publicKeys[i]);
+            Pi = Point.fromBytes(publicKeys[i]);
         }
         catch (error) {
             throw new InvalidContributionErr(i, 'pubkey');
         }
         aggPublicKey = aggPublicKey.add(Pi.multiply(keyAggCoeffInternal(publicKeys[i], pk2, L)));
     }
-    let gAcc = 1n;
-    let tweakAcc = 0n;
+    let gAcc = Fn.ONE;
+    let tweakAcc = Fn.ZERO;
     // Apply tweaks
     for (let i = 0; i < tweaks.length; i++) {
-        const g = isXonly[i] && !aggPublicKey.hasEvenY() ? modN(-1n) : 1n;
-        const t = (0, utils_js_1.bytesToNumberBE)(tweaks[i]);
-        (0, utils_js_1.aInRange)('tweak', t, 0n, SECP_N);
+        const g = isXonly[i] && !hasEven(aggPublicKey.y) ? Fn.neg(Fn.ONE) : Fn.ONE;
+        const t = Fn.fromBytes(tweaks[i]);
         aggPublicKey = aggPublicKey.multiply(g).add(mulBase(t));
         if (isZero(aggPublicKey))
             throw new Error('The result of tweaking cannot be infinity');
-        gAcc = modN(g * gAcc);
-        tweakAcc = modN(t + g * tweakAcc);
+        gAcc = Fn.mul(g, gAcc);
+        tweakAcc = Fn.add(t, Fn.mul(g, tweakAcc));
     }
     return { aggPublicKey, gAcc, tweakAcc };
 }
@@ -151,7 +138,7 @@ function keyAggregate(publicKeys, tweaks = [], isXonly = []) {
  * @param ctx The result of the keyAggregate function.
  * @returns The aggregate public key as a byte array.
  */
-function keyAggExport(ctx) {
+export function keyAggExport(ctx) {
     return pointToBytes(ctx.aggPublicKey);
 }
 function aux(secret, rand) {
@@ -163,7 +150,7 @@ function aux(secret, rand) {
         res[i] = secret[i] ^ rand2[i];
     return res;
 }
-const nonceHash = (rand, publicKey, aggPublicKey, i, msgPrefixed, extraIn) => taggedInt('MuSig/nonce', rand, new Uint8Array([publicKey.length]), publicKey, new Uint8Array([aggPublicKey.length]), aggPublicKey, msgPrefixed, (0, utils_js_1.numberToBytesBE)(extraIn.length, 4), extraIn, new Uint8Array([i]));
+const nonceHash = (rand, publicKey, aggPublicKey, i, msgPrefixed, extraIn) => taggedInt('MuSig/nonce', rand, new Uint8Array([publicKey.length]), publicKey, new Uint8Array([aggPublicKey.length]), aggPublicKey, msgPrefixed, numberToBytesBE(extraIn.length, 4), extraIn, new Uint8Array([i]));
 /**
  * Generates a nonce pair (public and secret) for MuSig2 signing.
  * @param publicKey The individual public key of the signer (Uint8Array).
@@ -175,18 +162,20 @@ const nonceHash = (rand, publicKey, aggPublicKey, i, msgPrefixed, extraIn) => ta
  * @returns An object containing the public and secret nonces.
  * @throws {Error} If the input is invalid, such as non array publicKey, secretKey, aggPublicKey.
  */
-function nonceGen(publicKey, secretKey, aggPublicKey = new Uint8Array(0), msg, extraIn = new Uint8Array(0), rand = (0, utils_js_2.randomBytes)(32)) {
-    (0, utils_js_2.abytes)(publicKey, PUBKEY_LEN);
+export function nonceGen(publicKey, secretKey, aggPublicKey = new Uint8Array(0), msg, extraIn = new Uint8Array(0), rand = randomBytes(32)) {
+    abytes(publicKey, PUBKEY_LEN);
     abytesOptional(secretKey, 32);
-    (0, utils_js_2.abytes)(aggPublicKey, 0, 32);
+    abytes(aggPublicKey);
+    if (![0, 32].includes(aggPublicKey.length))
+        throw new Error('wrong aggPublicKey');
     abytesOptional(msg);
-    (0, utils_js_2.abytes)(extraIn);
-    (0, utils_js_2.abytes)(rand, 32);
+    abytes(extraIn);
+    abytes(rand, 32);
     if (secretKey !== undefined)
         rand = aux(secretKey, rand);
     const msgPrefixed = msg !== undefined
-        ? (0, utils_js_1.concatBytes)(new Uint8Array([1]), (0, utils_js_1.numberToBytesBE)(msg.length, 8), msg)
-        : new Uint8Array([0]);
+        ? concatBytes(Uint8Array.of(1), numberToBytesBE(msg.length, 8), msg)
+        : Uint8Array.of(0);
     const k1 = nonceHash(rand, publicKey, aggPublicKey, 0, msgPrefixed, extraIn);
     const k2 = nonceHash(rand, publicKey, aggPublicKey, 1, msgPrefixed, extraIn);
     return {
@@ -201,7 +190,7 @@ function nonceGen(publicKey, secretKey, aggPublicKey = new Uint8Array(0), msg, e
  * @throws {Error} If the input is not an array or if any element is not a Uint8Array of the correct length.
  * @throws {InvalidContributionErr} If any of the public nonces are invalid and cannot be processed.
  */
-function nonceAggregate(pubNonces) {
+export function nonceAggregate(pubNonces) {
     abytesArray(pubNonces, 66);
     let R1 = Point.ZERO;
     let R2 = Point.ZERO;
@@ -222,7 +211,18 @@ function nonceAggregate(pubNonces) {
 }
 // Class allows us re-use pre-computed stuff
 // NOTE: it would be nice to aggregate nonce in construdctor, but there is test that passes already aggregated nonce here.
-class Session {
+export class Session {
+    publicKeys;
+    Q;
+    gAcc;
+    tweakAcc;
+    b;
+    R;
+    e;
+    tweaks;
+    isXonly;
+    L;
+    secondKey;
     /**
      * Constructor for the Session class.
      * It precomputes and stores values derived from the aggregate nonce, public keys,
@@ -238,7 +238,7 @@ class Session {
         abytesArray(publicKeys, 33);
         abytesArray(tweaks, 32);
         aXonly(isXonly);
-        (0, utils_js_2.abytes)(msg);
+        abytes(msg);
         if (tweaks.length !== isXonly.length)
             throw new Error('The tweaks and isXonly arrays must have the same length');
         const { aggPublicKey, gAcc, tweakAcc } = keyAggregate(publicKeys, tweaks, isXonly);
@@ -265,25 +265,25 @@ class Session {
      */
     getSessionKeyAggCoeff(P) {
         const { publicKeys } = this;
-        const pk = P.toRawBytes(true);
-        const found = publicKeys.some((p) => (0, utils_js_1.equalBytes)(p, pk));
+        const pk = P.toBytes(true);
+        const found = publicKeys.some((p) => equalBytes(p, pk));
         if (!found)
             throw new Error("The signer's pubkey must be included in the list of pubkeys");
         return keyAggCoeffInternal(pk, this.secondKey, this.L);
     }
     partialSigVerifyInternal(partialSig, publicNonce, publicKey) {
         const { Q, gAcc, b, R, e } = this;
-        const s = (0, utils_js_1.bytesToNumberBE)(partialSig);
-        if (s >= SECP_N)
+        const s = Fn.fromBytes(partialSig, true);
+        if (!Fn.isValid(s))
             return false;
         const { R1, R2 } = PubNonce.decode(publicNonce);
         const Re_s_ = R1.add(R2.multiply(b));
-        const Re_s = R.hasEvenY() ? Re_s_ : Re_s_.negate();
-        const P = Point.fromHex(publicKey);
+        const Re_s = hasEven(R.y) ? Re_s_ : Re_s_.negate();
+        const P = Point.fromBytes(publicKey);
         const a = this.getSessionKeyAggCoeff(P);
-        const g = modN(evenScalar(Q, 1n) * gAcc);
+        const g = Fn.mul(evenScalar(Q, 1n), gAcc);
         const left = mulBase(s);
-        const right = Re_s.add(P.multiply(modN(e * a * g)));
+        const right = Re_s.add(P.multiply(Fn.mul(e, Fn.mul(a, g))));
         return left.equals(right);
     }
     /**
@@ -296,7 +296,7 @@ class Session {
      * @throws {Error} If the input is invalid, such as wrong array sizes, invalid nonce or secret key.
      */
     sign(secretNonce, secret, fastSign = false) {
-        (0, utils_js_2.abytes)(secret, 32);
+        abytes(secret, 32);
         if (typeof fastSign !== 'boolean')
             throw new Error('expected boolean');
         const { Q, gAcc, b, R, e } = this;
@@ -304,21 +304,25 @@ class Session {
         // zero-out the first 64 bytes of secretNonce so it cannot be reused
         // TODO: this was in reference implementation, but feels very broken. Modifying input arguments is pretty bad.
         secretNonce.fill(0, 0, 64);
-        (0, utils_js_1.aInRange)('k1', k1_, 0n, SECP_N);
-        (0, utils_js_1.aInRange)('k2', k2_, 0n, SECP_N);
+        if (!Fn.isValid(k1_))
+            throw new Error('wrong k1');
+        if (!Fn.isValid(k2_))
+            throw new Error('wrong k1');
         const k1 = evenScalar(R, k1_);
         const k2 = evenScalar(R, k2_);
-        const d_ = (0, utils_js_1.bytesToNumberBE)(secret);
-        (0, utils_js_1.aInRange)('d_', d_, 1n, SECP_N);
+        const d_ = Fn.fromBytes(secret);
+        if (Fn.is0(d_))
+            throw new Error('wrong d_');
         const P = mulBase(d_);
-        const pk = P.toRawBytes(true);
-        if (!(0, utils_js_1.equalBytes)(pk, originalPk))
+        const pk = P.toBytes(true);
+        if (!equalBytes(pk, originalPk))
             throw new Error('Public key does not match nonceGen argument');
         const a = this.getSessionKeyAggCoeff(P);
         const g = evenScalar(Q, 1n);
-        const d = modN(g * gAcc * d_);
-        const s = modN(k1 + b * k2 + e * a * d);
-        const partialSig = (0, utils_js_1.numberToBytesBE)(s, 32);
+        const d = Fn.mul(g, Fn.mul(gAcc, d_));
+        /// k1 + (b*k2) + (e*a*d)
+        const s = Fn.add(k1, Fn.add(Fn.mul(b, k2), Fn.mul(e, Fn.mul(a, d))));
+        const partialSig = Fn.toBytes(s);
         // Skip validation in fast-sign mode
         if (!fastSign) {
             const publicNonce = PubNonce.encode({
@@ -344,12 +348,12 @@ class Session {
      */
     partialSigVerify(partialSig, pubNonces, i) {
         const { publicKeys, tweaks, isXonly } = this;
-        (0, utils_js_2.abytes)(partialSig, 32);
+        abytes(partialSig, 32);
         abytesArray(pubNonces, 66);
         abytesArray(publicKeys, PUBKEY_LEN);
         abytesArray(tweaks, 32);
         aXonly(isXonly);
-        (0, utils_js_2.anumber)(i);
+        anumber(i);
         if (pubNonces.length !== publicKeys.length)
             throw new Error('The pubNonces and publicKeys arrays must have the same length');
         if (tweaks.length !== isXonly.length)
@@ -370,18 +374,17 @@ class Session {
         const { Q, tweakAcc, R, e } = this;
         let s = 0n;
         for (let i = 0; i < partialSigs.length; i++) {
-            const si = (0, utils_js_1.bytesToNumberBE)(partialSigs[i]);
-            if (si >= SECP_N)
+            const si = Fn.fromBytes(partialSigs[i], true);
+            if (!Fn.isValid(si))
                 throw new InvalidContributionErr(i, 'psig');
-            s = modN(s + si);
+            s = Fn.add(s, si);
         }
         const g = evenScalar(Q, 1n);
-        s = modN(s + e * g * tweakAcc);
-        return (0, utils_js_1.concatBytes)(pointToBytes(R), (0, utils_js_1.numberToBytesBE)(s, 32));
+        s = Fn.add(s, Fn.mul(e, Fn.mul(g, tweakAcc))); // s + e * g * tweakAcc
+        return concatBytes(pointToBytes(R), Fn.toBytes(s));
     }
 }
-exports.Session = Session;
-const deterministicNonceHash = (secret, aggOtherNonce, aggPublicKey, msg, i) => taggedInt('MuSig/deterministic/nonce', secret, aggOtherNonce, aggPublicKey, (0, utils_js_1.numberToBytesBE)(msg.length, 8), msg, new Uint8Array([i]));
+const deterministicNonceHash = (secret, aggOtherNonce, aggPublicKey, msg, i) => taggedInt('MuSig/deterministic/nonce', secret, aggOtherNonce, aggPublicKey, numberToBytesBE(msg.length, 8), msg, new Uint8Array([i]));
 /**
  * Generates a nonce pair and partial signature deterministically for a single signer.
  * @param secret The secret key of the signer (Uint8Array).
@@ -393,12 +396,12 @@ const deterministicNonceHash = (secret, aggOtherNonce, aggPublicKey, msg, i) =>
  * @param rand Optional extra randomness (Uint8Array).
  * @returns An object containing the public nonce and partial signature.
  */
-function deterministicSign(secret, aggOtherNonce, publicKeys, msg, tweaks = [], isXonly = [], rand, fastSign = false) {
-    (0, utils_js_2.abytes)(secret, 32);
-    (0, utils_js_2.abytes)(aggOtherNonce, 66);
+export function deterministicSign(secret, aggOtherNonce, publicKeys, msg, tweaks = [], isXonly = [], rand, fastSign = false) {
+    abytes(secret, 32);
+    abytes(aggOtherNonce, 66);
     abytesArray(publicKeys, PUBKEY_LEN);
     abytesArray(tweaks, 32);
-    (0, utils_js_2.abytes)(msg);
+    abytes(msg);
     abytesOptional(rand);
     const sk = rand !== undefined ? aux(secret, rand) : secret;
     const aggPublicKey = keyAggExport(keyAggregate(publicKeys, tweaks, isXonly));