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

package/dist/lib/provider.js

@@ -8,6 +8,12 @@ const prepare_1 = require("./contract/prepare");
 const rpc_1 = require("@taquito/rpc");
 const utils_1 = require("@taquito/utils");
 class Provider {
+    clearRpcCache() {
+        const rpc = this.context.rpc;
+        if (typeof rpc.deleteAllCachedData === 'function') {
+            rpc.deleteAllCachedData();
+        }
+    }
     parseRpcErrors(error) {
         if (!(error instanceof http_utils_1.HttpResponseError)) {
             return [];
@@ -43,7 +49,7 @@ class Provider {
             }
         }
     }
-    parseCounterInThePastAdjustments(error) {
+    parseCounterAdjustments(error) {
         return this.parseRpcErrors(error)
             .filter((value) => {
             const id = value.id;
@@ -51,7 +57,8 @@ class Provider {
             const expected = value.expected;
             const found = value.found;
             return (typeof id === 'string' &&
-                id.endsWith('contract.counter_in_the_past') &&
+                (id.endsWith('contract.counter_in_the_past') ||
+                    id.endsWith('contract.counter_in_the_future')) &&
                 typeof contract === 'string' &&
                 typeof expected === 'string' &&
                 typeof found === 'string');
@@ -61,7 +68,7 @@ class Provider {
             expected: BigInt(value.expected),
             found: BigInt(value.found),
         }))
-            .filter((value) => value.expected > value.found);
+            .filter((value) => value.expected !== value.found);
     }
     hasGasLimitTooHighAndBlockExhausted(error) {
         const ids = this.parseRpcErrors(error)
@@ -284,7 +291,7 @@ class Provider {
             };
         }
         catch (error) {
-            const adjustments = this.parseCounterInThePastAdjustments(error);
+            const adjustments = this.parseCounterAdjustments(error);
             const patchedOp = this.patchSimulationCounters(op, adjustments);
             if (patchedOp) {
                 try {
@@ -335,11 +342,21 @@ class Provider {
         return opRequireReveal;
     }
     async signAndInject(forgedBytes) {
-        const signed = await this.signer.sign(forgedBytes.opbytes, new Uint8Array([3]));
-        forgedBytes.opbytes = signed.sbytes;
-        forgedBytes.opOb.signature = signed.prefixSig;
+        let signedForgedBytes = await this.signForgedBytes(forgedBytes);
         const opResponse = [];
-        const results = await this.rpc.preapplyOperations([forgedBytes.opOb]);
+        let results;
+        try {
+            results = await this.rpc.preapplyOperations([signedForgedBytes.opOb]);
+        }
+        catch (error) {
+            const adjustments = this.parseCounterAdjustments(error);
+            const patchedForgedBytes = await this.patchForgedBytesCounters(signedForgedBytes, adjustments);
+            if (!patchedForgedBytes) {
+                throw error;
+            }
+            signedForgedBytes = await this.signForgedBytes(patchedForgedBytes);
+            results = await this.rpc.preapplyOperations([signedForgedBytes.opOb]);
+        }
         if (!Array.isArray(results)) {
             throw new errors_1.TezosPreapplyFailureError(results);
         }
@@ -352,12 +369,67 @@ class Provider {
         if (errors.length) {
             throw new errors_1.TezosOperationError(errors, 'Error occurred during validation simulation of operation', opResponse);
         }
+        const hash = await this.context.injector.inject(signedForgedBytes.opbytes);
+        this.clearRpcCache();
         return {
-            hash: await this.context.injector.inject(forgedBytes.opbytes),
-            forgedBytes,
+            hash,
+            forgedBytes: signedForgedBytes,
             opResponse,
             context: this.context.clone(),
         };
     }
+    async signForgedBytes(forgedBytes) {
+        const signed = await this.signer.sign(forgedBytes.opbytes, new Uint8Array([3]));
+        return {
+            ...forgedBytes,
+            opbytes: signed.sbytes,
+            opOb: {
+                ...forgedBytes.opOb,
+                signature: signed.prefixSig,
+            },
+        };
+    }
+    async patchForgedBytesCounters(forgedBytes, adjustments) {
+        if (adjustments.length === 0 || !Array.isArray(forgedBytes.opOb.contents)) {
+            return;
+        }
+        const branch = forgedBytes.opOb.branch;
+        if (typeof branch !== 'string') {
+            return;
+        }
+        const contents = forgedBytes.opOb.contents.map((content) => ({ ...content }));
+        let patched = false;
+        for (const adjustment of adjustments) {
+            const delta = adjustment.expected - adjustment.found;
+            for (const content of contents) {
+                const source = content.source;
+                const counter = content.counter;
+                if (source !== adjustment.contract || typeof counter === 'undefined') {
+                    continue;
+                }
+                const contentCounter = BigInt(String(counter));
+                if (contentCounter < adjustment.found) {
+                    continue;
+                }
+                content.counter = (contentCounter + delta).toString();
+                patched = true;
+            }
+        }
+        if (!patched) {
+            return;
+        }
+        const unsignedOpBytes = await this.context.forger.forge({
+            branch,
+            contents,
+        });
+        return {
+            ...forgedBytes,
+            opbytes: unsignedOpBytes,
+            opOb: {
+                ...forgedBytes.opOb,
+                contents,
+            },
+        };
+    }
 }
 exports.Provider = Provider;

package/dist/lib/read-provider/interface.js

@@ -1,2 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBlockHashIdentifier = void 0;
+const utils_1 = require("@taquito/utils");
+const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
+const isBlockHashIdentifier = (block) => {
+    return (0, utils_1.validateBlock)(block) === utils_1.ValidationResult.VALID;
+};
+exports.isBlockHashIdentifier = isBlockHashIdentifier;

package/dist/lib/read-provider/rpc-read-adapter.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcReadAdapter = void 0;
+const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 /**
  * Converts calls from TzReadProvider into calls to the wrapped RpcClient in a format it can understand.
  */

package/dist/lib/tz/interface.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcTzProvider = void 0;
+const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 const operations_1 = require("../operations/operations");
 const utils_1 = require("@taquito/utils");
 const core_1 = require("@taquito/core");

package/dist/lib/version.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT!
 exports.VERSION = {
-    "commitHash": "fb73f1546d3dff2fbba7741ca6006680212bef16",
-    "version": "24.3.0-beta.2"
+    "commitHash": "a312cd3f4fc0ab0fb3351bfffe6ad855772cb077",
+    "version": "24.3.0-beta.3"
 };

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OriginationWalletOperation = void 0;
 const rpc_1 = require("@taquito/rpc");
+const interface_1 = require("../read-provider/interface");
 const types_1 = require("../operations/types");
 const operation_1 = require("./operation");
 const errors_1 = require("./errors");
@@ -47,7 +48,10 @@ class OriginationWalletOperation extends operation_1.WalletOperation {
         }
         await this.confirmation();
         const inclusionBlock = await this.getInclusionBlock();
-        return this.context.wallet.at(address, undefined, inclusionBlock.header.level);
+        if (!(0, interface_1.isBlockHashIdentifier)(inclusionBlock.hash)) {
+            throw new errors_1.OriginationWalletOperationError('Inclusion block hash is invalid');
+        }
+        return this.context.wallet.at(address, undefined, inclusionBlock.hash);
     }
 }
 exports.OriginationWalletOperation = OriginationWalletOperation;

package/dist/lib/wallet/receipt.js

@@ -2,20 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.receiptFromOperation = void 0;
 const bignumber_js_1 = require("bignumber.js");
+const BigNumber = bignumber_js_1.default;
 const constants_1 = require("../constants");
 const errors_1 = require("../operations/errors");
 const receiptFromOperation = (op, { ALLOCATION_BURN, ORIGINATION_BURN } = {
     ALLOCATION_BURN: 257,
     ORIGINATION_BURN: 257,
 }) => {
-    bignumber_js_1.default.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: bignumber_js_1.default.ROUND_UP });
+    BigNumber.config({ DECIMAL_PLACES: 0, ROUNDING_MODE: BigNumber.ROUND_UP });
     const operationResults = (0, errors_1.flattenOperationResult)({ contents: op });
-    let totalMilliGas = new bignumber_js_1.default(0);
-    let totalStorage = new bignumber_js_1.default(0);
-    let totalFee = new bignumber_js_1.default(0);
-    let totalOriginationBurn = new bignumber_js_1.default(0);
-    let totalAllocationBurn = new bignumber_js_1.default(0);
-    let totalPaidStorageDiff = new bignumber_js_1.default(0);
+    let totalMilliGas = new BigNumber(0);
+    let totalStorage = new BigNumber(0);
+    let totalFee = new BigNumber(0);
+    let totalOriginationBurn = new BigNumber(0);
+    let totalAllocationBurn = new BigNumber(0);
+    let totalPaidStorageDiff = new BigNumber(0);
     operationResults.forEach((result) => {
         totalFee = totalFee.plus(result.fee || 0);
         totalOriginationBurn = totalOriginationBurn.plus(Array.isArray(result.originated_contracts)
@@ -37,7 +38,7 @@ const receiptFromOperation = (op, { ALLOCATION_BURN, ORIGINATION_BURN } = {
         totalAllocationBurn,
         totalOriginationBurn,
         totalPaidStorageDiff,
-        totalStorageBurn: new bignumber_js_1.default(totalStorage.multipliedBy(constants_1.COST_PER_BYTE)),
+        totalStorageBurn: new BigNumber(totalStorage.multipliedBy(constants_1.COST_PER_BYTE)),
     };
 };
 exports.receiptFromOperation = receiptFromOperation;

package/dist/lib/wallet/wallet.js

@@ -4,8 +4,8 @@ exports.Wallet = exports.WalletOperationBatch = void 0;
 const contract_1 = require("../contract/contract");
 const types_1 = require("../operations/types");
 const core_1 = require("@taquito/core");
-const http_utils_1 = require("@taquito/http-utils");
 const utils_1 = require("@taquito/utils");
+const not_found_retry_1 = require("../contract/not-found-retry");
 class WalletOperationBatch {
     constructor(walletProvider, context) {
         this.walletProvider = walletProvider;
@@ -428,17 +428,28 @@ class Wallet {
             // Newly originated contracts can be visible at the operation's inclusion level in one RPC
             // call and still lag on another endpoint of the same rolling node. Retry at head so
             // wallet op.contract() behaves like octez-client, which resolves the originated contract
-            // after confirmation instead of pinning itself to a stale context forever.
-            if (block !== 'head' &&
-                error instanceof http_utils_1.HttpResponseError &&
-                error.status === http_utils_1.STATUS_CODE.NOT_FOUND) {
-                contractState = await loadContractState('head');
+            // after confirmation instead of pinning itself to a stale context forever. The head index
+            // can lag briefly as well, so bound a few retries there too.
+            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.context.contract, contractState.entrypoints, rpc, readProvider);
+        const abs = new contract_1.ContractAbstraction(address, contractState.script, this, this.context.contract, 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.context.contract, entrypoints, rpc, readProvider, block);
         return contractAbstractionComposer(abs, this.context);
     }
 }