@taquito/utils 23.0.3 → 24.0.0-beta.0

package/dist/lib/validators.js

@@ -11,11 +11,10 @@ exports.validatePublicKey = validatePublicKey;
 exports.validateOperation = validateOperation;
 exports.validateProtocol = validateProtocol;
 exports.validateBlock = validateBlock;
-exports.invalidDetail = invalidDetail;
 exports.validateSpendingKey = validateSpendingKey;
 exports.validateSmartRollupAddress = validateSmartRollupAddress;
 const constants_1 = require("./constants");
-const taquito_utils_1 = require("./taquito-utils");
+const encoding_1 = require("./encoding");
 const core_1 = require("@taquito/core");
 var core_2 = require("@taquito/core");
 Object.defineProperty(exports, "ValidationResult", { enumerable: true, get: function () { return core_2.ValidationResult; } });
@@ -31,7 +30,7 @@ Object.defineProperty(exports, "ValidationResult", { enumerable: true, get: func
  * ```
  */
 function isValidPrefixedValue(value, prefixes) {
-    return validatePrefixedValue(value, prefixes) === taquito_utils_1.ValidationResult.VALID;
+    return validatePrefixedValue(value, prefixes) === core_1.ValidationResult.VALID;
 }
 /**
  * @description This function is called by the validation functions ([[validateAddress]], [[validateChain]], [[validateContractAddress]], [[validateKeyHash]], [[validateSignature]], [[validatePublicKey]]).
@@ -50,15 +49,15 @@ function isValidPrefixedValue(value, prefixes) {
  */
 function validatePrefixedValue(value, prefixes) {
     try {
-        (0, taquito_utils_1.b58DecodeAndCheckPrefix)(value, prefixes);
+        (0, encoding_1.b58DecodeAndCheckPrefix)(value, prefixes);
     }
     catch (err) {
         if (err instanceof core_1.ParameterValidationError && err.result !== undefined) {
             return err.result;
         }
-        return taquito_utils_1.ValidationResult.OTHER;
+        return core_1.ValidationResult.OTHER;
     }
-    return taquito_utils_1.ValidationResult.VALID;
+    return core_1.ValidationResult.VALID;
 }
 /**
  * @description Used to check if an address or a contract address is valid.
@@ -76,8 +75,8 @@ function validatePrefixedValue(value, prefixes) {
  * ```
  */
 function validateAddress(value) {
-    const [addr] = (0, taquito_utils_1.splitAddress)(value !== null && value !== void 0 ? value : '');
-    return validatePrefixedValue(addr, taquito_utils_1.addressPrefixes);
+    const [addr] = (0, encoding_1.splitAddress)(value !== null && value !== void 0 ? value : '');
+    return validatePrefixedValue(addr, encoding_1.addressPrefixes);
 }
 /**
  * @description Used to check if a chain id is valid.
@@ -131,7 +130,7 @@ function validateContractAddress(value) {
  * ```
  */
 function validateKeyHash(value) {
-    return validatePrefixedValue(value, taquito_utils_1.publicKeyHashPrefixes);
+    return validatePrefixedValue(value, encoding_1.publicKeyHashPrefixes);
 }
 /**
  * @description Used to check if a signature is valid.
@@ -149,7 +148,7 @@ function validateKeyHash(value) {
  * ```
  */
 function validateSignature(value) {
-    return validatePrefixedValue(value, taquito_utils_1.signaturePrefixes);
+    return validatePrefixedValue(value, encoding_1.signaturePrefixes);
 }
 /**
  * @description Used to check if a public key is valid.
@@ -167,7 +166,7 @@ function validateSignature(value) {
  * ```
  */
 function validatePublicKey(value) {
-    return validatePrefixedValue(value, taquito_utils_1.publicKeyPrefixes);
+    return validatePrefixedValue(value, encoding_1.publicKeyPrefixes);
 }
 /**
  * @description Used to check if an operation hash is valid.
@@ -223,22 +222,6 @@ function validateProtocol(value) {
 function validateBlock(value) {
     return validatePrefixedValue(value, [constants_1.PrefixV2.BlockHash]);
 }
-/**
- * @deprecated this function will be removed in the next minor release
- * @description generates a readable error string from a validation result
- */
-function invalidDetail(validation) {
-    switch (validation) {
-        case taquito_utils_1.ValidationResult.NO_PREFIX_MATCHED:
-            return 'with unsupported prefix';
-        case taquito_utils_1.ValidationResult.INVALID_CHECKSUM:
-            return 'failed checksum';
-        case taquito_utils_1.ValidationResult.INVALID_LENGTH:
-            return 'with incorrect length';
-        default:
-            return '';
-    }
-}
 /**
  * @description Used to check if a spending key is valid.
  * @returns

package/dist/lib/verify-signature.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.POP_DST = exports.BLS12_381_DST = void 0;
 exports.verifySignature = verifySignature;
-exports.validatePkAndExtractPrefix = validatePkAndExtractPrefix;
 const ed25519_1 = require("@stablelib/ed25519");
 const blake2b_1 = require("@stablelib/blake2b");
-const taquito_utils_1 = require("./taquito-utils");
-const elliptic_1 = require("elliptic");
+const encoding_1 = require("./encoding");
+const constants_1 = require("./constants");
+const secp256k1_1 = require("@noble/curves/secp256k1");
+const nist_1 = require("@noble/curves/nist");
 const core_1 = require("@taquito/core");
 const bls12_381_1 = require("@noble/curves/bls12-381");
 exports.BLS12_381_DST = 'BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_';
@@ -33,7 +34,7 @@ exports.POP_DST = 'BLS_POP_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_';
 function verifySignature(message, publicKey, signature, watermark, pop) {
     const [pk, pre] = (() => {
         try {
-            return (0, taquito_utils_1.b58DecodeAndCheckPrefix)(publicKey, taquito_utils_1.publicKeyPrefixes);
+            return (0, encoding_1.b58DecodeAndCheckPrefix)(publicKey, encoding_1.publicKeyPrefixes);
         }
         catch (err) {
             if (err instanceof core_1.ParameterValidationError) {
@@ -46,7 +47,7 @@ function verifySignature(message, publicKey, signature, watermark, pop) {
     })();
     const sig = (() => {
         try {
-            const [sig] = (0, taquito_utils_1.b58DecodeAndCheckPrefix)(signature, taquito_utils_1.signaturePrefixes);
+            const [sig] = (0, encoding_1.b58DecodeAndCheckPrefix)(signature, encoding_1.signaturePrefixes);
             return sig;
         }
         catch (err) {
@@ -60,48 +61,33 @@ function verifySignature(message, publicKey, signature, watermark, pop) {
     })();
     let msg;
     if (typeof message === 'string') {
-        msg = (0, taquito_utils_1.hex2buf)(message);
+        msg = (0, encoding_1.hex2buf)(message);
     }
     else {
         msg = message;
     }
     if (msg.length === 0) {
-        throw new core_1.InvalidMessageError((0, taquito_utils_1.buf2hex)(msg), `can't be empty`);
+        throw new core_1.InvalidMessageError((0, encoding_1.buf2hex)(msg), `can't be empty`);
     }
     if (typeof watermark !== 'undefined') {
-        msg = (0, taquito_utils_1.mergebuf)(watermark, msg);
+        msg = (0, encoding_1.mergebuf)(watermark, msg);
     }
     if (pop) {
         return verifyBLSPopSignature(sig, msg, pk);
     }
     else {
         switch (pre) {
-            case taquito_utils_1.PrefixV2.P256PublicKey:
+            case constants_1.PrefixV2.P256PublicKey:
                 return verifyP2Signature(sig, msg, pk);
-            case taquito_utils_1.PrefixV2.Secp256k1PublicKey:
+            case constants_1.PrefixV2.Secp256k1PublicKey:
                 return verifySpSignature(sig, msg, pk);
-            case taquito_utils_1.PrefixV2.Ed25519PublicKey:
+            case constants_1.PrefixV2.Ed25519PublicKey:
                 return verifyEdSignature(sig, msg, pk);
             default:
                 return verifyBLSSignature(sig, msg, pk);
         }
     }
 }
-/**
- * @deprecated use b58DecodeAndCheckPrefix instead, this function will be removed in the next minor release
- * @description validates a public key and extracts the prefix
- */
-function validatePkAndExtractPrefix(publicKey) {
-    if (publicKey === '') {
-        throw new core_1.InvalidPublicKeyError(publicKey, `can't be empty`);
-    }
-    const pkPrefix = publicKey.substring(0, 4);
-    const publicKeyValidation = (0, taquito_utils_1.validatePublicKey)(publicKey);
-    if (publicKeyValidation !== taquito_utils_1.ValidationResult.VALID) {
-        throw new core_1.InvalidPublicKeyError(publicKey, (0, taquito_utils_1.invalidDetail)(publicKeyValidation));
-    }
-    return pkPrefix;
-}
 function verifyEdSignature(sig, msg, publicKey) {
     const hash = (0, blake2b_1.hash)(msg, 32);
     try {
@@ -112,19 +98,18 @@ function verifyEdSignature(sig, msg, publicKey) {
     }
 }
 function verifySpSignature(sig, msg, publicKey) {
-    const key = new elliptic_1.default.ec('secp256k1').keyFromPublic(publicKey);
-    return verifySpOrP2Sig(sig, msg, key);
+    const hash = (0, blake2b_1.hash)(msg, 32);
+    try {
+        return secp256k1_1.secp256k1.verify(sig, hash, publicKey);
+    }
+    catch (_a) {
+        return false;
+    }
 }
 function verifyP2Signature(sig, msg, publicKey) {
-    const key = new elliptic_1.default.ec('p256').keyFromPublic(publicKey);
-    return verifySpOrP2Sig(sig, msg, key);
-}
-function verifySpOrP2Sig(sig, msg, key) {
-    const r = sig.slice(0, 32);
-    const s = sig.slice(32);
     const hash = (0, blake2b_1.hash)(msg, 32);
     try {
-        return key.verify(hash, { r, s });
+        return nist_1.p256.verify(sig, hash, publicKey);
     }
     catch (_a) {
         return false;

package/dist/lib/version.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 exports.VERSION = {
-    "commitHash": "42048d039f6d4345fc59d04b03650bcb8e27bb62",
-    "version": "23.0.3"
+    "commitHash": "7912b77f57f943dff619383900bd46a7a593a244",
+    "version": "24.0.0-beta.0"
 };