starknet 3.7.0 → 3.10.0

package/dist/account/default.js

@@ -81,11 +81,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Account = void 0;
 var minimalistic_assert_1 = __importDefault(require("minimalistic-assert"));
+var constants_1 = require("../constants");
 var provider_1 = require("../provider");
 var signer_1 = require("../signer");
 var ellipticCurve_1 = require("../utils/ellipticCurve");
 var hash_1 = require("../utils/hash");
 var number_1 = require("../utils/number");
+var shortString_1 = require("../utils/shortString");
 var stark_1 = require("../utils/stark");
 var transaction_1 = require("../utils/transaction");
 var typedData_1 = require("../utils/typedData");
@@ -114,29 +116,40 @@ 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, version, 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;
+                        version = (0, number_1.toBN)(hash_1.feeTransactionVersion);
                         signerDetails = {
                             walletAddress: this.address,
                             nonce: (0, number_1.toBN)(nonce),
-                            maxFee: (0, number_1.toBN)('0'),
+                            maxFee: constants_1.ZERO,
+                            version: version,
+                            chainId: this.chainId,
                         };
                         return [4 /*yield*/, this.signer.signTransaction(transactions, signerDetails)];
-                    case 2:
-                        signature = _a.sent();
-                        calldata = __spreadArray(__spreadArray([], __read((0, transaction_1.fromCallsToExecuteCalldata)(transactions)), false), [signerDetails.nonce.toString()], false);
-                        return [2 /*return*/, this.fetchEndpoint('estimate_fee', undefined, {
+                    case 4:
+                        signature = _e.sent();
+                        calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, nonce);
+                        return [2 /*return*/, this.fetchEndpoint('estimate_fee', { blockIdentifier: blockIdentifier }, {
                                 contract_address: this.address,
                                 entry_point_selector: (0, hash_1.getSelectorFromName)('__execute__'),
                                 calldata: calldata,
+                                version: (0, number_1.toHex)(version),
                                 signature: (0, number_1.bigNumberishArrayToDecimalStringArray)(signature),
                             })];
                 }
@@ -152,43 +165,46 @@ var Account = /** @class */ (function (_super) {
      * @returns a confirmation of invoking a function on the starknet contract
      */
     Account.prototype.execute = function (calls, abis, transactionsDetail) {
-        var _a, _b;
+        var _a;
         if (abis === void 0) { abis = undefined; }
         if (transactionsDetail === void 0) { transactionsDetail = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var transactions, nonce, _c, _d, maxFee, _e, signerDetails, signature, calldata;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var transactions, nonce, _b, _c, maxFee, estimatedFee, signerDetails, signature, calldata;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         transactions = Array.isArray(calls) ? calls : [calls];
-                        _c = number_1.toBN;
+                        _b = number_1.toBN;
                         if (!((_a = transactionsDetail.nonce) !== null && _a !== void 0)) return [3 /*break*/, 1];
-                        _d = _a;
+                        _c = _a;
                         return [3 /*break*/, 3];
                     case 1: return [4 /*yield*/, this.getNonce()];
                     case 2:
-                        _d = (_f.sent());
-                        _f.label = 3;
+                        _c = (_d.sent());
+                        _d.label = 3;
                     case 3:
-                        nonce = _c.apply(void 0, [_d]);
-                        if (!((_b = transactionsDetail.maxFee) !== null && _b !== void 0)) return [3 /*break*/, 4];
-                        _e = _b;
+                        nonce = _b.apply(void 0, [_c]);
+                        maxFee = '0';
+                        if (!(transactionsDetail.maxFee || transactionsDetail.maxFee === 0)) return [3 /*break*/, 4];
+                        maxFee = transactionsDetail.maxFee;
                         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;
+                        estimatedFee = (_d.sent()).amount;
+                        maxFee = (0, stark_1.estimatedFeeToMaxFee)(estimatedFee).toString();
+                        _d.label = 6;
                     case 6:
-                        maxFee = _e;
                         signerDetails = {
                             walletAddress: this.address,
                             nonce: nonce,
                             maxFee: maxFee,
+                            version: (0, number_1.toBN)(hash_1.transactionVersion),
+                            chainId: this.chainId,
                         };
                         return [4 /*yield*/, this.signer.signTransaction(transactions, signerDetails, abis)];
                     case 7:
-                        signature = _f.sent();
-                        calldata = __spreadArray(__spreadArray([], __read((0, transaction_1.fromCallsToExecuteCalldata)(transactions)), false), [signerDetails.nonce.toString()], false);
+                        signature = _d.sent();
+                        calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, nonce);
                         return [2 /*return*/, this.fetchEndpoint('add_transaction', undefined, {
                                 type: 'INVOKE_FUNCTION',
                                 contract_address: this.address,
@@ -220,7 +236,7 @@ var Account = /** @class */ (function (_super) {
                     .map(number_1.bigNumberishArrayToDecimalStringArray)
                     .map(hash_1.computeHashOnElements);
                 return (0, hash_1.computeHashOnElements)([
-                    hash_1.transactionPrefix,
+                    (0, shortString_1.encodeShortString)('StarkNet Transaction'),
                     account,
                     (0, hash_1.computeHashOnElements)(hashArray),
                     nonce,

package/dist/constants.d.ts

@@ -5,6 +5,15 @@ export declare const ONE: import("bn.js");
 export declare const TWO: import("bn.js");
 export declare const MASK_250: import("bn.js");
 export declare const MASK_251: import("bn.js");
+export declare enum StarknetChainId {
+    MAINNET = "0x534e5f4d41494e",
+    TESTNET = "0x534e5f474f45524c49"
+}
+export declare enum TransactionHashPrefix {
+    DEPLOY = "0x6465706c6f79",
+    INVOKE = "0x696e766f6b65",
+    L1_HANDLER = "0x6c315f68616e646c6572"
+}
 /**
  * The following is taken from https://github.com/starkware-libs/starkex-resources/blob/master/crypto/starkware/crypto/signature/pedersen_params.json but converted to hex, because JS is very bad handling big integers by default
  * Please do not edit until the JSON changes.

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CONSTANT_POINTS = exports.MAX_ECDSA_VAL = exports.BETA = exports.ALPHA = exports.EC_ORDER = exports.FIELD_SIZE = exports.FIELD_GEN = exports.FIELD_PRIME = exports.MASK_251 = exports.MASK_250 = exports.TWO = exports.ONE = exports.ZERO = exports.IS_BROWSER = void 0;
+exports.CONSTANT_POINTS = exports.MAX_ECDSA_VAL = exports.BETA = exports.ALPHA = exports.EC_ORDER = exports.FIELD_SIZE = exports.FIELD_GEN = exports.FIELD_PRIME = exports.TransactionHashPrefix = exports.StarknetChainId = exports.MASK_251 = exports.MASK_250 = exports.TWO = exports.ONE = exports.ZERO = exports.IS_BROWSER = void 0;
 var number_1 = require("./utils/number");
 var encode_1 = require("./utils/encode");
 Object.defineProperty(exports, "IS_BROWSER", { enumerable: true, get: function () { return encode_1.IS_BROWSER; } });
@@ -9,6 +9,17 @@ exports.ONE = (0, number_1.toBN)(1);
 exports.TWO = (0, number_1.toBN)(2);
 exports.MASK_250 = exports.TWO.pow((0, number_1.toBN)(250)).sub(exports.ONE); // 2 ** 250 - 1
 exports.MASK_251 = exports.TWO.pow((0, number_1.toBN)(251));
+var StarknetChainId;
+(function (StarknetChainId) {
+    StarknetChainId["MAINNET"] = "0x534e5f4d41494e";
+    StarknetChainId["TESTNET"] = "0x534e5f474f45524c49";
+})(StarknetChainId = exports.StarknetChainId || (exports.StarknetChainId = {}));
+var TransactionHashPrefix;
+(function (TransactionHashPrefix) {
+    TransactionHashPrefix["DEPLOY"] = "0x6465706c6f79";
+    TransactionHashPrefix["INVOKE"] = "0x696e766f6b65";
+    TransactionHashPrefix["L1_HANDLER"] = "0x6c315f68616e646c6572";
+})(TransactionHashPrefix = exports.TransactionHashPrefix || (exports.TransactionHashPrefix = {}));
 /**
  * The following is taken from https://github.com/starkware-libs/starkex-resources/blob/master/crypto/starkware/crypto/signature/pedersen_params.json but converted to hex, because JS is very bad handling big integers by default
  * Please do not edit until the JSON changes.

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

@@ -116,8 +116,20 @@ function buildInvoke(contract, functionAbi) {
             args[_i] = arguments[_i];
         }
         return __awaiter(this, void 0, void 0, function () {
+            var inputs, inputsLength, options;
             return __generator(this, function (_a) {
-                return [2 /*return*/, contract.invoke(functionAbi.name, args)];
+                inputs = functionAbi.inputs;
+                inputsLength = inputs.reduce(function (acc, input) {
+                    if (!/_len$/.test(input.name)) {
+                        return acc + 1;
+                    }
+                    return acc;
+                }, 0);
+                options = {};
+                if (inputsLength + 1 === args.length && typeof args[args.length - 1] === 'object') {
+                    Object.assign(options, args.pop());
+                }
+                return [2 /*return*/, contract.invoke(functionAbi.name, args, options)];
             });
         });
     };
@@ -550,8 +562,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 +576,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 +588,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

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import { Abi, AddTransactionResponse, Call, CallContractResponse, DeployContractPayload, Endpoints, GetBlockResponse, GetCodeResponse, GetContractAddressesResponse, GetTransactionResponse, GetTransactionStatusResponse, GetTransactionTraceResponse, Invocation, TransactionReceipt } from '../types';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
@@ -12,8 +13,10 @@ export declare class Provider implements ProviderInterface {
     baseUrl: string;
     feederGatewayUrl: string;
     gatewayUrl: string;
+    chainId: StarknetChainId;
     constructor(optionsOrProvider?: ProviderOptions | Provider);
     protected static getNetworkFromName(name: NetworkName): "https://alpha-mainnet.starknet.io" | "https://alpha4.starknet.io";
+    protected static getChainIdFromBaseUrl(baseUrl: string): StarknetChainId;
     private getFetchUrl;
     private getFetchMethod;
     private getQueryString;
@@ -36,8 +39,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

@@ -69,6 +69,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
 var axios_1 = __importDefault(require("axios"));
 var url_join_1 = __importDefault(require("url-join"));
+var constants_1 = require("../constants");
 var hash_1 = require("../utils/hash");
 var json_1 = require("../utils/json");
 var number_1 = require("../utils/number");
@@ -89,16 +90,20 @@ function isEmptyQueryObject(obj) {
 var Provider = /** @class */ (function () {
     function Provider(optionsOrProvider) {
         if (optionsOrProvider === void 0) { optionsOrProvider = { network: 'goerli-alpha' }; }
+        var _a;
         if (optionsOrProvider instanceof Provider) {
             this.baseUrl = optionsOrProvider.baseUrl;
             this.feederGatewayUrl = optionsOrProvider.feederGatewayUrl;
             this.gatewayUrl = optionsOrProvider.gatewayUrl;
+            this.chainId =
+                (_a = optionsOrProvider.chainId) !== null && _a !== void 0 ? _a : Provider.getChainIdFromBaseUrl(optionsOrProvider.baseUrl);
         }
         else {
             var baseUrl = 'baseUrl' in optionsOrProvider
                 ? optionsOrProvider.baseUrl
                 : Provider.getNetworkFromName(optionsOrProvider.network);
             this.baseUrl = baseUrl;
+            this.chainId = Provider.getChainIdFromBaseUrl(baseUrl);
             this.feederGatewayUrl = (0, url_join_1.default)(baseUrl, 'feeder_gateway');
             this.gatewayUrl = (0, url_join_1.default)(baseUrl, 'gateway');
         }
@@ -112,6 +117,19 @@ var Provider = /** @class */ (function () {
                 return 'https://alpha4.starknet.io';
         }
     };
+    Provider.getChainIdFromBaseUrl = function (baseUrl) {
+        try {
+            var url = new URL(baseUrl);
+            if (url.host.includes('mainnet.starknet.io')) {
+                return constants_1.StarknetChainId.MAINNET;
+            }
+        }
+        catch (_a) {
+            // eslint-disable-next-line no-console
+            console.error("Could not parse baseUrl: " + baseUrl);
+        }
+        return constants_1.StarknetChainId.TESTNET;
+    };
     Provider.prototype.getFetchUrl = function (endpoint) {
         var gatewayUrlEndpoints = ['add_transaction'];
         return gatewayUrlEndpoints.includes(endpoint) ? this.gatewayUrl : this.feederGatewayUrl;
@@ -219,12 +237,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 +279,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 +299,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 +420,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 +449,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/interface.d.ts

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import type { AddTransactionResponse, Call, CallContractResponse, DeployContractPayload, GetBlockResponse, GetCodeResponse, GetContractAddressesResponse, GetTransactionResponse, GetTransactionStatusResponse, Invocation, TransactionReceipt } from '../types';
 import type { BigNumberish } from '../utils/number';
 import { BlockIdentifier } from './utils';
@@ -5,6 +6,7 @@ export declare abstract class ProviderInterface {
     abstract baseUrl: string;
     abstract feederGatewayUrl: string;
     abstract gatewayUrl: string;
+    abstract chainId: StarknetChainId;
     /**
      * Gets the smart contract address on the goerli testnet.
      *

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/signer/default.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signer = void 0;
 var ellipticCurve_1 = require("../utils/ellipticCurve");
 var hash_1 = require("../utils/hash");
+var transaction_1 = require("../utils/transaction");
 var typedData_1 = require("../utils/typedData");
 var Signer = /** @class */ (function () {
     function Signer(keyPair) {
@@ -53,12 +54,13 @@ var Signer = /** @class */ (function () {
     };
     Signer.prototype.signTransaction = function (transactions, transactionsDetail, abis) {
         return __awaiter(this, void 0, void 0, function () {
-            var msgHash;
+            var calldata, msgHash;
             return __generator(this, function (_a) {
                 if (abis && abis.length !== transactions.length) {
                     throw new Error('ABI must be provided for each transaction or no transaction');
                 }
-                msgHash = (0, hash_1.hashMulticall)(transactionsDetail.walletAddress, transactions, transactionsDetail.nonce.toString(), transactionsDetail.maxFee.toString());
+                calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, transactionsDetail.nonce);
+                msgHash = (0, hash_1.calculcateTransactionHash)(transactionsDetail.walletAddress, transactionsDetail.version, (0, hash_1.getSelectorFromName)('__execute__'), calldata, transactionsDetail.maxFee, transactionsDetail.chainId);
                 return [2 /*return*/, (0, ellipticCurve_1.sign)(this.keyPair, msgHash)];
             });
         });

package/dist/signer/ledger.js

@@ -44,6 +44,7 @@ var hw_app_eth_1 = __importDefault(require("@ledgerhq/hw-app-eth"));
 var hw_transport_webhid_1 = __importDefault(require("@ledgerhq/hw-transport-webhid"));
 var encode_1 = require("../utils/encode");
 var hash_1 = require("../utils/hash");
+var transaction_1 = require("../utils/transaction");
 var typedData_1 = require("../utils/typedData");
 function hexZeroPad(hash, length) {
     var value = hash;
@@ -101,9 +102,10 @@ var LedgerBlindSigner = /** @class */ (function () {
     };
     LedgerBlindSigner.prototype.signTransaction = function (transactions, transactionsDetail) {
         return __awaiter(this, void 0, void 0, function () {
-            var msgHash;
+            var calldata, msgHash;
             return __generator(this, function (_a) {
-                msgHash = (0, hash_1.hashMulticall)(transactionsDetail.walletAddress, transactions, transactionsDetail.nonce.toString(), transactionsDetail.maxFee.toString());
+                calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, transactionsDetail.nonce);
+                msgHash = (0, hash_1.calculcateTransactionHash)(transactionsDetail.walletAddress, transactionsDetail.version, (0, hash_1.getSelectorFromName)('__execute__'), calldata, transactionsDetail.maxFee, transactionsDetail.chainId);
                 return [2 /*return*/, this.sign(msgHash)];
             });
         });

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;
     };
@@ -90,6 +92,7 @@ export declare type InvokeFunctionTransaction = {
     calldata?: RawCalldata;
     nonce?: BigNumberish;
     max_fee?: BigNumberish;
+    version?: BigNumberish;
 };
 export declare type InvokeFunctionTrace = {
     caller_address: string;

package/dist/types/lib.d.ts

@@ -18,6 +18,7 @@ export declare type Call = Omit<Invocation, 'signature'>;
 export declare type InvocationsDetails = {
     nonce?: BigNumberish;
     maxFee?: BigNumberish;
+    version?: BigNumberish;
 };
 export declare type Status = 'NOT_RECEIVED' | 'RECEIVED' | 'PENDING' | 'ACCEPTED_ON_L2' | 'ACCEPTED_ON_L1' | 'REJECTED';
 export declare type TransactionStatus = 'TRANSACTION_RECEIVED';

package/dist/types/signer.d.ts

@@ -1,4 +1,6 @@
+import { StarknetChainId } from '../constants';
 import { InvocationsDetails } from './lib';
 export interface InvocationsSignerDetails extends Required<InvocationsDetails> {
     walletAddress: string;
+    chainId: StarknetChainId;
 }