@taquito/taquito 23.0.0-beta.0 → 23.0.0-beta.1

package/README.md

@@ -7,7 +7,7 @@ The `@taquito/taquito` package contains higher-level functionality that builds u
 ## CDN Bundle
 
 ```html
-<script src="https://unpkg.com/@taquito/taquito@23.0.0-beta.0/dist/taquito.min.js"
+<script src="https://unpkg.com/@taquito/taquito@23.0.0-beta.1/dist/taquito.min.js"
 crossorigin="anonymous" integrity="sha384-IxvP0ECHi5oqLyz94wF85pU9+ktcsL1HHtA42MITxZsGbsUMEu/g+0Vkjj5vqiMR"></script>
 ```
 

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

@@ -42,7 +42,7 @@ class OperationBatch extends provider_1.Provider {
             throw new core_1.InvalidAmountError(params.amount.toString());
         }
         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: rpc_1.OpKind.TRANSACTION }, params));
         return this;
@@ -56,7 +56,7 @@ class OperationBatch extends provider_1.Provider {
     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: rpc_1.OpKind.TRANSFER_TICKET }, params));
         return this;
@@ -81,11 +81,11 @@ class OperationBatch extends provider_1.Provider {
         var _a;
         const sourceValidation = (0, utils_1.validateAddress)(params.source);
         if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+            throw new core_1.InvalidAddressError(params.source, sourceValidation);
         }
         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: rpc_1.OpKind.DELEGATION }, params));
         return this;
@@ -100,7 +100,7 @@ class OperationBatch extends provider_1.Provider {
     withActivation({ pkh, secret }) {
         const pkhValidation = (0, utils_1.validateKeyHash)(pkh);
         if (pkhValidation !== utils_1.ValidationResult.VALID) {
-            throw new core_1.InvalidKeyHashError(pkh, (0, utils_1.invalidDetail)(pkhValidation));
+            throw new core_1.InvalidKeyHashError(pkh, pkhValidation);
         }
         this.operations.push({ kind: rpc_1.OpKind.ACTIVATION, pkh, secret });
         return this;
@@ -135,6 +135,44 @@ class OperationBatch extends provider_1.Provider {
         this.operations.push(Object.assign({ kind: rpc_1.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] = (0, utils_1.b58DecodeAndCheckPrefix)(params.pk, utils_1.publicKeyPrefixes);
+        if (pkPrefix === utils_1.PrefixV2.BLS12_381PublicKey) {
+            if (!params.proof) {
+                throw new core_1.InvalidProofError('Proof is required to set a bls account as consensus key ');
+            }
+        }
+        else {
+            if (params.proof) {
+                throw new core_1.ProhibitedActionError('Proof field is only allowed for a bls account as consensus key');
+            }
+        }
+        this.operations.push(Object.assign({ kind: rpc_1.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] = (0, utils_1.b58DecodeAndCheckPrefix)(params.pk, utils_1.publicKeyPrefixes);
+        if (pkPrefix !== utils_1.PrefixV2.BLS12_381PublicKey) {
+            throw new core_1.ProhibitedActionError('companion key must be a bls account');
+        }
+        if (!params.proof) {
+            throw new core_1.InvalidProofError('Proof is required to set a bls account as companion key ');
+        }
+        this.operations.push(Object.assign({ kind: rpc_1.OpKind.UPDATE_COMPANION_KEY }, params));
+        return this;
+    }
     /**
      *
      * @description Add a smart rollup add messages operation to the batch
@@ -178,6 +216,10 @@ class OperationBatch extends provider_1.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/constants.js

@@ -124,7 +124,6 @@ var ChainIds;
     ChainIds["RIONET"] = "NetXPdgaoabtBth";
     ChainIds["SEOULNET"] = "NetXd56aBs1aeW3";
 })(ChainIds || (exports.ChainIds = 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);
 exports.getRevealGasLimit = getRevealGasLimit;
 const getRevealGasLimitInternal = (address) => {
@@ -152,7 +151,7 @@ const getRevealFeeInternal = (address) => {
         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}`);
     }

package/dist/lib/contract/contract.js

@@ -36,7 +36,7 @@ class ContractView {
                 throw new core_1.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_1.ValidationResult.VALID) {
-                throw new core_1.InvalidChainIdError(chainId, (0, utils_1.invalidDetail)(chainIdValidation));
+                throw new core_1.InvalidChainIdError(chainId, chainIdValidation);
             }
             const arg = this.parameterSchema.Encode(...this.args);
             const result = yield this.rpc.runView({

package/dist/lib/contract/prepare.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSmartRollupExecuteOutboxMessageOperation = exports.createSmartRollupOriginateOperation = exports.createSmartRollupAddMessagesOperation = exports.createUpdateConsensusKeyOperation = exports.createProposalsOperation = exports.createBallotOperation = exports.createDrainDelegateOperation = exports.createIncreasePaidStorageOperation = exports.createTransferTicketOperation = exports.createRegisterGlobalConstantOperation = exports.createRevealOperation = exports.createRegisterDelegateOperation = exports.createSetDelegateOperation = exports.createTransferOperation = exports.createOriginationOperation = exports.createActivationOperation = void 0;
+exports.createSmartRollupExecuteOutboxMessageOperation = exports.createSmartRollupOriginateOperation = exports.createSmartRollupAddMessagesOperation = exports.createUpdateCompanionKeyOperation = exports.createUpdateConsensusKeyOperation = exports.createProposalsOperation = exports.createBallotOperation = exports.createDrainDelegateOperation = exports.createIncreasePaidStorageOperation = exports.createTransferTicketOperation = exports.createRegisterGlobalConstantOperation = exports.createRevealOperation = exports.createRegisterDelegateOperation = exports.createSetDelegateOperation = exports.createTransferOperation = exports.createOriginationOperation = exports.createActivationOperation = void 0;
 const michelson_encoder_1 = require("@taquito/michelson-encoder");
 const rpc_1 = require("@taquito/rpc");
 const constants_1 = require("../constants");
@@ -100,7 +100,7 @@ const createRegisterDelegateOperation = (_a, source_1) => __awaiter(void 0, [_a,
     };
 });
 exports.createRegisterDelegateOperation = createRegisterDelegateOperation;
-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_1.OpKind.REVEAL,
         fee,
@@ -108,6 +108,7 @@ const createRevealOperation = (_a, source_1, publicKey_1) => __awaiter(void 0, [
         source,
         gas_limit: gasLimit !== null && gasLimit !== void 0 ? gasLimit : (0, constants_1.getRevealGasLimit)(source),
         storage_limit: storageLimit,
+        proof,
     };
 });
 exports.createRevealOperation = createRevealOperation;
@@ -176,7 +177,7 @@ const createProposalsOperation = (_a) => __awaiter(void 0, [_a], void 0, functio
     };
 });
 exports.createProposalsOperation = createProposalsOperation;
-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_1.OpKind.UPDATE_CONSENSUS_KEY,
         source,
@@ -184,9 +185,22 @@ const createUpdateConsensusKeyOperation = (_a) => __awaiter(void 0, [_a], void 0
         gas_limit: gasLimit,
         storage_limit: storageLimit,
         pk,
+        proof,
     };
 });
 exports.createUpdateConsensusKeyOperation = createUpdateConsensusKeyOperation;
+const createUpdateCompanionKeyOperation = (_a) => __awaiter(void 0, [_a], void 0, function* ({ source, fee, gasLimit, storageLimit, pk, proof, }) {
+    return {
+        kind: rpc_1.OpKind.UPDATE_COMPANION_KEY,
+        source,
+        fee,
+        gas_limit: gasLimit,
+        storage_limit: storageLimit,
+        pk,
+        proof,
+    };
+});
+exports.createUpdateCompanionKeyOperation = createUpdateCompanionKeyOperation;
 const createSmartRollupAddMessagesOperation = (_a) => __awaiter(void 0, [_a], void 0, function* ({ source, fee, gasLimit, storageLimit, message, }) {
     return {
         kind: rpc_1.OpKind.SMART_ROLLUP_ADD_MESSAGES,

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

@@ -30,6 +30,7 @@ const ballot_operation_1 = require("../operations/ballot-operation");
 const drain_delegate_operation_1 = require("../operations/drain-delegate-operation");
 const proposals_operation_1 = require("../operations/proposals-operation");
 const update_consensus_key_operation_1 = require("../operations/update-consensus-key-operation");
+const update_companion_key_operation_1 = require("../operations/update-companion-key-operation");
 const smart_rollup_add_messages_operation_1 = require("../operations/smart-rollup-add-messages-operation");
 const smart_rollup_originate_operation_1 = require("../operations/smart-rollup-originate-operation");
 const smart_rollup_execute_outbox_message_operation_1 = require("../operations/smart-rollup-execute-outbox-message-operation");
@@ -55,7 +56,7 @@ class RpcContractProvider extends provider_1.Provider {
         return __awaiter(this, void 0, void 0, function* () {
             const contractValidation = (0, utils_1.validateContractAddress)(contract);
             if (contractValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidContractAddressError(contract, (0, utils_1.invalidDetail)(contractValidation));
+                throw new core_1.InvalidContractAddressError(contract, contractValidation);
             }
             const script = yield this.context.readProvider.getScript(contract, 'head');
             if (!schema) {
@@ -87,7 +88,7 @@ class RpcContractProvider extends provider_1.Provider {
         return __awaiter(this, void 0, void 0, function* () {
             const contractValidation = (0, utils_1.validateContractAddress)(contract);
             if (contractValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidContractAddressError(contract, (0, utils_1.invalidDetail)(contractValidation));
+                throw new core_1.InvalidContractAddressError(contract, contractValidation);
             }
             if (!schema) {
                 schema = (yield this.rpc.getContract(contract)).script;
@@ -231,11 +232,11 @@ class RpcContractProvider extends provider_1.Provider {
             var _a;
             const sourceValidation = (0, utils_1.validateAddress)(params.source);
             if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+                throw new core_1.InvalidAddressError(params.source, sourceValidation);
             }
             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);
             }
             // Since babylon delegation source cannot smart contract
             if (/^kt1/i.test(params.source)) {
@@ -283,11 +284,11 @@ class RpcContractProvider extends provider_1.Provider {
             var _a;
             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);
             }
             const sourceValidation = (0, utils_1.validateAddress)((_a = params.source) !== null && _a !== void 0 ? _a : '');
             if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+                throw new core_1.InvalidAddressError(params.source, sourceValidation);
             }
             if (params.amount < 0) {
                 throw new core_1.InvalidAmountError(params.amount.toString());
@@ -315,7 +316,7 @@ class RpcContractProvider extends provider_1.Provider {
             var _a;
             const sourceValidation = (0, utils_1.validateAddress)((_a = params.source) !== null && _a !== void 0 ? _a : '');
             if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+                throw new core_1.InvalidAddressError(params.source, sourceValidation);
             }
             if (!params.to) {
                 params.to = params.source;
@@ -351,7 +352,7 @@ class RpcContractProvider extends provider_1.Provider {
             var _a;
             const sourceValidation = (0, utils_1.validateAddress)((_a = params.source) !== null && _a !== void 0 ? _a : '');
             if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+                throw new core_1.InvalidAddressError(params.source, sourceValidation);
             }
             if (!params.to) {
                 params.to = params.source;
@@ -384,7 +385,7 @@ class RpcContractProvider extends provider_1.Provider {
             var _a;
             const sourceValidation = (0, utils_1.validateAddress)((_a = params.source) !== null && _a !== void 0 ? _a : '');
             if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+                throw new core_1.InvalidAddressError(params.source, sourceValidation);
             }
             if (!params.to) {
                 params.to = params.source;
@@ -418,11 +419,11 @@ class RpcContractProvider extends provider_1.Provider {
             var _a, _b;
             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);
             }
             const sourceValidation = (0, utils_1.validateAddress)((_a = params.source) !== null && _a !== void 0 ? _a : '');
             if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+                throw new core_1.InvalidAddressError(params.source, sourceValidation);
             }
             const publicKeyHash = yield this.signer.publicKeyHash();
             const source = (_b = params.source) !== null && _b !== void 0 ? _b : publicKeyHash;
@@ -437,7 +438,6 @@ class RpcContractProvider extends provider_1.Provider {
     /**
      *
      * @description Reveal the public key of the current address. Will throw an error if the address is already revealed.
-     * @remarks Reveal tz4 address is not included in the current beta release for protocol Seoul (still a work in progress)
      * @returns An operation handle with the result from the rpc node
      *
      * @param RevealParams operation parameter
@@ -445,6 +445,21 @@ class RpcContractProvider extends provider_1.Provider {
     reveal(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const publicKeyHash = yield this.signer.publicKeyHash();
+            const [, pkhPrefix] = (0, utils_1.b58DecodeAndCheckPrefix)(publicKeyHash, utils_1.publicKeyHashPrefixes);
+            if (pkhPrefix === utils_1.PrefixV2.BLS12_381PublicKeyHash) {
+                if (params.proof) {
+                    (0, utils_1.b58DecodeAndCheckPrefix)(params.proof, [utils_1.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_1.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; }));
@@ -531,7 +546,7 @@ class RpcContractProvider extends provider_1.Provider {
             const publicKeyHash = yield this.signer.publicKeyHash();
             const sourceValidation = (0, utils_1.validateAddress)((_a = params.source) !== null && _a !== void 0 ? _a : '');
             if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+                throw new core_1.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 }));
@@ -555,7 +570,7 @@ class RpcContractProvider extends provider_1.Provider {
             const publicKeyHash = yield this.signer.publicKeyHash();
             const sourceValidation = (0, utils_1.validateAddress)((_a = params.source) !== null && _a !== void 0 ? _a : '');
             if (params.source && sourceValidation !== utils_1.ValidationResult.VALID) {
-                throw new core_1.InvalidAddressError(params.source, (0, utils_1.invalidDetail)(sourceValidation));
+                throw new core_1.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 }));
@@ -567,8 +582,7 @@ class RpcContractProvider extends provider_1.Provider {
     }
     /**
      *
-     * @description Updates the consensus key of the baker to public_key starting from the current cycle plus PRESERVED_CYCLES + 1
-     * @remarks updateConsensusKey to a tz4 address is not included in the current beta release for protocol Seoul (still a work in progress)
+     * @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
@@ -576,6 +590,17 @@ class RpcContractProvider extends provider_1.Provider {
     updateConsensusKey(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const publicKeyHash = yield this.signer.publicKeyHash();
+            const [, pkPrefix] = (0, utils_1.b58DecodeAndCheckPrefix)(params.pk, utils_1.publicKeyPrefixes);
+            if (pkPrefix === utils_1.PrefixV2.BLS12_381PublicKey) {
+                if (!params.proof) {
+                    throw new core_1.InvalidProofError('Proof is required to set a bls account as consensus key ');
+                }
+            }
+            else {
+                if (params.proof) {
+                    throw new core_1.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_1.OpKind.UPDATE_CONSENSUS_KEY);
@@ -584,6 +609,31 @@ class RpcContractProvider extends provider_1.Provider {
             return new update_consensus_key_operation_1.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] = (0, utils_1.b58DecodeAndCheckPrefix)(params.pk, utils_1.publicKeyPrefixes);
+            if (pkPrefix !== utils_1.PrefixV2.BLS12_381PublicKey) {
+                throw new core_1.ProhibitedActionError('Proof field is only allowed for a bls account as companion key');
+            }
+            if (!params.proof) {
+                throw new core_1.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_1.OpKind.UPDATE_COMPANION_KEY);
+            const opBytes = yield this.forge(prepared);
+            const { hash, context, forgedBytes, opResponse } = yield this.signAndInject(opBytes);
+            return new update_companion_key_operation_1.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
@@ -678,7 +728,7 @@ class RpcContractProvider extends provider_1.Provider {
         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;