@taquito/signer 24.3.0-beta.1 → 24.3.0-beta.2

package/dist/lib/bls-key.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BLSPublicKey = exports.BLSKey = void 0;
 const utils_1 = require("@taquito/utils");
 const bls12_381_1 = require("@noble/curves/bls12-381");
-const blake2b_1 = require("@stablelib/blake2b");
+const blake2_js_1 = require("@noble/hashes/blake2.js");
 const bls = bls12_381_1.bls12_381.longSignatures; // AKA MinPK
 class BLSKey {
     constructor(key, decrypt) {
@@ -85,7 +85,7 @@ class BLSPublicKey {
         }
     }
     hash() {
-        return (0, utils_1.b58Encode)((0, blake2b_1.hash)(__classPrivateFieldGet(this, _BLSPublicKey_key, "f"), 20), utils_1.PrefixV2.BLS12_381PublicKeyHash);
+        return (0, utils_1.b58Encode)((0, blake2_js_1.blake2b)(__classPrivateFieldGet(this, _BLSPublicKey_key, "f"), { dkLen: 20 }), utils_1.PrefixV2.BLS12_381PublicKeyHash);
     }
     bytes() {
         return __classPrivateFieldGet(this, _BLSPublicKey_key, "f");

package/dist/lib/derivation-tools/ecdsa.js

@@ -5,8 +5,8 @@ exports.PrivateKey = void 0;
 const secp256k1_1 = require("@noble/curves/secp256k1");
 const nist_1 = require("@noble/curves/nist");
 const types_1 = require("./types");
-const hmac_1 = require("@stablelib/hmac");
-const sha512_1 = require("@stablelib/sha512");
+const hmac_js_1 = require("@noble/hashes/hmac.js");
+const sha2_js_1 = require("@noble/hashes/sha2.js");
 const bn_js_1 = require("bn.js");
 const utils_1 = require("./utils");
 const errors_1 = require("../errors");
@@ -69,7 +69,7 @@ class PrivateKey {
         let chain = new Uint8Array();
         let i = 0;
         while (i === 0) {
-            const sum = new hmac_1.HMAC(sha512_1.SHA512, key).update(seed).digest();
+            const sum = (0, hmac_js_1.hmac)(sha2_js_1.sha512, key, seed);
             d = new bn_js_1.default(sum.subarray(0, 32));
             chain = sum.subarray(32);
             if (d.isZero() || d.cmp(curveOrder) >= 0) {
@@ -100,7 +100,7 @@ class PrivateKey {
         let chain = new Uint8Array();
         let i = 0;
         while (i === 0) {
-            const sum = new hmac_1.HMAC(sha512_1.SHA512, this.chainCode).update(data).digest();
+            const sum = (0, hmac_js_1.hmac)(sha2_js_1.sha512, this.chainCode, data);
             d = new bn_js_1.default(sum.subarray(0, 32));
             chain = sum.subarray(32);
             // Get curve order for comparison

package/dist/lib/derivation-tools/ed25519.js

@@ -2,13 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrivateKey = void 0;
 /* eslint-disable @typescript-eslint/no-this-alias */
-const hmac_1 = require("@stablelib/hmac");
-const sha512_1 = require("@stablelib/sha512");
-const ed25519_1 = require("@stablelib/ed25519");
+const hmac_js_1 = require("@noble/hashes/hmac.js");
+const sha2_js_1 = require("@noble/hashes/sha2.js");
+const ed25519_1 = require("@noble/curves/ed25519");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
 const errors_1 = require("../errors");
 const core_1 = require("@taquito/core");
+function generateKeyPairFromSeed(seed) {
+    const publicKey = ed25519_1.ed25519.getPublicKey(seed);
+    const secretKey = new Uint8Array(64);
+    secretKey.set(seed);
+    secretKey.set(publicKey, 32);
+    return { secretKey, publicKey };
+}
 // MinSeedSize is the minimal allowed seed byte length
 const minSeedSize = 16;
 // MaxSeedSize is the maximal allowed seed byte length
@@ -36,8 +43,8 @@ class PrivateKey {
             throw new errors_1.InvalidSeedLengthError(seed.length);
         }
         const key = new TextEncoder().encode(ed25519Key);
-        const sum = new hmac_1.HMAC(sha512_1.SHA512, key).update(seed).digest();
-        return new PrivateKey((0, ed25519_1.generateKeyPairFromSeed)(sum.subarray(0, 32)).secretKey, sum.subarray(32));
+        const sum = (0, hmac_js_1.hmac)(sha2_js_1.sha512, key, seed);
+        return new PrivateKey(generateKeyPairFromSeed(sum.subarray(0, 32)).secretKey, sum.subarray(32));
     }
     /**
      *
@@ -57,8 +64,8 @@ class PrivateKey {
         const data = new Uint8Array(37);
         data.set(this.seed(), 1);
         new DataView(data.buffer).setUint32(33, index);
-        const sum = new hmac_1.HMAC(sha512_1.SHA512, this.chainCode).update(data).digest();
-        return new PrivateKey((0, ed25519_1.generateKeyPairFromSeed)(sum.subarray(0, 32)).secretKey, sum.subarray(32));
+        const sum = (0, hmac_js_1.hmac)(sha2_js_1.sha512, this.chainCode, data);
+        return new PrivateKey(generateKeyPairFromSeed(sum.subarray(0, 32)).secretKey, sum.subarray(32));
     }
     /**
      * @param path array of numbers pre adjusted for hardened paths ie: 44' -> 2^31 + 44

package/dist/lib/ec-key.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _ECKey_keyPair, _ECPublicKey_key;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ECPublicKey = exports.ECKey = void 0;
-const blake2b_1 = require("@stablelib/blake2b");
+const blake2_js_1 = require("@noble/hashes/blake2.js");
 const utils_1 = require("@taquito/utils");
 const secp256k1_1 = require("@noble/curves/secp256k1");
 const nist_js_1 = require("@noble/curves/nist.js");
@@ -85,7 +85,7 @@ class ECKey {
      * @param bytesHash Blake2b hash of the bytes to sign
      */
     sign(bytes) {
-        const hash = (0, blake2b_1.hash)(bytes, 32);
+        const hash = (0, blake2_js_1.blake2b)(bytes, { dkLen: 32 });
         let signature;
         if (__classPrivateFieldGet(this, _ECKey_keyPair, "f").curve === 'secp256k1') {
             signature = secp256k1_1.secp256k1
@@ -164,7 +164,7 @@ class ECPublicKey {
     }
     hash() {
         const key = this.bytes();
-        return (0, utils_1.b58Encode)((0, blake2b_1.hash)(key, 20), pref[this.curve].pkh);
+        return (0, utils_1.b58Encode)((0, blake2_js_1.blake2b)(key, { dkLen: 20 }), pref[this.curve].pkh);
     }
     bytes(compress = true) {
         // @noble/curves supports both compressed and uncompressed formats

package/dist/lib/ed-key.js

@@ -13,9 +13,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EdKey_keyPair, _EdPublicKey_key;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EdPublicKey = exports.EdKey = void 0;
-const blake2b_1 = require("@stablelib/blake2b");
-const ed25519_1 = require("@stablelib/ed25519");
+const blake2_js_1 = require("@noble/hashes/blake2.js");
+const ed25519_1 = require("@noble/curves/ed25519");
 const utils_1 = require("@taquito/utils");
+function generateKeyPairFromSeed(seed) {
+    const publicKey = ed25519_1.ed25519.getPublicKey(seed);
+    const secretKey = new Uint8Array(64);
+    secretKey.set(seed);
+    secretKey.set(publicKey, 32);
+    return { secretKey, publicKey };
+}
 /**
  * Provide signing logic for ed25519 curve based key (tz1)
  */
@@ -51,7 +58,7 @@ class EdKey {
                     throw new Error('decryption function is not provided');
                 }
             }
-            __classPrivateFieldSet(this, _EdKey_keyPair, (0, ed25519_1.generateKeyPairFromSeed)(keyData), "f");
+            __classPrivateFieldSet(this, _EdKey_keyPair, generateKeyPairFromSeed(keyData), "f");
         }
     }
     /**
@@ -60,8 +67,9 @@ class EdKey {
      * @param bytesHash Blake2b hash of the bytes to sign
      */
     sign(bytes) {
-        const hash = (0, blake2b_1.hash)(bytes, 32);
-        const signature = (0, ed25519_1.sign)(__classPrivateFieldGet(this, _EdKey_keyPair, "f").secretKey, hash);
+        const hash = (0, blake2_js_1.blake2b)(bytes, { dkLen: 32 });
+        const seed = __classPrivateFieldGet(this, _EdKey_keyPair, "f").secretKey.subarray(0, 32);
+        const signature = ed25519_1.ed25519.sign(hash, seed);
         return {
             rawSignature: signature,
             sig: (0, utils_1.b58Encode)(signature, utils_1.PrefixV2.GenericSignature),
@@ -103,7 +111,7 @@ class EdPublicKey {
         }
     }
     hash() {
-        return (0, utils_1.b58Encode)((0, blake2b_1.hash)(__classPrivateFieldGet(this, _EdPublicKey_key, "f"), 20), utils_1.PrefixV2.Ed25519PublicKeyHash);
+        return (0, utils_1.b58Encode)((0, blake2_js_1.blake2b)(__classPrivateFieldGet(this, _EdPublicKey_key, "f"), { dkLen: 20 }), utils_1.PrefixV2.Ed25519PublicKeyHash);
     }
     bytes() {
         return __classPrivateFieldGet(this, _EdPublicKey_key, "f");

package/dist/lib/in-memory-signer.js

@@ -19,13 +19,15 @@ const utils_1 = require("@taquito/utils");
 const typedarray_to_buffer_1 = require("typedarray-to-buffer");
 const ed_key_1 = require("./ed-key");
 const ec_key_1 = require("./ec-key");
-const pbkdf2_1 = require("pbkdf2");
-const Bip39 = require("bip39");
+const bip39 = require("@scure/bip39");
+const english_js_1 = require("@scure/bip39/wordlists/english.js");
+const pbkdf2_js_1 = require("@noble/hashes/pbkdf2.js");
 const helpers_1 = require("./helpers");
 const errors_1 = require("./errors");
 const core_1 = require("@taquito/core");
 const key_interface_1 = require("./key-interface");
 const bls_key_1 = require("./bls-key");
+const sha2_js_1 = require("@noble/hashes/sha2.js");
 /**
  * A local implementation of the signer. Will represent a Tezos account and be able to produce signature in its behalf
  *
@@ -34,10 +36,10 @@ const bls_key_1 = require("./bls-key");
  */
 class InMemorySigner {
     static fromFundraiser(email, password, mnemonic) {
-        if (!Bip39.validateMnemonic(mnemonic)) {
+        if (!bip39.validateMnemonic(mnemonic, english_js_1.wordlist)) {
             throw new errors_1.InvalidMnemonicError();
         }
-        const seed = Bip39.mnemonicToSeedSync(mnemonic, `${email}${password}`);
+        const seed = bip39.mnemonicToSeedSync(mnemonic, `${email}${password}`);
         const key = (0, utils_1.b58Encode)(seed.subarray(0, 32), utils_1.PrefixV2.Ed25519Seed);
         return new InMemorySigner(key);
     }
@@ -52,10 +54,11 @@ class InMemorySigner {
      */
     static fromMnemonic({ mnemonic, password = '', derivationPath = "44'/1729'/0'/0'", curve = 'ed25519', }) {
         // check if curve is defined if not default tz1
-        if (!Bip39.validateMnemonic(mnemonic)) {
+        if (!bip39.validateMnemonic(mnemonic, english_js_1.wordlist)) {
+            // avoiding exposing mnemonic again in case of mistake making invalid
             throw new errors_1.InvalidMnemonicError();
         }
-        const seed = Bip39.mnemonicToSeedSync(mnemonic, password);
+        const seed = bip39.mnemonicToSeedSync(mnemonic, password);
         const sk = (0, helpers_1.generateSecretKey)(seed, derivationPath, curve);
         return new InMemorySigner(sk);
     }
@@ -100,7 +103,7 @@ class InMemorySigner {
             decrypt = (data) => {
                 const salt = (0, typedarray_to_buffer_1.default)(data.slice(0, 8));
                 const encryptedSk = data.slice(8);
-                const encryptionKey = pbkdf2_1.default.pbkdf2Sync(passphrase, salt, 32768, 32, 'sha512');
+                const encryptionKey = (0, pbkdf2_js_1.pbkdf2)(sha2_js_1.sha512, passphrase, salt, { c: 32768, dkLen: 32 });
                 // Zero nonce is safe here: Tezos encrypted key format uses a fresh random salt per
                 // encryption, producing a unique PBKDF2-derived key each time. The (key, nonce) pair
                 // never repeats, satisfying NaCl secretbox requirements. This matches octez-client.

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!
 exports.VERSION = {
-    "commitHash": "05df48fee92f846cba793920d6fa829afd6a1847",
-    "version": "24.3.0-beta.1"
+    "commitHash": "fb73f1546d3dff2fbba7741ca6006680212bef16",
+    "version": "24.3.0-beta.2"
 };