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

package/dist/taquito.umd.js

@@ -157,25 +157,55 @@
         });
     }
 
-    // value is based on octez-client reveal operation gasLimit of each address type in Rio Protocol
+    /**
+     * @deprecated default reveal gasLimit please use getRevealGasLimit(address) instead, removing hardcoded gasLimit of delegation, origination and transfer
+     */
+    const DEFAULT_GAS_LIMIT = {
+        DELEGATION: 10600,
+        ORIGINATION: 10600,
+        TRANSFER: 10600,
+        REVEAL_TZ1: 1000,
+        REVEAL_TZ2: 1000,
+        REVEAL_TZ3: 2000,
+        REVEAL_TZ4: 2000,
+    };
+    /**
+     * @deprecated default reveal fee please use getRevealFee(address) instead, removing hardcoded fee of delegation, origination and transfer
+     */
+    const DEFAULT_FEE = {
+        DELEGATION: 1257,
+        ORIGINATION: 10000,
+        TRANSFER: 10000,
+        REVEAL: 374,
+    };
+    /**
+     * @deprecated default reveal storageLimit please use REVEAL_STORAGE_LIMIT instead, removing hardcoded storageLimit of delegation, origination and transfer
+     */
+    const DEFAULT_STORAGE_LIMIT = {
+        DELEGATION: 0,
+        ORIGINATION: 257,
+        TRANSFER: 257,
+        REVEAL: 0,
+    };
+    // value is based on octez-client reveal operation gasLimit of each address type in Seoul Protocol
     const REVEAL_GAS_LIMIT = {
-        TZ1: 169,
-        TZ2: 155,
-        TZ3: 445,
-        TZ4: 1674,
+        TZ1: 171,
+        TZ2: 157,
+        TZ3: 447,
+        TZ4: 3252,
     };
-    // value is based on octez-client reveal operation fee of each address type in Rio Protocol
+    // value is based on octez-client reveal operation fee of each address type in Seoul Protocol
     const REVEAL_FEE = {
-        TZ1: 276,
-        TZ2: 276,
-        TZ3: 305,
-        TZ4: 477,
+        TZ1: 278,
+        TZ2: 277,
+        TZ3: 306,
+        TZ4: 736,
     };
-    // value is based on octez-client reveal operation storageLimit of all address type in Rio Protocol
+    // value is based on octez-client reveal operation storageLimit of all address type in Seoul Protocol
     const REVEAL_STORAGE_LIMIT = 0;
-    // protocol constants in Rio Protocol
+    // protocol constants in Seoul Protocol
     const ORIGINATION_SIZE = 257;
-    // protocol constants in Rio Protocol
+    // protocol constants in Seoul Protocol
     const COST_PER_BYTE = 250;
     exports.Protocols = void 0;
     (function (Protocols) {
@@ -201,6 +231,7 @@
         Protocols["PsParisCZ"] = "PsParisCZo7KAh1Z1smVd9ZMZ1HHn5gkzbM94V3PLCpknFWhUAi";
         Protocols["PsQuebecn"] = "PsQuebecnLByd3JwTiGadoG4nGWi3HYiLXUjkibeFV8dCFeVMUg";
         Protocols["PsRiotuma"] = "PsRiotumaAMotcRoDWW1bysEhQy2n1M5fy8JgRp8jjRfHGmfeA7";
+        Protocols["PtSeouLou"] = "PtSeouLouXkxhg39oWzjxDWaCydNfR3RxCUrNe4Q9Ro8BTehcbh";
         Protocols["ProtoALpha"] = "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK";
     })(exports.Protocols || (exports.Protocols = {}));
     const protocols = {
@@ -222,7 +253,8 @@
         '020': [exports.Protocols.PtParisBx, exports.Protocols.PsParisCZ],
         '021': [exports.Protocols.PsQuebecn],
         '022': [exports.Protocols.PsRiotuma],
-        '023': [exports.Protocols.ProtoALpha],
+        '023': [exports.Protocols.PtSeouLou],
+        '024': [exports.Protocols.ProtoALpha],
     };
     exports.ChainIds = void 0;
     (function (ChainIds) {
@@ -244,10 +276,10 @@
         ChainIds["OXFORDNET2"] = "NetXxWsskGahzQB";
         ChainIds["PARISBNET"] = "NetXo8SqH1c38SS";
         ChainIds["PARISCNET"] = "NetXXWAHLEvre9b";
-        ChainIds["QUEBECN"] = "NetXuTeGinLEqxp";
-        ChainIds["RIOTUMANET"] = "NetXPdgaoabtBth";
+        ChainIds["QUEBECNET"] = "NetXuTeGinLEqxp";
+        ChainIds["RIONET"] = "NetXPdgaoabtBth";
+        ChainIds["SEOULNET"] = "NetXd56aBs1aeW3";
     })(exports.ChainIds || (exports.ChainIds = {}));
-    // A fixed fee reveal operation gasLimit accepted by both simulate and injection endpoint is between 1.2-5 times of actual gas consumption (3.5 fails occasionally with gas exhausted; 4 fails occasionally with fee too low)
     const getRevealGasLimit = (address) => Math.round((getRevealGasLimitInternal(address) * 37) / 10);
     const getRevealGasLimitInternal = (address) => {
         switch (address.substring(0, 3)) {
@@ -273,7 +305,7 @@
             case 'tz3':
                 return REVEAL_FEE.TZ3;
             case 'tz4':
-                return REVEAL_FEE.TZ4;
+                return REVEAL_FEE.TZ4 * 1.7;
             default:
                 throw new Error(`Cannot estimate reveal fee for ${address}`);
         }
@@ -486,7 +518,7 @@
             delegate: source,
         };
     });
-    const createRevealOperation = (_a, source_1, publicKey_1) => __awaiter(void 0, [_a, source_1, publicKey_1], void 0, function* ({ fee, gasLimit, storageLimit }, source, publicKey) {
+    const createRevealOperation = (_a, source_1, publicKey_1) => __awaiter(void 0, [_a, source_1, publicKey_1], void 0, function* ({ fee, gasLimit, storageLimit, proof }, source, publicKey) {
         return {
             kind: rpc.OpKind.REVEAL,
             fee,
@@ -494,6 +526,7 @@
             source,
             gas_limit: gasLimit !== null && gasLimit !== void 0 ? gasLimit : getRevealGasLimit(source),
             storage_limit: storageLimit,
+            proof,
         };
     });
     const createRegisterGlobalConstantOperation = (_a) => __awaiter(void 0, [_a], void 0, function* ({ value, source, fee, gasLimit, storageLimit, }) {
@@ -555,7 +588,7 @@
             proposals,
         };
     });
-    const createUpdateConsensusKeyOperation = (_a) => __awaiter(void 0, [_a], void 0, function* ({ source, fee, gasLimit, storageLimit, pk, }) {
+    const createUpdateConsensusKeyOperation = (_a) => __awaiter(void 0, [_a], void 0, function* ({ source, fee, gasLimit, storageLimit, pk, proof, }) {
         return {
             kind: rpc.OpKind.UPDATE_CONSENSUS_KEY,
             source,
@@ -563,6 +596,18 @@
             gas_limit: gasLimit,
             storage_limit: storageLimit,
             pk,
+            proof,
+        };
+    });
+    const createUpdateCompanionKeyOperation = (_a) => __awaiter(void 0, [_a], void 0, function* ({ source, fee, gasLimit, storageLimit, pk, proof, }) {
+        return {
+            kind: rpc.OpKind.UPDATE_COMPANION_KEY,
+            source,
+            fee,
+            gas_limit: gasLimit,
+            storage_limit: storageLimit,
+            pk,
+            proof,
         };
     });
     const createSmartRollupAddMessagesOperation = (_a) => __awaiter(void 0, [_a], void 0, function* ({ source, fee, gasLimit, storageLimit, message, }) {
@@ -615,7 +660,8 @@
         return op.kind === kind;
     };
     const isOpWithGasBuffer = (op) => {
-        if (op.kind === rpc.OpKind.TRANSACTION && op.parameters) {
+        var _a;
+        if (op.kind === rpc.OpKind.TRANSACTION && ((_a = op.destination) === null || _a === void 0 ? void 0 : _a.startsWith('KT1'))) {
             return true;
         }
         else {
@@ -624,6 +670,7 @@
                 'register_global_constant',
                 'transfer_ticket',
                 'update_consensus_key',
+                'update_companion_key',
                 'smart_rollup_add_messages',
                 'smart_rollup_originate',
             ].indexOf(op.kind) !== -1);
@@ -639,6 +686,7 @@
             'increase_paid_storage',
             'transfer_ticket',
             'update_consensus_key',
+            'update_companion_key',
             'smart_rollup_add_messages',
             'smart_rollup_originate',
             'smart_rollup_execute_outbox_message',
@@ -653,6 +701,7 @@
             'increase_paid_storage',
             'transfer_ticket',
             'update_consensus_key',
+            'update_companion_key',
             'smart_rollup_add_messages',
             'smart_rollup_originate',
             'smart_rollup_execute_outbox_message',
@@ -1054,6 +1103,10 @@
                         return createRegisterGlobalConstantOperation(Object.assign({}, param));
                     case rpc.OpKind.INCREASE_PAID_STORAGE:
                         return createIncreasePaidStorageOperation(Object.assign({}, param));
+                    case rpc.OpKind.UPDATE_CONSENSUS_KEY:
+                        return createUpdateConsensusKeyOperation(Object.assign({}, param));
+                    case rpc.OpKind.UPDATE_COMPANION_KEY:
+                        return createUpdateCompanionKeyOperation(Object.assign({}, param));
                     case rpc.OpKind.TRANSFER_TICKET:
                         return createTransferTicketOperation(Object.assign({}, param));
                     case rpc.OpKind.SMART_ROLLUP_ADD_MESSAGES:
@@ -1148,7 +1201,7 @@
         withTransfer(params) {
             const toValidation = utils.validateAddress(params.to);
             if (toValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.to, utils.invalidDetail(toValidation));
+                throw new core.InvalidAddressError(params.to, toValidation);
             }
             this.operations.push(Object.assign({ kind: rpc.OpKind.TRANSACTION }, params));
             return this;
@@ -1169,7 +1222,7 @@
             var _a;
             const delegateValidation = utils.validateAddress((_a = params.delegate) !== null && _a !== void 0 ? _a : '');
             if (params.delegate && delegateValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.delegate, utils.invalidDetail(delegateValidation));
+                throw new core.InvalidAddressError(params.delegate, delegateValidation);
             }
             this.operations.push(Object.assign({ kind: rpc.OpKind.DELEGATION }, params));
             return this;
@@ -1189,7 +1242,7 @@
         withIncreasePaidStorage(params) {
             const destinationValidation = utils.validateAddress(params.destination);
             if (destinationValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.destination, utils.invalidDetail(destinationValidation));
+                throw new core.InvalidAddressError(params.destination, destinationValidation);
             }
             this.operations.push(Object.assign({ kind: rpc.OpKind.INCREASE_PAID_STORAGE }, params));
             return this;
@@ -1201,7 +1254,7 @@
         withTransferTicket(params) {
             const destinationValidation = utils.validateAddress(params.destination);
             if (destinationValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.destination, utils.invalidDetail(destinationValidation));
+                throw new core.InvalidAddressError(params.destination, destinationValidation);
             }
             this.operations.push(Object.assign({ kind: rpc.OpKind.TRANSFER_TICKET }, params));
             return this;
@@ -1323,7 +1376,7 @@
             var _a;
             const delegateValidation = utils.validateAddress((_a = params.delegate) !== null && _a !== void 0 ? _a : '');
             if (params.delegate && delegateValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.delegate, utils.invalidDetail(delegateValidation));
+                throw new core.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; }));
@@ -1385,7 +1438,7 @@
         transfer(params) {
             const toValidation = utils.validateAddress(params.to);
             if (toValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.to, utils.invalidDetail(toValidation));
+                throw new core.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; }));
@@ -1401,7 +1454,7 @@
         transferTicket(params) {
             const toValidation = utils.validateAddress(params.destination);
             if (toValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.destination, utils.invalidDetail(toValidation));
+                throw new core.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; }));
@@ -1467,9 +1520,6 @@
                     if (!params.to) {
                         params.to = source;
                     }
-                    if (params.to !== source) {
-                        throw new core.InvalidStakingAddressError(params.to);
-                    }
                     if (!params.amount) {
                         params.amount = 0;
                     }
@@ -1491,7 +1541,7 @@
         increasePaidStorage(params) {
             const destinationValidation = utils.validateAddress(params.destination);
             if (destinationValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.destination, utils.invalidDetail(destinationValidation));
+                throw new core.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; }));
@@ -1521,7 +1571,7 @@
             return __awaiter(this, arguments, void 0, function* (address, contractAbstractionComposer = (x) => x) {
                 const addressValidation = utils.validateContractAddress(address);
                 if (addressValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidContractAddressError(address, utils.invalidDetail(addressValidation));
+                    throw new core.InvalidContractAddressError(address, addressValidation);
                 }
                 const rpc = this.context.withExtensions().rpc;
                 const readProvider = this.context.withExtensions().readProvider;
@@ -1647,7 +1697,7 @@
                 connector: () => new rxjs.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(operators.map((head) => {
@@ -1668,7 +1718,7 @@
                 connector: () => new rxjs.ReplaySubject(1),
                 resetOnError: false,
                 resetOnComplete: false,
-                resetOnRefCountZero: false,
+                resetOnRefCountZero: true,
             }));
             if (utils.validateOperation(this.opHash) !== utils.ValidationResult.VALID) {
                 throw new core.InvalidOperationHashError(this.opHash);
@@ -2269,7 +2319,7 @@
                     throw new core.DeprecationError(`Since version 12, the lambda view no longer depends on a lambda contract. The read method no longer accepts a contract address as a parameter.`);
                 }
                 else if (chainId && chainIdValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidChainIdError(chainId, utils.invalidDetail(chainIdValidation));
+                    throw new core.InvalidChainIdError(chainId, chainIdValidation);
                 }
                 const arg = this.parameterSchema.Encode(...this.args);
                 const result = yield this.rpc.runView({
@@ -2707,10 +2757,14 @@
                         if (!publicKey) {
                             throw new core.PublicKeyNotFoundError(pkh);
                         }
+                        const [, pkhPrefix] = utils.b58DecodeAndCheckPrefix(pkh, utils.publicKeyHashPrefixes);
                         ops.unshift(yield createRevealOperation({
                             fee: getRevealFee(pkh),
                             storageLimit: REVEAL_STORAGE_LIMIT,
                             gasLimit: getRevealGasLimit(pkh),
+                            proof: pkhPrefix === utils.PrefixV2.BLS12_381PublicKeyHash
+                                ? (yield this.signer.provePossession()).prefixSig
+                                : undefined,
                         }, publicKeyHash, publicKey));
                         return ops;
                     }
@@ -2756,6 +2810,7 @@
                     case rpc.OpKind.DELEGATION:
                     case rpc.OpKind.REGISTER_GLOBAL_CONSTANT:
                     case rpc.OpKind.UPDATE_CONSENSUS_KEY:
+                    case rpc.OpKind.UPDATE_COMPANION_KEY:
                     case rpc.OpKind.SMART_ROLLUP_ADD_MESSAGES:
                     case rpc.OpKind.SMART_ROLLUP_ORIGINATE:
                     case rpc.OpKind.SMART_ROLLUP_EXECUTE_OUTBOX_MESSAGE:
@@ -2816,11 +2871,26 @@
          * @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.PublicKeyNotFoundError(pkh);
                 }
+                const [, pkhPrefix] = utils.b58DecodeAndCheckPrefix(pkh, utils.publicKeyHashPrefixes);
+                if (pkhPrefix === utils.PrefixV2.BLS12_381PublicKeyHash) {
+                    if (proof) {
+                        utils.b58DecodeAndCheckPrefix(proof, [utils.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.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);
@@ -2828,6 +2898,7 @@
                     fee: mergedEstimates.fee,
                     gasLimit: mergedEstimates.gasLimit,
                     storageLimit: mergedEstimates.storageLimit,
+                    proof,
                 }, pkh, publicKey);
                 const ops = this.convertIntoArray(op);
                 const hash = yield this.getBlockHash();
@@ -2986,11 +3057,11 @@
          */
         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 createTransferOperation(Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { to: pkh, amount: 0 }), mergeLimits({ fee, storageLimit, gasLimit }, DEFAULT_PARAMS)), { parameter: {
+                const op = yield 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' },
                     } }));
@@ -3119,6 +3190,17 @@
             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] = utils.b58DecodeAndCheckPrefix(rest.pk, utils.publicKeyPrefixes);
+                if (pkPrefix === utils.PrefixV2.BLS12_381PublicKey) {
+                    if (!rest.proof) {
+                        throw new core.InvalidProofError('Proof is required to set a bls account as consensus key ');
+                    }
+                }
+                else {
+                    if (rest.proof) {
+                        throw new core.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 createUpdateConsensusKeyOperation(Object.assign(Object.assign({}, rest), mergeLimits({ fee, storageLimit, gasLimit }, DEFAULT_PARAMS)));
@@ -3139,6 +3221,44 @@
                 };
             });
         }
+        /**
+         *
+         * @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] = utils.b58DecodeAndCheckPrefix(rest.pk, utils.publicKeyPrefixes);
+                if (pkPrefix !== utils.PrefixV2.BLS12_381PublicKey) {
+                    throw new core.ProhibitedActionError('companion key must be a bls account');
+                }
+                if (!rest.proof) {
+                    throw new core.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 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
@@ -3429,10 +3549,14 @@
                     if (!publicKey) {
                         throw new core.PublicKeyNotFoundError(pkh);
                     }
+                    const [, pkhPrefix] = utils.b58DecodeAndCheckPrefix(pkh, utils.publicKeyHashPrefixes);
                     ops.unshift(yield createRevealOperation({
                         fee: getRevealFee(pkh),
                         storageLimit: REVEAL_STORAGE_LIMIT,
                         gasLimit: getRevealGasLimit(pkh),
+                        proof: pkhPrefix === utils.PrefixV2.BLS12_381PublicKeyHash
+                            ? (yield this.signer.provePossession()).prefixSig
+                            : undefined,
                     }, pkh, publicKey));
                 }
                 const hash = yield this.getBlockHash();
@@ -3549,7 +3673,7 @@
                 throw new core.InvalidAmountError(params.amount.toString());
             }
             if (toValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.to, utils.invalidDetail(toValidation));
+                throw new core.InvalidAddressError(params.to, toValidation);
             }
             this.operations.push(Object.assign({ kind: rpc.OpKind.TRANSACTION }, params));
             return this;
@@ -3563,7 +3687,7 @@
         withTransferTicket(params) {
             const destinationValidation = utils.validateAddress(params.destination);
             if (destinationValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.destination, utils.invalidDetail(destinationValidation));
+                throw new core.InvalidAddressError(params.destination, destinationValidation);
             }
             this.operations.push(Object.assign({ kind: rpc.OpKind.TRANSFER_TICKET }, params));
             return this;
@@ -3588,11 +3712,11 @@
             var _a;
             const sourceValidation = utils.validateAddress(params.source);
             if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                throw new core.InvalidAddressError(params.source, sourceValidation);
             }
             const delegateValidation = utils.validateAddress((_a = params.delegate) !== null && _a !== void 0 ? _a : '');
             if (params.delegate && delegateValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidAddressError(params.delegate, utils.invalidDetail(delegateValidation));
+                throw new core.InvalidAddressError(params.delegate, delegateValidation);
             }
             this.operations.push(Object.assign({ kind: rpc.OpKind.DELEGATION }, params));
             return this;
@@ -3607,7 +3731,7 @@
         withActivation({ pkh, secret }) {
             const pkhValidation = utils.validateKeyHash(pkh);
             if (pkhValidation !== utils.ValidationResult.VALID) {
-                throw new core.InvalidKeyHashError(pkh, utils.invalidDetail(pkhValidation));
+                throw new core.InvalidKeyHashError(pkh, pkhValidation);
             }
             this.operations.push({ kind: rpc.OpKind.ACTIVATION, pkh, secret });
             return this;
@@ -3642,6 +3766,44 @@
             this.operations.push(Object.assign({ kind: rpc.OpKind.INCREASE_PAID_STORAGE }, params));
             return this;
         }
+        /**
+         *
+         * @description Add a update consensus key operation to the batch
+         *
+         * @param params UpdateConsensusKey operation parameter
+         */
+        withUpdateConsensusKey(params) {
+            const [, pkPrefix] = utils.b58DecodeAndCheckPrefix(params.pk, utils.publicKeyPrefixes);
+            if (pkPrefix === utils.PrefixV2.BLS12_381PublicKey) {
+                if (!params.proof) {
+                    throw new core.InvalidProofError('Proof is required to set a bls account as consensus key ');
+                }
+            }
+            else {
+                if (params.proof) {
+                    throw new core.ProhibitedActionError('Proof field is only allowed for a bls account as consensus key');
+                }
+            }
+            this.operations.push(Object.assign({ kind: rpc.OpKind.UPDATE_CONSENSUS_KEY }, params));
+            return this;
+        }
+        /**
+         *
+         * @description Add a update companion key operation to the batch
+         *
+         * @param params UpdateCompanionKey operation parameter
+         */
+        withUpdateCompanionKey(params) {
+            const [, pkPrefix] = utils.b58DecodeAndCheckPrefix(params.pk, utils.publicKeyPrefixes);
+            if (pkPrefix !== utils.PrefixV2.BLS12_381PublicKey) {
+                throw new core.ProhibitedActionError('companion key must be a bls account');
+            }
+            if (!params.proof) {
+                throw new core.InvalidProofError('Proof is required to set a bls account as companion key ');
+            }
+            this.operations.push(Object.assign({ kind: rpc.OpKind.UPDATE_COMPANION_KEY }, params));
+            return this;
+        }
         /**
          *
          * @description Add a smart rollup add messages operation to the batch
@@ -3685,6 +3847,10 @@
                         return createRegisterGlobalConstantOperation(Object.assign({}, param));
                     case rpc.OpKind.INCREASE_PAID_STORAGE:
                         return createIncreasePaidStorageOperation(Object.assign({}, param));
+                    case rpc.OpKind.UPDATE_CONSENSUS_KEY:
+                        return createUpdateConsensusKeyOperation(Object.assign({}, param));
+                    case rpc.OpKind.UPDATE_COMPANION_KEY:
+                        return createUpdateCompanionKeyOperation(Object.assign({}, param));
                     case rpc.OpKind.TRANSFER_TICKET:
                         return createTransferTicketOperation(Object.assign({}, param));
                     case rpc.OpKind.SMART_ROLLUP_ADD_MESSAGES:
@@ -3899,7 +4065,7 @@
             connector: () => new rxjs.ReplaySubject(1),
             resetOnError: false,
             resetOnComplete: false,
-            resetOnRefCountZero: false,
+            resetOnRefCountZero: true,
         }));
     };
     class OperationFactory {
@@ -3981,7 +4147,7 @@
             return __awaiter(this, void 0, void 0, function* () {
                 const addressValidation = utils.validateAddress(address);
                 if (addressValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(address, utils.invalidDetail(addressValidation));
+                    throw new core.InvalidAddressError(address, addressValidation);
                 }
                 return this.context.readProvider.getBalance(address, 'head');
             });
@@ -3990,7 +4156,7 @@
             return __awaiter(this, void 0, void 0, function* () {
                 const addressValidation = utils.validateAddress(address);
                 if (addressValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(address, utils.invalidDetail(addressValidation));
+                    throw new core.InvalidAddressError(address, addressValidation);
                 }
                 return this.context.readProvider.getSpendable(address, 'head');
             });
@@ -3999,7 +4165,7 @@
             return __awaiter(this, void 0, void 0, function* () {
                 const addressValidation = utils.validateAddress(address);
                 if (addressValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(address, utils.invalidDetail(addressValidation));
+                    throw new core.InvalidAddressError(address, addressValidation);
                 }
                 return this.context.readProvider.getDelegate(address, 'head');
             });
@@ -4008,7 +4174,7 @@
             return __awaiter(this, void 0, void 0, function* () {
                 const pkhValidation = utils.validateKeyHash(pkh);
                 if (pkhValidation !== utils.ValidationResult.VALID) {
-                    throw new utils.InvalidKeyHashError(pkh, utils.invalidDetail(pkhValidation));
+                    throw new utils.InvalidKeyHashError(pkh, pkhValidation);
                 }
                 const prepared = yield this.prepare.activate({ pkh, secret });
                 const forgedBytes = yield this.forge(prepared);
@@ -4162,7 +4328,8 @@
     class RPCEstimateProvider extends Provider {
         constructor() {
             super(...arguments);
-            this.OP_SIZE_REVEAL = 324; // injecting size tz1=320, tz2=322, tz3=322, tz4=420(not supported)
+            this.REVEAL_LENGTH = 324; // injecting size tz1=320, tz2=322, tz3=322
+            this.REVEAL_LENGTH_TZ4 = 622; // injecting size tz4=620
             this.MILLIGAS_BUFFER = 100 * 1000; // 100 buffer depends on operation kind
             this.STORAGE_BUFFER = 20; // according to octez-client
             this.prepare = new PrepareProvider(this.context);
@@ -4244,9 +4411,20 @@
                             : op.opOb.contents.length;
                 }
                 return opResponse.contents.map((x) => {
+                    const content = x;
+                    content.source = content.source || '';
+                    let revealSize, eachOpSize;
+                    if (content.source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)) {
+                        revealSize = this.REVEAL_LENGTH_TZ4 / 2;
+                        eachOpSize = (opbytes.length / 2 + utils.payloadLength[utils.PrefixV2.BLS12_381Signature]) / numberOfOps;
+                    }
+                    else {
+                        revealSize = this.REVEAL_LENGTH / 2;
+                        eachOpSize = (opbytes.length / 2 + utils.payloadLength[utils.PrefixV2.Ed25519Signature]) / numberOfOps;
+                    }
                     return this.getEstimationPropertiesFromOperationContent(x, 
                     // diff between estimated and injecting OP_SIZE is 124-126, we added buffer to use 130
-                    x.kind === 'reveal' ? this.OP_SIZE_REVEAL / 2 : (opbytes.length + 130) / 2 / numberOfOps, cost_per_byte, origination_size !== null && origination_size !== void 0 ? origination_size : 257 // protocol constants
+                    x.kind === 'reveal' ? revealSize : eachOpSize, cost_per_byte, origination_size !== null && origination_size !== void 0 ? origination_size : 257 // protocol constants
                     );
                 });
             });
@@ -4265,8 +4443,11 @@
                 const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4285,11 +4466,11 @@
                 var { fee, storageLimit, gasLimit } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit"]);
                 const toValidation = utils.validateAddress(rest.to);
                 if (toValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.to, utils.invalidDetail(toValidation));
+                    throw new core.InvalidAddressError(rest.to, toValidation);
                 }
                 const sourceValidation = utils.validateAddress((_b = rest.source) !== null && _b !== void 0 ? _b : '');
                 if (rest.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(rest.source, sourceValidation);
                 }
                 if (rest.amount < 0) {
                     throw new core.InvalidAmountError(rest.amount.toString());
@@ -4300,8 +4481,11 @@
                 const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4320,7 +4504,7 @@
                 var { fee, storageLimit, gasLimit } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit"]);
                 const sourceValidation = utils.validateAddress((_b = rest.source) !== null && _b !== void 0 ? _b : '');
                 if (rest.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(rest.source, sourceValidation);
                 }
                 if (!rest.to) {
                     rest.to = rest.source;
@@ -4338,7 +4522,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4357,7 +4544,7 @@
                 var { fee, storageLimit, gasLimit } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit"]);
                 const sourceValidation = utils.validateAddress((_b = rest.source) !== null && _b !== void 0 ? _b : '');
                 if (rest.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(rest.source, sourceValidation);
                 }
                 if (!rest.to) {
                     rest.to = rest.source;
@@ -4375,7 +4562,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4394,14 +4584,11 @@
                 var { fee, storageLimit, gasLimit } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit"]);
                 const sourceValidation = utils.validateAddress((_b = rest.source) !== null && _b !== void 0 ? _b : '');
                 if (rest.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(rest.source, sourceValidation);
                 }
                 if (!rest.to) {
                     rest.to = rest.source;
                 }
-                if (rest.to && rest.to !== rest.source) {
-                    throw new core.InvalidStakingAddressError(rest.to);
-                }
                 if (!rest.amount) {
                     rest.amount = 0;
                 }
@@ -4415,7 +4602,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4434,11 +4624,11 @@
                 var { fee, storageLimit, gasLimit } = _a, rest = __rest(_a, ["fee", "storageLimit", "gasLimit"]);
                 const destinationValidation = utils.validateAddress(rest.destination);
                 if (destinationValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.destination, utils.invalidDetail(destinationValidation));
+                    throw new core.InvalidAddressError(rest.destination, destinationValidation);
                 }
                 const sourceValidation = utils.validateAddress((_b = rest.source) !== null && _b !== void 0 ? _b : '');
                 if (rest.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(rest.source, sourceValidation);
                 }
                 const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
                 const preparedOperation = yield this.prepare.transferTicket(Object.assign({ fee,
@@ -4447,7 +4637,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4466,11 +4659,11 @@
                 var { fee, gasLimit, storageLimit } = _a, rest = __rest(_a, ["fee", "gasLimit", "storageLimit"]);
                 const sourceValidation = utils.validateAddress(rest.source);
                 if (rest.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(rest.source, sourceValidation);
                 }
                 const delegateValidation = utils.validateAddress((_b = rest.delegate) !== null && _b !== void 0 ? _b : '');
                 if (rest.delegate && delegateValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(rest.delegate, utils.invalidDetail(delegateValidation));
+                    throw new core.InvalidAddressError(rest.delegate, delegateValidation);
                 }
                 const preparedOperation = yield this.prepare.delegation(Object.assign({ fee,
                     storageLimit,
@@ -4479,7 +4672,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4516,7 +4712,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4524,7 +4723,6 @@
         /**
          *
          * @description Estimate gasLimit, storageLimit and fees to reveal the current account
-         *
          * @returns An estimation of gasLimit, storageLimit and fees for the operation or undefined if the account is already revealed
          *
          * @param Estimate
@@ -4536,6 +4734,21 @@
                     throw new RevealEstimateError();
                 }
                 if (yield this.isAccountRevealRequired(publicKeyHash)) {
+                    const [, pkhPrefix] = utils.b58DecodeAndCheckPrefix(publicKeyHash, utils.publicKeyHashPrefixes);
+                    if (pkhPrefix === utils.PrefixV2.BLS12_381PublicKeyHash) {
+                        if (params && params.proof) {
+                            utils.b58DecodeAndCheckPrefix(params.proof, [utils.PrefixV2.BLS12_381Signature]); // validate proof to be a bls signature
+                        }
+                        else {
+                            const { prefixSig } = yield this.signer.provePossession();
+                            params = Object.assign(Object.assign({}, params), { proof: prefixSig });
+                        }
+                    }
+                    else {
+                        if (params && params.proof) {
+                            throw new core.ProhibitedActionError('Proof field is only allowed to reveal a bls account ');
+                        }
+                    }
                     const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
                     const preparedOperation = params
                         ? yield this.prepare.reveal(params)
@@ -4563,7 +4776,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4589,7 +4805,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4597,19 +4816,59 @@
         /**
          *
          * @description Estimate gasLimit, storageLimit and fees for an Update Consensus Key operation
-         *
          * @returns An estimation of gasLimit, storageLimit and fees for the operation
-         *
          * @param Estimate
          */
         updateConsensusKey(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const [, pkPrefix] = utils.b58DecodeAndCheckPrefix(params.pk, utils.publicKeyPrefixes);
+                if (pkPrefix === utils.PrefixV2.BLS12_381PublicKey) {
+                    if (!params.proof) {
+                        throw new core.InvalidProofError('Proof is required to set a bls account as consensus key ');
+                    }
+                }
+                else {
+                    if (params.proof) {
+                        throw new core.ProhibitedActionError('Proof field is only allowed for a bls account as consensus key');
+                    }
+                }
                 const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
                 const preparedOperation = yield this.prepare.updateConsensusKey(params);
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
+                }
+                return Estimate.createEstimateInstanceFromProperties(estimateProperties);
+            });
+        }
+        /**
+         *
+         * @description Estimate gasLimit, storageLimit and fees for an Update Companion Key operation
+         * @returns An estimation of gasLimit, storageLimit and fees for the operation
+         * @param Estimate
+         */
+        updateCompanionKey(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const [, pkPrefix] = utils.b58DecodeAndCheckPrefix(params.pk, utils.publicKeyPrefixes);
+                if (pkPrefix !== utils.PrefixV2.BLS12_381PublicKey) {
+                    throw new core.ProhibitedActionError('companion key must be a bls account');
+                }
+                if (!params.proof) {
+                    throw new core.InvalidProofError('Proof is required to set a bls account as companion key ');
+                }
+                const protocolConstants = yield this.context.readProvider.getProtocolConstants('head');
+                const preparedOperation = yield this.prepare.updateCompanionKey(params);
+                const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
+                if (preparedOperation.opOb.contents[0].kind === 'reveal') {
+                    estimateProperties.shift();
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4629,7 +4888,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4649,7 +4911,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4688,7 +4953,10 @@
                 const estimateProperties = yield this.calculateEstimates(preparedOperation, protocolConstants);
                 if (preparedOperation.opOb.contents[0].kind === 'reveal') {
                     estimateProperties.shift();
-                    estimateProperties[0].opSize -= this.OP_SIZE_REVEAL / 2;
+                    const revealSize = preparedOperation.opOb.contents[0].source.startsWith(utils.PrefixV2.BLS12_381PublicKeyHash)
+                        ? this.REVEAL_LENGTH_TZ4 / 2
+                        : this.REVEAL_LENGTH / 2;
+                    estimateProperties[0].opSize -= revealSize;
                 }
                 return Estimate.createEstimateInstanceFromProperties(estimateProperties);
             });
@@ -4906,6 +5174,14 @@
         get publicKey() {
             return this.params.public_key;
         }
+        get proof() {
+            if (this.params.proof) {
+                return this.params.proof;
+            }
+            else {
+                throw new core.ProhibitedActionError('Only BLS key has proof');
+            }
+        }
         sumProp(arr, prop) {
             return arr.reduce((prev, current) => {
                 return prop in current ? Number(current[prop]) + prev : prev;
@@ -5076,6 +5352,67 @@
         get pk() {
             return this.params.pk;
         }
+        get proof() {
+            if (this.params.proof) {
+                return this.params.proof;
+            }
+            else {
+                throw new core.ProhibitedActionError('Only updating consensus key to a BLS account has proof');
+            }
+        }
+        get consumedMilliGas() {
+            var _a;
+            return (_a = this.operationResults) === null || _a === void 0 ? void 0 : _a.consumed_milligas;
+        }
+        get errors() {
+            var _a;
+            return (_a = this.operationResults) === null || _a === void 0 ? void 0 : _a.errors;
+        }
+    }
+
+    /**
+     *
+     * @description UpdateCompanionKeyOperation provides utility to fetch properties for Operation of kind UpdateCompanionKey
+     *
+     */
+    class UpdateCompanionKeyOperation extends Operation {
+        constructor(hash, params, source, raw, results, context) {
+            super(hash, raw, results, context);
+            this.params = params;
+            this.source = source;
+        }
+        get operationResults() {
+            const updateCompanionKeyOp = Array.isArray(this.results) &&
+                this.results.find((op) => op.kind === 'update_companion_key');
+            const result = updateCompanionKeyOp &&
+                updateCompanionKeyOp.metadata &&
+                updateCompanionKeyOp.metadata.operation_result;
+            return result ? result : undefined;
+        }
+        get status() {
+            var _a, _b;
+            return (_b = (_a = this.operationResults) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : 'unknown';
+        }
+        get fee() {
+            return Number(this.params.fee);
+        }
+        get gasLimit() {
+            return Number(this.params.gas_limit);
+        }
+        get storageLimit() {
+            return Number(this.params.storage_limit);
+        }
+        get pk() {
+            return this.params.pk;
+        }
+        get proof() {
+            if (this.params.proof) {
+                return this.params.proof;
+            }
+            else {
+                throw new core.ProhibitedActionError('Only updating companion key to a BLS account has proof');
+            }
+        }
         get consumedMilliGas() {
             var _a;
             return (_a = this.operationResults) === null || _a === void 0 ? void 0 : _a.consumed_milligas;
@@ -5373,7 +5710,7 @@
             return __awaiter(this, void 0, void 0, function* () {
                 const contractValidation = utils.validateContractAddress(contract);
                 if (contractValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidContractAddressError(contract, utils.invalidDetail(contractValidation));
+                    throw new core.InvalidContractAddressError(contract, contractValidation);
                 }
                 const script = yield this.context.readProvider.getScript(contract, 'head');
                 if (!schema) {
@@ -5405,7 +5742,7 @@
             return __awaiter(this, void 0, void 0, function* () {
                 const contractValidation = utils.validateContractAddress(contract);
                 if (contractValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidContractAddressError(contract, utils.invalidDetail(contractValidation));
+                    throw new core.InvalidContractAddressError(contract, contractValidation);
                 }
                 if (!schema) {
                     schema = (yield this.rpc.getContract(contract)).script;
@@ -5549,14 +5886,14 @@
                 var _a;
                 const sourceValidation = utils.validateAddress(params.source);
                 if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(params.source, sourceValidation);
                 }
                 const delegateValidation = utils.validateAddress((_a = params.delegate) !== null && _a !== void 0 ? _a : '');
                 if (params.delegate && delegateValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.delegate, utils.invalidDetail(delegateValidation));
+                    throw new core.InvalidAddressError(params.delegate, delegateValidation);
                 }
                 // Since babylon delegation source cannot smart contract
-                if (/kt1/i.test(params.source)) {
+                if (/^kt1/i.test(params.source)) {
                     throw new InvalidDelegationSource(params.source);
                 }
                 const publicKeyHash = yield this.signer.publicKeyHash();
@@ -5601,11 +5938,11 @@
                 var _a;
                 const toValidation = utils.validateAddress(params.to);
                 if (toValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.to, utils.invalidDetail(toValidation));
+                    throw new core.InvalidAddressError(params.to, toValidation);
                 }
                 const sourceValidation = utils.validateAddress((_a = params.source) !== null && _a !== void 0 ? _a : '');
                 if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(params.source, sourceValidation);
                 }
                 if (params.amount < 0) {
                     throw new core.InvalidAmountError(params.amount.toString());
@@ -5633,7 +5970,7 @@
                 var _a;
                 const sourceValidation = utils.validateAddress((_a = params.source) !== null && _a !== void 0 ? _a : '');
                 if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(params.source, sourceValidation);
                 }
                 if (!params.to) {
                     params.to = params.source;
@@ -5669,7 +6006,7 @@
                 var _a;
                 const sourceValidation = utils.validateAddress((_a = params.source) !== null && _a !== void 0 ? _a : '');
                 if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(params.source, sourceValidation);
                 }
                 if (!params.to) {
                     params.to = params.source;
@@ -5702,14 +6039,11 @@
                 var _a;
                 const sourceValidation = utils.validateAddress((_a = params.source) !== null && _a !== void 0 ? _a : '');
                 if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(params.source, sourceValidation);
                 }
                 if (!params.to) {
                     params.to = params.source;
                 }
-                if (params.to && params.to !== params.source) {
-                    throw new core.InvalidStakingAddressError(params.to);
-                }
                 if (!params.amount) {
                     params.amount = 0;
                 }
@@ -5739,11 +6073,11 @@
                 var _a, _b;
                 const destinationValidation = utils.validateAddress(params.destination);
                 if (destinationValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.destination, utils.invalidDetail(destinationValidation));
+                    throw new core.InvalidAddressError(params.destination, destinationValidation);
                 }
                 const sourceValidation = utils.validateAddress((_a = params.source) !== null && _a !== void 0 ? _a : '');
                 if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(params.source, sourceValidation);
                 }
                 const publicKeyHash = yield this.signer.publicKeyHash();
                 const source = (_b = params.source) !== null && _b !== void 0 ? _b : publicKeyHash;
@@ -5757,8 +6091,7 @@
         }
         /**
          *
-         * @description Reveal the current address. Will throw an error if the address is already revealed.
-         *
+         * @description Reveal the public key of the current address. Will throw an error if the address is already revealed.
          * @returns An operation handle with the result from the rpc node
          *
          * @param RevealParams operation parameter
@@ -5766,6 +6099,21 @@
         reveal(params) {
             return __awaiter(this, void 0, void 0, function* () {
                 const publicKeyHash = yield this.signer.publicKeyHash();
+                const [, pkhPrefix] = utils.b58DecodeAndCheckPrefix(publicKeyHash, utils.publicKeyHashPrefixes);
+                if (pkhPrefix === utils.PrefixV2.BLS12_381PublicKeyHash) {
+                    if (params.proof) {
+                        utils.b58DecodeAndCheckPrefix(params.proof, [utils.PrefixV2.BLS12_381Signature]); // validate proof to be a bls signature
+                    }
+                    else {
+                        const { prefixSig } = yield this.signer.provePossession();
+                        params.proof = prefixSig;
+                    }
+                }
+                else {
+                    if (params.proof) {
+                        throw new core.ProhibitedActionError('Proof field is only allowed to reveal a bls account ');
+                    }
+                }
                 const estimateReveal = yield this.estimator.reveal(params);
                 if (estimateReveal) {
                     const estimated = yield this.estimate(params, () => __awaiter(this, void 0, void 0, function* () { return estimateReveal; }));
@@ -5852,7 +6200,7 @@
                 const publicKeyHash = yield this.signer.publicKeyHash();
                 const sourceValidation = utils.validateAddress((_a = params.source) !== null && _a !== void 0 ? _a : '');
                 if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(params.source, sourceValidation);
                 }
                 const source = (_b = params.source) !== null && _b !== void 0 ? _b : publicKeyHash;
                 const prepared = yield this.prepare.ballot(Object.assign(Object.assign({}, params), { source }));
@@ -5876,7 +6224,7 @@
                 const publicKeyHash = yield this.signer.publicKeyHash();
                 const sourceValidation = utils.validateAddress((_a = params.source) !== null && _a !== void 0 ? _a : '');
                 if (params.source && sourceValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidAddressError(params.source, utils.invalidDetail(sourceValidation));
+                    throw new core.InvalidAddressError(params.source, sourceValidation);
                 }
                 const source = (_b = params.source) !== null && _b !== void 0 ? _b : publicKeyHash;
                 const prepared = yield this.prepare.proposals(Object.assign(Object.assign({}, params), { source }));
@@ -5888,8 +6236,7 @@
         }
         /**
          *
-         * @description Updates the consensus key of the baker to public_key starting from the current cycle plus PRESERVED_CYCLES + 1
-         *
+         * @description Update the consensus key of a delegate starting from the current cycle plus CONSENSUS_RIGHTS_DELAY + 1
          * @returns An operation handle with the result from the rpc node
          *
          * @param UpdateConsensusKeyParams
@@ -5897,6 +6244,17 @@
         updateConsensusKey(params) {
             return __awaiter(this, void 0, void 0, function* () {
                 const publicKeyHash = yield this.signer.publicKeyHash();
+                const [, pkPrefix] = utils.b58DecodeAndCheckPrefix(params.pk, utils.publicKeyPrefixes);
+                if (pkPrefix === utils.PrefixV2.BLS12_381PublicKey) {
+                    if (!params.proof) {
+                        throw new core.InvalidProofError('Proof is required to set a bls account as consensus key ');
+                    }
+                }
+                else {
+                    if (params.proof) {
+                        throw new core.ProhibitedActionError('Proof field is only allowed for a bls account as consensus key');
+                    }
+                }
                 const estimate = yield this.estimate(params, this.estimator.updateConsensusKey.bind(this.estimator));
                 const prepared = yield this.prepare.updateConsensusKey(Object.assign(Object.assign({}, params), estimate));
                 const content = prepared.opOb.contents.find((op) => op.kind === rpc.OpKind.UPDATE_CONSENSUS_KEY);
@@ -5905,6 +6263,31 @@
                 return new UpdateConsensusKeyOperation(hash, content, publicKeyHash, forgedBytes, opResponse, context);
             });
         }
+        /**
+         *
+         * @description Updates the companion key of the delegate starting from the current cycle plus CONSENSUS_KEY_ACTIVATION_DELAY + 1
+         * @returns An operation handle with the result from the rpc node
+         *
+         * @param UpdateCompanionKeyParams
+         */
+        updateCompanionKey(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const publicKeyHash = yield this.signer.publicKeyHash();
+                const [, pkPrefix] = utils.b58DecodeAndCheckPrefix(params.pk, utils.publicKeyPrefixes);
+                if (pkPrefix !== utils.PrefixV2.BLS12_381PublicKey) {
+                    throw new core.ProhibitedActionError('Proof field is only allowed for a bls account as companion key');
+                }
+                if (!params.proof) {
+                    throw new core.InvalidProofError('Proof is required to set a bls account as companion key ');
+                }
+                const estimate = yield this.estimate(params, this.estimator.updateCompanionKey.bind(this.estimator));
+                const prepared = yield this.prepare.updateCompanionKey(Object.assign(Object.assign({}, params), estimate));
+                const content = prepared.opOb.contents.find((op) => op.kind === rpc.OpKind.UPDATE_COMPANION_KEY);
+                const opBytes = yield this.forge(prepared);
+                const { hash, context, forgedBytes, opResponse } = yield this.signAndInject(opBytes);
+                return new UpdateCompanionKeyOperation(hash, content, publicKeyHash, forgedBytes, opResponse, context);
+            });
+        }
         /**
          * @description Adds messages to the rollup inbox that can be executed/claimed after it gets cemented
          * @param SmartRollupAddMessagesParams
@@ -5999,7 +6382,7 @@
             return __awaiter(this, arguments, void 0, function* (address, contractAbstractionComposer = (x) => x) {
                 const addressValidation = utils.validateContractAddress(address);
                 if (addressValidation !== utils.ValidationResult.VALID) {
-                    throw new core.InvalidContractAddressError(address, utils.invalidDetail(addressValidation));
+                    throw new core.InvalidContractAddressError(address, addressValidation);
                 }
                 const rpc = this.context.withExtensions().rpc;
                 const readProvider = this.context.withExtensions().readProvider;
@@ -6636,7 +7019,7 @@
         constructor(context, config = {}) {
             this.context = context;
             this._config$ = new rxjs.BehaviorSubject(Object.assign(Object.assign({}, defaultConfigStreamer), config));
-            this.timer$ = this._config$.pipe(operators.pluck('pollingIntervalMilliseconds'), operators.switchMap((pollingIntervalMilliseconds) => {
+            this.timer$ = this._config$.pipe(operators.map((x) => x === null || x === void 0 ? void 0 : x.pollingIntervalMilliseconds), operators.switchMap((pollingIntervalMilliseconds) => {
                 if (!pollingIntervalMilliseconds) {
                     return rxjs.from(this.getConfirmationPollingInterval()).pipe(operators.switchMap((interval) => {
                         return rxjs.timer(0, interval);
@@ -6646,7 +7029,11 @@
                     return rxjs.timer(0, pollingIntervalMilliseconds);
                 }
             }));
-            this.newBlock$ = this.timer$.pipe(operators.switchMap(() => getLastBlock(this.context)), operators.distinctUntilKeyChanged('hash'), operators.publish(), operators.refCount());
+            this.newBlock$ = this.timer$.pipe(operators.switchMap(() => getLastBlock(this.context)), operators.distinctUntilKeyChanged('hash'), operators.share({
+                resetOnError: false,
+                resetOnComplete: false,
+                resetOnRefCountZero: true,
+            }));
         }
         get config() {
             return this._config$.getValue();
@@ -6678,7 +7065,7 @@
             return new ObservableSubscription(this.newBlock$, this.config.shouldObservableSubscriptionRetry, this.config.observableSubscriptionRetryFunction);
         }
         subscribe(_filter) {
-            return new ObservableSubscription(this.newBlock$.pipe(operators.pluck('hash')), this.config.shouldObservableSubscriptionRetry, this.config.observableSubscriptionRetryFunction);
+            return new ObservableSubscription(this.newBlock$.pipe(operators.map((x) => x === null || x === void 0 ? void 0 : x.hash)), this.config.shouldObservableSubscriptionRetry, this.config.observableSubscriptionRetryFunction);
         }
         subscribeOperation(filter) {
             return new ObservableSubscription(this.newBlock$.pipe(applyFilter(filter)), this.config.shouldObservableSubscriptionRetry, this.config.observableSubscriptionRetryFunction);
@@ -6864,8 +7251,8 @@
 
     // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
     const VERSION = {
-        "commitHash": "f0eb755ed1e0de4d1cd86623df4496f76efd0caf",
-        "version": "22.0.0-beta.0"
+        "commitHash": "13639ef56845fbb7e93bcbd37d3f6d0457b0872b",
+        "version": "23.0.0-RC.0"
     };
 
     /**
@@ -7339,7 +7726,10 @@
     exports.ContractMethod = ContractMethod;
     exports.ContractMethodObject = ContractMethodObject;
     exports.ContractView = ContractView;
+    exports.DEFAULT_FEE = DEFAULT_FEE;
+    exports.DEFAULT_GAS_LIMIT = DEFAULT_GAS_LIMIT;
     exports.DEFAULT_SMART_CONTRACT_METHOD_NAME = DEFAULT_SMART_CONTRACT_METHOD_NAME;
+    exports.DEFAULT_STORAGE_LIMIT = DEFAULT_STORAGE_LIMIT;
     exports.DefaultGlobalConstantsProvider = DefaultGlobalConstantsProvider;
     exports.DelegateOperation = DelegateOperation;
     exports.DelegationWalletOperation = DelegationWalletOperation;
@@ -7391,6 +7781,7 @@
     exports.TransferTicketOperation = TransferTicketOperation;
     exports.TransferTicketWalletOperation = TransferTicketWalletOperation;
     exports.UnconfiguredGlobalConstantsProviderError = UnconfiguredGlobalConstantsProviderError;
+    exports.UpdateCompanionKeyOperation = UpdateCompanionKeyOperation;
     exports.UpdateConsensusKeyOperation = UpdateConsensusKeyOperation;
     exports.VIEW_LAMBDA = VIEW_LAMBDA;
     exports.ViewSimulationError = ViewSimulationError;
@@ -7414,6 +7805,7 @@
     exports.createSmartRollupOriginateOperation = createSmartRollupOriginateOperation;
     exports.createTransferOperation = createTransferOperation;
     exports.createTransferTicketOperation = createTransferTicketOperation;
+    exports.createUpdateCompanionKeyOperation = createUpdateCompanionKeyOperation;
     exports.createUpdateConsensusKeyOperation = createUpdateConsensusKeyOperation;
     exports.defaultConfigConfirmation = defaultConfigConfirmation;
     exports.findWithKind = findWithKind;