@taquito/signer 23.0.0-beta.0 → 23.0.0

package/dist/lib/taquito-signer.js

@@ -22,14 +22,26 @@ 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;
+exports.publicKeyFromString = publicKeyFromString;
 /**
  * @packageDocumentation
  * @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 +51,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 +72,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 +108,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 +172,70 @@ 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* () {
-            let bb = (0, utils_1.hex2buf)(bytes);
-            if (typeof watermark !== 'undefined') {
-                bb = (0, utils_1.mergebuf)(watermark, bb);
+            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* () {
+            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 Promise.resolve(String(__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 Promise.resolve(__classPrivateFieldGet(this, _InMemorySigner_key, "f").publicKey().hash());
     }
     /**
      * @returns Encoded private key
      */
     secretKey() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._key.secretKey();
-        });
+        return Promise.resolve(__classPrivateFieldGet(this, _InMemorySigner_key, "f").secretKey());
     }
 }
 exports.InMemorySigner = InMemorySigner;
+_InMemorySigner_key = new WeakMap();
+function publicKeyFromString(src) {
+    const [keyData, pre] = (0, utils_1.b58DecodeAndCheckPrefix)(src, [
+        utils_1.PrefixV2.Ed25519PublicKey,
+        utils_1.PrefixV2.Secp256k1PublicKey,
+        utils_1.PrefixV2.P256PublicKey,
+        utils_1.PrefixV2.BLS12_381PublicKey,
+    ]);
+    switch (pre) {
+        case utils_1.PrefixV2.Ed25519PublicKey:
+            return new ed_key_1.EdPublicKey(keyData);
+        case utils_1.PrefixV2.Secp256k1PublicKey:
+            return new ec_key_1.ECPublicKey(keyData, 'secp256k1');
+        case utils_1.PrefixV2.P256PublicKey:
+            return new ec_key_1.ECPublicKey(keyData, 'p256');
+        case utils_1.PrefixV2.BLS12_381PublicKey:
+            return new bls_key_1.BLSPublicKey(keyData);
+    }
+}

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": "7af2138a9e5c5b230c4b4c726f35c2f2e67b721c",
-    "version": "23.0.0-beta.0"
+    "commitHash": "9065acc1b41ec205a49e64b54ef89f50bafa6210",
+    "version": "23.0.0"
 };