@bitcoin-js/tiny-secp256k1-asmjs 2.2.3 → 2.2.5

package/README.md

@@ -340,6 +340,7 @@ Returns the ECDSA public key from a signature if it can be recovered, `null` oth
 
 - `Expected Signature` if `signature` has any (r, s) values not in range `(0...order - 1]`
 - `Bad Recovery Id` if `recid & 2 !== 0`  and `signature` has any r value not in range `(0...P - N - 1]`
+- `Bad Recovery Id` if `recoveryId` is not an integer from 0 through 3
 - `Expected Hash` if `h` is not 256-bit
 
 

package/lib/cjs/index.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifySchnorr = exports.recover = exports.verify = exports.signSchnorr = exports.signRecoverable = exports.sign = exports.xOnlyPointAddTweakCheck = exports.xOnlyPointAddTweak = exports.privateNegate = exports.privateSub = exports.privateAdd = exports.pointMultiply = exports.xOnlyPointFromPoint = exports.xOnlyPointFromScalar = exports.pointFromScalar = exports.pointCompress = exports.pointAddScalar = exports.pointAdd = exports.isPrivate = exports.isXOnlyPoint = exports.isPointCompressed = exports.isPoint = exports.__initializeContext = void 0;
 const uint8array_tools_1 = require("uint8array-tools");
 const validate = require("./validate.cjs");
+const validate_error_js_1 = require("./validate_error.cjs");
 const wasm_loader_js_1 = require("./wasm_loader.cjs");
 const WASM_BUFFER = new Uint8Array(wasm_loader_js_1.default.memory.buffer);
 const WASM_PRIVATE_KEY_PTR = wasm_loader_js_1.default.PRIVATE_INPUT.value;
@@ -34,7 +35,7 @@ function assumeCompression(compressed, p) {
 function _isPoint(p) {
     try {
         PUBLIC_KEY_INPUT.set(p);
-        return wasm_loader_js_1.default.isPoint(p.length) === 1;
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.isPoint(p.length)) === 1;
     }
     finally {
         PUBLIC_KEY_INPUT.fill(0);
@@ -67,7 +68,7 @@ function pointAdd(pA, pB, compressed) {
     try {
         PUBLIC_KEY_INPUT.set(pA);
         PUBLIC_KEY_INPUT2.set(pB);
-        return wasm_loader_js_1.default.pointAdd(pA.length, pB.length, outputlen) === 1
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.pointAdd(pA.length, pB.length, outputlen)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -84,7 +85,7 @@ function pointAddScalar(p, tweak, compressed) {
     try {
         PUBLIC_KEY_INPUT.set(p);
         TWEAK_INPUT.set(tweak);
-        return wasm_loader_js_1.default.pointAddScalar(p.length, outputlen) === 1
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.pointAddScalar(p.length, outputlen)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -99,7 +100,7 @@ function pointCompress(p, compressed) {
     const outputlen = assumeCompression(compressed, p);
     try {
         PUBLIC_KEY_INPUT.set(p);
-        wasm_loader_js_1.default.pointCompress(p.length, outputlen);
+        (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.pointCompress(p.length, outputlen));
         return PUBLIC_KEY_INPUT.slice(0, outputlen);
     }
     finally {
@@ -112,7 +113,7 @@ function pointFromScalar(d, compressed) {
     const outputlen = assumeCompression(compressed);
     try {
         PRIVATE_KEY_INPUT.set(d);
-        return wasm_loader_js_1.default.pointFromScalar(outputlen) === 1
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.pointFromScalar(outputlen)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -126,7 +127,7 @@ function xOnlyPointFromScalar(d) {
     validate.validatePrivate(d);
     try {
         PRIVATE_KEY_INPUT.set(d);
-        wasm_loader_js_1.default.xOnlyPointFromScalar();
+        (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.xOnlyPointFromScalar());
         return X_ONLY_PUBLIC_KEY_INPUT.slice(0, validate.X_ONLY_PUBLIC_KEY_SIZE);
     }
     finally {
@@ -139,7 +140,7 @@ function xOnlyPointFromPoint(p) {
     validate.validatePoint(p);
     try {
         PUBLIC_KEY_INPUT.set(p);
-        wasm_loader_js_1.default.xOnlyPointFromPoint(p.length);
+        (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.xOnlyPointFromPoint(p.length));
         return X_ONLY_PUBLIC_KEY_INPUT.slice(0, validate.X_ONLY_PUBLIC_KEY_SIZE);
     }
     finally {
@@ -155,7 +156,7 @@ function pointMultiply(p, tweak, compressed) {
     try {
         PUBLIC_KEY_INPUT.set(p);
         TWEAK_INPUT.set(tweak);
-        return wasm_loader_js_1.default.pointMultiply(p.length, outputlen) === 1
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.pointMultiply(p.length, outputlen)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -171,7 +172,7 @@ function privateAdd(d, tweak) {
     try {
         PRIVATE_KEY_INPUT.set(d);
         TWEAK_INPUT.set(tweak);
-        return wasm_loader_js_1.default.privateAdd() === 1
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.privateAdd()) === 1
             ? PRIVATE_KEY_INPUT.slice(0, validate.PRIVATE_KEY_SIZE)
             : null;
     }
@@ -192,7 +193,7 @@ function privateSub(d, tweak) {
     try {
         PRIVATE_KEY_INPUT.set(d);
         TWEAK_INPUT.set(tweak);
-        return wasm_loader_js_1.default.privateSub() === 1
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.privateSub()) === 1
             ? PRIVATE_KEY_INPUT.slice(0, validate.PRIVATE_KEY_SIZE)
             : null;
     }
@@ -206,7 +207,7 @@ function privateNegate(d) {
     validate.validatePrivate(d);
     try {
         PRIVATE_KEY_INPUT.set(d);
-        wasm_loader_js_1.default.privateNegate();
+        (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.privateNegate());
         return PRIVATE_KEY_INPUT.slice(0, validate.PRIVATE_KEY_SIZE);
     }
     finally {
@@ -220,8 +221,8 @@ function xOnlyPointAddTweak(p, tweak) {
     try {
         X_ONLY_PUBLIC_KEY_INPUT.set(p);
         TWEAK_INPUT.set(tweak);
-        const parity = wasm_loader_js_1.default.xOnlyPointAddTweak();
-        return parity !== -1
+        const parity = (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.xOnlyPointAddTweak());
+        return parity !== 42
             ? {
                 parity,
                 xOnlyPubkey: X_ONLY_PUBLIC_KEY_INPUT.slice(0, validate.X_ONLY_PUBLIC_KEY_SIZE),
@@ -246,10 +247,11 @@ function xOnlyPointAddTweakCheck(point, tweak, resultToCheck, tweakParity) {
         X_ONLY_PUBLIC_KEY_INPUT2.set(resultToCheck);
         TWEAK_INPUT.set(tweak);
         if (hasParity) {
-            return wasm_loader_js_1.default.xOnlyPointAddTweakCheck(tweakParity) === 1;
+            return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.xOnlyPointAddTweakCheck(tweakParity)) === 1;
         }
         else {
-            wasm_loader_js_1.default.xOnlyPointAddTweak();
+            if ((0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.xOnlyPointAddTweak()) === 42)
+                return false;
             const newKey = X_ONLY_PUBLIC_KEY_INPUT.slice(0, validate.X_ONLY_PUBLIC_KEY_SIZE);
             return (0, uint8array_tools_1.compare)(newKey, resultToCheck) === 0;
         }
@@ -270,7 +272,7 @@ function sign(h, d, e) {
         PRIVATE_KEY_INPUT.set(d);
         if (e !== undefined)
             EXTRA_DATA_INPUT.set(e);
-        wasm_loader_js_1.default.sign(e === undefined ? 0 : 1);
+        (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.sign(e === undefined ? 0 : 1));
         return SIGNATURE_INPUT.slice(0, validate.SIGNATURE_SIZE);
     }
     finally {
@@ -291,7 +293,7 @@ function signRecoverable(h, d, e) {
         PRIVATE_KEY_INPUT.set(d);
         if (e !== undefined)
             EXTRA_DATA_INPUT.set(e);
-        const recoveryId = wasm_loader_js_1.default.signRecoverable(e === undefined ? 0 : 1);
+        const recoveryId = (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.signRecoverable(e === undefined ? 0 : 1));
         const signature = SIGNATURE_INPUT.slice(0, validate.SIGNATURE_SIZE);
         return {
             signature,
@@ -316,7 +318,7 @@ function signSchnorr(h, d, e) {
         PRIVATE_KEY_INPUT.set(d);
         if (e !== undefined)
             EXTRA_DATA_INPUT.set(e);
-        wasm_loader_js_1.default.signSchnorr(e === undefined ? 0 : 1);
+        (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.signSchnorr(e === undefined ? 0 : 1));
         return SIGNATURE_INPUT.slice(0, validate.SIGNATURE_SIZE);
     }
     finally {
@@ -336,7 +338,9 @@ function verify(h, Q, signature, strict = false) {
         HASH_INPUT.set(h);
         PUBLIC_KEY_INPUT.set(Q);
         SIGNATURE_INPUT.set(signature);
-        return wasm_loader_js_1.default.verify(Q.length, strict === true ? 1 : 0) === 1 ? true : false;
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.verify(Q.length, strict === true ? 1 : 0)) === 1
+            ? true
+            : false;
     }
     finally {
         HASH_INPUT.fill(0);
@@ -348,6 +352,7 @@ exports.verify = verify;
 function recover(h, signature, recoveryId, compressed = false) {
     validate.validateHash(h);
     validate.validateSignature(signature);
+    validate.validateRecoveryId(recoveryId);
     validate.validateSignatureNonzeroRS(signature);
     if (recoveryId & 2) {
         validate.validateSigrPMinusN(signature);
@@ -357,7 +362,7 @@ function recover(h, signature, recoveryId, compressed = false) {
     try {
         HASH_INPUT.set(h);
         SIGNATURE_INPUT.set(signature);
-        return wasm_loader_js_1.default.recover(outputlen, recoveryId) === 1
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.recover(outputlen, recoveryId)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -376,7 +381,7 @@ function verifySchnorr(h, Q, signature) {
         HASH_INPUT.set(h);
         X_ONLY_PUBLIC_KEY_INPUT.set(Q);
         SIGNATURE_INPUT.set(signature);
-        return wasm_loader_js_1.default.verifySchnorr() === 1 ? true : false;
+        return (0, validate_error_js_1.vCheck)(wasm_loader_js_1.default.verifySchnorr()) === 1 ? true : false;
     }
     finally {
         HASH_INPUT.fill(0);