@taquito/taquito 22.0.0-beta.0 → 23.0.0-RC.0

package/dist/lib/prepare/prepare-provider.js

@@ -41,6 +41,7 @@ const core_1 = require("@taquito/core");
 const contract_1 = require("../contract");
 const provider_1 = require("../provider");
 const bignumber_js_1 = require("bignumber.js");
+const utils_1 = require("@taquito/utils");
 const mergeLimits = (userDefinedLimit, defaultLimits) => {
     var _a, _b, _c;
     return {
@@ -114,10 +115,14 @@ class PrepareProvider extends provider_1.Provider {
                     if (!publicKey) {
                         throw new core_1.PublicKeyNotFoundError(pkh);
                     }
+                    const [, pkhPrefix] = (0, utils_1.b58DecodeAndCheckPrefix)(pkh, utils_1.publicKeyHashPrefixes);
                     ops.unshift(yield (0, contract_1.createRevealOperation)({
                         fee: (0, constants_1.getRevealFee)(pkh),
                         storageLimit: constants_1.REVEAL_STORAGE_LIMIT,
                         gasLimit: (0, constants_1.getRevealGasLimit)(pkh),
+                        proof: pkhPrefix === utils_1.PrefixV2.BLS12_381PublicKeyHash
+                            ? (yield this.signer.provePossession()).prefixSig
+                            : undefined,
                     }, publicKeyHash, publicKey));
                     return ops;
                 }
@@ -163,6 +168,7 @@ class PrepareProvider extends provider_1.Provider {
                 case rpc_1.OpKind.DELEGATION:
                 case rpc_1.OpKind.REGISTER_GLOBAL_CONSTANT:
                 case rpc_1.OpKind.UPDATE_CONSENSUS_KEY:
+                case rpc_1.OpKind.UPDATE_COMPANION_KEY:
                 case rpc_1.OpKind.SMART_ROLLUP_ADD_MESSAGES:
                 case rpc_1.OpKind.SMART_ROLLUP_ORIGINATE:
                 case rpc_1.OpKind.SMART_ROLLUP_EXECUTE_OUTBOX_MESSAGE:
@@ -223,11 +229,26 @@ class PrepareProvider extends provider_1.Provider {
      * @returns a PreparedOperation object
      */
     reveal(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ fee, gasLimit, storageLimit }) {
+        return __awaiter(this, arguments, void 0, function* ({ fee, gasLimit, storageLimit, proof }) {
             const { pkh, publicKey } = yield this.getKeys();
             if (!publicKey) {
                 throw new core_1.PublicKeyNotFoundError(pkh);
             }
+            const [, pkhPrefix] = (0, utils_1.b58DecodeAndCheckPrefix)(pkh, utils_1.publicKeyHashPrefixes);
+            if (pkhPrefix === utils_1.PrefixV2.BLS12_381PublicKeyHash) {
+                if (proof) {
+                    (0, utils_1.b58DecodeAndCheckPrefix)(proof, [utils_1.PrefixV2.BLS12_381Signature]); // validate proof to be a bls signature
+                }
+                else {
+                    const { prefixSig } = yield this.signer.provePossession();
+                    proof = prefixSig;
+                }
+            }
+            else {
+                if (proof) {
+                    throw new core_1.ProhibitedActionError('Proof field is only allowed to reveal a bls account ');
+                }
+            }
             const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
             const DEFAULT_PARAMS = yield this.getOperationLimits(protocolConstants);
             const mergedEstimates = mergeLimits({ fee, storageLimit, gasLimit }, DEFAULT_PARAMS);
@@ -235,6 +256,7 @@ class PrepareProvider extends provider_1.Provider {
                 fee: mergedEstimates.fee,
                 gasLimit: mergedEstimates.gasLimit,
                 storageLimit: mergedEstimates.storageLimit,
+                proof,
             }, pkh, publicKey);
             const ops = this.convertIntoArray(op);
             const hash = yield this.getBlockHash();
@@ -393,11 +415,11 @@ class PrepareProvider extends provider_1.Provider {
      */
     finalizeUnstake(_a) {
         return __awaiter(this, void 0, void 0, function* () {
-            var { fee, storageLimit, gasLimit } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit"]);
+            var { fee, storageLimit, gasLimit, to } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit", "to"]);
             const { pkh } = yield this.getKeys();
             const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
             const DEFAULT_PARAMS = yield this.getOperationLimits(protocolConstants);
-            const op = yield (0, contract_1.createTransferOperation)(Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { to: pkh, amount: 0 }), mergeLimits({ fee, storageLimit, gasLimit }, DEFAULT_PARAMS)), { parameter: {
+            const op = yield (0, contract_1.createTransferOperation)(Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { to: to ? to : pkh, amount: 0 }), mergeLimits({ fee, storageLimit, gasLimit }, DEFAULT_PARAMS)), { parameter: {
                     entrypoint: 'finalize_unstake',
                     value: { prim: 'Unit' },
                 } }));
@@ -526,6 +548,17 @@ class PrepareProvider extends provider_1.Provider {
         return __awaiter(this, void 0, void 0, function* () {
             var { fee, storageLimit, gasLimit } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit"]);
             const { pkh } = yield this.getKeys();
+            const [, pkPrefix] = (0, utils_1.b58DecodeAndCheckPrefix)(rest.pk, utils_1.publicKeyPrefixes);
+            if (pkPrefix === utils_1.PrefixV2.BLS12_381PublicKey) {
+                if (!rest.proof) {
+                    throw new core_1.InvalidProofError('Proof is required to set a bls account as consensus key ');
+                }
+            }
+            else {
+                if (rest.proof) {
+                    throw new core_1.ProhibitedActionError('Proof field is only allowed for a bls account as consensus key');
+                }
+            }
             const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
             const DEFAULT_PARAMS = yield this.getOperationLimits(protocolConstants);
             const op = yield (0, contract_1.createUpdateConsensusKeyOperation)(Object.assign(Object.assign({}, rest), mergeLimits({ fee, storageLimit, gasLimit }, DEFAULT_PARAMS)));
@@ -546,6 +579,44 @@ class PrepareProvider extends provider_1.Provider {
             };
         });
     }
+    /**
+     *
+     * @description Method to prepare an update_companion_key operation
+     * @param operation RPCOperation object or RPCOperation array
+     * @param source string or undefined source pkh
+     * @returns a PreparedOperation object
+     */
+    updateCompanionKey(_a, source) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var { fee, storageLimit, gasLimit } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit"]);
+            const { pkh } = yield this.getKeys();
+            const [, pkPrefix] = (0, utils_1.b58DecodeAndCheckPrefix)(rest.pk, utils_1.publicKeyPrefixes);
+            if (pkPrefix !== utils_1.PrefixV2.BLS12_381PublicKey) {
+                throw new core_1.ProhibitedActionError('companion key must be a bls account');
+            }
+            if (!rest.proof) {
+                throw new core_1.InvalidProofError('Proof is required to set a bls account as companion key ');
+            }
+            const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
+            const DEFAULT_PARAMS = yield this.getOperationLimits(protocolConstants);
+            const op = yield (0, contract_1.createUpdateCompanionKeyOperation)(Object.assign(Object.assign({}, rest), mergeLimits({ fee, storageLimit, gasLimit }, DEFAULT_PARAMS)));
+            const operation = yield this.addRevealOperationIfNeeded(op, pkh);
+            const ops = this.convertIntoArray(operation);
+            const hash = yield this.getBlockHash();
+            const protocol = yield this.getProtocolHash();
+            __classPrivateFieldSet(this, _PrepareProvider_counters, {}, "f");
+            const headCounter = parseInt(yield this.getHeadCounter(pkh), 10);
+            const contents = this.constructOpContents(ops, headCounter, pkh, source);
+            return {
+                opOb: {
+                    branch: hash,
+                    contents,
+                    protocol,
+                },
+                counter: headCounter,
+            };
+        });
+    }
     /**
      *
      * @description Method to prepare an increase_paid_storage operation
@@ -836,10 +907,14 @@ class PrepareProvider extends provider_1.Provider {
                 if (!publicKey) {
                     throw new core_1.PublicKeyNotFoundError(pkh);
                 }
+                const [, pkhPrefix] = (0, utils_1.b58DecodeAndCheckPrefix)(pkh, utils_1.publicKeyHashPrefixes);
                 ops.unshift(yield (0, contract_1.createRevealOperation)({
                     fee: (0, constants_1.getRevealFee)(pkh),
                     storageLimit: constants_1.REVEAL_STORAGE_LIMIT,
                     gasLimit: (0, constants_1.getRevealGasLimit)(pkh),
+                    proof: pkhPrefix === utils_1.PrefixV2.BLS12_381PublicKeyHash
+                        ? (yield this.signer.provePossession()).prefixSig
+                        : undefined,
                 }, pkh, publicKey));
             }
             const hash = yield this.getBlockHash();

package/dist/lib/provider.js

@@ -91,6 +91,10 @@ class Provider {
                     return (0, prepare_1.createRegisterGlobalConstantOperation)(Object.assign({}, param));
                 case rpc_1.OpKind.INCREASE_PAID_STORAGE:
                     return (0, prepare_1.createIncreasePaidStorageOperation)(Object.assign({}, param));
+                case rpc_1.OpKind.UPDATE_CONSENSUS_KEY:
+                    return (0, prepare_1.createUpdateConsensusKeyOperation)(Object.assign({}, param));
+                case rpc_1.OpKind.UPDATE_COMPANION_KEY:
+                    return (0, prepare_1.createUpdateCompanionKeyOperation)(Object.assign({}, param));
                 case rpc_1.OpKind.TRANSFER_TICKET:
                     return (0, prepare_1.createTransferTicketOperation)(Object.assign({}, param));
                 case rpc_1.OpKind.SMART_ROLLUP_ADD_MESSAGES:

package/dist/lib/subscribe/polling-subcribe-provider.js

@@ -60,7 +60,7 @@ class PollingSubscribeProvider {
     constructor(context, config = {}) {
         this.context = context;
         this._config$ = new rxjs_1.BehaviorSubject(Object.assign(Object.assign({}, exports.defaultConfigStreamer), config));
-        this.timer$ = this._config$.pipe((0, operators_1.pluck)('pollingIntervalMilliseconds'), (0, operators_1.switchMap)((pollingIntervalMilliseconds) => {
+        this.timer$ = this._config$.pipe((0, operators_1.map)((x) => x === null || x === void 0 ? void 0 : x.pollingIntervalMilliseconds), (0, operators_1.switchMap)((pollingIntervalMilliseconds) => {
             if (!pollingIntervalMilliseconds) {
                 return (0, rxjs_1.from)(this.getConfirmationPollingInterval()).pipe((0, operators_1.switchMap)((interval) => {
                     return (0, rxjs_1.timer)(0, interval);
@@ -70,7 +70,11 @@ class PollingSubscribeProvider {
                 return (0, rxjs_1.timer)(0, pollingIntervalMilliseconds);
             }
         }));
-        this.newBlock$ = this.timer$.pipe((0, operators_1.switchMap)(() => getLastBlock(this.context)), (0, operators_1.distinctUntilKeyChanged)('hash'), (0, operators_1.publish)(), (0, operators_1.refCount)());
+        this.newBlock$ = this.timer$.pipe((0, operators_1.switchMap)(() => getLastBlock(this.context)), (0, operators_1.distinctUntilKeyChanged)('hash'), (0, operators_1.share)({
+            resetOnError: false,
+            resetOnComplete: false,
+            resetOnRefCountZero: true,
+        }));
     }
     get config() {
         return this._config$.getValue();
@@ -102,7 +106,7 @@ class PollingSubscribeProvider {
         return new observable_subscription_1.ObservableSubscription(this.newBlock$, this.config.shouldObservableSubscriptionRetry, this.config.observableSubscriptionRetryFunction);
     }
     subscribe(_filter) {
-        return new observable_subscription_1.ObservableSubscription(this.newBlock$.pipe((0, operators_1.pluck)('hash')), this.config.shouldObservableSubscriptionRetry, this.config.observableSubscriptionRetryFunction);
+        return new observable_subscription_1.ObservableSubscription(this.newBlock$.pipe((0, operators_1.map)((x) => x === null || x === void 0 ? void 0 : x.hash)), this.config.shouldObservableSubscriptionRetry, this.config.observableSubscriptionRetryFunction);
     }
     subscribeOperation(filter) {
         return new observable_subscription_1.ObservableSubscription(this.newBlock$.pipe(applyFilter(filter)), this.config.shouldObservableSubscriptionRetry, this.config.observableSubscriptionRetryFunction);

package/dist/lib/tz/rpc-tz-provider.js

@@ -24,7 +24,7 @@ class RpcTzProvider extends provider_1.Provider {
         return __awaiter(this, void 0, void 0, function* () {
             const addressValidation = (0, utils_1.validateAddress)(address);
             if (addressValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(address, (0, utils_1.invalidDetail)(addressValidation));
+                throw new core_1.InvalidAddressError(address, addressValidation);
             }
             return this.context.readProvider.getBalance(address, 'head');
         });
@@ -33,7 +33,7 @@ class RpcTzProvider extends provider_1.Provider {
         return __awaiter(this, void 0, void 0, function* () {
             const addressValidation = (0, utils_1.validateAddress)(address);
             if (addressValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(address, (0, utils_1.invalidDetail)(addressValidation));
+                throw new core_1.InvalidAddressError(address, addressValidation);
             }
             return this.context.readProvider.getSpendable(address, 'head');
         });
@@ -42,7 +42,7 @@ class RpcTzProvider extends provider_1.Provider {
         return __awaiter(this, void 0, void 0, function* () {
             const addressValidation = (0, utils_1.validateAddress)(address);
             if (addressValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(address, (0, utils_1.invalidDetail)(addressValidation));
+                throw new core_1.InvalidAddressError(address, addressValidation);
             }
             return this.context.readProvider.getDelegate(address, 'head');
         });
@@ -51,7 +51,7 @@ class RpcTzProvider extends provider_1.Provider {
         return __awaiter(this, void 0, void 0, function* () {
             const pkhValidation = (0, utils_1.validateKeyHash)(pkh);
             if (pkhValidation !== utils_1.ValidationResult.VALID) {
-                throw new utils_1.InvalidKeyHashError(pkh, (0, utils_1.invalidDetail)(pkhValidation));
+                throw new utils_1.InvalidKeyHashError(pkh, pkhValidation);
             }
             const prepared = yield this.prepare.activate({ pkh, secret });
             const forgedBytes = yield this.forge(prepared);

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": "f0eb755ed1e0de4d1cd86623df4496f76efd0caf",
-    "version": "22.0.0-beta.0"
+    "commitHash": "13639ef56845fbb7e93bcbd37d3f6d0457b0872b",
+    "version": "23.0.0-RC.0"
 };

package/dist/lib/wallet/operation-factory.js

@@ -35,7 +35,7 @@ const createNewPollingBasedHeadObservable = (sharedHeadOb, context, _scheduler)
         connector: () => new rxjs_1.ReplaySubject(1),
         resetOnError: false,
         resetOnComplete: false,
-        resetOnRefCountZero: false,
+        resetOnRefCountZero: true,
     }));
 };
 exports.createNewPollingBasedHeadObservable = createNewPollingBasedHeadObservable;

package/dist/lib/wallet/operation.js

@@ -62,7 +62,7 @@ class WalletOperation {
             connector: () => new rxjs_1.ReplaySubject(1),
             resetOnError: false,
             resetOnComplete: false,
-            resetOnRefCountZero: false,
+            resetOnRefCountZero: true,
         }));
         // Observable that emit once operation is seen in a block
         this.confirmed$ = this.newHead$.pipe((0, operators_1.map)((head) => {
@@ -83,7 +83,7 @@ class WalletOperation {
             connector: () => new rxjs_1.ReplaySubject(1),
             resetOnError: false,
             resetOnComplete: false,
-            resetOnRefCountZero: false,
+            resetOnRefCountZero: true,
         }));
         if ((0, utils_1.validateOperation)(this.opHash) !== utils_1.ValidationResult.VALID) {
             throw new core_1.InvalidOperationHashError(this.opHash);

package/dist/lib/wallet/wallet.js

@@ -27,7 +27,7 @@ class WalletOperationBatch {
     withTransfer(params) {
         const toValidation = (0, utils_1.validateAddress)(params.to);
         if (toValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.to, (0, utils_1.invalidDetail)(toValidation));
+            throw new core_1.InvalidAddressError(params.to, toValidation);
         }
         this.operations.push(Object.assign({ kind: types_1.OpKind.TRANSACTION }, params));
         return this;
@@ -48,7 +48,7 @@ class WalletOperationBatch {
         var _a;
         const delegateValidation = (0, utils_1.validateAddress)((_a = params.delegate) !== null && _a !== void 0 ? _a : '');
         if (params.delegate && delegateValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.delegate, (0, utils_1.invalidDetail)(delegateValidation));
+            throw new core_1.InvalidAddressError(params.delegate, delegateValidation);
         }
         this.operations.push(Object.assign({ kind: types_1.OpKind.DELEGATION }, params));
         return this;
@@ -68,7 +68,7 @@ class WalletOperationBatch {
     withIncreasePaidStorage(params) {
         const destinationValidation = (0, utils_1.validateAddress)(params.destination);
         if (destinationValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.destination, (0, utils_1.invalidDetail)(destinationValidation));
+            throw new core_1.InvalidAddressError(params.destination, destinationValidation);
         }
         this.operations.push(Object.assign({ kind: types_1.OpKind.INCREASE_PAID_STORAGE }, params));
         return this;
@@ -80,7 +80,7 @@ class WalletOperationBatch {
     withTransferTicket(params) {
         const destinationValidation = (0, utils_1.validateAddress)(params.destination);
         if (destinationValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.destination, (0, utils_1.invalidDetail)(destinationValidation));
+            throw new core_1.InvalidAddressError(params.destination, destinationValidation);
         }
         this.operations.push(Object.assign({ kind: types_1.OpKind.TRANSFER_TICKET }, params));
         return this;
@@ -203,7 +203,7 @@ class Wallet {
         var _a;
         const delegateValidation = (0, utils_1.validateAddress)((_a = params.delegate) !== null && _a !== void 0 ? _a : '');
         if (params.delegate && delegateValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.delegate, (0, utils_1.invalidDetail)(delegateValidation));
+            throw new core_1.InvalidAddressError(params.delegate, delegateValidation);
         }
         return this.walletCommand(() => __awaiter(this, void 0, void 0, function* () {
             const mappedParams = yield this.walletProvider.mapDelegateParamsToWalletParams(() => __awaiter(this, void 0, void 0, function* () { return params; }));
@@ -265,7 +265,7 @@ class Wallet {
     transfer(params) {
         const toValidation = (0, utils_1.validateAddress)(params.to);
         if (toValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.to, (0, utils_1.invalidDetail)(toValidation));
+            throw new core_1.InvalidAddressError(params.to, toValidation);
         }
         return this.walletCommand(() => __awaiter(this, void 0, void 0, function* () {
             const mappedParams = yield this.walletProvider.mapTransferParamsToWalletParams(() => __awaiter(this, void 0, void 0, function* () { return params; }));
@@ -281,7 +281,7 @@ class Wallet {
     transferTicket(params) {
         const toValidation = (0, utils_1.validateAddress)(params.destination);
         if (toValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.destination, (0, utils_1.invalidDetail)(toValidation));
+            throw new core_1.InvalidAddressError(params.destination, toValidation);
         }
         return this.walletCommand(() => __awaiter(this, void 0, void 0, function* () {
             const mappedParams = yield this.walletProvider.mapTransferTicketParamsToWalletParams(() => __awaiter(this, void 0, void 0, function* () { return params; }));
@@ -347,9 +347,6 @@ class Wallet {
                 if (!params.to) {
                     params.to = source;
                 }
-                if (params.to !== source) {
-                    throw new core_1.InvalidStakingAddressError(params.to);
-                }
                 if (!params.amount) {
                     params.amount = 0;
                 }
@@ -371,7 +368,7 @@ class Wallet {
     increasePaidStorage(params) {
         const destinationValidation = (0, utils_1.validateAddress)(params.destination);
         if (destinationValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.destination, (0, utils_1.invalidDetail)(destinationValidation));
+            throw new core_1.InvalidAddressError(params.destination, destinationValidation);
         }
         return this.walletCommand(() => __awaiter(this, void 0, void 0, function* () {
             const mappedParams = yield this.walletProvider.mapIncreasePaidStorageWalletParams(() => __awaiter(this, void 0, void 0, function* () { return params; }));
@@ -401,7 +398,7 @@ class Wallet {
         return __awaiter(this, arguments, void 0, function* (address, contractAbstractionComposer = (x) => x) {
             const addressValidation = (0, utils_1.validateContractAddress)(address);
             if (addressValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidContractAddressError(address, (0, utils_1.invalidDetail)(addressValidation));
+                throw new core_1.InvalidContractAddressError(address, addressValidation);
             }
             const rpc = this.context.withExtensions().rpc;
             const readProvider = this.context.withExtensions().readProvider;