starknet 3.7.0 → 3.8.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [3.8.0](https://github.com/seanjameshan/starknet.js/compare/v3.7.0...v3.8.0) (2022-04-04)
+
+### Bug Fixes
+
+- getBlock should not default to pending block ([7a641b5](https://github.com/seanjameshan/starknet.js/commit/7a641b55c3c762dada70814bf509b147f0cd315e))
+
+### Features
+
+- complete interface ([39d2f05](https://github.com/seanjameshan/starknet.js/commit/39d2f0574691e4b37a6050831b4e548b07a8e3e3))
+- default estimateFee to pending block ([719dda5](https://github.com/seanjameshan/starknet.js/commit/719dda5f33a2bed353bd1bf311a2baf3110d1654))
+- default to pending block ([d3c1bdc](https://github.com/seanjameshan/starknet.js/commit/d3c1bdcdca996bce273673cf9c8220156e965863))
+- pending as success ([9e79288](https://github.com/seanjameshan/starknet.js/commit/9e7928845cc1e7088ba9a8dc9ba8fb9311970440))
+
 # [3.7.0](https://github.com/seanjameshan/starknet.js/compare/v3.6.0...v3.7.0) (2022-03-24)
 
 ### Features

package/account/default.d.ts

@@ -1,4 +1,5 @@
 import { Provider } from '../provider';
+import { BlockIdentifier } from '../provider/utils';
 import { SignerInterface } from '../signer';
 import {
   Abi,
@@ -18,7 +19,16 @@ export declare class Account extends Provider implements AccountInterface {
   private signer;
   constructor(provider: Provider, address: string, keyPairOrSigner: KeyPair | SignerInterface);
   getNonce(): Promise<string>;
-  estimateFee(calls: Call | Call[]): Promise<EstimateFeeResponse>;
+  estimateFee(
+    calls: Call | Call[],
+    {
+      nonce: providedNonce,
+      blockIdentifier,
+    }?: {
+      nonce?: BigNumberish;
+      blockIdentifier?: BlockIdentifier;
+    }
+  ): Promise<EstimateFeeResponse>;
   /**
    * Invoke execute function in account contract
    *

package/account/default.js

@@ -234,24 +234,35 @@ var Account = /** @class */ (function (_super) {
       });
     });
   };
-  Account.prototype.estimateFee = function (calls) {
+  Account.prototype.estimateFee = function (calls, _a) {
+    var _b = _a === void 0 ? {} : _a,
+      providedNonce = _b.nonce,
+      _c = _b.blockIdentifier,
+      blockIdentifier = _c === void 0 ? 'pending' : _c;
     return __awaiter(this, void 0, void 0, function () {
-      var transactions, nonce, signerDetails, signature, calldata;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
+      var transactions, nonce, _d, signerDetails, signature, calldata;
+      return __generator(this, function (_e) {
+        switch (_e.label) {
           case 0:
             transactions = Array.isArray(calls) ? calls : [calls];
-            return [4 /*yield*/, this.getNonce()];
+            if (!(providedNonce !== null && providedNonce !== void 0)) return [3 /*break*/, 1];
+            _d = providedNonce;
+            return [3 /*break*/, 3];
           case 1:
-            nonce = _a.sent();
+            return [4 /*yield*/, this.getNonce()];
+          case 2:
+            _d = _e.sent();
+            _e.label = 3;
+          case 3:
+            nonce = _d;
             signerDetails = {
               walletAddress: this.address,
               nonce: (0, number_1.toBN)(nonce),
               maxFee: (0, number_1.toBN)('0'),
             };
             return [4 /*yield*/, this.signer.signTransaction(transactions, signerDetails)];
-          case 2:
-            signature = _a.sent();
+          case 4:
+            signature = _e.sent();
             calldata = __spreadArray(
               __spreadArray(
                 [],
@@ -263,12 +274,16 @@ var Account = /** @class */ (function (_super) {
             );
             return [
               2 /*return*/,
-              this.fetchEndpoint('estimate_fee', undefined, {
-                contract_address: this.address,
-                entry_point_selector: (0, hash_1.getSelectorFromName)('__execute__'),
-                calldata: calldata,
-                signature: (0, number_1.bigNumberishArrayToDecimalStringArray)(signature),
-              }),
+              this.fetchEndpoint(
+                'estimate_fee',
+                { blockIdentifier: blockIdentifier },
+                {
+                  contract_address: this.address,
+                  entry_point_selector: (0, hash_1.getSelectorFromName)('__execute__'),
+                  calldata: calldata,
+                  signature: (0, number_1.bigNumberishArrayToDecimalStringArray)(signature),
+                }
+              ),
             ];
         }
       });
@@ -313,7 +328,7 @@ var Account = /** @class */ (function (_super) {
             _e = _b;
             return [3 /*break*/, 6];
           case 4:
-            return [4 /*yield*/, this.estimateFee(transactions)];
+            return [4 /*yield*/, this.estimateFee(transactions, { nonce: nonce })];
           case 5:
             _e = _f.sent().amount;
             _f.label = 6;

package/contract/default.d.ts

@@ -1,5 +1,6 @@
 import { AccountInterface } from '../account';
 import { ProviderInterface } from '../provider';
+import { BlockIdentifier } from '../provider/utils';
 import {
   Abi,
   AbiEntry,
@@ -9,6 +10,7 @@ import {
   Calldata,
   ContractFunction,
   Invocation,
+  Overrides,
   ParsedStruct,
   Result,
   StructAbi,
@@ -136,8 +138,16 @@ export declare class Contract implements ContractInterface {
    * @return - parsed response corresponding to the abi
    */
   protected parseResponse(method: string, response: string[]): Result;
-  invoke(method: string, args?: Array<any>): Promise<AddTransactionResponse>;
-  call(method: string, args?: Array<any>): Promise<Result>;
+  invoke(method: string, args?: Array<any>, options?: Overrides): Promise<AddTransactionResponse>;
+  call(
+    method: string,
+    args?: Array<any>,
+    {
+      blockIdentifier,
+    }?: {
+      blockIdentifier?: BlockIdentifier;
+    }
+  ): Promise<Result>;
   estimate(method: string, args?: Array<any>): Promise<import('../types').EstimateFeeResponse>;
   populate(method: string, args?: Array<any>): Invocation;
 }

package/contract/default.js

@@ -705,10 +705,13 @@ var Contract = /** @class */ (function () {
       return acc;
     }, []);
   };
-  Contract.prototype.invoke = function (method, args) {
+  Contract.prototype.invoke = function (method, args, options) {
     if (args === void 0) {
       args = [];
     }
+    if (options === void 0) {
+      options = {};
+    }
     // ensure contract is connected
     (0, minimalistic_assert_1.default)(
       this.address !== null,
@@ -725,10 +728,6 @@ var Contract = /** @class */ (function () {
       }
       return acc;
     }, 0);
-    var overrides = {};
-    if (args.length === inputsLength + 1 && Array.isArray(args[args.length - 1])) {
-      Object.assign(overrides, args.pop());
-    }
     if (args.length !== inputsLength) {
       throw Error(
         'Invalid number of arguments, expected ' +
@@ -746,22 +745,25 @@ var Contract = /** @class */ (function () {
     };
     if ('execute' in this.providerOrAccount) {
       return this.providerOrAccount.execute(invocation, undefined, {
-        maxFee: overrides.maxFee,
-        nonce: overrides.nonce,
+        maxFee: options.maxFee,
+        nonce: options.nonce,
       });
     }
     return this.providerOrAccount.invokeFunction(
-      __assign(__assign({}, invocation), { signature: overrides.signature || [] })
+      __assign(__assign({}, invocation), { signature: options.signature || [] })
     );
   };
-  Contract.prototype.call = function (method, args) {
+  Contract.prototype.call = function (method, args, _a) {
     if (args === void 0) {
       args = [];
     }
+    var _b = _a === void 0 ? {} : _a,
+      _c = _b.blockIdentifier,
+      blockIdentifier = _c === void 0 ? 'pending' : _c;
     return __awaiter(this, void 0, void 0, function () {
-      var inputs, inputsLength, options, calldata;
+      var inputs, calldata;
       var _this = this;
-      return __generator(this, function (_a) {
+      return __generator(this, function (_d) {
         // ensure contract is connected
         (0,
         minimalistic_assert_1.default)(this.address !== null, 'contract isnt connected to an address');
@@ -770,13 +772,6 @@ var Contract = /** @class */ (function () {
         inputs = this.abi.find(function (abi) {
           return abi.name === method;
         }).inputs;
-        inputsLength = inputs.length;
-        options = {
-          blockIdentifier: null,
-        };
-        if (args.length === inputsLength + 1 && typeof args[args.length - 1] === 'object') {
-          Object.assign(options, args.pop());
-        }
         calldata = this.compileCalldata(args, inputs);
         return [
           2 /*return*/,
@@ -787,7 +782,7 @@ var Contract = /** @class */ (function () {
                 calldata: calldata,
                 entrypoint: method,
               },
-              options
+              { blockIdentifier: blockIdentifier }
             )
             .then(function (x) {
               return _this.parseResponse(method, x.result);

package/contract/interface.d.ts

@@ -1,11 +1,13 @@
 import { AccountInterface } from '../account';
 import { ProviderInterface } from '../provider';
+import { BlockIdentifier } from '../provider/utils';
 import {
   Abi,
   AddTransactionResponse,
   AsyncContractFunction,
   ContractFunction,
   Invocation,
+  Overrides,
   Result,
 } from '../types';
 export declare abstract class ContractInterface {
@@ -52,7 +54,13 @@ export declare abstract class ContractInterface {
    * @param args Array of the arguments for the call
    * @returns Result of the call as an array with key value pars
    */
-  abstract call(method: string, args?: Array<any>): Promise<Result>;
+  abstract call(
+    method: string,
+    args?: Array<any>,
+    options?: {
+      blockIdentifier?: BlockIdentifier;
+    }
+  ): Promise<Result>;
   /**
    * Invokes a method on a contract
    *
@@ -60,14 +68,24 @@ export declare abstract class ContractInterface {
    * @param args Array of the arguments for the invoke
    * @returns Add Transaction Response
    */
-  abstract invoke(method: string, args?: Array<any>): Promise<AddTransactionResponse>;
+  abstract invoke(
+    method: string,
+    args?: Array<any>,
+    options?: Overrides
+  ): Promise<AddTransactionResponse>;
   /**
    * Calls a method on a contract
    *
    * @param method name of the method
    * @param args Array of the arguments for the call
    */
-  abstract estimate(method: string, args?: Array<any>): Promise<any>;
+  abstract estimate(
+    method: string,
+    args?: Array<any>,
+    options?: {
+      blockIdentifier?: BlockIdentifier;
+    }
+  ): Promise<any>;
   /**
    * Calls a method on a contract
    *

package/dist/account/default.d.ts

@@ -1,4 +1,5 @@
 import { Provider } from '../provider';
+import { BlockIdentifier } from '../provider/utils';
 import { SignerInterface } from '../signer';
 import { Abi, AddTransactionResponse, Call, EstimateFeeResponse, InvocationsDetails, KeyPair, Signature, Transaction } from '../types';
 import { BigNumberish } from '../utils/number';
@@ -9,7 +10,10 @@ export declare class Account extends Provider implements AccountInterface {
     private signer;
     constructor(provider: Provider, address: string, keyPairOrSigner: KeyPair | SignerInterface);
     getNonce(): Promise<string>;
-    estimateFee(calls: Call | Call[]): Promise<EstimateFeeResponse>;
+    estimateFee(calls: Call | Call[], { nonce: providedNonce, blockIdentifier, }?: {
+        nonce?: BigNumberish;
+        blockIdentifier?: BlockIdentifier;
+    }): Promise<EstimateFeeResponse>;
     /**
      * Invoke execute function in account contract
      *

package/dist/account/default.js

@@ -114,26 +114,33 @@ var Account = /** @class */ (function (_super) {
             });
         });
     };
-    Account.prototype.estimateFee = function (calls) {
+    Account.prototype.estimateFee = function (calls, _a) {
+        var _b = _a === void 0 ? {} : _a, providedNonce = _b.nonce, _c = _b.blockIdentifier, blockIdentifier = _c === void 0 ? 'pending' : _c;
         return __awaiter(this, void 0, void 0, function () {
-            var transactions, nonce, signerDetails, signature, calldata;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var transactions, nonce, _d, signerDetails, signature, calldata;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         transactions = Array.isArray(calls) ? calls : [calls];
-                        return [4 /*yield*/, this.getNonce()];
-                    case 1:
-                        nonce = _a.sent();
+                        if (!(providedNonce !== null && providedNonce !== void 0)) return [3 /*break*/, 1];
+                        _d = providedNonce;
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, this.getNonce()];
+                    case 2:
+                        _d = (_e.sent());
+                        _e.label = 3;
+                    case 3:
+                        nonce = _d;
                         signerDetails = {
                             walletAddress: this.address,
                             nonce: (0, number_1.toBN)(nonce),
                             maxFee: (0, number_1.toBN)('0'),
                         };
                         return [4 /*yield*/, this.signer.signTransaction(transactions, signerDetails)];
-                    case 2:
-                        signature = _a.sent();
+                    case 4:
+                        signature = _e.sent();
                         calldata = __spreadArray(__spreadArray([], __read((0, transaction_1.fromCallsToExecuteCalldata)(transactions)), false), [signerDetails.nonce.toString()], false);
-                        return [2 /*return*/, this.fetchEndpoint('estimate_fee', undefined, {
+                        return [2 /*return*/, this.fetchEndpoint('estimate_fee', { blockIdentifier: blockIdentifier }, {
                                 contract_address: this.address,
                                 entry_point_selector: (0, hash_1.getSelectorFromName)('__execute__'),
                                 calldata: calldata,
@@ -174,7 +181,7 @@ var Account = /** @class */ (function (_super) {
                         if (!((_b = transactionsDetail.maxFee) !== null && _b !== void 0)) return [3 /*break*/, 4];
                         _e = _b;
                         return [3 /*break*/, 6];
-                    case 4: return [4 /*yield*/, this.estimateFee(transactions)];
+                    case 4: return [4 /*yield*/, this.estimateFee(transactions, { nonce: nonce })];
                     case 5:
                         _e = (_f.sent()).amount;
                         _f.label = 6;

package/dist/contract/default.d.ts

@@ -1,6 +1,7 @@
 import { AccountInterface } from '../account';
 import { ProviderInterface } from '../provider';
-import { Abi, AbiEntry, AddTransactionResponse, Args, AsyncContractFunction, Calldata, ContractFunction, Invocation, ParsedStruct, Result, StructAbi } from '../types';
+import { BlockIdentifier } from '../provider/utils';
+import { Abi, AbiEntry, AddTransactionResponse, Args, AsyncContractFunction, Calldata, ContractFunction, Invocation, Overrides, ParsedStruct, Result, StructAbi } from '../types';
 import { BigNumberish } from '../utils/number';
 import { ContractInterface } from './interface';
 export declare class Contract implements ContractInterface {
@@ -114,8 +115,10 @@ export declare class Contract implements ContractInterface {
      * @return - parsed response corresponding to the abi
      */
     protected parseResponse(method: string, response: string[]): Result;
-    invoke(method: string, args?: Array<any>): Promise<AddTransactionResponse>;
-    call(method: string, args?: Array<any>): Promise<Result>;
+    invoke(method: string, args?: Array<any>, options?: Overrides): Promise<AddTransactionResponse>;
+    call(method: string, args?: Array<any>, { blockIdentifier, }?: {
+        blockIdentifier?: BlockIdentifier;
+    }): Promise<Result>;
     estimate(method: string, args?: Array<any>): Promise<import("../types").EstimateFeeResponse>;
     populate(method: string, args?: Array<any>): Invocation;
 }

package/dist/contract/default.js

@@ -550,8 +550,9 @@ var Contract = /** @class */ (function () {
             return acc;
         }, []);
     };
-    Contract.prototype.invoke = function (method, args) {
+    Contract.prototype.invoke = function (method, args, options) {
         if (args === void 0) { args = []; }
+        if (options === void 0) { options = {}; }
         // ensure contract is connected
         (0, minimalistic_assert_1.default)(this.address !== null, 'contract isnt connected to an address');
         // validate method and args
@@ -563,10 +564,6 @@ var Contract = /** @class */ (function () {
             }
             return acc;
         }, 0);
-        var overrides = {};
-        if (args.length === inputsLength + 1 && Array.isArray(args[args.length - 1])) {
-            Object.assign(overrides, args.pop());
-        }
         if (args.length !== inputsLength) {
             throw Error("Invalid number of arguments, expected " + inputsLength + " arguments, but got " + args.length);
         }
@@ -579,37 +576,31 @@ var Contract = /** @class */ (function () {
         };
         if ('execute' in this.providerOrAccount) {
             return this.providerOrAccount.execute(invocation, undefined, {
-                maxFee: overrides.maxFee,
-                nonce: overrides.nonce,
+                maxFee: options.maxFee,
+                nonce: options.nonce,
             });
         }
-        return this.providerOrAccount.invokeFunction(__assign(__assign({}, invocation), { signature: overrides.signature || [] }));
+        return this.providerOrAccount.invokeFunction(__assign(__assign({}, invocation), { signature: options.signature || [] }));
     };
-    Contract.prototype.call = function (method, args) {
+    Contract.prototype.call = function (method, args, _a) {
         if (args === void 0) { args = []; }
+        var _b = _a === void 0 ? {} : _a, _c = _b.blockIdentifier, blockIdentifier = _c === void 0 ? 'pending' : _c;
         return __awaiter(this, void 0, void 0, function () {
-            var inputs, inputsLength, options, calldata;
+            var inputs, calldata;
             var _this = this;
-            return __generator(this, function (_a) {
+            return __generator(this, function (_d) {
                 // ensure contract is connected
                 (0, minimalistic_assert_1.default)(this.address !== null, 'contract isnt connected to an address');
                 // validate method and args
                 this.validateMethodAndArgs('CALL', method, args);
                 inputs = this.abi.find(function (abi) { return abi.name === method; }).inputs;
-                inputsLength = inputs.length;
-                options = {
-                    blockIdentifier: null,
-                };
-                if (args.length === inputsLength + 1 && typeof args[args.length - 1] === 'object') {
-                    Object.assign(options, args.pop());
-                }
                 calldata = this.compileCalldata(args, inputs);
                 return [2 /*return*/, this.providerOrAccount
                         .callContract({
                         contractAddress: this.address,
                         calldata: calldata,
                         entrypoint: method,
-                    }, options)
+                    }, { blockIdentifier: blockIdentifier })
                         .then(function (x) { return _this.parseResponse(method, x.result); })];
             });
         });

package/dist/contract/interface.d.ts

@@ -1,6 +1,7 @@
 import { AccountInterface } from '../account';
 import { ProviderInterface } from '../provider';
-import { Abi, AddTransactionResponse, AsyncContractFunction, ContractFunction, Invocation, Result } from '../types';
+import { BlockIdentifier } from '../provider/utils';
+import { Abi, AddTransactionResponse, AsyncContractFunction, ContractFunction, Invocation, Overrides, Result } from '../types';
 export declare abstract class ContractInterface {
     abstract abi: Abi;
     abstract address: string;
@@ -45,7 +46,9 @@ export declare abstract class ContractInterface {
      * @param args Array of the arguments for the call
      * @returns Result of the call as an array with key value pars
      */
-    abstract call(method: string, args?: Array<any>): Promise<Result>;
+    abstract call(method: string, args?: Array<any>, options?: {
+        blockIdentifier?: BlockIdentifier;
+    }): Promise<Result>;
     /**
      * Invokes a method on a contract
      *
@@ -53,14 +56,16 @@ export declare abstract class ContractInterface {
      * @param args Array of the arguments for the invoke
      * @returns Add Transaction Response
      */
-    abstract invoke(method: string, args?: Array<any>): Promise<AddTransactionResponse>;
+    abstract invoke(method: string, args?: Array<any>, options?: Overrides): Promise<AddTransactionResponse>;
     /**
      * Calls a method on a contract
      *
      * @param method name of the method
      * @param args Array of the arguments for the call
      */
-    abstract estimate(method: string, args?: Array<any>): Promise<any>;
+    abstract estimate(method: string, args?: Array<any>, options?: {
+        blockIdentifier?: BlockIdentifier;
+    }): Promise<any>;
     /**
      * Calls a method on a contract
      *

package/dist/provider/default.d.ts

@@ -36,8 +36,8 @@ export declare class Provider implements ProviderInterface {
      * @param blockNumber
      * @returns the result of the function on the smart contract.
      */
-    callContract({ contractAddress, entrypoint, calldata }: Call, options?: {
-        blockIdentifier: BlockIdentifier;
+    callContract({ contractAddress, entrypoint, calldata }: Call, { blockIdentifier }?: {
+        blockIdentifier?: BlockIdentifier;
     }): Promise<CallContractResponse>;
     /**
      * Gets the block information

package/dist/provider/default.js

@@ -219,12 +219,12 @@ var Provider = /** @class */ (function () {
      * @param blockNumber
      * @returns the result of the function on the smart contract.
      */
-    Provider.prototype.callContract = function (_a, options) {
-        var contractAddress = _a.contractAddress, entrypoint = _a.entrypoint, _b = _a.calldata, calldata = _b === void 0 ? [] : _b;
-        if (options === void 0) { options = { blockIdentifier: null }; }
+    Provider.prototype.callContract = function (_a, _b) {
+        var contractAddress = _a.contractAddress, entrypoint = _a.entrypoint, _c = _a.calldata, calldata = _c === void 0 ? [] : _c;
+        var _d = _b === void 0 ? {} : _b, _e = _d.blockIdentifier, blockIdentifier = _e === void 0 ? 'pending' : _e;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_c) {
-                return [2 /*return*/, this.fetchEndpoint('call_contract', options, {
+            return __generator(this, function (_f) {
+                return [2 /*return*/, this.fetchEndpoint('call_contract', { blockIdentifier: blockIdentifier }, {
                         signature: [],
                         contract_address: contractAddress,
                         entry_point_selector: (0, hash_1.getSelectorFromName)(entrypoint),
@@ -261,7 +261,7 @@ var Provider = /** @class */ (function () {
      * @returns Bytecode and ABI of compiled contract
      */
     Provider.prototype.getCode = function (contractAddress, blockIdentifier) {
-        if (blockIdentifier === void 0) { blockIdentifier = null; }
+        if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.fetchEndpoint('get_code', { blockIdentifier: blockIdentifier, contractAddress: contractAddress })];
@@ -281,7 +281,7 @@ var Provider = /** @class */ (function () {
      * @returns the value of the storage variable
      */
     Provider.prototype.getStorageAt = function (contractAddress, key, blockIdentifier) {
-        if (blockIdentifier === void 0) { blockIdentifier = null; }
+        if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.fetchEndpoint('get_storage_at', { blockIdentifier: blockIdentifier, contractAddress: contractAddress, key: key })];
@@ -402,29 +402,28 @@ var Provider = /** @class */ (function () {
     Provider.prototype.waitForTransaction = function (txHash, retryInterval) {
         if (retryInterval === void 0) { retryInterval = 8000; }
         return __awaiter(this, void 0, void 0, function () {
-            var onchain, res, message, error;
+            var onchain, res, successStates, errorStates, message, error;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         onchain = false;
-                        return [4 /*yield*/, wait(retryInterval)];
+                        _a.label = 1;
                     case 1:
-                        _a.sent();
-                        _a.label = 2;
-                    case 2:
-                        if (!!onchain) return [3 /*break*/, 5];
+                        if (!!onchain) return [3 /*break*/, 4];
                         // eslint-disable-next-line no-await-in-loop
                         return [4 /*yield*/, wait(retryInterval)];
-                    case 3:
+                    case 2:
                         // eslint-disable-next-line no-await-in-loop
                         _a.sent();
                         return [4 /*yield*/, this.getTransactionStatus(txHash)];
-                    case 4:
+                    case 3:
                         res = _a.sent();
-                        if (res.tx_status === 'ACCEPTED_ON_L1' || res.tx_status === 'ACCEPTED_ON_L2') {
+                        successStates = ['ACCEPTED_ON_L1', 'ACCEPTED_ON_L2', 'PENDING'];
+                        errorStates = ['REJECTED', 'NOT_RECEIVED'];
+                        if (successStates.includes(res.tx_status)) {
                             onchain = true;
                         }
-                        else if (res.tx_status === 'REJECTED' || res.tx_status === 'NOT_RECEIVED') {
+                        else if (errorStates.includes(res.tx_status)) {
                             message = res.tx_failure_reason
                                 ? res.tx_status + ": " + res.tx_failure_reason.code + "\n" + res.tx_failure_reason.error_message
                                 : res.tx_status;
@@ -432,8 +431,8 @@ var Provider = /** @class */ (function () {
                             error.response = res;
                             throw error;
                         }
-                        return [3 /*break*/, 2];
-                    case 5: return [2 /*return*/];
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/];
                 }
             });
         });

package/dist/provider/utils.d.ts

@@ -35,8 +35,7 @@ export declare function getBlockIdentifier(blockIdentifier: BlockIdentifier): Bl
  *
  * [Reference](https://github.com/starkware-libs/cairo-lang/blob/fc97bdd8322a7df043c87c371634b26c15ed6cee/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L164-L173)
  *
- * @param blockNumber
- * @param blockHash
+ * @param blockIdentifier
  * @returns block identifier for API request
  */
 export declare function getFormattedBlockIdentifier(blockIdentifier?: BlockIdentifier): string;

package/dist/provider/utils.js

@@ -36,6 +36,12 @@ exports.txIdentifier = txIdentifier;
  * @returns block identifier object
  */
 function getBlockIdentifier(blockIdentifier) {
+    if (blockIdentifier === null) {
+        return { type: 'BLOCK_NUMBER', data: null };
+    }
+    if (blockIdentifier === 'pending') {
+        return { type: 'BLOCK_NUMBER', data: 'pending' };
+    }
     if (typeof blockIdentifier === 'number') {
         return { type: 'BLOCK_NUMBER', data: blockIdentifier };
     }
@@ -45,12 +51,6 @@ function getBlockIdentifier(blockIdentifier) {
     if (typeof blockIdentifier === 'string' && !Number.isNaN(parseInt(blockIdentifier, 10))) {
         return { type: 'BLOCK_NUMBER', data: parseInt(blockIdentifier, 10) };
     }
-    if (blockIdentifier === null) {
-        return { type: 'BLOCK_NUMBER', data: null };
-    }
-    if (blockIdentifier === 'pending') {
-        return { type: 'BLOCK_NUMBER', data: 'pending' };
-    }
     if (typeof blockIdentifier === 'string') {
         throw new Error("Invalid block identifier: " + blockIdentifier);
     }
@@ -62,8 +62,7 @@ exports.getBlockIdentifier = getBlockIdentifier;
  *
  * [Reference](https://github.com/starkware-libs/cairo-lang/blob/fc97bdd8322a7df043c87c371634b26c15ed6cee/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L164-L173)
  *
- * @param blockNumber
- * @param blockHash
+ * @param blockIdentifier
  * @returns block identifier for API request
  */
 function getFormattedBlockIdentifier(blockIdentifier) {

package/dist/types/api.d.ts

@@ -65,7 +65,9 @@ export declare type Endpoints = {
         RESPONSE: CallContractResponse;
     };
     estimate_fee: {
-        QUERY: never;
+        QUERY: {
+            blockIdentifier: BlockIdentifier;
+        };
         REQUEST: CallContractTransaction;
         RESPONSE: EstimateFeeResponse;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "JavaScript library for StarkNet",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/provider/default.d.ts

@@ -66,8 +66,10 @@ export declare class Provider implements ProviderInterface {
    */
   callContract(
     { contractAddress, entrypoint, calldata }: Call,
-    options?: {
-      blockIdentifier: BlockIdentifier;
+    {
+      blockIdentifier,
+    }?: {
+      blockIdentifier?: BlockIdentifier;
     }
   ): Promise<CallContractResponse>;
   /**

package/provider/default.js

@@ -343,24 +343,28 @@ var Provider = /** @class */ (function () {
    * @param blockNumber
    * @returns the result of the function on the smart contract.
    */
-  Provider.prototype.callContract = function (_a, options) {
+  Provider.prototype.callContract = function (_a, _b) {
     var contractAddress = _a.contractAddress,
       entrypoint = _a.entrypoint,
-      _b = _a.calldata,
-      calldata = _b === void 0 ? [] : _b;
-    if (options === void 0) {
-      options = { blockIdentifier: null };
-    }
+      _c = _a.calldata,
+      calldata = _c === void 0 ? [] : _c;
+    var _d = _b === void 0 ? {} : _b,
+      _e = _d.blockIdentifier,
+      blockIdentifier = _e === void 0 ? 'pending' : _e;
     return __awaiter(this, void 0, void 0, function () {
-      return __generator(this, function (_c) {
+      return __generator(this, function (_f) {
         return [
           2 /*return*/,
-          this.fetchEndpoint('call_contract', options, {
-            signature: [],
-            contract_address: contractAddress,
-            entry_point_selector: (0, hash_1.getSelectorFromName)(entrypoint),
-            calldata: calldata,
-          }),
+          this.fetchEndpoint(
+            'call_contract',
+            { blockIdentifier: blockIdentifier },
+            {
+              signature: [],
+              contract_address: contractAddress,
+              entry_point_selector: (0, hash_1.getSelectorFromName)(entrypoint),
+              calldata: calldata,
+            }
+          ),
         ];
       });
     });
@@ -399,7 +403,7 @@ var Provider = /** @class */ (function () {
    */
   Provider.prototype.getCode = function (contractAddress, blockIdentifier) {
     if (blockIdentifier === void 0) {
-      blockIdentifier = null;
+      blockIdentifier = 'pending';
     }
     return __awaiter(this, void 0, void 0, function () {
       return __generator(this, function (_a) {
@@ -427,7 +431,7 @@ var Provider = /** @class */ (function () {
    */
   Provider.prototype.getStorageAt = function (contractAddress, key, blockIdentifier) {
     if (blockIdentifier === void 0) {
-      blockIdentifier = null;
+      blockIdentifier = 'pending';
     }
     return __awaiter(this, void 0, void 0, function () {
       return __generator(this, function (_a) {
@@ -586,28 +590,27 @@ var Provider = /** @class */ (function () {
       retryInterval = 8000;
     }
     return __awaiter(this, void 0, void 0, function () {
-      var onchain, res, message, error;
+      var onchain, res, successStates, errorStates, message, error;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             onchain = false;
-            return [4 /*yield*/, wait(retryInterval)];
+            _a.label = 1;
           case 1:
-            _a.sent();
-            _a.label = 2;
-          case 2:
-            if (!!onchain) return [3 /*break*/, 5];
+            if (!!onchain) return [3 /*break*/, 4];
             // eslint-disable-next-line no-await-in-loop
             return [4 /*yield*/, wait(retryInterval)];
-          case 3:
+          case 2:
             // eslint-disable-next-line no-await-in-loop
             _a.sent();
             return [4 /*yield*/, this.getTransactionStatus(txHash)];
-          case 4:
+          case 3:
             res = _a.sent();
-            if (res.tx_status === 'ACCEPTED_ON_L1' || res.tx_status === 'ACCEPTED_ON_L2') {
+            successStates = ['ACCEPTED_ON_L1', 'ACCEPTED_ON_L2', 'PENDING'];
+            errorStates = ['REJECTED', 'NOT_RECEIVED'];
+            if (successStates.includes(res.tx_status)) {
               onchain = true;
-            } else if (res.tx_status === 'REJECTED' || res.tx_status === 'NOT_RECEIVED') {
+            } else if (errorStates.includes(res.tx_status)) {
               message = res.tx_failure_reason
                 ? res.tx_status +
                   ': ' +
@@ -619,8 +622,8 @@ var Provider = /** @class */ (function () {
               error.response = res;
               throw error;
             }
-            return [3 /*break*/, 2];
-          case 5:
+            return [3 /*break*/, 1];
+          case 4:
             return [2 /*return*/];
         }
       });

package/provider/utils.d.ts

@@ -37,8 +37,7 @@ export declare function getBlockIdentifier(blockIdentifier: BlockIdentifier): Bl
  *
  * [Reference](https://github.com/starkware-libs/cairo-lang/blob/fc97bdd8322a7df043c87c371634b26c15ed6cee/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L164-L173)
  *
- * @param blockNumber
- * @param blockHash
+ * @param blockIdentifier
  * @returns block identifier for API request
  */
 export declare function getFormattedBlockIdentifier(blockIdentifier?: BlockIdentifier): string;

package/provider/utils.js

@@ -39,6 +39,12 @@ exports.txIdentifier = txIdentifier;
  * @returns block identifier object
  */
 function getBlockIdentifier(blockIdentifier) {
+  if (blockIdentifier === null) {
+    return { type: 'BLOCK_NUMBER', data: null };
+  }
+  if (blockIdentifier === 'pending') {
+    return { type: 'BLOCK_NUMBER', data: 'pending' };
+  }
   if (typeof blockIdentifier === 'number') {
     return { type: 'BLOCK_NUMBER', data: blockIdentifier };
   }
@@ -48,12 +54,6 @@ function getBlockIdentifier(blockIdentifier) {
   if (typeof blockIdentifier === 'string' && !Number.isNaN(parseInt(blockIdentifier, 10))) {
     return { type: 'BLOCK_NUMBER', data: parseInt(blockIdentifier, 10) };
   }
-  if (blockIdentifier === null) {
-    return { type: 'BLOCK_NUMBER', data: null };
-  }
-  if (blockIdentifier === 'pending') {
-    return { type: 'BLOCK_NUMBER', data: 'pending' };
-  }
   if (typeof blockIdentifier === 'string') {
     throw new Error('Invalid block identifier: ' + blockIdentifier);
   }
@@ -65,8 +65,7 @@ exports.getBlockIdentifier = getBlockIdentifier;
  *
  * [Reference](https://github.com/starkware-libs/cairo-lang/blob/fc97bdd8322a7df043c87c371634b26c15ed6cee/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L164-L173)
  *
- * @param blockNumber
- * @param blockHash
+ * @param blockIdentifier
  * @returns block identifier for API request
  */
 function getFormattedBlockIdentifier(blockIdentifier) {

package/src/account/default.ts

@@ -1,6 +1,7 @@
 import assert from 'minimalistic-assert';
 
 import { Provider } from '../provider';
+import { BlockIdentifier } from '../provider/utils';
 import { Signer, SignerInterface } from '../signer';
 import {
   Abi,
@@ -46,9 +47,15 @@ export class Account extends Provider implements AccountInterface {
     return toHex(toBN(result[0]));
   }
 
-  public async estimateFee(calls: Call | Call[]): Promise<EstimateFeeResponse> {
+  public async estimateFee(
+    calls: Call | Call[],
+    {
+      nonce: providedNonce,
+      blockIdentifier = 'pending',
+    }: { nonce?: BigNumberish; blockIdentifier?: BlockIdentifier } = {}
+  ): Promise<EstimateFeeResponse> {
     const transactions = Array.isArray(calls) ? calls : [calls];
-    const nonce = await this.getNonce();
+    const nonce = providedNonce ?? (await this.getNonce());
     const signerDetails = {
       walletAddress: this.address,
       nonce: toBN(nonce),
@@ -57,12 +64,16 @@ export class Account extends Provider implements AccountInterface {
     const signature = await this.signer.signTransaction(transactions, signerDetails);
 
     const calldata = [...fromCallsToExecuteCalldata(transactions), signerDetails.nonce.toString()];
-    return this.fetchEndpoint('estimate_fee', undefined, {
-      contract_address: this.address,
-      entry_point_selector: getSelectorFromName('__execute__'),
-      calldata,
-      signature: bigNumberishArrayToDecimalStringArray(signature),
-    });
+    return this.fetchEndpoint(
+      'estimate_fee',
+      { blockIdentifier },
+      {
+        contract_address: this.address,
+        entry_point_selector: getSelectorFromName('__execute__'),
+        calldata,
+        signature: bigNumberishArrayToDecimalStringArray(signature),
+      }
+    );
   }
 
   /**
@@ -80,7 +91,8 @@ export class Account extends Provider implements AccountInterface {
   ): Promise<AddTransactionResponse> {
     const transactions = Array.isArray(calls) ? calls : [calls];
     const nonce = toBN(transactionsDetail.nonce ?? (await this.getNonce()));
-    const maxFee = transactionsDetail.maxFee ?? (await this.estimateFee(transactions)).amount;
+    const maxFee =
+      transactionsDetail.maxFee ?? (await this.estimateFee(transactions, { nonce })).amount;
     const signerDetails = {
       walletAddress: this.address,
       nonce,

package/src/contract/default.ts

@@ -3,6 +3,7 @@ import assert from 'minimalistic-assert';
 
 import { AccountInterface } from '../account';
 import { ProviderInterface, defaultProvider } from '../provider';
+import { BlockIdentifier } from '../provider/utils';
 import {
   Abi,
   AbiEntry,
@@ -528,7 +529,11 @@ export class Contract implements ContractInterface {
     }, [] as Result);
   }
 
-  public invoke(method: string, args: Array<any> = []): Promise<AddTransactionResponse> {
+  public invoke(
+    method: string,
+    args: Array<any> = [],
+    options: Overrides = {}
+  ): Promise<AddTransactionResponse> {
     // ensure contract is connected
     assert(this.address !== null, 'contract isnt connected to an address');
     // validate method and args
@@ -542,11 +547,6 @@ export class Contract implements ContractInterface {
       return acc;
     }, 0);
 
-    const overrides: Overrides = {};
-    if (args.length === inputsLength + 1 && Array.isArray(args[args.length - 1])) {
-      Object.assign(overrides, args.pop());
-    }
-
     if (args.length !== inputsLength) {
       throw Error(
         `Invalid number of arguments, expected ${inputsLength} arguments, but got ${args.length}`
@@ -562,31 +562,33 @@ export class Contract implements ContractInterface {
     };
     if ('execute' in this.providerOrAccount) {
       return this.providerOrAccount.execute(invocation, undefined, {
-        maxFee: overrides.maxFee,
-        nonce: overrides.nonce,
+        maxFee: options.maxFee,
+        nonce: options.nonce,
       });
     }
 
     return this.providerOrAccount.invokeFunction({
       ...invocation,
-      signature: overrides.signature || [],
+      signature: options.signature || [],
     });
   }
 
-  public async call(method: string, args: Array<any> = []): Promise<Result> {
+  public async call(
+    method: string,
+    args: Array<any> = [],
+    {
+      blockIdentifier = 'pending',
+    }: {
+      blockIdentifier?: BlockIdentifier;
+    } = {}
+  ): Promise<Result> {
     // ensure contract is connected
     assert(this.address !== null, 'contract isnt connected to an address');
 
     // validate method and args
     this.validateMethodAndArgs('CALL', method, args);
     const { inputs } = this.abi.find((abi) => abi.name === method) as FunctionAbi;
-    const inputsLength = inputs.length;
-    const options = {
-      blockIdentifier: null,
-    };
-    if (args.length === inputsLength + 1 && typeof args[args.length - 1] === 'object') {
-      Object.assign(options, args.pop());
-    }
+
     // compile calldata
     const calldata = this.compileCalldata(args, inputs);
     return this.providerOrAccount
@@ -596,7 +598,7 @@ export class Contract implements ContractInterface {
           calldata,
           entrypoint: method,
         },
-        options
+        { blockIdentifier }
       )
       .then((x) => this.parseResponse(method, x.result));
   }

package/src/contract/interface.ts

@@ -1,11 +1,13 @@
 import { AccountInterface } from '../account';
 import { ProviderInterface } from '../provider';
+import { BlockIdentifier } from '../provider/utils';
 import {
   Abi,
   AddTransactionResponse,
   AsyncContractFunction,
   ContractFunction,
   Invocation,
+  Overrides,
   Result,
 } from '../types';
 
@@ -57,7 +59,13 @@ export abstract class ContractInterface {
    * @param args Array of the arguments for the call
    * @returns Result of the call as an array with key value pars
    */
-  public abstract call(method: string, args?: Array<any>): Promise<Result>;
+  public abstract call(
+    method: string,
+    args?: Array<any>,
+    options?: {
+      blockIdentifier?: BlockIdentifier;
+    }
+  ): Promise<Result>;
 
   /**
    * Invokes a method on a contract
@@ -66,7 +74,11 @@ export abstract class ContractInterface {
    * @param args Array of the arguments for the invoke
    * @returns Add Transaction Response
    */
-  public abstract invoke(method: string, args?: Array<any>): Promise<AddTransactionResponse>;
+  public abstract invoke(
+    method: string,
+    args?: Array<any>,
+    options?: Overrides
+  ): Promise<AddTransactionResponse>;
 
   /**
    * Calls a method on a contract
@@ -74,7 +86,13 @@ export abstract class ContractInterface {
    * @param method name of the method
    * @param args Array of the arguments for the call
    */
-  public abstract estimate(method: string, args?: Array<any>): Promise<any>;
+  public abstract estimate(
+    method: string,
+    args?: Array<any>,
+    options?: {
+      blockIdentifier?: BlockIdentifier;
+    }
+  ): Promise<any>;
 
   /**
    * Calls a method on a contract

package/src/provider/default.ts

@@ -168,14 +168,18 @@ export class Provider implements ProviderInterface {
    */
   public async callContract(
     { contractAddress, entrypoint, calldata = [] }: Call,
-    options: { blockIdentifier: BlockIdentifier } = { blockIdentifier: null }
+    { blockIdentifier = 'pending' }: { blockIdentifier?: BlockIdentifier } = {}
   ): Promise<CallContractResponse> {
-    return this.fetchEndpoint('call_contract', options, {
-      signature: [],
-      contract_address: contractAddress,
-      entry_point_selector: getSelectorFromName(entrypoint),
-      calldata,
-    });
+    return this.fetchEndpoint(
+      'call_contract',
+      { blockIdentifier },
+      {
+        signature: [],
+        contract_address: contractAddress,
+        entry_point_selector: getSelectorFromName(entrypoint),
+        calldata,
+      }
+    );
   }
 
   /**
@@ -203,7 +207,7 @@ export class Provider implements ProviderInterface {
    */
   public async getCode(
     contractAddress: string,
-    blockIdentifier: BlockIdentifier = null
+    blockIdentifier: BlockIdentifier = 'pending'
   ): Promise<GetCodeResponse> {
     return this.fetchEndpoint('get_code', { blockIdentifier, contractAddress });
   }
@@ -223,7 +227,7 @@ export class Provider implements ProviderInterface {
   public async getStorageAt(
     contractAddress: string,
     key: number,
-    blockIdentifier: BlockIdentifier = null
+    blockIdentifier: BlockIdentifier = 'pending'
   ): Promise<object> {
     return this.fetchEndpoint('get_storage_at', { blockIdentifier, contractAddress, key });
   }
@@ -340,7 +344,6 @@ export class Provider implements ProviderInterface {
 
   public async waitForTransaction(txHash: BigNumberish, retryInterval: number = 8000) {
     let onchain = false;
-    await wait(retryInterval);
 
     while (!onchain) {
       // eslint-disable-next-line no-await-in-loop
@@ -348,9 +351,12 @@ export class Provider implements ProviderInterface {
       // eslint-disable-next-line no-await-in-loop
       const res = await this.getTransactionStatus(txHash);
 
-      if (res.tx_status === 'ACCEPTED_ON_L1' || res.tx_status === 'ACCEPTED_ON_L2') {
+      const successStates = ['ACCEPTED_ON_L1', 'ACCEPTED_ON_L2', 'PENDING'];
+      const errorStates = ['REJECTED', 'NOT_RECEIVED'];
+
+      if (successStates.includes(res.tx_status)) {
         onchain = true;
-      } else if (res.tx_status === 'REJECTED' || res.tx_status === 'NOT_RECEIVED') {
+      } else if (errorStates.includes(res.tx_status)) {
         const message = res.tx_failure_reason
           ? `${res.tx_status}: ${res.tx_failure_reason.code}\n${res.tx_failure_reason.error_message}`
           : res.tx_status;

package/src/provider/utils.ts

@@ -43,6 +43,12 @@ type BlockIdentifierObject =
  * @returns block identifier object
  */
 export function getBlockIdentifier(blockIdentifier: BlockIdentifier): BlockIdentifierObject {
+  if (blockIdentifier === null) {
+    return { type: 'BLOCK_NUMBER', data: null };
+  }
+  if (blockIdentifier === 'pending') {
+    return { type: 'BLOCK_NUMBER', data: 'pending' };
+  }
   if (typeof blockIdentifier === 'number') {
     return { type: 'BLOCK_NUMBER', data: blockIdentifier };
   }
@@ -52,12 +58,6 @@ export function getBlockIdentifier(blockIdentifier: BlockIdentifier): BlockIdent
   if (typeof blockIdentifier === 'string' && !Number.isNaN(parseInt(blockIdentifier, 10))) {
     return { type: 'BLOCK_NUMBER', data: parseInt(blockIdentifier, 10) };
   }
-  if (blockIdentifier === null) {
-    return { type: 'BLOCK_NUMBER', data: null };
-  }
-  if (blockIdentifier === 'pending') {
-    return { type: 'BLOCK_NUMBER', data: 'pending' };
-  }
   if (typeof blockIdentifier === 'string') {
     throw new Error(`Invalid block identifier: ${blockIdentifier}`);
   }
@@ -69,8 +69,7 @@ export function getBlockIdentifier(blockIdentifier: BlockIdentifier): BlockIdent
  *
  * [Reference](https://github.com/starkware-libs/cairo-lang/blob/fc97bdd8322a7df043c87c371634b26c15ed6cee/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L164-L173)
  *
- * @param blockNumber
- * @param blockHash
+ * @param blockIdentifier
  * @returns block identifier for API request
  */
 export function getFormattedBlockIdentifier(blockIdentifier: BlockIdentifier = null): string {

package/src/types/api.ts

@@ -75,7 +75,9 @@ export type Endpoints = {
     RESPONSE: CallContractResponse;
   };
   estimate_fee: {
-    QUERY: never;
+    QUERY: {
+      blockIdentifier: BlockIdentifier;
+    };
     REQUEST: CallContractTransaction;
     RESPONSE: EstimateFeeResponse;
   };

package/types/api.d.ts

@@ -74,7 +74,9 @@ export declare type Endpoints = {
     RESPONSE: CallContractResponse;
   };
   estimate_fee: {
-    QUERY: never;
+    QUERY: {
+      blockIdentifier: BlockIdentifier;
+    };
     REQUEST: CallContractTransaction;
     RESPONSE: EstimateFeeResponse;
   };