@taquito/taquito 24.3.0-beta.2 → 24.3.0-beta.3

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@24.3.0-beta.2/dist/taquito.min.js"
+<script src="https://unpkg.com/@taquito/taquito@24.3.0-beta.3/dist/taquito.min.js"
 crossorigin="anonymous" integrity="sha384-IxvP0ECHi5oqLyz94wF85pU9+ktcsL1HHtA42MITxZsGbsUMEu/g+0Vkjj5vqiMR"></script>
 ```
 

package/dist/lib/contract/big-map.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BigMapAbstraction = void 0;
+const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 const http_utils_1 = require("@taquito/http-utils");
 class BigMapAbstraction {
-    constructor(id, schema, provider) {
+    constructor(id, schema, provider, defaultBlock) {
         this.id = id;
         this.schema = schema;
         this.provider = provider;
+        this.defaultBlock = defaultBlock;
     }
     /**
      *
@@ -19,7 +22,7 @@ class BigMapAbstraction {
      */
     async get(keyToEncode, block) {
         try {
-            const id = await this.provider.getBigMapKeyByID(this.id.toString(), keyToEncode, this.schema, block);
+            const id = await this.provider.getBigMapKeyByID(this.id.toString(), keyToEncode, this.schema, block ?? this.defaultBlock);
             return id;
         }
         catch (e) {
@@ -45,7 +48,7 @@ class BigMapAbstraction {
      *
      */
     async getMultipleValues(keysToEncode, block, batchSize = 5) {
-        return this.provider.getBigMapKeysByID(this.id.toString(), keysToEncode, this.schema, block, batchSize);
+        return this.provider.getBigMapKeysByID(this.id.toString(), keysToEncode, this.schema, block ?? this.defaultBlock, batchSize);
     }
     toJSON() {
         return this.id.toString();

package/dist/lib/contract/contract.js

@@ -8,6 +8,7 @@ const errors_1 = require("./errors");
 const core_1 = require("@taquito/core");
 const constants_1 = require("./constants");
 Object.defineProperty(exports, "DEFAULT_SMART_CONTRACT_METHOD_NAME", { enumerable: true, get: function () { return constants_1.DEFAULT_SMART_CONTRACT_METHOD_NAME; } });
+const semantic_1 = require("./semantic");
 /**
  * Utility class to retrieve data from a smart contract's storage without incurring fees via a contract's view method
  */
@@ -61,13 +62,14 @@ const isView = (entrypoint) => {
  * Smart contract abstraction
  */
 class ContractAbstraction {
-    constructor(address, script, provider, storageProvider, entrypoints, rpc, readProvider) {
+    constructor(address, script, provider, storageProvider, entrypoints, rpc, readProvider, readBlock = 'head') {
         this.address = address;
         this.script = script;
         this.storageProvider = storageProvider;
         this.entrypoints = entrypoints;
         this.rpc = rpc;
         this.readProvider = readProvider;
+        this.readBlock = readBlock;
         /**
          * Contains methods that are implemented by the target Tezos Smart Contract, and offers the user to call the Smart Contract methods as if they were native TS/JS methods.
          * `methodsObject` serves the exact same purpose as the `methods` member. The difference is that it allows passing the parameter in an object format when calling the smart contract method (instead of the flattened representation)
@@ -151,8 +153,11 @@ class ContractAbstraction {
     /**
      * Return a friendly representation of the smart contract storage
      */
-    storage() {
-        return this.storageProvider.getStorage(this.address, this.schema);
+    async storage() {
+        if (this.readBlock !== 'head') {
+            return this.schema.Execute(this.script.storage, (0, semantic_1.smartContractAbstractionSemantic)(this.storageProvider, this.readBlock));
+        }
+        return this.storageProvider.getStorage(this.address, this.schema, this.readBlock);
     }
 }
 exports.ContractAbstraction = ContractAbstraction;

package/dist/lib/contract/not-found-retry.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.retryOnNotFound = exports.isNotFoundError = void 0;
+const http_utils_1 = require("@taquito/http-utils");
+const CONTRACT_READ_RETRY_DELAYS_MS = [0, 200, 400, 800];
+const sleep = (durationMs) => new Promise((resolve) => {
+    setTimeout(resolve, durationMs);
+});
+const isNotFoundError = (error) => error instanceof http_utils_1.HttpResponseError && error.status === http_utils_1.STATUS_CODE.NOT_FOUND;
+exports.isNotFoundError = isNotFoundError;
+const retryOnNotFound = async (read, retryDelaysMs = CONTRACT_READ_RETRY_DELAYS_MS) => {
+    let lastError;
+    for (const delayMs of retryDelaysMs) {
+        if (delayMs > 0) {
+            await sleep(delayMs);
+        }
+        try {
+            return await read();
+        }
+        catch (error) {
+            if (!(0, exports.isNotFoundError)(error)) {
+                throw error;
+            }
+            lastError = error;
+        }
+    }
+    throw lastError;
+};
+exports.retryOnNotFound = retryOnNotFound;

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

@@ -27,6 +27,7 @@ const smart_rollup_originate_operation_1 = require("../operations/smart-rollup-o
 const smart_rollup_execute_outbox_message_operation_1 = require("../operations/smart-rollup-execute-outbox-message-operation");
 const provider_1 = require("../provider");
 const prepare_1 = require("../prepare");
+const not_found_retry_1 = require("./not-found-retry");
 class RpcContractProvider extends provider_1.Provider {
     constructor(context, estimator) {
         super(context);
@@ -43,12 +44,14 @@ class RpcContractProvider extends provider_1.Provider {
      * @throws {@link InvalidContractAddressError}
      * @see https://tezos.gitlab.io/api/rpc.html#get-block-id-context-contracts-contract-id-script
      */
-    async getStorage(contract, schema) {
+    async getStorage(contract, schema, block = 'head') {
         const contractValidation = (0, utils_1.validateContractAddress)(contract);
         if (contractValidation !== utils_1.ValidationResult.VALID) {
             throw new core_1.InvalidContractAddressError(contract, contractValidation);
         }
-        const script = await this.context.readProvider.getScript(contract, 'head');
+        const script = block === 'head'
+            ? await (0, not_found_retry_1.retryOnNotFound)(() => this.context.readProvider.getScript(contract, 'head'))
+            : await this.context.readProvider.getScript(contract, block);
         if (!schema) {
             schema = script;
         }
@@ -59,7 +62,7 @@ class RpcContractProvider extends provider_1.Provider {
         else {
             contractSchema = michelson_encoder_1.Schema.fromRPCResponse({ script: schema });
         }
-        return contractSchema.Execute(script.storage, (0, semantic_1.smartContractAbstractionSemantic)(this)); // Cast into T because only the caller can know the true type of the storage
+        return contractSchema.Execute(script.storage, (0, semantic_1.smartContractAbstractionSemantic)(this, block)); // Cast into T because only the caller can know the true type of the storage
     }
     /**
      *
@@ -76,10 +79,9 @@ class RpcContractProvider extends provider_1.Provider {
         const { key, type } = schema.EncodeBigMapKey(keyToEncode);
         const { packed } = await this.context.packer.packData({ data: key, type });
         const encodedExpr = (0, utils_1.encodeExpr)(packed);
-        const bigMapValue = block
-            ? await this.context.readProvider.getBigMapValue({ id: id.toString(), expr: encodedExpr }, block)
-            : await this.context.readProvider.getBigMapValue({ id: id.toString(), expr: encodedExpr }, 'head');
-        return schema.ExecuteOnBigMapValue(bigMapValue, (0, semantic_1.smartContractAbstractionSemantic)(this));
+        const requestedBlock = block ?? 'head';
+        const bigMapValue = await this.context.readProvider.getBigMapValue({ id: id.toString(), expr: encodedExpr }, requestedBlock);
+        return schema.ExecuteOnBigMapValue(bigMapValue, (0, semantic_1.smartContractAbstractionSemantic)(this, requestedBlock));
     }
     /**
      *
@@ -139,11 +141,8 @@ class RpcContractProvider extends provider_1.Provider {
      * @param block optional block level to fetch the value from
      *
      */
-    async getSaplingDiffByID(id, block) {
-        const saplingState = block
-            ? await this.context.readProvider.getSaplingDiffById({ id: id.toString() }, block)
-            : await this.context.readProvider.getSaplingDiffById({ id: id.toString() }, 'head');
-        return saplingState;
+    async getSaplingDiffByID(id, block = 'head') {
+        return this.context.readProvider.getSaplingDiffById({ id: id.toString() }, block);
     }
     /**
      *
@@ -643,17 +642,28 @@ class RpcContractProvider extends provider_1.Provider {
         catch (error) {
             // Shadownet's rolling nodes occasionally 404 a just-originated contract at the exact
             // inclusion level even after confirmation. Retry at head so the contract abstraction still
-            // resolves once the node's contract index catches up.
-            if (block !== 'head' &&
-                error instanceof http_utils_1.HttpResponseError &&
-                error.status === http_utils_1.STATUS_CODE.NOT_FOUND) {
-                contractState = await loadContractState('head');
+            // resolves once the node's contract index catches up. The head index can lag briefly too,
+            // so give it a few bounded retries before surfacing the 404.
+            if (block !== 'head' && (0, not_found_retry_1.isNotFoundError)(error)) {
+                contractState = await (0, not_found_retry_1.retryOnNotFound)(() => loadContractState('head'));
             }
             else {
                 throw error;
             }
         }
-        const abs = new contract_1.ContractAbstraction(address, contractState.script, this, this, contractState.entrypoints, rpc, readProvider);
+        const abs = new contract_1.ContractAbstraction(address, contractState.script, this, this, contractState.entrypoints, rpc, readProvider, 'head');
+        return contractAbstractionComposer(abs, this.context);
+    }
+    async atExactBlock(address, contractAbstractionComposer = (x) => x, block) {
+        const addressValidation = (0, utils_1.validateContractAddress)(address);
+        if (addressValidation !== utils_1.ValidationResult.VALID) {
+            throw new core_1.InvalidContractAddressError(address, addressValidation);
+        }
+        const rpc = this.context.withExtensions().rpc;
+        const readProvider = this.context.withExtensions().readProvider;
+        const script = await readProvider.getScript(address, block);
+        const entrypoints = await rpc.getEntrypoints(address, { block: String(block) });
+        const abs = new contract_1.ContractAbstraction(address, script, this, this, entrypoints, rpc, readProvider, block);
         return contractAbstractionComposer(abs, this.context);
     }
     /**

package/dist/lib/contract/sapling-state-abstraction.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SaplingStateAbstraction = void 0;
+const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 class SaplingStateAbstraction {
-    constructor(id, provider) {
+    constructor(id, provider, defaultBlock) {
         this.id = id;
         this.provider = provider;
+        this.defaultBlock = defaultBlock;
     }
     /**
      *
@@ -15,7 +18,7 @@ class SaplingStateAbstraction {
      *
      */
     async getSaplingDiff(block) {
-        return this.provider.getSaplingDiffByID(this.id.toString(), block);
+        return this.provider.getSaplingDiffByID(this.id.toString(), block ?? this.defaultBlock);
     }
     getId() {
         return this.id.toString();

package/dist/lib/contract/semantic.js

@@ -7,10 +7,10 @@ const bignumber_js_1 = require("bignumber.js");
 const sapling_state_abstraction_1 = require("./sapling-state-abstraction");
 /**
  * Override the default michelson encoder semantic to provide richer abstraction over storage properties
- * @param p ContractProvider (contract API)
+ * @param p StorageProvider (contract API)
  */
 // Override the default michelson encoder semantic to provide richer abstraction over storage properties
-const smartContractAbstractionSemantic = (provider) => ({
+const smartContractAbstractionSemantic = (provider, block) => ({
     // Provide a specific abstraction for BigMaps
     big_map: (val, code) => {
         if (!val || !('int' in val) || val.int === undefined) {
@@ -19,7 +19,7 @@ const smartContractAbstractionSemantic = (provider) => ({
         }
         else {
             const schema = new michelson_encoder_1.Schema(code);
-            return new big_map_1.BigMapAbstraction(new bignumber_js_1.default(val.int), schema, provider);
+            return new big_map_1.BigMapAbstraction(new bignumber_js_1.default(val.int), schema, provider, block);
         }
     },
     sapling_state: (val) => {
@@ -28,7 +28,7 @@ const smartContractAbstractionSemantic = (provider) => ({
             return {};
         }
         else {
-            return new sapling_state_abstraction_1.SaplingStateAbstraction(new bignumber_js_1.default(val.int), provider);
+            return new sapling_state_abstraction_1.SaplingStateAbstraction(new bignumber_js_1.default(val.int), provider, block);
         }
     },
     /*

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPCEstimateProvider = void 0;
+const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 const errors_1 = require("../operations/errors");
 const types_1 = require("../operations/types");
 const estimate_1 = require("./estimate");

package/dist/lib/operations/batch-operation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BatchOperation = void 0;
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 const constants_1 = require("../batch/constants");
 const errors_1 = require("./errors");
 const operations_1 = require("./operations");
@@ -50,8 +51,8 @@ class BatchOperation extends operations_1.Operation {
         return this.sumProp(this.params, 'storage_limit');
     }
     get consumedGas() {
-        bignumber_js_1.default.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: bignumber_js_1.default.ROUND_UP });
-        return new bignumber_js_1.default(this.consumedMilliGas).dividedBy(1000).toString();
+        BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: BigNumber.ROUND_UP });
+        return new BigNumber(this.consumedMilliGas).dividedBy(1000).toString();
     }
     get consumedMilliGas() {
         return String(this.sumProp((0, errors_1.flattenOperationResult)({ contents: this.results }), 'consumed_milligas'));

package/dist/lib/operations/delegate-operation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DelegateOperation = void 0;
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.BigNumber;
 const operations_1 = require("./operations");
 /**
  * Delegation operation provide utility function to fetch newly issued delegation
@@ -39,9 +40,9 @@ class DelegateOperation extends operations_1.Operation {
         return Number(this.params.storage_limit);
     }
     get consumedGas() {
-        bignumber_js_1.BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: bignumber_js_1.BigNumber.ROUND_UP });
+        BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: BigNumber.ROUND_UP });
         return this.consumedMilliGas
-            ? new bignumber_js_1.BigNumber(this.consumedMilliGas).dividedBy(1000).toString()
+            ? new BigNumber(this.consumedMilliGas).dividedBy(1000).toString()
             : undefined;
     }
     get consumedMilliGas() {

package/dist/lib/operations/operations.js

@@ -67,6 +67,13 @@ class Operation {
     get includedInBlock() {
         return this._foundAt;
     }
+    async getInclusionBlock() {
+        const inclusionBlock = await this._includedInBlock.pipe((0, operators_1.first)()).toPromise();
+        if (!inclusionBlock) {
+            throw new Error('Inclusion block is undefined');
+        }
+        return inclusionBlock;
+    }
     /**
      *
      * @param hash Operation hash
@@ -80,6 +87,7 @@ class Operation {
         this.results = results;
         this.context = context;
         this._pollingConfig$ = new rxjs_1.ReplaySubject(1);
+        this._includedInBlock = new rxjs_1.ReplaySubject(1);
         this.currentHead$ = this._pollingConfig$.pipe((0, operators_1.switchMap)((config) => {
             return new rxjs_1.BehaviorSubject(config).pipe((0, operators_1.timeout)({
                 each: config.timeout * 1000,
@@ -94,11 +102,13 @@ class Operation {
         // Observable that emit once operation is seen in a block
         this.confirmed$ = this.currentHead$.pipe((0, operators_1.map)((head) => {
             for (let i = 3; i >= 0; i--) {
-                head.operations[i].forEach((op) => {
+                for (const op of head.operations[i]) {
                     if (op.hash === this.hash) {
                         this._foundAt = head.header.level;
+                        this._includedInBlock.next(head);
+                        return this._foundAt;
                     }
-                });
+                }
             }
             if (head.header.level - this._foundAt >= 0) {
                 return this._foundAt;

package/dist/lib/operations/origination-operation.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OriginationOperation = void 0;
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.BigNumber;
+const interface_1 = require("../read-provider/interface");
 const errors_1 = require("./errors");
 const operations_1 = require("./operations");
 const types_1 = require("./types");
@@ -41,9 +43,9 @@ class OriginationOperation extends operations_1.Operation {
         return Number(this.params.storage_limit);
     }
     get consumedGas() {
-        bignumber_js_1.BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: bignumber_js_1.BigNumber.ROUND_UP });
+        BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: BigNumber.ROUND_UP });
         return this.consumedMilliGas
-            ? new bignumber_js_1.BigNumber(this.consumedMilliGas).dividedBy(1000).toString()
+            ? new BigNumber(this.consumedMilliGas).dividedBy(1000).toString()
             : undefined;
     }
     get consumedMilliGas() {
@@ -72,7 +74,11 @@ class OriginationOperation extends operations_1.Operation {
         if (!Number.isFinite(this.includedInBlock)) {
             throw new errors_1.OriginationOperationError('Confirmation completed but includedInBlock was not set');
         }
-        return this.contractProvider.at(this.contractAddress, undefined, this.includedInBlock);
+        const inclusionBlock = await this.getInclusionBlock();
+        if (!(0, interface_1.isBlockHashIdentifier)(inclusionBlock.hash)) {
+            throw new errors_1.OriginationOperationError('Confirmation completed but includedInBlock was not set');
+        }
+        return this.contractProvider.at(this.contractAddress, undefined, inclusionBlock.hash);
     }
 }
 exports.OriginationOperation = OriginationOperation;

package/dist/lib/operations/register-global-constant-operation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegisterGlobalConstantOperation = void 0;
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.BigNumber;
 const operations_1 = require("./operations");
 /**
  * RegisterGlobalConstantOperation provides utility functions to fetch a newly issued operation of kind register_global_constant
@@ -40,9 +41,9 @@ class RegisterGlobalConstantOperation extends operations_1.Operation {
         return this.operationResults?.errors;
     }
     get consumedGas() {
-        bignumber_js_1.BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: bignumber_js_1.BigNumber.ROUND_UP });
+        BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: BigNumber.ROUND_UP });
         return this.consumedMilliGas
-            ? new bignumber_js_1.BigNumber(this.consumedMilliGas).dividedBy(1000).toString()
+            ? new BigNumber(this.consumedMilliGas).dividedBy(1000).toString()
             : undefined;
     }
     get consumedMilliGas() {

package/dist/lib/operations/reveal-operation.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RevealOperation = void 0;
 const core_1 = require("@taquito/core");
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.BigNumber;
 const errors_1 = require("./errors");
 const operations_1 = require("./operations");
 /**
@@ -55,8 +56,8 @@ class RevealOperation extends operations_1.Operation {
         }, 0);
     }
     get consumedGas() {
-        bignumber_js_1.BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: bignumber_js_1.BigNumber.ROUND_UP });
-        return new bignumber_js_1.BigNumber(this.consumedMilliGas).dividedBy(1000).toString();
+        BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: BigNumber.ROUND_UP });
+        return new BigNumber(this.consumedMilliGas).dividedBy(1000).toString();
     }
     get consumedMilliGas() {
         return String(this.sumProp((0, errors_1.flattenOperationResult)({ contents: this.operationResults }), 'consumed_milligas'));

package/dist/lib/operations/transaction-operation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionOperation = void 0;
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 const errors_1 = require("./errors");
 const operations_1 = require("./operations");
 /**
@@ -31,7 +32,7 @@ class TransactionOperation extends operations_1.Operation {
         }
     }
     get amount() {
-        return new bignumber_js_1.default(this.params.amount);
+        return new BigNumber(this.params.amount);
     }
     get destination() {
         return this.params.destination;
@@ -51,8 +52,8 @@ class TransactionOperation extends operations_1.Operation {
         }, 0);
     }
     get consumedGas() {
-        bignumber_js_1.default.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: bignumber_js_1.default.ROUND_UP });
-        return new bignumber_js_1.default(this.consumedMilliGas).dividedBy(1000).toString();
+        BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: BigNumber.ROUND_UP });
+        return new BigNumber(this.consumedMilliGas).dividedBy(1000).toString();
     }
     get consumedMilliGas() {
         return String(this.sumProp((0, errors_1.flattenOperationResult)({ contents: this.operationResults }), 'consumed_milligas'));

package/dist/lib/operations/transfer-ticket-operation.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransferTicketOperation = void 0;
 const rpc_1 = require("@taquito/rpc");
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.BigNumber;
 const operations_1 = require("./operations");
 /**
  *
@@ -35,9 +36,9 @@ class TransferTicketOperation extends operations_1.Operation {
         return Number(this.params.storage_limit);
     }
     get consumedGas() {
-        bignumber_js_1.BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: bignumber_js_1.BigNumber.ROUND_UP });
+        BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: BigNumber.ROUND_UP });
         return this.consumedMilliGas
-            ? new bignumber_js_1.BigNumber(this.consumedMilliGas).dividedBy(1000).toString()
+            ? new BigNumber(this.consumedMilliGas).dividedBy(1000).toString()
             : undefined;
     }
     get consumedMilliGas() {

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

@@ -21,6 +21,7 @@ const core_1 = require("@taquito/core");
 const contract_1 = require("../contract");
 const provider_1 = require("../provider");
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 const utils_1 = require("@taquito/utils");
 const mergeLimits = (userDefinedLimit, defaultLimits) => {
     return {
@@ -48,15 +49,15 @@ class PrepareProvider extends provider_1.Provider {
     async getHeadCounter(pkh) {
         return this.context.readProvider.getCounter(pkh, 'head') ?? '0';
     }
-    adjustGasForManagerOperations(gasLimitBlock, gaslimitOp, opsNeedingGasLimitPatch, explicitGasLimitTotal = new bignumber_js_1.default(0)) {
+    adjustGasForManagerOperations(gasLimitBlock, gaslimitOp, opsNeedingGasLimitPatch, explicitGasLimitTotal = new BigNumber(0)) {
         if (opsNeedingGasLimitPatch <= 0) {
             return gaslimitOp;
         }
         const remainingBlockGas = gasLimitBlock.minus(explicitGasLimitTotal);
         if (remainingBlockGas.lte(0)) {
-            return new bignumber_js_1.default(0);
+            return new BigNumber(0);
         }
-        return bignumber_js_1.default.min(gaslimitOp, remainingBlockGas.div(opsNeedingGasLimitPatch).integerValue(bignumber_js_1.default.ROUND_DOWN));
+        return BigNumber.min(gaslimitOp, remainingBlockGas.div(opsNeedingGasLimitPatch).integerValue(BigNumber.ROUND_DOWN));
     }
     getOperationLimits(constants, options = {}) {
         const { hard_gas_limit_per_operation, hard_gas_limit_per_block, hard_storage_limit_per_operation, } = constants;
@@ -71,7 +72,7 @@ class PrepareProvider extends provider_1.Provider {
         return this.getOperationLimits(constants, {
             opsNeedingGasLimitPatch: typeof gasLimit === 'undefined' ? 1 : 0,
             explicitGasLimitTotal: revealNeeded
-                ? new bignumber_js_1.default((0, constants_1.getRevealGasLimit)(publicKeyHash))
+                ? new BigNumber((0, constants_1.getRevealGasLimit)(publicKeyHash))
                 : undefined,
         });
     }
@@ -901,7 +902,7 @@ class PrepareProvider extends provider_1.Provider {
         const { pkh, publicKey } = await this.getKeys();
         const protocolConstants = await this.context.readProvider.getProtocolConstants('head');
         const revealNeeded = await this.isRevealOpNeeded(batchParams, pkh);
-        const explicitGasLimitTotal = batchParams.reduce((acc, op) => (0, types_1.isOpWithFee)(op) && typeof op.gasLimit !== 'undefined' ? acc.plus(op.gasLimit) : acc, revealNeeded ? new bignumber_js_1.default((0, constants_1.getRevealGasLimit)(pkh)) : new bignumber_js_1.default(0));
+        const explicitGasLimitTotal = batchParams.reduce((acc, op) => (0, types_1.isOpWithFee)(op) && typeof op.gasLimit !== 'undefined' ? acc.plus(op.gasLimit) : acc, revealNeeded ? new BigNumber((0, constants_1.getRevealGasLimit)(pkh)) : new BigNumber(0));
         const DEFAULT_PARAMS = this.getOperationLimits(protocolConstants, {
             opsNeedingGasLimitPatch: batchParams.filter((op) => (0, types_1.isOpWithFee)(op) && typeof op.gasLimit === 'undefined').length,
             explicitGasLimitTotal,