starknet 4.6.0 → 4.7.0

package/provider/rpc.d.ts

@@ -1,46 +1,48 @@
 import { StarknetChainId } from '../constants';
-import { Call, CallContractResponse, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetCodeResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
+import { Call, CallContractResponse, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetCodeResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetailsWithNonce, InvokeFunctionResponse } from '../types';
 import { RPC } from '../types/api';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
 import { BlockIdentifier } from './utils';
 export declare type RpcProviderOptions = {
     nodeUrl: string;
+    retries?: number;
 };
 export declare class RpcProvider implements ProviderInterface {
     nodeUrl: string;
     chainId: StarknetChainId;
     private responseParser;
+    private retries;
     constructor(optionsOrProvider: RpcProviderOptions);
     fetch(method: any, params: any): Promise<any>;
     protected errorHandler(error: any): void;
-    protected fetchEndpoint<T extends keyof RPC.Methods>(method: T, request?: RPC.Methods[T]['REQUEST']): Promise<RPC.Methods[T]['RESPONSE']>;
+    protected fetchEndpoint<T extends keyof RPC.Methods>(method: T, params?: RPC.Methods[T]['params']): Promise<RPC.Methods[T]['result']>;
     getChainId(): Promise<any>;
     getBlock(blockIdentifier?: BlockIdentifier): Promise<GetBlockResponse>;
     getBlockHashAndNumber(): Promise<RPC.BlockHashAndNumber>;
     getBlockWithTxHashes(blockIdentifier?: BlockIdentifier): Promise<RPC.GetBlockWithTxHashesResponse>;
     getBlockWithTxs(blockIdentifier?: BlockIdentifier): Promise<RPC.GetBlockWithTxs>;
     getClassHashAt(blockIdentifier: BlockIdentifier, contractAddress: RPC.ContractAddress): Promise<RPC.Felt>;
-    getNonce(contractAddress: string): Promise<any>;
+    getNonce(contractAddress: string, blockIdentifier?: BlockIdentifier): Promise<RPC.Nonce>;
     getPendingTransactions(): Promise<RPC.PendingTransactions>;
     getProtocolVersion(): Promise<Error>;
     getStateUpdate(blockIdentifier: BlockIdentifier): Promise<RPC.StateUpdate>;
     getStorageAt(contractAddress: string, key: BigNumberish, blockIdentifier?: BlockIdentifier): Promise<BigNumberish>;
-    getTransaction(txHash: BigNumberish): Promise<GetTransactionResponse>;
-    getTransactionByHash(txHash: BigNumberish): Promise<RPC.GetTransactionByHashResponse>;
+    getTransaction(txHash: string): Promise<GetTransactionResponse>;
+    getTransactionByHash(txHash: string): Promise<RPC.GetTransactionByHashResponse>;
     getTransactionByBlockIdAndIndex(blockIdentifier: BlockIdentifier, index: number): Promise<RPC.GetTransactionByBlockIdAndIndex>;
-    getTransactionReceipt(txHash: BigNumberish): Promise<GetTransactionReceiptResponse>;
+    getTransactionReceipt(txHash: string): Promise<GetTransactionReceiptResponse>;
     getClass(classHash: RPC.Felt): Promise<RPC.ContractClass>;
-    getClassAt(contractAddress: string, blockIdentifier: BlockIdentifier): Promise<any>;
+    getClassAt(contractAddress: string, blockIdentifier: BlockIdentifier): Promise<RPC.ContractClass>;
     getCode(_contractAddress: string, _blockIdentifier?: BlockIdentifier): Promise<GetCodeResponse>;
-    getEstimateFee(invocation: Invocation, blockIdentifier?: BlockIdentifier, invocationDetails?: InvocationsDetails): Promise<EstimateFeeResponse>;
+    getEstimateFee(invocation: Invocation, invocationDetails: InvocationsDetailsWithNonce, blockIdentifier?: BlockIdentifier): Promise<EstimateFeeResponse>;
     declareContract({ contract, version, }: DeclareContractPayload): Promise<DeclareContractResponse>;
     deployContract({ contract, constructorCalldata, addressSalt, }: DeployContractPayload): Promise<DeployContractResponse>;
-    invokeFunction(functionInvocation: Invocation, details: InvocationsDetails): Promise<InvokeFunctionResponse>;
+    invokeFunction(functionInvocation: Invocation, details: InvocationsDetailsWithNonce): Promise<InvokeFunctionResponse>;
     callContract(call: Call, blockIdentifier?: BlockIdentifier): Promise<CallContractResponse>;
     traceTransaction(transactionHash: RPC.TransactionHash): Promise<RPC.Trace>;
     traceBlockTransactions(blockHash: RPC.BlockHash): Promise<RPC.Traces>;
-    waitForTransaction(txHash: BigNumberish, retryInterval?: number): Promise<void>;
+    waitForTransaction(txHash: string, retryInterval?: number): Promise<void>;
     /**
      * Gets the transaction count from a block.
      *

package/provider/rpc.js

@@ -52,8 +52,9 @@ var RpcProvider = /** @class */ (function () {
     function RpcProvider(optionsOrProvider) {
         var _this = this;
         this.responseParser = new rpc_1.RPCResponseParser();
-        var nodeUrl = optionsOrProvider.nodeUrl;
+        var nodeUrl = optionsOrProvider.nodeUrl, retries = optionsOrProvider.retries;
         this.nodeUrl = nodeUrl;
+        this.retries = retries || 200;
         this.getChainId().then(function (chainId) {
             _this.chainId = chainId;
         });
@@ -71,7 +72,7 @@ var RpcProvider = /** @class */ (function () {
             throw new Error("".concat(code, ": ").concat(message));
         }
     };
-    RpcProvider.prototype.fetchEndpoint = function (method, request) {
+    RpcProvider.prototype.fetchEndpoint = function (method, params) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             var rawResult, _b, error, result, error_1;
@@ -79,7 +80,7 @@ var RpcProvider = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         _c.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.fetch(method, request)];
+                        return [4 /*yield*/, this.fetch(method, params)];
                     case 1:
                         rawResult = _c.sent();
                         return [4 /*yield*/, rawResult.json()];
@@ -123,36 +124,45 @@ var RpcProvider = /** @class */ (function () {
     RpcProvider.prototype.getBlockWithTxHashes = function (blockIdentifier) {
         if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
-            var block;
+            var block_id;
             return __generator(this, function (_a) {
-                block = new utils_1.Block(blockIdentifier);
-                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockWithTxHashes', [block.identifier])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockWithTxHashes', { block_id: block_id })];
             });
         });
     };
     RpcProvider.prototype.getBlockWithTxs = function (blockIdentifier) {
         if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
-            var block;
+            var block_id;
             return __generator(this, function (_a) {
-                block = new utils_1.Block(blockIdentifier);
-                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockWithTxs', [block.identifier])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockWithTxs', { block_id: block_id })];
             });
         });
     };
     RpcProvider.prototype.getClassHashAt = function (blockIdentifier, contractAddress) {
         return __awaiter(this, void 0, void 0, function () {
-            var block;
+            var block_id;
             return __generator(this, function (_a) {
-                block = new utils_1.Block(blockIdentifier);
-                return [2 /*return*/, this.fetchEndpoint('starknet_getClassHashAt', [block.identifier, contractAddress])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getClassHashAt', {
+                        block_id: block_id,
+                        contract_address: contractAddress,
+                    })];
             });
         });
     };
-    RpcProvider.prototype.getNonce = function (contractAddress) {
+    RpcProvider.prototype.getNonce = function (contractAddress, blockIdentifier) {
+        if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
+            var block_id;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_getNonce', [contractAddress])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getNonce', {
+                        contract_address: contractAddress,
+                        block_id: block_id,
+                    })];
             });
         });
     };
@@ -172,25 +182,25 @@ var RpcProvider = /** @class */ (function () {
     };
     RpcProvider.prototype.getStateUpdate = function (blockIdentifier) {
         return __awaiter(this, void 0, void 0, function () {
-            var block;
+            var block_id;
             return __generator(this, function (_a) {
-                block = new utils_1.Block(blockIdentifier);
-                return [2 /*return*/, this.fetchEndpoint('starknet_getStateUpdate', [block.identifier])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getStateUpdate', { block_id: block_id })];
             });
         });
     };
     RpcProvider.prototype.getStorageAt = function (contractAddress, key, blockIdentifier) {
         if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
-            var parsedKey, block;
+            var parsedKey, block_id;
             return __generator(this, function (_a) {
                 parsedKey = (0, number_1.toHex)((0, number_1.toBN)(key));
-                block = new utils_1.Block(blockIdentifier);
-                return [2 /*return*/, this.fetchEndpoint('starknet_getStorageAt', [
-                        contractAddress,
-                        parsedKey,
-                        block.identifier,
-                    ])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getStorageAt', {
+                        contract_address: contractAddress,
+                        key: parsedKey,
+                        block_id: block_id,
+                    })];
             });
         });
     };
@@ -205,42 +215,42 @@ var RpcProvider = /** @class */ (function () {
     RpcProvider.prototype.getTransactionByHash = function (txHash) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionByHash', [txHash])];
+                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionByHash', { transaction_hash: txHash })];
             });
         });
     };
     RpcProvider.prototype.getTransactionByBlockIdAndIndex = function (blockIdentifier, index) {
         return __awaiter(this, void 0, void 0, function () {
-            var block;
+            var block_id;
             return __generator(this, function (_a) {
-                block = new utils_1.Block(blockIdentifier);
-                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionByBlockIdAndIndex', [
-                        block.identifier,
-                        index,
-                    ])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionByBlockIdAndIndex', { block_id: block_id, index: index })];
             });
         });
     };
     RpcProvider.prototype.getTransactionReceipt = function (txHash) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionReceipt', [txHash]).then(this.responseParser.parseGetTransactionReceiptResponse)];
+                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionReceipt', { transaction_hash: txHash }).then(this.responseParser.parseGetTransactionReceiptResponse)];
             });
         });
     };
     RpcProvider.prototype.getClass = function (classHash) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_getClass', [classHash])];
+                return [2 /*return*/, this.fetchEndpoint('starknet_getClass', { class_hash: classHash })];
             });
         });
     };
     RpcProvider.prototype.getClassAt = function (contractAddress, blockIdentifier) {
         return __awaiter(this, void 0, void 0, function () {
-            var block;
+            var block_id;
             return __generator(this, function (_a) {
-                block = new utils_1.Block(blockIdentifier);
-                return [2 /*return*/, this.fetchEndpoint('starknet_getClassAt', [block.identifier, contractAddress])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getClassAt', {
+                        block_id: block_id,
+                        contract_address: contractAddress,
+                    })];
             });
         });
     };
@@ -251,23 +261,22 @@ var RpcProvider = /** @class */ (function () {
             });
         });
     };
-    RpcProvider.prototype.getEstimateFee = function (invocation, blockIdentifier, invocationDetails) {
+    RpcProvider.prototype.getEstimateFee = function (invocation, invocationDetails, blockIdentifier) {
         if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
-        if (invocationDetails === void 0) { invocationDetails = {}; }
         return __awaiter(this, void 0, void 0, function () {
             var block_id;
             return __generator(this, function (_a) {
                 block_id = new utils_1.Block(blockIdentifier).identifier;
-                return [2 /*return*/, this.fetchEndpoint('starknet_estimateFee', [
-                        {
+                return [2 /*return*/, this.fetchEndpoint('starknet_estimateFee', {
+                        request: {
                             contract_address: invocation.contractAddress,
-                            entry_point_selector: (0, hash_1.getSelectorFromName)(invocation.entrypoint),
                             calldata: (0, provider_1.parseCalldata)(invocation.calldata),
                             signature: (0, number_1.bigNumberishArrayToHexadecimalStringArray)(invocation.signature || []),
                             version: (0, number_1.toHex)((0, number_1.toBN)((invocationDetails === null || invocationDetails === void 0 ? void 0 : invocationDetails.version) || 0)),
+                            max_fee: (0, number_1.toHex)((0, number_1.toBN)((invocationDetails === null || invocationDetails === void 0 ? void 0 : invocationDetails.maxFee) || 0)),
                         },
-                        block_id,
-                    ]).then(this.responseParser.parseFeeEstimateResponse)];
+                        block_id: block_id,
+                    }).then(this.responseParser.parseFeeEstimateResponse)];
             });
         });
     };
@@ -277,14 +286,14 @@ var RpcProvider = /** @class */ (function () {
             var contractDefinition;
             return __generator(this, function (_b) {
                 contractDefinition = (0, provider_1.parseContract)(contract);
-                return [2 /*return*/, this.fetchEndpoint('starknet_addDeclareTransaction', [
-                        {
+                return [2 /*return*/, this.fetchEndpoint('starknet_addDeclareTransaction', {
+                        contract_class: {
                             program: contractDefinition.program,
                             entry_points_by_type: contractDefinition.entry_points_by_type,
                             abi: contractDefinition.abi, // rpc 2.0
                         },
-                        (0, number_1.toHex)((0, number_1.toBN)(version || 0)),
-                    ]).then(this.responseParser.parseDeclareContractResponse)];
+                        version: (0, number_1.toHex)((0, number_1.toBN)(version || 0)),
+                    })];
             });
         });
     };
@@ -294,31 +303,30 @@ var RpcProvider = /** @class */ (function () {
             var contractDefinition;
             return __generator(this, function (_b) {
                 contractDefinition = (0, provider_1.parseContract)(contract);
-                return [2 /*return*/, this.fetchEndpoint('starknet_addDeployTransaction', [
-                        addressSalt !== null && addressSalt !== void 0 ? addressSalt : (0, stark_1.randomAddress)(),
-                        (0, number_1.bigNumberishArrayToHexadecimalStringArray)(constructorCalldata !== null && constructorCalldata !== void 0 ? constructorCalldata : []),
-                        {
+                return [2 /*return*/, this.fetchEndpoint('starknet_addDeployTransaction', {
+                        contract_address_salt: addressSalt !== null && addressSalt !== void 0 ? addressSalt : (0, stark_1.randomAddress)(),
+                        constructor_calldata: (0, number_1.bigNumberishArrayToHexadecimalStringArray)(constructorCalldata !== null && constructorCalldata !== void 0 ? constructorCalldata : []),
+                        contract_definition: {
                             program: contractDefinition.program,
                             entry_points_by_type: contractDefinition.entry_points_by_type,
                             abi: contractDefinition.abi, // rpc 2.0
                         },
-                    ]).then(this.responseParser.parseDeployContractResponse)];
+                    })];
             });
         });
     };
     RpcProvider.prototype.invokeFunction = function (functionInvocation, details) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_addInvokeTransaction', [
-                        {
+                return [2 /*return*/, this.fetchEndpoint('starknet_addInvokeTransaction', {
+                        function_invocation: {
                             contract_address: functionInvocation.contractAddress,
-                            entry_point_selector: (0, hash_1.getSelectorFromName)(functionInvocation.entrypoint),
                             calldata: (0, provider_1.parseCalldata)(functionInvocation.calldata),
                         },
-                        (0, number_1.bigNumberishArrayToHexadecimalStringArray)(functionInvocation.signature || []),
-                        (0, number_1.toHex)((0, number_1.toBN)(details.maxFee || 0)),
-                        (0, number_1.toHex)((0, number_1.toBN)(details.version || 0)),
-                    ]).then(this.responseParser.parseInvokeFunctionResponse)];
+                        signature: (0, number_1.bigNumberishArrayToHexadecimalStringArray)(functionInvocation.signature || []),
+                        max_fee: (0, number_1.toHex)((0, number_1.toBN)(details.maxFee || 0)),
+                        version: (0, number_1.toHex)((0, number_1.toBN)(details.version || 0)),
+                    })];
             });
         });
     };
@@ -331,14 +339,14 @@ var RpcProvider = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         block_id = new utils_1.Block(blockIdentifier).identifier;
-                        return [4 /*yield*/, this.fetchEndpoint('starknet_call', [
-                                {
+                        return [4 /*yield*/, this.fetchEndpoint('starknet_call', {
+                                request: {
                                     contract_address: call.contractAddress,
                                     entry_point_selector: (0, hash_1.getSelectorFromName)(call.entrypoint),
                                     calldata: (0, provider_1.parseCalldata)(call.calldata),
                                 },
-                                block_id,
-                            ])];
+                                block_id: block_id,
+                            })];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, this.responseParser.parseCallContractResponse(result)];
@@ -349,26 +357,26 @@ var RpcProvider = /** @class */ (function () {
     RpcProvider.prototype.traceTransaction = function (transactionHash) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_traceTransaction', [transactionHash])];
+                return [2 /*return*/, this.fetchEndpoint('starknet_traceTransaction', { transaction_hash: transactionHash })];
             });
         });
     };
     RpcProvider.prototype.traceBlockTransactions = function (blockHash) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_traceBlockTransactions', [blockHash])];
+                return [2 /*return*/, this.fetchEndpoint('starknet_traceBlockTransactions', { block_hash: blockHash })];
             });
         });
     };
     RpcProvider.prototype.waitForTransaction = function (txHash, retryInterval) {
         if (retryInterval === void 0) { retryInterval = 8000; }
         return __awaiter(this, void 0, void 0, function () {
-            var onchain, retries, successStates, errorStates, res, message, error, error_2;
+            var retries, onchain, successStates, errorStates, res, message, error, error_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        retries = this.retries;
                         onchain = false;
-                        retries = 200;
                         _a.label = 1;
                     case 1:
                         if (!!onchain) return [3 /*break*/, 7];
@@ -401,7 +409,7 @@ var RpcProvider = /** @class */ (function () {
                             throw error_2;
                         }
                         if (retries === 0) {
-                            throw error_2;
+                            throw new Error('waitForTransaction timedout with retries');
                         }
                         return [3 /*break*/, 6];
                     case 6:
@@ -424,10 +432,10 @@ var RpcProvider = /** @class */ (function () {
      */
     RpcProvider.prototype.getTransactionCount = function (blockIdentifier) {
         return __awaiter(this, void 0, void 0, function () {
-            var block;
+            var block_id;
             return __generator(this, function (_a) {
-                block = new utils_1.Block(blockIdentifier);
-                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockTransactionCount', [block.identifier])];
+                block_id = new utils_1.Block(blockIdentifier).identifier;
+                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockTransactionCount', { block_id: block_id })];
             });
         });
     };
@@ -466,7 +474,7 @@ var RpcProvider = /** @class */ (function () {
     RpcProvider.prototype.getEvents = function (eventFilter) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_getEvents', [eventFilter])];
+                return [2 /*return*/, this.fetchEndpoint('starknet_getEvents', { filter: eventFilter })];
             });
         });
     };

package/provider/sequencer.d.ts

@@ -1,5 +1,5 @@
 import { StarknetChainId } from '../constants';
-import { Call, CallContractResponse, ContractClass, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
+import { Call, CallContractResponse, ContractClass, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetailsWithNonce, InvokeFunctionResponse } from '../types';
 import { GetContractAddressesResponse, GetTransactionStatusResponse, GetTransactionTraceResponse, Sequencer } from '../types/api';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
@@ -30,14 +30,15 @@ export declare class SequencerProvider implements ProviderInterface {
     getChainId(): Promise<StarknetChainId>;
     callContract({ contractAddress, entrypoint: entryPointSelector, calldata }: Call, blockIdentifier?: BlockIdentifier): Promise<CallContractResponse>;
     getBlock(blockIdentifier?: BlockIdentifier): Promise<GetBlockResponse>;
+    getNonce(contractAddress: string, blockIdentifier?: BlockIdentifier): Promise<BigNumberish>;
     getStorageAt(contractAddress: string, key: BigNumberish, blockIdentifier?: BlockIdentifier): Promise<BigNumberish>;
     getTransaction(txHash: BigNumberish): Promise<GetTransactionResponse>;
     getTransactionReceipt(txHash: BigNumberish): Promise<GetTransactionReceiptResponse>;
     getClassAt(contractAddress: string, blockIdentifier?: BlockIdentifier): Promise<ContractClass>;
-    invokeFunction(functionInvocation: Invocation, details: InvocationsDetails): Promise<InvokeFunctionResponse>;
+    invokeFunction(functionInvocation: Invocation, details: InvocationsDetailsWithNonce): Promise<InvokeFunctionResponse>;
     deployContract({ contract, constructorCalldata, addressSalt, }: DeployContractPayload): Promise<DeployContractResponse>;
     declareContract({ contract, }: DeclareContractPayload): Promise<DeclareContractResponse>;
-    getEstimateFee(invocation: Invocation, blockIdentifier?: BlockIdentifier, invocationDetails?: InvocationsDetails): Promise<EstimateFeeResponse>;
+    getEstimateFee(invocation: Invocation, invocationDetails: InvocationsDetailsWithNonce, blockIdentifier?: BlockIdentifier): Promise<EstimateFeeResponse>;
     getCode(contractAddress: string, blockIdentifier?: BlockIdentifier): Promise<Sequencer.GetCodeResponse>;
     waitForTransaction(txHash: BigNumberish, retryInterval?: number): Promise<void>;
     /**

package/provider/sequencer.js

@@ -257,6 +257,14 @@ var SequencerProvider = /** @class */ (function () {
             });
         });
     };
+    SequencerProvider.prototype.getNonce = function (contractAddress, blockIdentifier) {
+        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_nonce', { contractAddress: contractAddress, blockIdentifier: blockIdentifier })];
+            });
+        });
+    };
     SequencerProvider.prototype.getStorageAt = function (contractAddress, key, blockIdentifier) {
         if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
@@ -307,11 +315,11 @@ var SequencerProvider = /** @class */ (function () {
                 return [2 /*return*/, this.fetchEndpoint('add_transaction', undefined, {
                         type: 'INVOKE_FUNCTION',
                         contract_address: functionInvocation.contractAddress,
-                        entry_point_selector: (0, hash_1.getSelectorFromName)(functionInvocation.entrypoint),
                         calldata: (0, number_1.bigNumberishArrayToDecimalStringArray)((_a = functionInvocation.calldata) !== null && _a !== void 0 ? _a : []),
                         signature: (0, number_1.bigNumberishArrayToDecimalStringArray)((_b = functionInvocation.signature) !== null && _b !== void 0 ? _b : []),
+                        nonce: (0, number_1.toHex)((0, number_1.toBN)(details.nonce)),
                         max_fee: (0, number_1.toHex)((0, number_1.toBN)(details.maxFee || 0)),
-                        version: (0, number_1.toHex)((0, number_1.toBN)(details.version || 0)),
+                        version: (0, number_1.toHex)((0, number_1.toBN)(details.version || 1)),
                     }).then(this.responseParser.parseInvokeFunctionResponse)];
             });
         });
@@ -347,18 +355,18 @@ var SequencerProvider = /** @class */ (function () {
             });
         });
     };
-    SequencerProvider.prototype.getEstimateFee = function (invocation, blockIdentifier, invocationDetails) {
+    SequencerProvider.prototype.getEstimateFee = function (invocation, invocationDetails, blockIdentifier) {
         var _a;
         if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
-        if (invocationDetails === void 0) { invocationDetails = {}; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_b) {
                 return [2 /*return*/, this.fetchEndpoint('estimate_fee', { blockIdentifier: blockIdentifier }, {
+                        type: 'INVOKE_FUNCTION',
                         contract_address: invocation.contractAddress,
-                        entry_point_selector: (0, hash_1.getSelectorFromName)(invocation.entrypoint),
                         calldata: (_a = invocation.calldata) !== null && _a !== void 0 ? _a : [],
                         signature: (0, number_1.bigNumberishArrayToDecimalStringArray)(invocation.signature || []),
-                        version: (0, number_1.toHex)((0, number_1.toBN)((invocationDetails === null || invocationDetails === void 0 ? void 0 : invocationDetails.version) || 0)),
+                        version: (0, number_1.toHex)((0, number_1.toBN)((invocationDetails === null || invocationDetails === void 0 ? void 0 : invocationDetails.version) || 1)),
+                        nonce: (0, number_1.toHex)((0, number_1.toBN)(invocationDetails.nonce)),
                     }).then(this.responseParser.parseFeeEstimateResponse)];
             });
         });

package/signer/default.d.ts

@@ -1,10 +1,10 @@
-import { Abi, Invocation, InvocationsSignerDetails, KeyPair, Signature } from '../types';
+import { Abi, Call, InvocationsSignerDetails, KeyPair, Signature } from '../types';
 import { TypedData } from '../utils/typedData';
 import { SignerInterface } from './interface';
 export declare class Signer implements SignerInterface {
     protected keyPair: KeyPair;
     constructor(keyPair?: KeyPair);
     getPubKey(): Promise<string>;
-    signTransaction(transactions: Invocation[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): Promise<Signature>;
+    signTransaction(transactions: Call[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): Promise<Signature>;
     signMessage(typedData: TypedData, accountAddress: string): Promise<Signature>;
 }

package/signer/default.js

@@ -60,8 +60,8 @@ var Signer = /** @class */ (function () {
                 if (abis && abis.length !== transactions.length) {
                     throw new Error('ABI must be provided for each transaction or no transaction');
                 }
-                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);
+                calldata = (0, transaction_1.fromCallsToExecuteCalldata)(transactions);
+                msgHash = (0, hash_1.calculateTransactionHash)(transactionsDetail.walletAddress, transactionsDetail.version, calldata, transactionsDetail.maxFee, transactionsDetail.chainId, transactionsDetail.nonce);
                 return [2 /*return*/, (0, ellipticCurve_1.sign)(this.keyPair, msgHash)];
             });
         });

package/signer/interface.d.ts

@@ -1,4 +1,4 @@
-import { Abi, Invocation, InvocationsSignerDetails, Signature } from '../types';
+import { Abi, Call, InvocationsSignerDetails, Signature } from '../types';
 import { TypedData } from '../utils/typedData';
 export declare abstract class SignerInterface {
     /**
@@ -29,5 +29,5 @@ export declare abstract class SignerInterface {
      *
      * @returns signature
      */
-    abstract signTransaction(transactions: Invocation[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): Promise<Signature>;
+    abstract signTransaction(transactions: Call[], transactionsDetail: InvocationsSignerDetails, abis?: Abi[]): Promise<Signature>;
 }

package/src/account/default.ts

@@ -1,6 +1,7 @@
 import { ZERO } from '../constants';
 import { ProviderInterface, ProviderOptions } from '../provider';
 import { Provider } from '../provider/default';
+import { BlockIdentifier } from '../provider/utils';
 import { Signer, SignerInterface } from '../signer';
 import {
   Abi,
@@ -12,32 +13,31 @@ import {
   Signature,
 } from '../types';
 import { EstimateFee, EstimateFeeDetails } from '../types/account';
-import { feeTransactionVersion, transactionVersion } from '../utils/hash';
-import { BigNumberish, toBN, toHex } from '../utils/number';
+import { transactionVersion } from '../utils/hash';
+import { BigNumberish, toBN } from '../utils/number';
 import { compileCalldata, estimatedFeeToMaxFee } from '../utils/stark';
-import { fromCallsToExecuteCalldataWithNonce } from '../utils/transaction';
+import { fromCallsToExecuteCalldata } from '../utils/transaction';
 import { TypedData, getMessageHash } from '../utils/typedData';
 import { AccountInterface } from './interface';
 
 export class Account extends Provider implements AccountInterface {
   public signer: SignerInterface;
 
+  public address: string;
+
   constructor(
     providerOrOptions: ProviderOptions | ProviderInterface,
-    public address: string,
+    address: string,
     keyPairOrSigner: KeyPair | SignerInterface
   ) {
     super(providerOrOptions);
+    this.address = address.toLowerCase();
     this.signer =
       'getPubKey' in keyPairOrSigner ? keyPairOrSigner : new Signer(keyPairOrSigner as KeyPair);
   }
 
-  public async getNonce(): Promise<string> {
-    const { result } = await this.callContract({
-      contractAddress: this.address,
-      entrypoint: 'get_nonce',
-    });
-    return toHex(toBN(result[0]));
+  public async getNonce(blockIdentifier?: BlockIdentifier): Promise<BigNumberish> {
+    return super.getNonce(this.address, blockIdentifier);
   }
 
   public async estimateFee(
@@ -45,13 +45,13 @@ export class Account extends Provider implements AccountInterface {
     { nonce: providedNonce, blockIdentifier }: EstimateFeeDetails = {}
   ): Promise<EstimateFee> {
     const transactions = Array.isArray(calls) ? calls : [calls];
-    const nonce = providedNonce ?? (await this.getNonce());
-    const version = toBN(feeTransactionVersion);
+    const nonce = toBN(providedNonce ?? (await this.getNonce()));
+    const version = toBN(transactionVersion);
     const chainId = await this.getChainId();
 
     const signerDetails: InvocationsSignerDetails = {
       walletAddress: this.address,
-      nonce: toBN(nonce),
+      nonce,
       maxFee: ZERO,
       version,
       chainId,
@@ -59,11 +59,11 @@ export class Account extends Provider implements AccountInterface {
 
     const signature = await this.signer.signTransaction(transactions, signerDetails);
 
-    const calldata = fromCallsToExecuteCalldataWithNonce(transactions, nonce);
+    const calldata = fromCallsToExecuteCalldata(transactions);
     const response = await super.getEstimateFee(
-      { contractAddress: this.address, entrypoint: '__execute__', calldata, signature },
-      blockIdentifier,
-      { version }
+      { contractAddress: this.address, calldata, signature },
+      { version, nonce },
+      blockIdentifier
     );
 
     const suggestedMaxFee = estimatedFeeToMaxFee(response.overall_fee);
@@ -112,11 +112,12 @@ export class Account extends Provider implements AccountInterface {
 
     const signature = await this.signer.signTransaction(transactions, signerDetails, abis);
 
-    const calldata = fromCallsToExecuteCalldataWithNonce(transactions, nonce);
+    const calldata = fromCallsToExecuteCalldata(transactions);
 
     return this.invokeFunction(
-      { contractAddress: this.address, entrypoint: '__execute__', calldata, signature },
+      { contractAddress: this.address, calldata, signature },
       {
+        nonce,
         maxFee,
         version,
       }
@@ -158,7 +159,7 @@ export class Account extends Provider implements AccountInterface {
     try {
       await this.callContract({
         contractAddress: this.address,
-        entrypoint: 'is_valid_signature',
+        entrypoint: 'isValidSignature',
         calldata: compileCalldata({
           hash: toBN(hash).toString(),
           signature: signature.map((x) => toBN(x).toString()),