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

package/lib/cjs/validate.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSigrPMinusN = exports.validateSignatureNonzeroRS = exports.validateSignatureCustom = exports.validateSignature = exports.validateExtraData = exports.validateHash = exports.validateTweak = exports.validateXOnlyPoint = exports.validatePoint = exports.validatePrivate = exports.validateParity = exports.isPointCompressed = exports.isDERPoint = exports.isXOnlyPoint = exports.isPoint = exports.isPrivate = exports.isZero = exports.SIGNATURE_SIZE = exports.EXTRA_DATA_SIZE = exports.HASH_SIZE = exports.TWEAK_SIZE = exports.X_ONLY_PUBLIC_KEY_SIZE = exports.PUBLIC_KEY_UNCOMPRESSED_SIZE = exports.PUBLIC_KEY_COMPRESSED_SIZE = exports.PRIVATE_KEY_SIZE = void 0;
+exports.validateSigrPMinusN = exports.validateSignatureNonzeroRS = exports.validateSignatureCustom = exports.validateSignature = exports.validateExtraData = exports.validateHash = exports.validateTweak = exports.validateXOnlyPoint = exports.validatePoint = exports.validatePrivate = exports.validateRecoveryId = exports.validateParity = exports.isPointCompressed = exports.isDERPoint = exports.isXOnlyPoint = exports.isPoint = exports.isPrivate = exports.isZero = exports.SIGNATURE_SIZE = exports.EXTRA_DATA_SIZE = exports.HASH_SIZE = exports.TWEAK_SIZE = exports.X_ONLY_PUBLIC_KEY_SIZE = exports.PUBLIC_KEY_UNCOMPRESSED_SIZE = exports.PUBLIC_KEY_COMPRESSED_SIZE = exports.PRIVATE_KEY_SIZE = void 0;
 const validate_error_js_1 = require("./validate_error.cjs");
 exports.PRIVATE_KEY_SIZE = 32;
 exports.PUBLIC_KEY_COMPRESSED_SIZE = 33;
@@ -90,6 +90,11 @@ function validateParity(p) {
         (0, validate_error_js_1.throwError)(validate_error_js_1.ERROR_BAD_PARITY);
 }
 exports.validateParity = validateParity;
+function validateRecoveryId(recoveryId) {
+    if (!Number.isInteger(recoveryId) || recoveryId < 0 || recoveryId > 3)
+        (0, validate_error_js_1.throwError)(validate_error_js_1.ERROR_BAD_RECOVERY_ID);
+}
+exports.validateRecoveryId = validateRecoveryId;
 function validatePrivate(d) {
     if (!isPrivate(d))
         (0, validate_error_js_1.throwError)(validate_error_js_1.ERROR_BAD_PRIVATE);

package/lib/cjs/validate_error.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throwError = exports.ERROR_BAD_RECOVERY_ID = exports.ERROR_BAD_PARITY = exports.ERROR_BAD_EXTRA_DATA = exports.ERROR_BAD_SIGNATURE = exports.ERROR_BAD_HASH = exports.ERROR_BAD_TWEAK = exports.ERROR_BAD_POINT = exports.ERROR_BAD_PRIVATE = void 0;
+exports.vCheck = exports.throwError = exports.ERROR_BAD_RECOVERY_ID = exports.ERROR_BAD_PARITY = exports.ERROR_BAD_EXTRA_DATA = exports.ERROR_BAD_SIGNATURE = exports.ERROR_BAD_HASH = exports.ERROR_BAD_TWEAK = exports.ERROR_BAD_POINT = exports.ERROR_BAD_PRIVATE = void 0;
 exports.ERROR_BAD_PRIVATE = 0;
 exports.ERROR_BAD_POINT = 1;
 exports.ERROR_BAD_TWEAK = 2;
@@ -24,3 +24,17 @@ function throwError(errcode) {
     throw new TypeError(message);
 }
 exports.throwError = throwError;
+/**
+ * Checks for error codes in the higher bits and throws an error if any are found.
+ * @param retval The return value of the wasm function.
+ * @returns The original return value if no error is found.
+ */
+function vCheck(retval) {
+    if ((retval & 0x80) !== 0) {
+        const ERROR_MASK = 0xff00;
+        const errorCode = (retval & ERROR_MASK) >> 8;
+        throwError(errorCode);
+    }
+    return retval;
+}
+exports.vCheck = vCheck;

package/lib/index.js

@@ -1,5 +1,6 @@
 import { compare } from "uint8array-tools";
 import * as validate from "./validate.js";
+import { vCheck } from "./validate_error.js";
 import wasm from "./wasm_loader.js";
 const WASM_BUFFER = new Uint8Array(wasm.memory.buffer);
 const WASM_PRIVATE_KEY_PTR = wasm.PRIVATE_INPUT.value;
@@ -31,7 +32,7 @@ function assumeCompression(compressed, p) {
 function _isPoint(p) {
     try {
         PUBLIC_KEY_INPUT.set(p);
-        return wasm.isPoint(p.length) === 1;
+        return vCheck(wasm.isPoint(p.length)) === 1;
     }
     finally {
         PUBLIC_KEY_INPUT.fill(0);
@@ -59,7 +60,7 @@ export function pointAdd(pA, pB, compressed) {
     try {
         PUBLIC_KEY_INPUT.set(pA);
         PUBLIC_KEY_INPUT2.set(pB);
-        return wasm.pointAdd(pA.length, pB.length, outputlen) === 1
+        return vCheck(wasm.pointAdd(pA.length, pB.length, outputlen)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -75,7 +76,7 @@ export function pointAddScalar(p, tweak, compressed) {
     try {
         PUBLIC_KEY_INPUT.set(p);
         TWEAK_INPUT.set(tweak);
-        return wasm.pointAddScalar(p.length, outputlen) === 1
+        return vCheck(wasm.pointAddScalar(p.length, outputlen)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -89,7 +90,7 @@ export function pointCompress(p, compressed) {
     const outputlen = assumeCompression(compressed, p);
     try {
         PUBLIC_KEY_INPUT.set(p);
-        wasm.pointCompress(p.length, outputlen);
+        vCheck(wasm.pointCompress(p.length, outputlen));
         return PUBLIC_KEY_INPUT.slice(0, outputlen);
     }
     finally {
@@ -101,7 +102,7 @@ export function pointFromScalar(d, compressed) {
     const outputlen = assumeCompression(compressed);
     try {
         PRIVATE_KEY_INPUT.set(d);
-        return wasm.pointFromScalar(outputlen) === 1
+        return vCheck(wasm.pointFromScalar(outputlen)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -114,7 +115,7 @@ export function xOnlyPointFromScalar(d) {
     validate.validatePrivate(d);
     try {
         PRIVATE_KEY_INPUT.set(d);
-        wasm.xOnlyPointFromScalar();
+        vCheck(wasm.xOnlyPointFromScalar());
         return X_ONLY_PUBLIC_KEY_INPUT.slice(0, validate.X_ONLY_PUBLIC_KEY_SIZE);
     }
     finally {
@@ -126,7 +127,7 @@ export function xOnlyPointFromPoint(p) {
     validate.validatePoint(p);
     try {
         PUBLIC_KEY_INPUT.set(p);
-        wasm.xOnlyPointFromPoint(p.length);
+        vCheck(wasm.xOnlyPointFromPoint(p.length));
         return X_ONLY_PUBLIC_KEY_INPUT.slice(0, validate.X_ONLY_PUBLIC_KEY_SIZE);
     }
     finally {
@@ -141,7 +142,7 @@ export function pointMultiply(p, tweak, compressed) {
     try {
         PUBLIC_KEY_INPUT.set(p);
         TWEAK_INPUT.set(tweak);
-        return wasm.pointMultiply(p.length, outputlen) === 1
+        return vCheck(wasm.pointMultiply(p.length, outputlen)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -156,7 +157,7 @@ export function privateAdd(d, tweak) {
     try {
         PRIVATE_KEY_INPUT.set(d);
         TWEAK_INPUT.set(tweak);
-        return wasm.privateAdd() === 1
+        return vCheck(wasm.privateAdd()) === 1
             ? PRIVATE_KEY_INPUT.slice(0, validate.PRIVATE_KEY_SIZE)
             : null;
     }
@@ -176,7 +177,7 @@ export function privateSub(d, tweak) {
     try {
         PRIVATE_KEY_INPUT.set(d);
         TWEAK_INPUT.set(tweak);
-        return wasm.privateSub() === 1
+        return vCheck(wasm.privateSub()) === 1
             ? PRIVATE_KEY_INPUT.slice(0, validate.PRIVATE_KEY_SIZE)
             : null;
     }
@@ -189,7 +190,7 @@ export function privateNegate(d) {
     validate.validatePrivate(d);
     try {
         PRIVATE_KEY_INPUT.set(d);
-        wasm.privateNegate();
+        vCheck(wasm.privateNegate());
         return PRIVATE_KEY_INPUT.slice(0, validate.PRIVATE_KEY_SIZE);
     }
     finally {
@@ -202,8 +203,8 @@ export function xOnlyPointAddTweak(p, tweak) {
     try {
         X_ONLY_PUBLIC_KEY_INPUT.set(p);
         TWEAK_INPUT.set(tweak);
-        const parity = wasm.xOnlyPointAddTweak();
-        return parity !== -1
+        const parity = vCheck(wasm.xOnlyPointAddTweak());
+        return parity !== 42
             ? {
                 parity,
                 xOnlyPubkey: X_ONLY_PUBLIC_KEY_INPUT.slice(0, validate.X_ONLY_PUBLIC_KEY_SIZE),
@@ -227,10 +228,11 @@ export function xOnlyPointAddTweakCheck(point, tweak, resultToCheck, tweakParity
         X_ONLY_PUBLIC_KEY_INPUT2.set(resultToCheck);
         TWEAK_INPUT.set(tweak);
         if (hasParity) {
-            return wasm.xOnlyPointAddTweakCheck(tweakParity) === 1;
+            return vCheck(wasm.xOnlyPointAddTweakCheck(tweakParity)) === 1;
         }
         else {
-            wasm.xOnlyPointAddTweak();
+            if (vCheck(wasm.xOnlyPointAddTweak()) === 42)
+                return false;
             const newKey = X_ONLY_PUBLIC_KEY_INPUT.slice(0, validate.X_ONLY_PUBLIC_KEY_SIZE);
             return compare(newKey, resultToCheck) === 0;
         }
@@ -250,7 +252,7 @@ export function sign(h, d, e) {
         PRIVATE_KEY_INPUT.set(d);
         if (e !== undefined)
             EXTRA_DATA_INPUT.set(e);
-        wasm.sign(e === undefined ? 0 : 1);
+        vCheck(wasm.sign(e === undefined ? 0 : 1));
         return SIGNATURE_INPUT.slice(0, validate.SIGNATURE_SIZE);
     }
     finally {
@@ -270,7 +272,7 @@ export function signRecoverable(h, d, e) {
         PRIVATE_KEY_INPUT.set(d);
         if (e !== undefined)
             EXTRA_DATA_INPUT.set(e);
-        const recoveryId = wasm.signRecoverable(e === undefined ? 0 : 1);
+        const recoveryId = vCheck(wasm.signRecoverable(e === undefined ? 0 : 1));
         const signature = SIGNATURE_INPUT.slice(0, validate.SIGNATURE_SIZE);
         return {
             signature,
@@ -294,7 +296,7 @@ export function signSchnorr(h, d, e) {
         PRIVATE_KEY_INPUT.set(d);
         if (e !== undefined)
             EXTRA_DATA_INPUT.set(e);
-        wasm.signSchnorr(e === undefined ? 0 : 1);
+        vCheck(wasm.signSchnorr(e === undefined ? 0 : 1));
         return SIGNATURE_INPUT.slice(0, validate.SIGNATURE_SIZE);
     }
     finally {
@@ -313,7 +315,9 @@ export function verify(h, Q, signature, strict = false) {
         HASH_INPUT.set(h);
         PUBLIC_KEY_INPUT.set(Q);
         SIGNATURE_INPUT.set(signature);
-        return wasm.verify(Q.length, strict === true ? 1 : 0) === 1 ? true : false;
+        return vCheck(wasm.verify(Q.length, strict === true ? 1 : 0)) === 1
+            ? true
+            : false;
     }
     finally {
         HASH_INPUT.fill(0);
@@ -324,6 +328,7 @@ export function verify(h, Q, signature, strict = false) {
 export 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);
@@ -333,7 +338,7 @@ export function recover(h, signature, recoveryId, compressed = false) {
     try {
         HASH_INPUT.set(h);
         SIGNATURE_INPUT.set(signature);
-        return wasm.recover(outputlen, recoveryId) === 1
+        return vCheck(wasm.recover(outputlen, recoveryId)) === 1
             ? PUBLIC_KEY_INPUT.slice(0, outputlen)
             : null;
     }
@@ -351,7 +356,7 @@ export function verifySchnorr(h, Q, signature) {
         HASH_INPUT.set(h);
         X_ONLY_PUBLIC_KEY_INPUT.set(Q);
         SIGNATURE_INPUT.set(signature);
-        return wasm.verifySchnorr() === 1 ? true : false;
+        return vCheck(wasm.verifySchnorr()) === 1 ? true : false;
     }
     finally {
         HASH_INPUT.fill(0);