@taquito/signer 22.0.0 → 23.0.0-RC.0

package/dist/lib/bls-key.js

@@ -0,0 +1,73 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _BLSKey_key, _BLSKey_publicKey;
+Object.defineProperty(exports, "__esModule", { value: true });
+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 bls = bls12_381_1.bls12_381.longSignatures; // AKA MinPK
+class BLSKey {
+    constructor(key, decrypt) {
+        _BLSKey_key.set(this, void 0);
+        _BLSKey_publicKey.set(this, void 0);
+        const tmp = (0, utils_1.b58DecodeAndCheckPrefix)(key, [
+            utils_1.PrefixV2.BLS12_381EncryptedSecretKey,
+            utils_1.PrefixV2.BLS12_381SecretKey,
+        ]);
+        let [keyData] = tmp;
+        const [, prefix] = tmp;
+        if (prefix === utils_1.PrefixV2.BLS12_381EncryptedSecretKey) {
+            if (decrypt !== undefined) {
+                keyData = decrypt(keyData);
+            }
+            else {
+                throw new Error('decryption function is not provided');
+            }
+        }
+        __classPrivateFieldSet(this, _BLSKey_key, keyData, "f");
+        __classPrivateFieldSet(this, _BLSKey_publicKey, bls.getPublicKey(this.sk()).toBytes(), "f");
+    }
+    sk() {
+        return new Uint8Array(__classPrivateFieldGet(this, _BLSKey_key, "f")).reverse();
+    }
+    signDst(message, dst) {
+        const point = bls.hash(message, dst);
+        const sig = bls.sign(point, this.sk()).toBytes();
+        return Promise.resolve({
+            rawSignature: sig,
+            sig: (0, utils_1.b58Encode)(sig, utils_1.PrefixV2.GenericSignature),
+            prefixSig: (0, utils_1.b58Encode)(sig, utils_1.PrefixV2.BLS12_381Signature),
+        });
+    }
+    sign(message) {
+        return this.signDst(message, utils_1.BLS12_381_DST);
+    }
+    provePossession() {
+        return this.signDst(__classPrivateFieldGet(this, _BLSKey_publicKey, "f"), utils_1.POP_DST);
+    }
+    publicKey() {
+        const res = (0, utils_1.b58Encode)(__classPrivateFieldGet(this, _BLSKey_publicKey, "f"), utils_1.PrefixV2.BLS12_381PublicKey);
+        return Promise.resolve(res);
+    }
+    publicKeyHash() {
+        const res = (0, utils_1.b58Encode)((0, blake2b_1.hash)(__classPrivateFieldGet(this, _BLSKey_publicKey, "f"), 20), utils_1.PrefixV2.BLS12_381PublicKeyHash);
+        return Promise.resolve(res);
+    }
+    secretKey() {
+        const res = (0, utils_1.b58Encode)(__classPrivateFieldGet(this, _BLSKey_key, "f"), utils_1.PrefixV2.BLS12_381SecretKey);
+        return Promise.resolve(res);
+    }
+}
+exports.BLSKey = BLSKey;
+_BLSKey_key = new WeakMap(), _BLSKey_publicKey = new WeakMap();

package/dist/lib/ec-key.js

@@ -1,32 +1,33 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _ECKey_key, _ECKey_publicKey, _ECKey_curve;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tz2 = exports.Tz3 = exports.ECKey = void 0;
+exports.ECKey = void 0;
 const blake2b_1 = require("@stablelib/blake2b");
 const utils_1 = require("@taquito/utils");
-const typedarray_to_buffer_1 = require("typedarray-to-buffer");
 const elliptic_1 = require("elliptic");
-const core_1 = require("@taquito/core");
 const pref = {
     p256: {
-        pk: utils_1.prefix['p2pk'],
-        sk: utils_1.prefix['p2sk'],
-        pkh: utils_1.prefix.tz3,
-        sig: utils_1.prefix.p2sig,
+        pk: utils_1.PrefixV2.P256PublicKey,
+        sk: utils_1.PrefixV2.P256SecretKey,
+        pkh: utils_1.PrefixV2.P256PublicKeyHash,
+        sig: utils_1.PrefixV2.P256Signature,
     },
     secp256k1: {
-        pk: utils_1.prefix['sppk'],
-        sk: utils_1.prefix['spsk'],
-        pkh: utils_1.prefix.tz2,
-        sig: utils_1.prefix.spsig,
+        pk: utils_1.PrefixV2.Secp256k1PublicKey,
+        sk: utils_1.PrefixV2.Secp256k1SecretKey,
+        pkh: utils_1.PrefixV2.Secp256k1PublicKeyHash,
+        sig: utils_1.PrefixV2.Secp256k1Signature,
     },
 };
 /**
@@ -35,79 +36,87 @@ const pref = {
 class ECKey {
     /**
      *
-     * @param curve Curve to use with the key
      * @param key Encoded private key
-     * @param encrypted Is the private key encrypted
      * @param decrypt Decrypt function
      * @throws {@link InvalidKeyError}
      */
-    constructor(curve, key, encrypted, decrypt) {
-        this.curve = curve;
-        this.key = key;
-        const keyPrefix = key.substring(0, encrypted ? 5 : 4);
-        if (!(0, utils_1.isValidPrefix)(keyPrefix)) {
-            throw new core_1.InvalidKeyError((0, utils_1.invalidDetail)(utils_1.ValidationResult.NO_PREFIX_MATCHED) +
-                ` expecting one of the following prefix '${utils_1.Prefix.SPSK}', '${utils_1.Prefix.SPESK}', '${utils_1.Prefix.P2SK}' or '${utils_1.Prefix.P2ESK}'.`);
+    constructor(key, decrypt) {
+        var _a;
+        _ECKey_key.set(this, void 0);
+        _ECKey_publicKey.set(this, void 0);
+        _ECKey_curve.set(this, void 0);
+        const tmp = (0, utils_1.b58DecodeAndCheckPrefix)(key, [
+            utils_1.PrefixV2.Secp256k1EncryptedSecretKey,
+            utils_1.PrefixV2.P256EncryptedSecretKey,
+            utils_1.PrefixV2.Secp256k1SecretKey,
+            utils_1.PrefixV2.P256SecretKey,
+        ]);
+        _a = this, [({ set value(_b) { __classPrivateFieldSet(_a, _ECKey_key, _b, "f"); } }).value] = tmp;
+        const [, prefix] = tmp;
+        switch (prefix) {
+            case utils_1.PrefixV2.Secp256k1EncryptedSecretKey:
+            case utils_1.PrefixV2.P256EncryptedSecretKey:
+                if (decrypt !== undefined) {
+                    __classPrivateFieldSet(this, _ECKey_key, decrypt(__classPrivateFieldGet(this, _ECKey_key, "f")), "f");
+                }
+                else {
+                    throw new Error('decryption function is not provided');
+                }
+                if (prefix === utils_1.PrefixV2.Secp256k1EncryptedSecretKey) {
+                    __classPrivateFieldSet(this, _ECKey_curve, 'secp256k1', "f");
+                }
+                else {
+                    __classPrivateFieldSet(this, _ECKey_curve, 'p256', "f");
+                }
+                break;
+            case utils_1.PrefixV2.Secp256k1SecretKey:
+                __classPrivateFieldSet(this, _ECKey_curve, 'secp256k1', "f");
+                break;
+            default:
+                __classPrivateFieldSet(this, _ECKey_curve, 'p256', "f");
+                break;
         }
-        this._key = decrypt((0, utils_1.b58cdecode)(this.key, utils_1.prefix[keyPrefix]));
-        const keyPair = new elliptic_1.default.ec(this.curve).keyFromPrivate(this._key);
-        const keyPairY = keyPair.getPublic().getY().toArray();
-        const parityByte = keyPairY.length < 32 ? keyPairY[keyPairY.length - 1] : keyPairY[31];
-        const pref = parityByte % 2 ? 3 : 2;
-        const pad = new Array(32).fill(0);
-        this._publicKey = (0, typedarray_to_buffer_1.default)(new Uint8Array([pref].concat(pad.concat(keyPair.getPublic().getX().toArray()).slice(-32))));
+        const keyPair = new elliptic_1.default.ec(__classPrivateFieldGet(this, _ECKey_curve, "f")).keyFromPrivate(__classPrivateFieldGet(this, _ECKey_key, "f"));
+        __classPrivateFieldSet(this, _ECKey_publicKey, new Uint8Array(keyPair.getPublic(true, 'array')), "f"); // compress
     }
     /**
      *
      * @param bytes Bytes to sign
      * @param bytesHash Blake2b hash of the bytes to sign
      */
-    sign(bytes, bytesHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = new elliptic_1.default.ec(this.curve).keyFromPrivate(this._key);
-            const sig = key.sign(bytesHash, { canonical: true });
-            const signature = sig.r.toString('hex', 64) + sig.s.toString('hex', 64);
-            const sbytes = bytes + signature;
-            return {
-                bytes,
-                sig: (0, utils_1.b58cencode)(signature, utils_1.prefix.sig),
-                prefixSig: (0, utils_1.b58cencode)(signature, pref[this.curve].sig),
-                sbytes,
-            };
+    sign(bytes) {
+        const hash = (0, blake2b_1.hash)(bytes, 32);
+        const key = new elliptic_1.default.ec(__classPrivateFieldGet(this, _ECKey_curve, "f")).keyFromPrivate(__classPrivateFieldGet(this, _ECKey_key, "f"));
+        const sig = key.sign(hash, { canonical: true });
+        const signature = new Uint8Array(64);
+        const r = sig.r.toArray();
+        const s = sig.s.toArray();
+        signature.set(r, 32 - r.length);
+        signature.set(s, 64 - s.length);
+        return Promise.resolve({
+            rawSignature: signature,
+            sig: (0, utils_1.b58Encode)(signature, utils_1.PrefixV2.GenericSignature),
+            prefixSig: (0, utils_1.b58Encode)(signature, pref[__classPrivateFieldGet(this, _ECKey_curve, "f")].sig),
         });
     }
     /**
      * @returns Encoded public key
      */
     publicKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, utils_1.b58cencode)(this._publicKey, pref[this.curve].pk);
-        });
+        return Promise.resolve((0, utils_1.b58Encode)(__classPrivateFieldGet(this, _ECKey_publicKey, "f"), pref[__classPrivateFieldGet(this, _ECKey_curve, "f")].pk));
     }
     /**
      * @returns Encoded public key hash
      */
     publicKeyHash() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, utils_1.b58cencode)((0, blake2b_1.hash)(new Uint8Array(this._publicKey), 20), pref[this.curve].pkh);
-        });
+        return Promise.resolve((0, utils_1.b58Encode)((0, blake2b_1.hash)(new Uint8Array(__classPrivateFieldGet(this, _ECKey_publicKey, "f")), 20), pref[__classPrivateFieldGet(this, _ECKey_curve, "f")].pkh));
     }
     /**
      * @returns Encoded private key
      */
     secretKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = this._key;
-            return (0, utils_1.b58cencode)(key, pref[this.curve].sk);
-        });
+        return Promise.resolve((0, utils_1.b58Encode)(__classPrivateFieldGet(this, _ECKey_key, "f"), pref[__classPrivateFieldGet(this, _ECKey_curve, "f")].sk));
     }
 }
 exports.ECKey = ECKey;
-/**
- * @description Tz3 key class using the p256 curve
- */
-exports.Tz3 = ECKey.bind(null, 'p256');
-/**
- * @description Tz2 key class using the secp256k1 curve
- */
-exports.Tz2 = ECKey.bind(null, 'secp256k1');
+_ECKey_key = new WeakMap(), _ECKey_publicKey = new WeakMap(), _ECKey_curve = new WeakMap();

package/dist/lib/ed-key.js

@@ -8,17 +8,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _EdKey_secretKey, _EdKey_publicKey;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tz1 = void 0;
+exports.EdKey = void 0;
 const blake2b_1 = require("@stablelib/blake2b");
 const ed25519_1 = require("@stablelib/ed25519");
 const utils_1 = require("@taquito/utils");
-const typedarray_to_buffer_1 = require("typedarray-to-buffer");
-const core_1 = require("@taquito/core");
 /**
  * @description Provide signing logic for ed25519 curve based key (tz1)
  */
-class Tz1 {
+class EdKey {
     /**
      *
      * @param key Encoded private key
@@ -26,77 +36,68 @@ class Tz1 {
      * @param decrypt Decrypt function
      * @throws {@link InvalidKeyError}
      */
-    constructor(key, encrypted, decrypt) {
-        this.key = key;
-        const keyPrefix = key.substring(0, encrypted ? 5 : 4);
-        if (!(0, utils_1.isValidPrefix)(keyPrefix)) {
-            throw new core_1.InvalidKeyError(`${(0, utils_1.invalidDetail)(utils_1.ValidationResult.NO_PREFIX_MATCHED)} expecting either '${utils_1.Prefix.EDESK}' or '${utils_1.Prefix.EDSK}'.`);
+    constructor(key, decrypt) {
+        _EdKey_secretKey.set(this, void 0);
+        _EdKey_publicKey.set(this, void 0);
+        const tmp = (0, utils_1.b58DecodeAndCheckPrefix)(key, [
+            utils_1.PrefixV2.Ed25519SecretKey,
+            utils_1.PrefixV2.Ed25519EncryptedSeed,
+            utils_1.PrefixV2.Ed25519Seed,
+        ]);
+        let [keyData] = tmp;
+        const [, prefix] = tmp;
+        if (prefix === utils_1.PrefixV2.Ed25519SecretKey) {
+            __classPrivateFieldSet(this, _EdKey_secretKey, keyData, "f");
+            __classPrivateFieldSet(this, _EdKey_publicKey, keyData.slice(32), "f");
         }
-        this._key = decrypt((0, utils_1.b58cdecode)(this.key, utils_1.prefix[keyPrefix]));
-        this._publicKey = this._key.slice(32);
-        if (!this._key) {
-            throw new core_1.InvalidKeyError('unable to decode');
-        }
-        this.isInit = this.init();
-    }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._key.length !== 64) {
-                const { publicKey, secretKey } = (0, ed25519_1.generateKeyPairFromSeed)(new Uint8Array(this._key));
-                this._publicKey = publicKey;
-                this._key = secretKey;
+        else {
+            if (prefix === utils_1.PrefixV2.Ed25519EncryptedSeed) {
+                if (decrypt !== undefined) {
+                    keyData = decrypt(keyData);
+                }
+                else {
+                    throw new Error('decryption function is not provided');
+                }
             }
-            return true;
-        });
+            const { publicKey, secretKey } = (0, ed25519_1.generateKeyPairFromSeed)(keyData);
+            __classPrivateFieldSet(this, _EdKey_publicKey, publicKey, "f");
+            __classPrivateFieldSet(this, _EdKey_secretKey, secretKey, "f");
+        }
     }
     /**
      *
      * @param bytes Bytes to sign
      * @param bytesHash Blake2b hash of the bytes to sign
      */
-    sign(bytes, bytesHash) {
+    sign(bytes) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.isInit;
-            const signature = (0, ed25519_1.sign)(new Uint8Array(this._key), new Uint8Array(bytesHash));
-            const signatureBuffer = (0, typedarray_to_buffer_1.default)(signature);
-            const sbytes = bytes + (0, utils_1.buf2hex)(signatureBuffer);
-            return {
-                bytes,
-                sig: (0, utils_1.b58cencode)(signature, utils_1.prefix.sig),
-                prefixSig: (0, utils_1.b58cencode)(signature, utils_1.prefix.edsig),
-                sbytes,
-            };
+            const hash = (0, blake2b_1.hash)(bytes, 32);
+            const signature = (0, ed25519_1.sign)(__classPrivateFieldGet(this, _EdKey_secretKey, "f"), hash);
+            return Promise.resolve({
+                rawSignature: signature,
+                sig: (0, utils_1.b58Encode)(signature, utils_1.PrefixV2.GenericSignature),
+                prefixSig: (0, utils_1.b58Encode)(signature, utils_1.PrefixV2.Ed25519Signature),
+            });
         });
     }
     /**
      * @returns Encoded public key
      */
     publicKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.isInit;
-            return (0, utils_1.b58cencode)(this._publicKey, utils_1.prefix['edpk']);
-        });
+        return Promise.resolve((0, utils_1.b58Encode)(__classPrivateFieldGet(this, _EdKey_publicKey, "f"), utils_1.PrefixV2.Ed25519PublicKey));
     }
     /**
      * @returns Encoded public key hash
      */
     publicKeyHash() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.isInit;
-            return (0, utils_1.b58cencode)((0, blake2b_1.hash)(new Uint8Array(this._publicKey), 20), utils_1.prefix.tz1);
-        });
+        return Promise.resolve((0, utils_1.b58Encode)((0, blake2b_1.hash)(__classPrivateFieldGet(this, _EdKey_publicKey, "f"), 20), utils_1.PrefixV2.Ed25519PublicKeyHash));
     }
     /**
      * @returns Encoded private key
      */
     secretKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.isInit;
-            let key = this._key;
-            const { secretKey } = (0, ed25519_1.generateKeyPairFromSeed)(new Uint8Array(key).slice(0, 32));
-            key = (0, typedarray_to_buffer_1.default)(secretKey);
-            return (0, utils_1.b58cencode)(key, utils_1.prefix[`edsk`]);
-        });
+        return Promise.resolve((0, utils_1.b58Encode)(__classPrivateFieldGet(this, _EdKey_secretKey, "f"), utils_1.PrefixV2.Ed25519SecretKey));
     }
 }
-exports.Tz1 = Tz1;
+exports.EdKey = EdKey;
+_EdKey_secretKey = new WeakMap(), _EdKey_publicKey = new WeakMap();

package/dist/lib/helpers.js

@@ -21,16 +21,16 @@ const generateSecretKey = (seed, derivationPath, curve) => {
     switch (curve) {
         case 'ed25519': {
             node = ed25519_1.PrivateKey.fromSeed(seed).derivePath(path);
-            const sk = (0, utils_1.b58cencode)(node.seed().slice(0, 32), utils_1.prefix.edsk2);
+            const sk = (0, utils_1.b58Encode)(node.seed().slice(0, 32), utils_1.PrefixV2.Ed25519Seed);
             return sk;
         }
         case 'secp256k1':
         case 'p256': {
-            const prefixType = curve === 'secp256k1' ? utils_1.prefix.spsk : utils_1.prefix.p2sk;
+            const prefixType = curve === 'secp256k1' ? utils_1.PrefixV2.Secp256k1SecretKey : utils_1.PrefixV2.P256SecretKey;
             let privKey = ecdsa_1.PrivateKey.fromSeed(seed, curve);
             privKey = privKey.derivePath(path);
             const uint8arr = new Uint8Array(privKey.keyPair.getPrivate().toArray());
-            const sk = (0, utils_1.b58cencode)(uint8arr, prefixType);
+            const sk = (0, utils_1.b58Encode)(uint8arr, prefixType);
             return sk;
         }
         case 'bip25519': {

package/dist/lib/key-interface.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPOP = isPOP;
+function isPOP(k) {
+    return 'provePossession' in k;
+}

package/dist/lib/signer.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPOP = isPOP;
+function isPOP(k) {
+    return 'provePossession' in k;
+}

package/dist/lib/taquito-signer.js

@@ -22,6 +22,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _InMemorySigner_key;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemorySigner = exports.InvalidPassphraseError = exports.VERSION = void 0;
 /**
@@ -29,7 +41,6 @@ exports.InMemorySigner = exports.InvalidPassphraseError = exports.VERSION = void
  * @module @taquito/signer
  */
 const nacl_1 = require("@stablelib/nacl");
-const blake2b_1 = require("@stablelib/blake2b");
 const utils_1 = require("@taquito/utils");
 const typedarray_to_buffer_1 = require("typedarray-to-buffer");
 const ed_key_1 = require("./ed-key");
@@ -39,6 +50,8 @@ const Bip39 = require("bip39");
 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");
 __exportStar(require("./import-key"), exports);
 var version_1 = require("./version");
 Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
@@ -58,7 +71,7 @@ class InMemorySigner {
             throw new errors_1.InvalidMnemonicError(mnemonic);
         }
         const seed = Bip39.mnemonicToSeedSync(mnemonic, `${email}${password}`);
-        const key = (0, utils_1.b58cencode)(seed.slice(0, 32), utils_1.prefix.edsk2);
+        const key = (0, utils_1.b58Encode)(seed.subarray(0, 32), utils_1.PrefixV2.Ed25519Seed);
         return new InMemorySigner(key);
     }
     static fromSecretKey(key, passphrase) {
@@ -94,34 +107,63 @@ class InMemorySigner {
      *
      */
     constructor(key, passphrase) {
-        const encrypted = key.substring(2, 3) === 'e';
-        let decrypt = (k) => k;
+        _InMemorySigner_key.set(this, void 0);
+        const keyPrefixes = [
+            utils_1.PrefixV2.Ed25519EncryptedSeed,
+            utils_1.PrefixV2.Ed25519Seed,
+            utils_1.PrefixV2.Ed25519SecretKey,
+            utils_1.PrefixV2.Secp256k1EncryptedSecretKey,
+            utils_1.PrefixV2.Secp256k1SecretKey,
+            utils_1.PrefixV2.P256EncryptedSecretKey,
+            utils_1.PrefixV2.P256SecretKey,
+            utils_1.PrefixV2.BLS12_381EncryptedSecretKey,
+            utils_1.PrefixV2.BLS12_381SecretKey,
+        ];
+        const pre = (() => {
+            try {
+                const [, pre] = (0, utils_1.b58DecodeAndCheckPrefix)(key, keyPrefixes);
+                return pre;
+            }
+            catch (_a) {
+                throw new core_1.InvalidKeyError(`Invalid private key, expecting one of the following prefixes '${keyPrefixes}'.`);
+            }
+        })();
+        const encrypted = pre === utils_1.PrefixV2.Ed25519EncryptedSeed ||
+            pre === utils_1.PrefixV2.Secp256k1EncryptedSecretKey ||
+            pre === utils_1.PrefixV2.P256EncryptedSecretKey ||
+            pre === utils_1.PrefixV2.BLS12_381EncryptedSecretKey;
+        let decrypt;
         if (encrypted) {
             if (!passphrase) {
                 throw new errors_1.InvalidPassphraseError('No passphrase provided to decrypt encrypted key');
             }
-            decrypt = (constructedKey) => {
-                const salt = (0, typedarray_to_buffer_1.default)(constructedKey.slice(0, 8));
-                const encryptedSk = constructedKey.slice(8);
+            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');
-                return (0, nacl_1.openSecretBox)(new Uint8Array(encryptionKey), new Uint8Array(24), new Uint8Array(encryptedSk));
+                const res = (0, nacl_1.openSecretBox)(new Uint8Array(encryptionKey), new Uint8Array(24), new Uint8Array(encryptedSk));
+                if (!res) {
+                    throw new Error("can't decrypt secret key");
+                }
+                return res;
             };
         }
-        switch (key.substring(0, 4)) {
-            case 'edes':
-            case 'edsk':
-                this._key = new ed_key_1.Tz1(key, encrypted, decrypt);
+        switch (pre) {
+            case utils_1.PrefixV2.Ed25519EncryptedSeed:
+            case utils_1.PrefixV2.Ed25519Seed:
+            case utils_1.PrefixV2.Ed25519SecretKey:
+                __classPrivateFieldSet(this, _InMemorySigner_key, new ed_key_1.EdKey(key, decrypt), "f");
                 break;
-            case 'spsk':
-            case 'spes':
-                this._key = new ec_key_1.Tz2(key, encrypted, decrypt);
+            case utils_1.PrefixV2.Secp256k1EncryptedSecretKey:
+            case utils_1.PrefixV2.Secp256k1SecretKey:
+            case utils_1.PrefixV2.P256EncryptedSecretKey:
+            case utils_1.PrefixV2.P256SecretKey:
+                __classPrivateFieldSet(this, _InMemorySigner_key, new ec_key_1.ECKey(key, decrypt), "f");
                 break;
-            case 'p2sk':
-            case 'p2es':
-                this._key = new ec_key_1.Tz3(key, encrypted, decrypt);
+            case utils_1.PrefixV2.BLS12_381EncryptedSecretKey:
+            case utils_1.PrefixV2.BLS12_381SecretKey:
+                __classPrivateFieldSet(this, _InMemorySigner_key, new bls_key_1.BLSKey(key, decrypt), "f");
                 break;
-            default:
-                throw new core_1.InvalidKeyError(`${(0, utils_1.invalidDetail)(utils_1.ValidationResult.NO_PREFIX_MATCHED)} expecting one of the following '${utils_1.Prefix.EDESK}', '${utils_1.Prefix.EDSK}', '${utils_1.Prefix.SPSK}', '${utils_1.Prefix.SPESK}', '${utils_1.Prefix.P2SK}' or '${utils_1.Prefix.P2ESK}'.`);
         }
     }
     /**
@@ -129,39 +171,52 @@ class InMemorySigner {
      * @param bytes Bytes to sign
      * @param watermark Watermark to append to the bytes
      */
-    sign(bytes, watermark) {
+    sign(message, watermark) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const msg = typeof message == 'string' ? (0, utils_1.hex2buf)(message) : message;
+            const watermarkMsg = watermark !== undefined ? (0, utils_1.mergebuf)(watermark, msg) : msg;
+            const { rawSignature, sig: signature, prefixSig: prefixedSignature, } = yield __classPrivateFieldGet(this, _InMemorySigner_key, "f").sign(watermarkMsg);
+            return {
+                bytes: (0, utils_1.buf2hex)(msg),
+                sig: signature,
+                prefixSig: prefixedSignature,
+                sbytes: (0, utils_1.buf2hex)((0, utils_1.mergebuf)(msg, 
+                // bls only Signature_prefix ff03 ref:https://octez.tezos.com/docs/shell/p2p_api.html#signature-prefix-tag-255 & https://octez.tezos.com/docs/shell/p2p_api.html#bls-prefix-tag-3
+                (0, key_interface_1.isPOP)(__classPrivateFieldGet(this, _InMemorySigner_key, "f")) ? (0, utils_1.mergebuf)(new Uint8Array([255, 3]), rawSignature) : rawSignature)),
+            };
+        });
+    }
+    provePossession() {
         return __awaiter(this, void 0, void 0, function* () {
-            let bb = (0, utils_1.hex2buf)(bytes);
-            if (typeof watermark !== 'undefined') {
-                bb = (0, utils_1.mergebuf)(watermark, bb);
+            if ((0, key_interface_1.isPOP)(__classPrivateFieldGet(this, _InMemorySigner_key, "f"))) {
+                return __classPrivateFieldGet(this, _InMemorySigner_key, "f").provePossession();
+            }
+            else {
+                throw new core_1.ProhibitedActionError('Only BLS keys can prove possession');
             }
-            const bytesHash = (0, blake2b_1.hash)(bb, 32);
-            return this._key.sign(bytes, bytesHash);
         });
     }
+    get canProvePossession() {
+        return (0, key_interface_1.isPOP)(__classPrivateFieldGet(this, _InMemorySigner_key, "f"));
+    }
     /**
      * @returns Encoded public key
      */
     publicKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._key.publicKey();
-        });
+        return __classPrivateFieldGet(this, _InMemorySigner_key, "f").publicKey();
     }
     /**
      * @returns Encoded public key hash
      */
     publicKeyHash() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._key.publicKeyHash();
-        });
+        return __classPrivateFieldGet(this, _InMemorySigner_key, "f").publicKeyHash();
     }
     /**
      * @returns Encoded private key
      */
     secretKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._key.secretKey();
-        });
+        return __classPrivateFieldGet(this, _InMemorySigner_key, "f").secretKey();
     }
 }
 exports.InMemorySigner = InMemorySigner;
+_InMemorySigner_key = new WeakMap();