starknet 2.3.1 → 2.4.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [2.4.0](https://github.com/seanjameshan/starknet.js/compare/v2.3.1...v2.4.0) (2021-12-09)
+
+### Features
+
+- allow custom nonce ([17666de](https://github.com/seanjameshan/starknet.js/commit/17666de94db6875bbf8e88555773b8862a4a32cf))
+
 ## [2.3.1](https://github.com/seanjameshan/starknet.js/compare/v2.3.0...v2.3.1) (2021-12-01)
 
 ### Bug Fixes

package/__tests__/signer.test.ts

@@ -99,4 +99,21 @@ describe('deploy and test Wallet', () => {
 
     expect(number.toBN(res as string).toString()).toStrictEqual(number.toBN(990).toString());
   });
+  test('execute with custom nonce', async () => {
+    const { result } = await signer.callContract({
+      contract_address: signer.address,
+      entry_point_selector: stark.getSelectorFromName('get_nonce'),
+    });
+    const nonce = parseInt(result[0], 10);
+    const { code, transaction_hash } = await signer.addTransaction({
+      type: 'INVOKE_FUNCTION',
+      contract_address: erc20Address,
+      entry_point_selector: stark.getSelectorFromName('transfer'),
+      calldata: [erc20Address, '10'],
+      nonce,
+    });
+
+    expect(code).toBe('TRANSACTION_RECEIVED');
+    await defaultProvider.waitForTx(transaction_hash);
+  });
 });

package/dist/provider/default.d.ts

@@ -25,11 +25,11 @@ export declare class Provider implements ProviderInterface {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
      *
-     * @param invokeTx - transaction to be invoked
+     * @param invokeTransaction - transaction to be invoked
      * @param blockId
      * @returns the result of the function on the smart contract.
      */
-    callContract(invokeTx: CallContractTransaction, blockId?: number): Promise<CallContractResponse>;
+    callContract(invokeTransaction: CallContractTransaction, blockId?: number): Promise<CallContractResponse>;
     /**
      * Gets the block information from a block ID.
      *
@@ -83,10 +83,10 @@ export declare class Provider implements ProviderInterface {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
      *
-     * @param tx - transaction to be invoked
+     * @param transaction - transaction to be invoked
      * @returns a confirmation of invoking a function on the starknet contract
      */
-    addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+    addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
     /**
      * Deploys a given compiled contract (json) to starknet
      *

package/dist/provider/default.js

@@ -109,16 +109,16 @@ var Provider = /** @class */ (function () {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
      *
-     * @param invokeTx - transaction to be invoked
+     * @param invokeTransaction - transaction to be invoked
      * @param blockId
      * @returns the result of the function on the smart contract.
      */
-    Provider.prototype.callContract = function (invokeTx, blockId) {
+    Provider.prototype.callContract = function (invokeTransaction, blockId) {
         return __awaiter(this, void 0, void 0, function () {
             var data;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, axios_1.default.post((0, url_join_1.default)(this.feederGatewayUrl, 'call_contract', "?blockId=" + (blockId !== null && blockId !== void 0 ? blockId : 'null')), __assign({ signature: [], calldata: [] }, invokeTx))];
+                    case 0: return [4 /*yield*/, axios_1.default.post((0, url_join_1.default)(this.feederGatewayUrl, 'call_contract', "?blockId=" + (blockId !== null && blockId !== void 0 ? blockId : 'null')), __assign({ signature: [], calldata: [] }, invokeTransaction))];
                     case 1:
                         data = (_a.sent()).data;
                         return [2 /*return*/, data];
@@ -244,18 +244,18 @@ var Provider = /** @class */ (function () {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
      *
-     * @param tx - transaction to be invoked
+     * @param transaction - transaction to be invoked
      * @returns a confirmation of invoking a function on the starknet contract
      */
-    Provider.prototype.addTransaction = function (tx) {
+    Provider.prototype.addTransaction = function (transaction) {
         return __awaiter(this, void 0, void 0, function () {
             var signature, contract_address_salt, data;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        signature = tx.type === 'INVOKE_FUNCTION' && (0, stark_1.formatSignature)(tx.signature);
-                        contract_address_salt = tx.type === 'DEPLOY' && (0, number_1.toHex)((0, number_1.toBN)(tx.contract_address_salt));
-                        return [4 /*yield*/, axios_1.default.post((0, url_join_1.default)(this.gatewayUrl, 'add_transaction'), (0, json_1.stringify)(__assign(__assign(__assign({}, tx), (Array.isArray(signature) && { signature: signature })), (contract_address_salt && { contract_address_salt: contract_address_salt }))), { headers: { 'Content-Type': 'application/json' } })];
+                        signature = transaction.type === 'INVOKE_FUNCTION' && (0, stark_1.formatSignature)(transaction.signature);
+                        contract_address_salt = transaction.type === 'DEPLOY' && (0, number_1.toHex)((0, number_1.toBN)(transaction.contract_address_salt));
+                        return [4 /*yield*/, axios_1.default.post((0, url_join_1.default)(this.gatewayUrl, 'add_transaction'), (0, json_1.stringify)(__assign(__assign(__assign({}, transaction), (Array.isArray(signature) && { signature: signature })), (contract_address_salt && { contract_address_salt: contract_address_salt }))), { headers: { 'Content-Type': 'application/json' } })];
                     case 1:
                         data = (_a.sent()).data;
                         return [2 /*return*/, data];

package/dist/provider/interface.d.ts

@@ -16,11 +16,11 @@ export declare abstract class ProviderInterface {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
      *
-     * @param invokeTx - transaction to be invoked
+     * @param invokeTransaction - transaction to be invoked
      * @param blockId
      * @returns the result of the function on the smart contract.
      */
-    abstract callContract(invokeTx: CallContractTransaction, blockId?: number): Promise<CallContractResponse>;
+    abstract callContract(invokeTransaction: CallContractTransaction, blockId?: number): Promise<CallContractResponse>;
     /**
      * Gets the block information from a block ID.
      *
@@ -74,10 +74,10 @@ export declare abstract class ProviderInterface {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
      *
-     * @param tx - transaction to be invoked
+     * @param transaction - transaction to be invoked
      * @returns a confirmation of invoking a function on the starknet contract
      */
-    abstract addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+    abstract addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
     /**
      * Deploys a given compiled contract (json) to starknet
      *

package/dist/signer/default.d.ts

@@ -10,8 +10,8 @@ export declare class Signer extends Provider implements SignerInterface {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
      *
-     * @param tx - transaction to be invoked
+     * @param transaction - transaction to be invoked
      * @returns a confirmation of invoking a function on the starknet contract
      */
-    addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+    addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
 }

package/dist/signer/default.js

@@ -100,34 +100,39 @@ var Signer = /** @class */ (function (_super) {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
      *
-     * @param tx - transaction to be invoked
+     * @param transaction - transaction to be invoked
      * @returns a confirmation of invoking a function on the starknet contract
      */
-    Signer.prototype.addTransaction = function (tx) {
+    Signer.prototype.addTransaction = function (transaction) {
         return __awaiter(this, void 0, void 0, function () {
-            var result, nonceBn, calldataDecimal, msgHash, _a, r, s;
+            var nonceBn, result, calldataDecimal, msgHash, _a, r, s;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (tx.type === 'DEPLOY')
-                            return [2 /*return*/, _super.prototype.addTransaction.call(this, tx)];
-                        (0, minimalistic_assert_1.default)(!tx.signature, "Adding signatures to a signer tx currently isn't supported");
-                        return [4 /*yield*/, this.callContract({
-                                contract_address: this.address,
-                                entry_point_selector: (0, stark_1.getSelectorFromName)('get_nonce'),
-                            })];
-                    case 1:
+                        if (transaction.type === 'DEPLOY')
+                            return [2 /*return*/, _super.prototype.addTransaction.call(this, transaction)];
+                        (0, minimalistic_assert_1.default)(!transaction.signature, "Adding signatures to a signer transaction currently isn't supported");
+                        if (!transaction.nonce) return [3 /*break*/, 1];
+                        nonceBn = (0, number_1.toBN)(transaction.nonce);
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, this.callContract({
+                            contract_address: this.address,
+                            entry_point_selector: (0, stark_1.getSelectorFromName)('get_nonce'),
+                        })];
+                    case 2:
                         result = (_b.sent()).result;
                         nonceBn = (0, number_1.toBN)(result[0]);
-                        calldataDecimal = (tx.calldata || []).map(function (x) { return (0, number_1.toBN)(x).toString(); });
-                        msgHash = (0, encode_1.addHexPrefix)((0, hash_1.hashMessage)(this.address, tx.contract_address, tx.entry_point_selector, calldataDecimal, nonceBn.toString()));
+                        _b.label = 3;
+                    case 3:
+                        calldataDecimal = (transaction.calldata || []).map(function (x) { return (0, number_1.toBN)(x).toString(); });
+                        msgHash = (0, encode_1.addHexPrefix)((0, hash_1.hashMessage)(this.address, transaction.contract_address, transaction.entry_point_selector, calldataDecimal, nonceBn.toString()));
                         _a = (0, ellipticCurve_1.sign)(this.keyPair, msgHash), r = _a.r, s = _a.s;
                         return [2 /*return*/, _super.prototype.addTransaction.call(this, {
                                 type: 'INVOKE_FUNCTION',
                                 entry_point_selector: (0, stark_1.getSelectorFromName)('execute'),
                                 calldata: __spreadArray(__spreadArray([
-                                    tx.contract_address,
-                                    tx.entry_point_selector,
+                                    transaction.contract_address,
+                                    transaction.entry_point_selector,
                                     calldataDecimal.length.toString()
                                 ], __read(calldataDecimal), false), [
                                     nonceBn.toString(),

package/dist/signer/interface.d.ts

@@ -7,8 +7,8 @@ export declare abstract class SignerInterface extends Provider {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
      *
-     * @param tx - transaction to be invoked
+     * @param transaction - transaction to be invoked
      * @returns a confirmation of invoking a function on the starknet contract
      */
-    abstract addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+    abstract addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
 }

package/dist/types.d.ts

@@ -7,7 +7,7 @@ export declare type GetContractAddressesResponse = {
     GpsStatementVerifier: string;
 };
 export declare type Status = 'NOT_RECEIVED' | 'RECEIVED' | 'PENDING' | 'REJECTED' | 'ACCEPTED_ONCHAIN';
-export declare type TxStatus = 'TRANSACTION_RECEIVED';
+export declare type TransactionStatus = 'TRANSACTION_RECEIVED';
 export declare type Type = 'DEPLOY' | 'INVOKE_FUNCTION';
 export declare type EntryPointType = 'EXTERNAL';
 export declare type CompressedProgram = string;
@@ -44,6 +44,7 @@ export declare type DeployTransaction = {
     contract_definition: CompressedCompiledContract;
     contract_address_salt: BigNumberish;
     constructor_calldata: string[];
+    nonce?: BigNumberish;
 };
 export declare type InvokeFunctionTransaction = {
     type: 'INVOKE_FUNCTION';
@@ -52,6 +53,7 @@ export declare type InvokeFunctionTransaction = {
     entry_point_type?: EntryPointType;
     entry_point_selector: string;
     calldata?: string[];
+    nonce?: BigNumberish;
 };
 export declare type CallContractTransaction = Omit<InvokeFunctionTransaction, 'type'>;
 export declare type Transaction = DeployTransaction | InvokeFunctionTransaction;
@@ -100,7 +102,7 @@ export declare type GetTransactionResponse = {
     transaction_hash: string;
 };
 export declare type AddTransactionResponse = {
-    code: TxStatus;
+    code: TransactionStatus;
     transaction_hash: string;
     address?: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "JavaScript library for StarkNet",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,6 +23,7 @@
     "zk",
     "rollup"
   ],
+  "repository": "github:seanjameshan/starknet.js",
   "author": "Sean Han",
   "license": "MIT",
   "devDependencies": {

package/provider/default.d.ts

@@ -40,11 +40,14 @@ export declare class Provider implements ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
    *
-   * @param invokeTx - transaction to be invoked
+   * @param invokeTransaction - transaction to be invoked
    * @param blockId
    * @returns the result of the function on the smart contract.
    */
-  callContract(invokeTx: CallContractTransaction, blockId?: number): Promise<CallContractResponse>;
+  callContract(
+    invokeTransaction: CallContractTransaction,
+    blockId?: number
+  ): Promise<CallContractResponse>;
   /**
    * Gets the block information from a block ID.
    *
@@ -98,10 +101,10 @@ export declare class Provider implements ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+  addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
   /**
    * Deploys a given compiled contract (json) to starknet
    *

package/provider/default.js

@@ -219,11 +219,11 @@ var Provider = /** @class */ (function () {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
    *
-   * @param invokeTx - transaction to be invoked
+   * @param invokeTransaction - transaction to be invoked
    * @param blockId
    * @returns the result of the function on the smart contract.
    */
-  Provider.prototype.callContract = function (invokeTx, blockId) {
+  Provider.prototype.callContract = function (invokeTransaction, blockId) {
     return __awaiter(this, void 0, void 0, function () {
       var data;
       return __generator(this, function (_a) {
@@ -237,7 +237,7 @@ var Provider = /** @class */ (function () {
                   'call_contract',
                   '?blockId=' + (blockId !== null && blockId !== void 0 ? blockId : 'null')
                 ),
-                __assign({ signature: [], calldata: [] }, invokeTx)
+                __assign({ signature: [], calldata: [] }, invokeTransaction)
               ),
             ];
           case 1:
@@ -421,19 +421,21 @@ var Provider = /** @class */ (function () {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  Provider.prototype.addTransaction = function (tx) {
+  Provider.prototype.addTransaction = function (transaction) {
     return __awaiter(this, void 0, void 0, function () {
       var signature, contract_address_salt, data;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
-            signature = tx.type === 'INVOKE_FUNCTION' && (0, stark_1.formatSignature)(tx.signature);
+            signature =
+              transaction.type === 'INVOKE_FUNCTION' &&
+              (0, stark_1.formatSignature)(transaction.signature);
             contract_address_salt =
-              tx.type === 'DEPLOY' &&
-              (0, number_1.toHex)((0, number_1.toBN)(tx.contract_address_salt));
+              transaction.type === 'DEPLOY' &&
+              (0, number_1.toHex)((0, number_1.toBN)(transaction.contract_address_salt));
             return [
               4 /*yield*/,
               axios_1.default.post(
@@ -441,7 +443,7 @@ var Provider = /** @class */ (function () {
                 (0, json_1.stringify)(
                   __assign(
                     __assign(
-                      __assign({}, tx),
+                      __assign({}, transaction),
                       Array.isArray(signature) && { signature: signature }
                     ),
                     contract_address_salt && { contract_address_salt: contract_address_salt }

package/provider/interface.d.ts

@@ -27,12 +27,12 @@ export declare abstract class ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
    *
-   * @param invokeTx - transaction to be invoked
+   * @param invokeTransaction - transaction to be invoked
    * @param blockId
    * @returns the result of the function on the smart contract.
    */
   abstract callContract(
-    invokeTx: CallContractTransaction,
+    invokeTransaction: CallContractTransaction,
     blockId?: number
   ): Promise<CallContractResponse>;
   /**
@@ -88,10 +88,10 @@ export declare abstract class ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  abstract addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+  abstract addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
   /**
    * Deploys a given compiled contract (json) to starknet
    *

package/signer/default.d.ts

@@ -10,8 +10,8 @@ export declare class Signer extends Provider implements SignerInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+  addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
 }

package/signer/default.js

@@ -216,19 +216,23 @@ var Signer = /** @class */ (function (_super) {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  Signer.prototype.addTransaction = function (tx) {
+  Signer.prototype.addTransaction = function (transaction) {
     return __awaiter(this, void 0, void 0, function () {
-      var result, nonceBn, calldataDecimal, msgHash, _a, r, s;
+      var nonceBn, result, calldataDecimal, msgHash, _a, r, s;
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            if (tx.type === 'DEPLOY')
-              return [2 /*return*/, _super.prototype.addTransaction.call(this, tx)];
+            if (transaction.type === 'DEPLOY')
+              return [2 /*return*/, _super.prototype.addTransaction.call(this, transaction)];
             (0,
-            minimalistic_assert_1.default)(!tx.signature, "Adding signatures to a signer tx currently isn't supported");
+            minimalistic_assert_1.default)(!transaction.signature, "Adding signatures to a signer transaction currently isn't supported");
+            if (!transaction.nonce) return [3 /*break*/, 1];
+            nonceBn = (0, number_1.toBN)(transaction.nonce);
+            return [3 /*break*/, 3];
+          case 1:
             return [
               4 /*yield*/,
               this.callContract({
@@ -236,17 +240,19 @@ var Signer = /** @class */ (function (_super) {
                 entry_point_selector: (0, stark_1.getSelectorFromName)('get_nonce'),
               }),
             ];
-          case 1:
+          case 2:
             result = _b.sent().result;
             nonceBn = (0, number_1.toBN)(result[0]);
-            calldataDecimal = (tx.calldata || []).map(function (x) {
+            _b.label = 3;
+          case 3:
+            calldataDecimal = (transaction.calldata || []).map(function (x) {
               return (0, number_1.toBN)(x).toString();
             });
             msgHash = (0, encode_1.addHexPrefix)(
               (0, hash_1.hashMessage)(
                 this.address,
-                tx.contract_address,
-                tx.entry_point_selector,
+                transaction.contract_address,
+                transaction.entry_point_selector,
                 calldataDecimal,
                 nonceBn.toString()
               )
@@ -260,8 +266,8 @@ var Signer = /** @class */ (function (_super) {
                 calldata: __spreadArray(
                   __spreadArray(
                     [
-                      tx.contract_address,
-                      tx.entry_point_selector,
+                      transaction.contract_address,
+                      transaction.entry_point_selector,
                       calldataDecimal.length.toString(),
                     ],
                     __read(calldataDecimal),

package/signer/interface.d.ts

@@ -7,8 +7,8 @@ export declare abstract class SignerInterface extends Provider {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  abstract addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+  abstract addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
 }

package/src/provider/default.ts

@@ -83,12 +83,12 @@ export class Provider implements ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
    *
-   * @param invokeTx - transaction to be invoked
+   * @param invokeTransaction - transaction to be invoked
    * @param blockId
    * @returns the result of the function on the smart contract.
    */
   public async callContract(
-    invokeTx: CallContractTransaction,
+    invokeTransaction: CallContractTransaction,
     blockId?: number
   ): Promise<CallContractResponse> {
     const { data } = await axios.post<CallContractResponse>(
@@ -96,7 +96,7 @@ export class Provider implements ProviderInterface {
       {
         signature: [],
         calldata: [],
-        ...invokeTx,
+        ...invokeTransaction,
       }
     );
     return data;
@@ -204,17 +204,19 @@ export class Provider implements ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  public async addTransaction(tx: Transaction): Promise<AddTransactionResponse> {
-    const signature = tx.type === 'INVOKE_FUNCTION' && formatSignature(tx.signature);
-    const contract_address_salt = tx.type === 'DEPLOY' && toHex(toBN(tx.contract_address_salt));
+  public async addTransaction(transaction: Transaction): Promise<AddTransactionResponse> {
+    const signature =
+      transaction.type === 'INVOKE_FUNCTION' && formatSignature(transaction.signature);
+    const contract_address_salt =
+      transaction.type === 'DEPLOY' && toHex(toBN(transaction.contract_address_salt));
 
     const { data } = await axios.post<AddTransactionResponse>(
       urljoin(this.gatewayUrl, 'add_transaction'),
       stringify({
-        ...tx, // the tx can contain BigInts, so we use our own `stringify`
+        ...transaction, // the tx can contain BigInts, so we use our own `stringify`
         ...(Array.isArray(signature) && { signature }), // not needed on deploy tx
         ...(contract_address_salt && { contract_address_salt }), // not needed on invoke tx
       }),

package/src/provider/interface.ts

@@ -32,12 +32,12 @@ export abstract class ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
    *
-   * @param invokeTx - transaction to be invoked
+   * @param invokeTransaction - transaction to be invoked
    * @param blockId
    * @returns the result of the function on the smart contract.
    */
   public abstract callContract(
-    invokeTx: CallContractTransaction,
+    invokeTransaction: CallContractTransaction,
     blockId?: number
   ): Promise<CallContractResponse>;
 
@@ -104,10 +104,10 @@ export abstract class ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  public abstract addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+  public abstract addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
 
   /**
    * Deploys a given compiled contract (json) to starknet

package/src/signer/default.ts

@@ -25,26 +25,35 @@ export class Signer extends Provider implements SignerInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  public override async addTransaction(tx: Transaction): Promise<AddTransactionResponse> {
-    if (tx.type === 'DEPLOY') return super.addTransaction(tx);
+  public override async addTransaction(transaction: Transaction): Promise<AddTransactionResponse> {
+    if (transaction.type === 'DEPLOY') return super.addTransaction(transaction);
 
-    assert(!tx.signature, "Adding signatures to a signer tx currently isn't supported");
+    assert(
+      !transaction.signature,
+      "Adding signatures to a signer transaction currently isn't supported"
+    );
 
-    const { result } = await this.callContract({
-      contract_address: this.address,
-      entry_point_selector: getSelectorFromName('get_nonce'),
-    });
-    const nonceBn = toBN(result[0]);
-    const calldataDecimal = (tx.calldata || []).map((x) => toBN(x).toString());
+    let nonceBn;
+    if (transaction.nonce) {
+      nonceBn = toBN(transaction.nonce);
+    } else {
+      const { result } = await this.callContract({
+        contract_address: this.address,
+        entry_point_selector: getSelectorFromName('get_nonce'),
+      });
+      nonceBn = toBN(result[0]);
+    }
+
+    const calldataDecimal = (transaction.calldata || []).map((x) => toBN(x).toString());
 
     const msgHash = addHexPrefix(
       hashMessage(
         this.address,
-        tx.contract_address,
-        tx.entry_point_selector,
+        transaction.contract_address,
+        transaction.entry_point_selector,
         calldataDecimal,
         nonceBn.toString()
       )
@@ -56,8 +65,8 @@ export class Signer extends Provider implements SignerInterface {
       type: 'INVOKE_FUNCTION',
       entry_point_selector: getSelectorFromName('execute'),
       calldata: [
-        tx.contract_address,
-        tx.entry_point_selector,
+        transaction.contract_address,
+        transaction.entry_point_selector,
         calldataDecimal.length.toString(),
         ...calldataDecimal,
         nonceBn.toString(),

package/src/signer/interface.ts

@@ -8,8 +8,10 @@ export abstract class SignerInterface extends Provider {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  public abstract override addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+  public abstract override addTransaction(
+    transaction: Transaction
+  ): Promise<AddTransactionResponse>;
 }

package/src/types.ts

@@ -11,7 +11,7 @@ export type GetContractAddressesResponse = {
 };
 
 export type Status = 'NOT_RECEIVED' | 'RECEIVED' | 'PENDING' | 'REJECTED' | 'ACCEPTED_ONCHAIN';
-export type TxStatus = 'TRANSACTION_RECEIVED';
+export type TransactionStatus = 'TRANSACTION_RECEIVED';
 export type Type = 'DEPLOY' | 'INVOKE_FUNCTION';
 export type EntryPointType = 'EXTERNAL';
 export type CompressedProgram = string;
@@ -51,6 +51,7 @@ export type DeployTransaction = {
   contract_definition: CompressedCompiledContract;
   contract_address_salt: BigNumberish;
   constructor_calldata: string[];
+  nonce?: BigNumberish;
 };
 
 export type InvokeFunctionTransaction = {
@@ -60,6 +61,7 @@ export type InvokeFunctionTransaction = {
   entry_point_type?: EntryPointType;
   entry_point_selector: string;
   calldata?: string[];
+  nonce?: BigNumberish;
 };
 
 export type CallContractTransaction = Omit<InvokeFunctionTransaction, 'type'>;
@@ -116,7 +118,7 @@ export type GetTransactionResponse = {
 };
 
 export type AddTransactionResponse = {
-  code: TxStatus;
+  code: TransactionStatus;
   transaction_hash: string;
   address?: string;
 };

package/types.d.ts

@@ -13,7 +13,7 @@ export declare type Status =
   | 'PENDING'
   | 'REJECTED'
   | 'ACCEPTED_ONCHAIN';
-export declare type TxStatus = 'TRANSACTION_RECEIVED';
+export declare type TransactionStatus = 'TRANSACTION_RECEIVED';
 export declare type Type = 'DEPLOY' | 'INVOKE_FUNCTION';
 export declare type EntryPointType = 'EXTERNAL';
 export declare type CompressedProgram = string;
@@ -50,6 +50,7 @@ export declare type DeployTransaction = {
   contract_definition: CompressedCompiledContract;
   contract_address_salt: BigNumberish;
   constructor_calldata: string[];
+  nonce?: BigNumberish;
 };
 export declare type InvokeFunctionTransaction = {
   type: 'INVOKE_FUNCTION';
@@ -58,6 +59,7 @@ export declare type InvokeFunctionTransaction = {
   entry_point_type?: EntryPointType;
   entry_point_selector: string;
   calldata?: string[];
+  nonce?: BigNumberish;
 };
 export declare type CallContractTransaction = Omit<InvokeFunctionTransaction, 'type'>;
 export declare type Transaction = DeployTransaction | InvokeFunctionTransaction;
@@ -106,7 +108,7 @@ export declare type GetTransactionResponse = {
   transaction_hash: string;
 };
 export declare type AddTransactionResponse = {
-  code: TxStatus;
+  code: TransactionStatus;
   transaction_hash: string;
   address?: string;
 };