@noble/curves 1.9.5 → 2.0.0-beta.1

package/package.json

@@ -1,27 +1,24 @@
 {
   "name": "@noble/curves",
-  "version": "1.9.5",
+  "version": "2.0.0-beta.1",
   "description": "Audited & minimal JS implementation of elliptic curve cryptography",
   "files": [
     "*.js",
     "*.js.map",
     "*.d.ts",
     "*.d.ts.map",
-    "esm",
-    "src",
     "abstract",
-    "!oprf.*",
-    "!webcrypto.*"
+    "src"
   ],
   "scripts": {
     "bench": "npm run bench:install; cd test/benchmark; node secp256k1.js; node curves.js; node utils.js; node bls.js",
     "bench:install": "cd test/benchmark; npm install; npm install ../.. --install-links",
-    "build": "tsc && tsc -p tsconfig.cjs.json",
-    "build:release": "npx jsbt esbuild test/build",
+    "build": "tsc",
+    "build:release": "npx --no @paulmillr/jsbt esbuild test/build",
     "build:clean": "rm {.,esm,abstract,esm/abstract}/*.{js,d.ts,d.ts.map,js.map} 2> /dev/null",
     "lint": "prettier --check 'src/**/*.{js,ts}' 'test/*.js'",
     "format": "prettier --write 'src/**/*.{js,ts}' 'test/*.js'",
-    "test": "node test/index.js",
+    "test": "node --disable-warning=ExperimentalWarning test/index.js",
     "test:bun": "bun test/index.js",
     "test:deno": "deno --allow-env --allow-read test/index.js",
     "test:coverage": "npm install --no-save c8@10.1.2 && npx c8 npm test"
@@ -34,7 +31,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@noble/hashes": "1.8.0"
+    "@noble/hashes": "2.0.0-beta.3"
   },
   "devDependencies": {
     "@paulmillr/jsbt": "0.4.0",
@@ -46,223 +43,11 @@
     "typescript": "5.8.3"
   },
   "sideEffects": false,
+  "type": "module",
   "main": "index.js",
-  "exports": {
-    ".": {
-      "import": "./esm/index.js",
-      "require": "./index.js"
-    },
-    "./abstract/bls": {
-      "import": "./esm/abstract/bls.js",
-      "require": "./abstract/bls.js"
-    },
-    "./abstract/curve": {
-      "import": "./esm/abstract/curve.js",
-      "require": "./abstract/curve.js"
-    },
-    "./abstract/edwards": {
-      "import": "./esm/abstract/edwards.js",
-      "require": "./abstract/edwards.js"
-    },
-    "./abstract/hash-to-curve": {
-      "import": "./esm/abstract/hash-to-curve.js",
-      "require": "./abstract/hash-to-curve.js"
-    },
-    "./abstract/modular": {
-      "import": "./esm/abstract/modular.js",
-      "require": "./abstract/modular.js"
-    },
-    "./abstract/montgomery": {
-      "import": "./esm/abstract/montgomery.js",
-      "require": "./abstract/montgomery.js"
-    },
-    "./abstract/poseidon": {
-      "import": "./esm/abstract/poseidon.js",
-      "require": "./abstract/poseidon.js"
-    },
-    "./abstract/tower": {
-      "import": "./esm/abstract/tower.js",
-      "require": "./abstract/tower.js"
-    },
-    "./abstract/utils": {
-      "import": "./esm/abstract/utils.js",
-      "require": "./abstract/utils.js"
-    },
-    "./abstract/weierstrass": {
-      "import": "./esm/abstract/weierstrass.js",
-      "require": "./abstract/weierstrass.js"
-    },
-    "./abstract/fft": {
-      "import": "./esm/abstract/fft.js",
-      "require": "./abstract/fft.js"
-    },
-    "./_shortw_utils": {
-      "import": "./esm/_shortw_utils.js",
-      "require": "./_shortw_utils.js"
-    },
-    "./bls12-381": {
-      "import": "./esm/bls12-381.js",
-      "require": "./bls12-381.js"
-    },
-    "./bn254": {
-      "import": "./esm/bn254.js",
-      "require": "./bn254.js"
-    },
-    "./ed448": {
-      "import": "./esm/ed448.js",
-      "require": "./ed448.js"
-    },
-    "./ed25519": {
-      "import": "./esm/ed25519.js",
-      "require": "./ed25519.js"
-    },
-    "./index": {
-      "import": "./esm/index.js",
-      "require": "./index.js"
-    },
-    "./jubjub": {
-      "import": "./esm/jubjub.js",
-      "require": "./jubjub.js"
-    },
-    "./misc": {
-      "import": "./esm/misc.js",
-      "require": "./misc.js"
-    },
-    "./nist": {
-      "import": "./esm/nist.js",
-      "require": "./nist.js"
-    },
-    "./p256": {
-      "import": "./esm/p256.js",
-      "require": "./p256.js"
-    },
-    "./p384": {
-      "import": "./esm/p384.js",
-      "require": "./p384.js"
-    },
-    "./p521": {
-      "import": "./esm/p521.js",
-      "require": "./p521.js"
-    },
-    "./pasta": {
-      "import": "./esm/pasta.js",
-      "require": "./pasta.js"
-    },
-    "./secp256k1": {
-      "import": "./esm/secp256k1.js",
-      "require": "./secp256k1.js"
-    },
-    "./utils": {
-      "import": "./esm/utils.js",
-      "require": "./utils.js"
-    },
-    "./abstract/bls.js": {
-      "import": "./esm/abstract/bls.js",
-      "require": "./abstract/bls.js"
-    },
-    "./abstract/curve.js": {
-      "import": "./esm/abstract/curve.js",
-      "require": "./abstract/curve.js"
-    },
-    "./abstract/edwards.js": {
-      "import": "./esm/abstract/edwards.js",
-      "require": "./abstract/edwards.js"
-    },
-    "./abstract/hash-to-curve.js": {
-      "import": "./esm/abstract/hash-to-curve.js",
-      "require": "./abstract/hash-to-curve.js"
-    },
-    "./abstract/modular.js": {
-      "import": "./esm/abstract/modular.js",
-      "require": "./abstract/modular.js"
-    },
-    "./abstract/montgomery.js": {
-      "import": "./esm/abstract/montgomery.js",
-      "require": "./abstract/montgomery.js"
-    },
-    "./abstract/poseidon.js": {
-      "import": "./esm/abstract/poseidon.js",
-      "require": "./abstract/poseidon.js"
-    },
-    "./abstract/tower.js": {
-      "import": "./esm/abstract/tower.js",
-      "require": "./abstract/tower.js"
-    },
-    "./abstract/utils.js": {
-      "import": "./esm/abstract/utils.js",
-      "require": "./abstract/utils.js"
-    },
-    "./abstract/weierstrass.js": {
-      "import": "./esm/abstract/weierstrass.js",
-      "require": "./abstract/weierstrass.js"
-    },
-    "./abstract/fft.js": {
-      "import": "./esm/abstract/fft.js",
-      "require": "./abstract/fft.js"
-    },
-    "./_shortw_utils.js": {
-      "import": "./esm/_shortw_utils.js",
-      "require": "./_shortw_utils.js"
-    },
-    "./bls12-381.js": {
-      "import": "./esm/bls12-381.js",
-      "require": "./bls12-381.js"
-    },
-    "./bn254.js": {
-      "import": "./esm/bn254.js",
-      "require": "./bn254.js"
-    },
-    "./utils.js": {
-      "import": "./esm/utils.js",
-      "require": "./utils.js"
-    },
-    "./ed448.js": {
-      "import": "./esm/ed448.js",
-      "require": "./ed448.js"
-    },
-    "./ed25519.js": {
-      "import": "./esm/ed25519.js",
-      "require": "./ed25519.js"
-    },
-    "./index.js": {
-      "import": "./esm/index.js",
-      "require": "./index.js"
-    },
-    "./jubjub.js": {
-      "import": "./esm/jubjub.js",
-      "require": "./jubjub.js"
-    },
-    "./misc.js": {
-      "import": "./esm/misc.js",
-      "require": "./misc.js"
-    },
-    "./nist.js": {
-      "import": "./esm/nist.js",
-      "require": "./nist.js"
-    },
-    "./p256.js": {
-      "import": "./esm/p256.js",
-      "require": "./p256.js"
-    },
-    "./p384.js": {
-      "import": "./esm/p384.js",
-      "require": "./p384.js"
-    },
-    "./p521.js": {
-      "import": "./esm/p521.js",
-      "require": "./p521.js"
-    },
-    "./pasta.js": {
-      "import": "./esm/pasta.js",
-      "require": "./pasta.js"
-    },
-    "./secp256k1.js": {
-      "import": "./esm/secp256k1.js",
-      "require": "./secp256k1.js"
-    }
-  },
+  "module": "index.js",
   "engines": {
-    "node": "^14.21.3 || >=16"
+    "node": ">= 20.19.0"
   },
   "keywords": [
     "elliptic",

package/secp256k1.d.ts

@@ -1,10 +1,6 @@
-import { type CurveFnWithCreate } from './_shortw_utils.ts';
 import type { CurveLengths } from './abstract/curve.ts';
-import { type H2CHasher, type H2CMethod } from './abstract/hash-to-curve.ts';
-import { mod } from './abstract/modular.ts';
-import { type WeierstrassPoint as PointType, type WeierstrassPointCons } from './abstract/weierstrass.ts';
-import type { Hex, PrivKey } from './utils.ts';
-import { bytesToNumberBE, numberToBytesBE } from './utils.ts';
+import { type H2CHasher } from './abstract/hash-to-curve.ts';
+import { type ECDSA, type WeierstrassPoint as PointType, type WeierstrassPointCons } from './abstract/weierstrass.ts';
 /**
  * secp256k1 curve, ECDSA and ECDH methods.
  *
@@ -19,7 +15,7 @@ import { bytesToNumberBE, numberToBytesBE } from './utils.ts';
  * const isValid = secp256k1.verify(sig, msg, publicKey) === true;
  * ```
  */
-export declare const secp256k1: CurveFnWithCreate;
+export declare const secp256k1: ECDSA;
 declare function taggedHash(tag: string, ...messages: Uint8Array[]): Uint8Array;
 /**
  * lift_x from BIP340. Convert 32-byte x coordinate to elliptic curve point.
@@ -29,17 +25,17 @@ declare function lift_x(x: bigint): PointType<bigint>;
 /**
  * Schnorr public key is just `x` coordinate of Point as per BIP340.
  */
-declare function schnorrGetPublicKey(secretKey: Hex): Uint8Array;
+declare function schnorrGetPublicKey(secretKey: Uint8Array): Uint8Array;
 /**
  * Creates Schnorr signature as per BIP340. Verifies itself before returning anything.
  * auxRand is optional and is not the sole source of k generation: bad CSPRNG won't be dangerous.
  */
-declare function schnorrSign(message: Hex, secretKey: PrivKey, auxRand?: Hex): Uint8Array;
+declare function schnorrSign(message: Uint8Array, secretKey: Uint8Array, auxRand?: Uint8Array): Uint8Array;
 /**
  * Verifies Schnorr signature.
  * Will swallow errors & return false except for initial type validation of arguments.
  */
-declare function schnorrVerify(signature: Hex, message: Hex, publicKey: Hex): boolean;
+declare function schnorrVerify(signature: Uint8Array, message: Uint8Array, publicKey: Uint8Array): boolean;
 export type SecpSchnorr = {
     keygen: (seed?: Uint8Array) => {
         secretKey: Uint8Array;
@@ -54,14 +50,6 @@ export type SecpSchnorr = {
         pointToBytes: (point: PointType<bigint>) => Uint8Array;
         lift_x: typeof lift_x;
         taggedHash: typeof taggedHash;
-        /** @deprecated use `randomSecretKey` */
-        randomPrivateKey: (seed?: Uint8Array) => Uint8Array;
-        /** @deprecated use `utils` */
-        numberToBytesBE: typeof numberToBytesBE;
-        /** @deprecated use `utils` */
-        bytesToNumberBE: typeof bytesToNumberBE;
-        /** @deprecated use `modular` */
-        mod: typeof mod;
     };
     lengths: CurveLengths;
 };
@@ -80,10 +68,6 @@ export type SecpSchnorr = {
  */
 export declare const schnorr: SecpSchnorr;
 /** Hashing / encoding to secp256k1 points / field. RFC 9380 methods. */
-export declare const secp256k1_hasher: H2CHasher<bigint>;
-/** @deprecated use `import { secp256k1_hasher } from '@noble/curves/secp256k1.js';` */
-export declare const hashToCurve: H2CMethod<bigint>;
-/** @deprecated use `import { secp256k1_hasher } from '@noble/curves/secp256k1.js';` */
-export declare const encodeToCurve: H2CMethod<bigint>;
+export declare const secp256k1_hasher: H2CHasher<WeierstrassPointCons<bigint>>;
 export {};
 //# sourceMappingURL=secp256k1.d.ts.map

package/secp256k1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secp256k1.d.ts","sourceRoot":"","sources":["src/secp256k1.ts"],"names":[],"mappings":"AAUA,OAAO,EAAe,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,SAAS,EAEf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAyB,GAAG,EAAQ,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAIL,KAAK,gBAAgB,IAAI,SAAS,EAElC,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAEL,eAAe,EAIf,eAAe,EAEhB,MAAM,YAAY,CAAC;AAyDpB;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,SAAS,EAAE,iBAGvB,CAAC;AAMF,iBAAS,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,CAQtE;AAkBD;;;GAGG;AACH,iBAAS,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAS5C;AASD;;GAEG;AACH,iBAAS,mBAAmB,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU,CAEvD;AAED;;;GAGG;AACH,iBAAS,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAE,GAAqB,GAAG,UAAU,CAgBjG;AAED;;;GAGG;AACH,iBAAS,aAAa,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,CAoB5E;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK;QAAE,SAAS,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE,UAAU,CAAA;KAAE,CAAC;IAChF,YAAY,EAAE,OAAO,mBAAmB,CAAC;IACzC,IAAI,EAAE,OAAO,WAAW,CAAC;IACzB,MAAM,EAAE,OAAO,aAAa,CAAC;IAC7B,KAAK,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACpC,KAAK,EAAE;QACL,eAAe,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,UAAU,CAAC;QACnD,YAAY,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC;QACvD,MAAM,EAAE,OAAO,MAAM,CAAC;QACtB,UAAU,EAAE,OAAO,UAAU,CAAC;QAE9B,wCAAwC;QACxC,gBAAgB,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,UAAU,CAAC;QACpD,8BAA8B;QAC9B,eAAe,EAAE,OAAO,eAAe,CAAC;QACxC,8BAA8B;QAC9B,eAAe,EAAE,OAAO,eAAe,CAAC;QACxC,gCAAgC;QAChC,GAAG,EAAE,OAAO,GAAG,CAAC;KACjB,CAAC;IACF,OAAO,EAAE,YAAY,CAAC;CACvB,CAAC;AACF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,EAAE,WAsClB,CAAC;AA0CL,wEAAwE;AACxE,eAAO,MAAM,gBAAgB,EAAE,SAAS,CAAC,MAAM,CAgBzC,CAAC;AAEP,uFAAuF;AACvF,eAAO,MAAM,WAAW,EAAE,SAAS,CAAC,MAAM,CACT,CAAC;AAElC,uFAAuF;AACvF,eAAO,MAAM,aAAa,EAAE,SAAS,CAAC,MAAM,CACT,CAAC"}
+{"version":3,"file":"secp256k1.d.ts","sourceRoot":"","sources":["src/secp256k1.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAgB,KAAK,SAAS,EAAc,MAAM,6BAA6B,CAAC;AAEvF,OAAO,EACL,KAAK,KAAK,EAIV,KAAK,gBAAgB,IAAI,SAAS,EAGlC,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AA8DnC;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,SAAS,EAAE,KAA8C,CAAC;AAMvE,iBAAS,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,CAQtE;AAcD;;;GAGG;AACH,iBAAS,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAY5C;AASD;;GAEG;AACH,iBAAS,mBAAmB,CAAC,SAAS,EAAE,UAAU,GAAG,UAAU,CAE9D;AAED;;;GAGG;AACH,iBAAS,WAAW,CAClB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,UAAU,EACrB,OAAO,GAAE,UAA4B,GACpC,UAAU,CAgBZ;AAED;;;GAGG;AACH,iBAAS,aAAa,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAqBjG;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK;QAAE,SAAS,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE,UAAU,CAAA;KAAE,CAAC;IAChF,YAAY,EAAE,OAAO,mBAAmB,CAAC;IACzC,IAAI,EAAE,OAAO,WAAW,CAAC;IACzB,MAAM,EAAE,OAAO,aAAa,CAAC;IAC7B,KAAK,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACpC,KAAK,EAAE;QACL,eAAe,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,UAAU,CAAC;QACnD,YAAY,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC;QACvD,MAAM,EAAE,OAAO,MAAM,CAAC;QACtB,UAAU,EAAE,OAAO,UAAU,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,YAAY,CAAC;CACvB,CAAC;AACF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,EAAE,WA8BlB,CAAC;AA0CL,wEAAwE;AACxE,eAAO,MAAM,gBAAgB,EAAE,SAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAgB/D,CAAC"}

package/secp256k1.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeToCurve = exports.hashToCurve = exports.secp256k1_hasher = exports.schnorr = exports.secp256k1 = void 0;
 /**
  * SECG secp256k1. See [pdf](https://www.secg.org/sec2-v2.pdf).
  *
@@ -9,15 +6,14 @@ exports.encodeToCurve = exports.hashToCurve = exports.secp256k1_hasher = exports
  * @module
  */
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-const sha2_js_1 = require("@noble/hashes/sha2.js");
-const utils_js_1 = require("@noble/hashes/utils.js");
-const _shortw_utils_ts_1 = require("./_shortw_utils.js");
-const hash_to_curve_ts_1 = require("./abstract/hash-to-curve.js");
-const modular_ts_1 = require("./abstract/modular.js");
-const weierstrass_ts_1 = require("./abstract/weierstrass.js");
-const utils_ts_1 = require("./utils.js");
+import { sha256 } from '@noble/hashes/sha2.js';
+import { randomBytes } from '@noble/hashes/utils.js';
+import { createHasher, isogenyMap } from "./abstract/hash-to-curve.js";
+import { Field, mapHashToField, pow2 } from "./abstract/modular.js";
+import { ecdsa, mapToCurveSimpleSWU, weierstrass, } from "./abstract/weierstrass.js";
+import { abytes, asciiToBytes, bytesToNumberBE, concatBytes, inRange } from "./utils.js";
 // Seems like generator was produced from some seed:
-// `Point.BASE.multiply(Point.Fn.inv(2n, N)).toAffine().x`
+// `Pointk1.BASE.multiply(Pointk1.Fn.inv(2n, N)).toAffine().x`
 // // gives short x 0x3b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63n
 const secp256k1_CURVE = {
     p: BigInt('0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f'),
@@ -50,23 +46,27 @@ function sqrtMod(y) {
     const _23n = BigInt(23), _44n = BigInt(44), _88n = BigInt(88);
     const b2 = (y * y * y) % P; // x^3, 11
     const b3 = (b2 * b2 * y) % P; // x^7
-    const b6 = ((0, modular_ts_1.pow2)(b3, _3n, P) * b3) % P;
-    const b9 = ((0, modular_ts_1.pow2)(b6, _3n, P) * b3) % P;
-    const b11 = ((0, modular_ts_1.pow2)(b9, _2n, P) * b2) % P;
-    const b22 = ((0, modular_ts_1.pow2)(b11, _11n, P) * b11) % P;
-    const b44 = ((0, modular_ts_1.pow2)(b22, _22n, P) * b22) % P;
-    const b88 = ((0, modular_ts_1.pow2)(b44, _44n, P) * b44) % P;
-    const b176 = ((0, modular_ts_1.pow2)(b88, _88n, P) * b88) % P;
-    const b220 = ((0, modular_ts_1.pow2)(b176, _44n, P) * b44) % P;
-    const b223 = ((0, modular_ts_1.pow2)(b220, _3n, P) * b3) % P;
-    const t1 = ((0, modular_ts_1.pow2)(b223, _23n, P) * b22) % P;
-    const t2 = ((0, modular_ts_1.pow2)(t1, _6n, P) * b2) % P;
-    const root = (0, modular_ts_1.pow2)(t2, _2n, P);
+    const b6 = (pow2(b3, _3n, P) * b3) % P;
+    const b9 = (pow2(b6, _3n, P) * b3) % P;
+    const b11 = (pow2(b9, _2n, P) * b2) % P;
+    const b22 = (pow2(b11, _11n, P) * b11) % P;
+    const b44 = (pow2(b22, _22n, P) * b22) % P;
+    const b88 = (pow2(b44, _44n, P) * b44) % P;
+    const b176 = (pow2(b88, _88n, P) * b88) % P;
+    const b220 = (pow2(b176, _44n, P) * b44) % P;
+    const b223 = (pow2(b220, _3n, P) * b3) % P;
+    const t1 = (pow2(b223, _23n, P) * b22) % P;
+    const t2 = (pow2(t1, _6n, P) * b2) % P;
+    const root = pow2(t2, _2n, P);
     if (!Fpk1.eql(Fpk1.sqr(root), y))
         throw new Error('Cannot find square root');
     return root;
 }
-const Fpk1 = (0, modular_ts_1.Field)(secp256k1_CURVE.p, { sqrt: sqrtMod });
+const Fpk1 = Field(secp256k1_CURVE.p, { sqrt: sqrtMod });
+const Pointk1 = /* @__PURE__ */ weierstrass(secp256k1_CURVE, {
+    Fp: Fpk1,
+    endo: secp256k1_ENDO,
+});
 /**
  * secp256k1 curve, ECDSA and ECDH methods.
  *
@@ -81,7 +81,7 @@ const Fpk1 = (0, modular_ts_1.Field)(secp256k1_CURVE.p, { sqrt: sqrtMod });
  * const isValid = secp256k1.verify(sig, msg, publicKey) === true;
  * ```
  */
-exports.secp256k1 = (0, _shortw_utils_ts_1.createCurve)({ ...secp256k1_CURVE, Fp: Fpk1, lowS: true, endo: secp256k1_ENDO }, sha2_js_1.sha256);
+export const secp256k1 = /* @__PURE__ */ ecdsa(Pointk1, sha256);
 // Schnorr signatures are superior to ECDSA from above. Below is Schnorr-specific BIP0340 code.
 // https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki
 /** An object mapping tags to their tagged hash prefix of [SHA256(tag) | SHA256(tag)] */
@@ -89,25 +89,21 @@ const TAGGED_HASH_PREFIXES = {};
 function taggedHash(tag, ...messages) {
     let tagP = TAGGED_HASH_PREFIXES[tag];
     if (tagP === undefined) {
-        const tagH = (0, sha2_js_1.sha256)((0, utils_ts_1.utf8ToBytes)(tag));
-        tagP = (0, utils_ts_1.concatBytes)(tagH, tagH);
+        const tagH = sha256(asciiToBytes(tag));
+        tagP = concatBytes(tagH, tagH);
         TAGGED_HASH_PREFIXES[tag] = tagP;
     }
-    return (0, sha2_js_1.sha256)((0, utils_ts_1.concatBytes)(tagP, ...messages));
+    return sha256(concatBytes(tagP, ...messages));
 }
 // ECDSA compact points are 33-byte. Schnorr is 32: we strip first byte 0x02 or 0x03
 const pointToBytes = (point) => point.toBytes(true).slice(1);
-const numTo32b = (n) => (0, utils_ts_1.numberToBytesBE)(n, 32);
-const modP = (x) => (0, modular_ts_1.mod)(x, secp256k1_CURVE.p);
-const modN = (x) => (0, modular_ts_1.mod)(x, secp256k1_CURVE.n);
-const Point = /* @__PURE__ */ (() => exports.secp256k1.Point)();
 const hasEven = (y) => y % _2n === _0n;
 // Calculate point, scalar and bytes
 function schnorrGetExtPubKey(priv) {
-    // TODO: replace with Point.Fn.fromBytes(priv)
-    let d_ = (0, weierstrass_ts_1._normFnElement)(Point.Fn, priv);
-    let p = Point.BASE.multiply(d_); // P = d'⋅G; 0 < d' < n check is done inside
-    const scalar = hasEven(p.y) ? d_ : modN(-d_);
+    const { Fn, BASE } = Pointk1;
+    const d_ = Fn.fromBytes(priv);
+    const p = BASE.multiply(d_); // P = d'⋅G; 0 < d' < n check is done inside
+    const scalar = hasEven(p.y) ? d_ : Fn.neg(d_);
     return { scalar, bytes: pointToBytes(p) };
 }
 /**
@@ -115,22 +111,26 @@ function schnorrGetExtPubKey(priv) {
  * @returns valid point checked for being on-curve
  */
 function lift_x(x) {
-    (0, utils_ts_1.aInRange)('x', x, _1n, secp256k1_CURVE.p); // Fail if x ≥ p.
-    const xx = modP(x * x);
-    const c = modP(xx * x + BigInt(7)); // Let c = x³ + 7 mod p.
-    let y = sqrtMod(c); // Let y = c^(p+1)/4 mod p.
+    const Fp = Fpk1;
+    if (!Fp.isValidNot0(x))
+        throw new Error('invalid x: Fail if x ≥ p');
+    const xx = Fp.create(x * x);
+    const c = Fp.create(xx * x + BigInt(7)); // Let c = x³ + 7 mod p.
+    let y = Fp.sqrt(c); // Let y = c^(p+1)/4 mod p. Same as sqrt().
+    // Return the unique point P such that x(P) = x and
+    // y(P) = y if y mod 2 = 0 or y(P) = p-y otherwise.
     if (!hasEven(y))
-        y = modP(-y); // Return the unique point P such that x(P) = x and
-    const p = Point.fromAffine({ x, y }); // y(P) = y if y mod 2 = 0 or y(P) = p-y otherwise.
+        y = Fp.neg(y);
+    const p = Pointk1.fromAffine({ x, y });
     p.assertValidity();
     return p;
 }
-const num = utils_ts_1.bytesToNumberBE;
+const num = bytesToNumberBE;
 /**
  * Create tagged hash, convert it to bigint, reduce modulo-n.
  */
 function challenge(...args) {
-    return modN(num(taggedHash('BIP0340/challenge', ...args)));
+    return Pointk1.Fn.create(num(taggedHash('BIP0340/challenge', ...args)));
 }
 /**
  * Schnorr public key is just `x` coordinate of Point as per BIP340.
@@ -142,20 +142,19 @@ function schnorrGetPublicKey(secretKey) {
  * Creates Schnorr signature as per BIP340. Verifies itself before returning anything.
  * auxRand is optional and is not the sole source of k generation: bad CSPRNG won't be dangerous.
  */
-function schnorrSign(message, secretKey, auxRand = (0, utils_js_1.randomBytes)(32)) {
-    const m = (0, utils_ts_1.ensureBytes)('message', message);
+function schnorrSign(message, secretKey, auxRand = randomBytes(32)) {
+    const { Fn } = Pointk1;
+    const m = abytes(message, undefined, 'message');
     const { bytes: px, scalar: d } = schnorrGetExtPubKey(secretKey); // checks for isWithinCurveOrder
-    const a = (0, utils_ts_1.ensureBytes)('auxRand', auxRand, 32); // Auxiliary random data a: a 32-byte array
-    const t = numTo32b(d ^ num(taggedHash('BIP0340/aux', a))); // Let t be the byte-wise xor of bytes(d) and hash/aux(a)
+    const a = abytes(auxRand, 32, 'auxRand'); // Auxiliary random data a: a 32-byte array
+    const t = Fn.toBytes(d ^ num(taggedHash('BIP0340/aux', a))); // Let t be the byte-wise xor of bytes(d) and hash/aux(a)
     const rand = taggedHash('BIP0340/nonce', t, px, m); // Let rand = hash/nonce(t || bytes(P) || m)
-    const k_ = modN(num(rand)); // Let k' = int(rand) mod n
-    if (k_ === _0n)
-        throw new Error('sign failed: k is zero'); // Fail if k' = 0.
-    const { bytes: rx, scalar: k } = schnorrGetExtPubKey(k_); // Let R = k'⋅G.
+    // Let k' = int(rand) mod n. Fail if k' = 0. Let R = k'⋅G
+    const { bytes: rx, scalar: k } = schnorrGetExtPubKey(rand);
     const e = challenge(rx, px, m); // Let e = int(hash/challenge(bytes(R) || bytes(P) || m)) mod n.
     const sig = new Uint8Array(64); // Let sig = bytes(R) || bytes((k + ed) mod n).
     sig.set(rx, 0);
-    sig.set(numTo32b(modN(k + e * d)), 32);
+    sig.set(Fn.toBytes(Fn.create(k + e * d)), 32);
     // If Verify(bytes(P), m, sig) (see below) returns failure, abort
     if (!schnorrVerify(sig, m, px))
         throw new Error('sign: Invalid signature produced');
@@ -166,20 +165,21 @@ function schnorrSign(message, secretKey, auxRand = (0, utils_js_1.randomBytes)(3
  * Will swallow errors & return false except for initial type validation of arguments.
  */
 function schnorrVerify(signature, message, publicKey) {
-    const sig = (0, utils_ts_1.ensureBytes)('signature', signature, 64);
-    const m = (0, utils_ts_1.ensureBytes)('message', message);
-    const pub = (0, utils_ts_1.ensureBytes)('publicKey', publicKey, 32);
+    const { Fn, BASE } = Pointk1;
+    const sig = abytes(signature, 64, 'signature');
+    const m = abytes(message, undefined, 'message');
+    const pub = abytes(publicKey, 32, 'publicKey');
     try {
         const P = lift_x(num(pub)); // P = lift_x(int(pk)); fail if that fails
         const r = num(sig.subarray(0, 32)); // Let r = int(sig[0:32]); fail if r ≥ p.
-        if (!(0, utils_ts_1.inRange)(r, _1n, secp256k1_CURVE.p))
+        if (!inRange(r, _1n, secp256k1_CURVE.p))
             return false;
         const s = num(sig.subarray(32, 64)); // Let s = int(sig[32:64]); fail if s ≥ n.
-        if (!(0, utils_ts_1.inRange)(s, _1n, secp256k1_CURVE.n))
+        if (!inRange(s, _1n, secp256k1_CURVE.n))
             return false;
-        const e = challenge(numTo32b(r), pointToBytes(P), m); // int(challenge(bytes(r)||bytes(P)||m))%n
+        const e = challenge(Fn.toBytes(r), pointToBytes(P), m); // int(challenge(bytes(r)||bytes(P)||m))%n
         // R = s⋅G - e⋅P, where -eP == (n-e)P
-        const R = Point.BASE.multiplyUnsafe(s).add(P.multiplyUnsafe(modN(-e)));
+        const R = BASE.multiplyUnsafe(s).add(P.multiplyUnsafe(Fn.neg(e)));
         const { x, y } = R.toAffine();
         // Fail if is_infinite(R) / not has_even_y(R) / x(R) ≠ r.
         if (R.is0() || !hasEven(y) || x !== r)
@@ -203,14 +203,12 @@ function schnorrVerify(signature, message, publicKey) {
  * const isValid = schnorr.verify(sig, msg, publicKey);
  * ```
  */
-exports.schnorr = (() => {
+export const schnorr = /* @__PURE__ */ (() => {
     const size = 32;
     const seedLength = 48;
-    const randomSecretKey = (seed = (0, utils_js_1.randomBytes)(seedLength)) => {
-        return (0, modular_ts_1.mapHashToField)(seed, secp256k1_CURVE.n);
+    const randomSecretKey = (seed = randomBytes(seedLength)) => {
+        return mapHashToField(seed, secp256k1_CURVE.n);
     };
-    // TODO: remove
-    exports.secp256k1.utils.randomSecretKey;
     function keygen(seed) {
         const secretKey = randomSecretKey(seed);
         return { secretKey, publicKey: schnorrGetPublicKey(secretKey) };
@@ -220,28 +218,23 @@ exports.schnorr = (() => {
         getPublicKey: schnorrGetPublicKey,
         sign: schnorrSign,
         verify: schnorrVerify,
-        Point,
+        Point: Pointk1,
         utils: {
-            randomSecretKey: randomSecretKey,
-            randomPrivateKey: randomSecretKey,
+            randomSecretKey,
             taggedHash,
-            // TODO: remove
             lift_x,
             pointToBytes,
-            numberToBytesBE: utils_ts_1.numberToBytesBE,
-            bytesToNumberBE: utils_ts_1.bytesToNumberBE,
-            mod: modular_ts_1.mod,
         },
         lengths: {
-            secret: size,
-            public: size,
+            secretKey: size,
+            publicKey: size,
+            publicKeyHasPrefix: false,
             signature: size * 2,
             seed: seedLength,
-            publicKeyHasPrefix: false,
         },
     };
 })();
-const isoMap = /* @__PURE__ */ (() => (0, hash_to_curve_ts_1.isogenyMap)(Fpk1, [
+const isoMap = /* @__PURE__ */ (() => isogenyMap(Fpk1, [
     // xNum
     [
         '0x8e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38daaaaa8c7',
@@ -270,13 +263,13 @@ const isoMap = /* @__PURE__ */ (() => (0, hash_to_curve_ts_1.isogenyMap)(Fpk1, [
         '0x0000000000000000000000000000000000000000000000000000000000000001', // LAST 1
     ],
 ].map((i) => i.map((j) => BigInt(j)))))();
-const mapSWU = /* @__PURE__ */ (() => (0, weierstrass_ts_1.mapToCurveSimpleSWU)(Fpk1, {
+const mapSWU = /* @__PURE__ */ (() => mapToCurveSimpleSWU(Fpk1, {
     A: BigInt('0x3f8731abdd661adca08a5558f0f5d272e953d363cb6f0e5d405447c01a444533'),
     B: BigInt('1771'),
     Z: Fpk1.create(BigInt('-11')),
 }))();
 /** Hashing / encoding to secp256k1 points / field. RFC 9380 methods. */
-exports.secp256k1_hasher = (() => (0, hash_to_curve_ts_1.createHasher)(exports.secp256k1.Point, (scalars) => {
+export const secp256k1_hasher = /* @__PURE__ */ (() => createHasher(Pointk1, (scalars) => {
     const { x, y } = mapSWU(Fpk1.create(scalars[0]));
     return isoMap(x, y);
 }, {
@@ -286,10 +279,6 @@ exports.secp256k1_hasher = (() => (0, hash_to_curve_ts_1.createHasher)(exports.s
     m: 1,
     k: 128,
     expand: 'xmd',
-    hash: sha2_js_1.sha256,
+    hash: sha256,
 }))();
-/** @deprecated use `import { secp256k1_hasher } from '@noble/curves/secp256k1.js';` */
-exports.hashToCurve = (() => exports.secp256k1_hasher.hashToCurve)();
-/** @deprecated use `import { secp256k1_hasher } from '@noble/curves/secp256k1.js';` */
-exports.encodeToCurve = (() => exports.secp256k1_hasher.encodeToCurve)();
 //# sourceMappingURL=secp256k1.js.map