starknet 3.8.0 → 3.10.1

package/__tests__/utils/ellipticalCurve.test.ts

@@ -1,7 +1,15 @@
+import { StarknetChainId } from '../../src/constants';
 import { ec, getKeyPair, getStarkKey, sign, verify } from '../../src/utils/ellipticCurve';
 import { removeHexPrefix } from '../../src/utils/encode';
-import { computeHashOnElements, hashMulticall, pedersen } from '../../src/utils/hash';
+import {
+  calculcateTransactionHash,
+  computeHashOnElements,
+  getSelectorFromName,
+  pedersen,
+  transactionVersion,
+} from '../../src/utils/hash';
 import { toBN, toHex } from '../../src/utils/number';
+import { fromCallsToExecuteCalldataWithNonce } from '../../src/utils/transaction';
 
 test('getKeyPair()', () => {
   const privateKey = '0x019800ea6a9a73f94aee6a3d2edf018fc770443e90c7ba121e8303ec6b349279';
@@ -42,17 +50,27 @@ test('hashMessage()', () => {
   ];
   const nonce = '3';
   const maxFee = '0';
-  const hashMsg = hashMulticall(account, transactions, nonce, maxFee);
-  expect(hashMsg).toBe(
-    toHex(toBN('1608351043472325350463069815257733118091727529101532499046754244230898025592'))
+  const calldata = fromCallsToExecuteCalldataWithNonce(transactions, nonce);
+
+  const hashMsg = calculcateTransactionHash(
+    account,
+    transactionVersion,
+    getSelectorFromName('__execute__'),
+    calldata,
+    maxFee,
+    StarknetChainId.TESTNET
+  );
+
+  expect(hashMsg).toMatchInlineSnapshot(
+    `"0x4c337c6bf32b2cf2b8ae54064e4b982c214660e8d0423b431a3fde10b9b9c02"`
   );
   const keyPair = getKeyPair(privateKey);
   const [r, s] = sign(keyPair, removeHexPrefix(hashMsg));
-  expect(r.toString()).toStrictEqual(
-    toBN('1079537730825246752292590270213864261175133133352510235773017189606850691611').toString()
+  expect(r.toString()).toMatchInlineSnapshot(
+    `"1944132633844378384908742523072599391732300777648030785844673145513474741467"`
   );
-  expect(s.toString()).toStrictEqual(
-    toBN('2904560423220491364719171767721067837294296476624248675613584621502231297000').toString()
+  expect(s.toString()).toMatchInlineSnapshot(
+    `"1067771353159635307522498807851959257107695451405842425488451092336556917559"`
   );
 });
 

package/__tests__/utils/transactionHash.test.ts

@@ -0,0 +1,17 @@
+import { StarknetChainId, TransactionHashPrefix } from '../../src/constants';
+import { calculateTransactionHashCommon } from '../../src/utils/hash';
+
+describe('calculateTransactionHashCommon()', () => {
+  test('should match most simple python output', () => {
+    const result = calculateTransactionHashCommon(
+      TransactionHashPrefix.INVOKE,
+      '0x0',
+      '0x2a',
+      '0x64',
+      [],
+      '0x0',
+      StarknetChainId.TESTNET
+    );
+    expect(result).toBe('0x7d260744de9d8c55e7675a34512d1951a7b262c79e685d26599edd2948de959');
+  });
+});

package/__tests__/utils/utils.test.ts

@@ -77,3 +77,13 @@ describe('computeHashOnElements()', () => {
     );
   });
 });
+describe('estimatedFeeToMaxFee()', () => {
+  test('should return maxFee for 0', () => {
+    const res = stark.estimatedFeeToMaxFee(0, 0.15).toNumber();
+    expect(res).toBe(0);
+  });
+  test('should return maxFee for 10_000', () => {
+    const res = stark.estimatedFeeToMaxFee(10_000, 0.15).toNumber();
+    expect(res).toBe(11_500);
+  });
+});

package/account/default.d.ts

@@ -1,4 +1,4 @@
-import { Provider } from '../provider';
+import { Provider, ProviderInterface } from '../provider';
 import { BlockIdentifier } from '../provider/utils';
 import { SignerInterface } from '../signer';
 import {
@@ -16,8 +16,12 @@ import { TypedData } from '../utils/typedData';
 import { AccountInterface } from './interface';
 export declare class Account extends Provider implements AccountInterface {
   address: string;
-  private signer;
-  constructor(provider: Provider, address: string, keyPairOrSigner: KeyPair | SignerInterface);
+  signer: SignerInterface;
+  constructor(
+    provider: ProviderInterface,
+    address: string,
+    keyPairOrSigner: KeyPair | SignerInterface
+  );
   getNonce(): Promise<string>;
   estimateFee(
     calls: Call | Call[],
@@ -64,7 +68,8 @@ export declare class Account extends Provider implements AccountInterface {
    */
   hashMessage(typedData: TypedData): Promise<string>;
   /**
-   * Verify a signature of a JSON object
+   * Verify a signature of a given hash
+   * @warning This method is not recommended, use verifyMessage instead
    *
    * @param hash - JSON object to be verified
    * @param signature - signature of the JSON object
@@ -73,8 +78,7 @@ export declare class Account extends Provider implements AccountInterface {
    */
   verifyMessageHash(hash: BigNumberish, signature: Signature): Promise<boolean>;
   /**
-   * Verify a signature of a given hash
-   * @warning This method is not recommended, use verifyMessage instead
+   * Verify a signature of a JSON object
    *
    * @param hash - hash to be verified
    * @param signature - signature of the hash

package/account/default.js

@@ -197,11 +197,13 @@ var __importDefault =
 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');
@@ -240,7 +242,7 @@ var Account = /** @class */ (function (_super) {
       _c = _b.blockIdentifier,
       blockIdentifier = _c === void 0 ? 'pending' : _c;
     return __awaiter(this, void 0, void 0, function () {
-      var transactions, nonce, _d, signerDetails, signature, calldata;
+      var transactions, nonce, _d, version, signerDetails, signature, calldata;
       return __generator(this, function (_e) {
         switch (_e.label) {
           case 0:
@@ -255,23 +257,18 @@ var Account = /** @class */ (function (_super) {
             _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 4:
             signature = _e.sent();
-            calldata = __spreadArray(
-              __spreadArray(
-                [],
-                __read((0, transaction_1.fromCallsToExecuteCalldata)(transactions)),
-                false
-              ),
-              [signerDetails.nonce.toString()],
-              false
-            );
+            calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, nonce);
             return [
               2 /*return*/,
               this.fetchEndpoint(
@@ -281,6 +278,7 @@ var Account = /** @class */ (function (_super) {
                   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),
                 }
               ),
@@ -298,7 +296,7 @@ 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;
     }
@@ -306,51 +304,46 @@ var Account = /** @class */ (function (_super) {
       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))
+            nonce = _b.apply(void 0, [_c]);
+            maxFee = '0';
+            if (!(transactionsDetail.maxFee || transactionsDetail.maxFee === 0))
               return [3 /*break*/, 4];
-            _e = _b;
+            maxFee = transactionsDetail.maxFee;
             return [3 /*break*/, 6];
           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, {
@@ -387,7 +380,7 @@ var Account = /** @class */ (function (_super) {
           .map(number_1.bigNumberishArrayToDecimalStringArray)
           .map(hash_1.computeHashOnElements);
         return (0,
-        hash_1.computeHashOnElements)([hash_1.transactionPrefix, account, (0, hash_1.computeHashOnElements)(hashArray), nonce, maxFee, hash_1.transactionVersion]);
+        hash_1.computeHashOnElements)([(0, shortString_1.encodeShortString)('StarkNet Transaction'), account, (0, hash_1.computeHashOnElements)(hashArray), nonce, maxFee, hash_1.transactionVersion]);
       }
       var nonceBn,
         result,
@@ -517,7 +510,8 @@ var Account = /** @class */ (function (_super) {
     });
   };
   /**
-   * Verify a signature of a JSON object
+   * Verify a signature of a given hash
+   * @warning This method is not recommended, use verifyMessage instead
    *
    * @param hash - JSON object to be verified
    * @param signature - signature of the JSON object
@@ -557,8 +551,7 @@ var Account = /** @class */ (function (_super) {
     });
   };
   /**
-   * Verify a signature of a given hash
-   * @warning This method is not recommended, use verifyMessage instead
+   * Verify a signature of a JSON object
    *
    * @param hash - hash to be verified
    * @param signature - signature of the hash

package/account/interface.d.ts

@@ -1,4 +1,5 @@
 import { ProviderInterface } from '../provider';
+import { SignerInterface } from '../signer';
 import {
   Abi,
   AddTransactionResponse,
@@ -13,6 +14,7 @@ import { BigNumberish } from '../utils/number';
 import { TypedData } from '../utils/typedData/types';
 export declare abstract class AccountInterface extends ProviderInterface {
   abstract address: string;
+  abstract signer: SignerInterface;
   /**
    * Deploys a given compiled contract (json) to starknet
    *

package/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/constants.js

@@ -8,6 +8,8 @@ exports.CONSTANT_POINTS =
   exports.FIELD_SIZE =
   exports.FIELD_GEN =
   exports.FIELD_PRIME =
+  exports.TransactionHashPrefix =
+  exports.StarknetChainId =
   exports.MASK_251 =
   exports.MASK_250 =
   exports.TWO =
@@ -28,6 +30,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/contract/contractFactory.d.ts

@@ -1,15 +1,15 @@
-import { Account } from '../account';
-import { Provider } from '../provider';
+import { AccountInterface } from '../account';
+import { ProviderInterface } from '../provider';
 import { Abi, CompiledContract, RawCalldata } from '../types';
 import { BigNumberish } from '../utils/number';
 import { Contract } from './default';
 export declare class ContractFactory {
   abi: Abi;
   compiledContract: CompiledContract;
-  providerOrAccount: Provider | Account;
+  providerOrAccount: ProviderInterface | AccountInterface;
   constructor(
     compiledContract: CompiledContract,
-    providerOrAccount?: Provider | Account,
+    providerOrAccount?: ProviderInterface | AccountInterface,
     abi?: Abi
   );
   /**
@@ -25,7 +25,7 @@ export declare class ContractFactory {
    *
    * @param providerOrAccount - new Provider or Account to attach to
    */
-  connect(providerOrAccount: Provider | Account): ContractFactory;
+  connect(providerOrAccount: ProviderInterface | AccountInterface): ContractFactory;
   /**
    * Attaches current abi and provider or account to the new address
    *

package/contract/default.js

@@ -224,8 +224,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)];
       });
     });
   };
@@ -510,7 +522,7 @@ var Contract = /** @class */ (function () {
       if (member.type === 'felt') {
         return acc + 1;
       }
-      return acc + _this.structMemberNum(member.type);
+      return acc + _this.calculateStructMembers(member.type);
     }, 0);
   };
   /**

package/dist/account/default.d.ts

@@ -1,4 +1,4 @@
-import { Provider } from '../provider';
+import { Provider, ProviderInterface } from '../provider';
 import { BlockIdentifier } from '../provider/utils';
 import { SignerInterface } from '../signer';
 import { Abi, AddTransactionResponse, Call, EstimateFeeResponse, InvocationsDetails, KeyPair, Signature, Transaction } from '../types';
@@ -7,8 +7,8 @@ import { TypedData } from '../utils/typedData';
 import { AccountInterface } from './interface';
 export declare class Account extends Provider implements AccountInterface {
     address: string;
-    private signer;
-    constructor(provider: Provider, address: string, keyPairOrSigner: KeyPair | SignerInterface);
+    signer: SignerInterface;
+    constructor(provider: ProviderInterface, address: string, keyPairOrSigner: KeyPair | SignerInterface);
     getNonce(): Promise<string>;
     estimateFee(calls: Call | Call[], { nonce: providedNonce, blockIdentifier, }?: {
         nonce?: BigNumberish;
@@ -45,7 +45,8 @@ export declare class Account extends Provider implements AccountInterface {
      */
     hashMessage(typedData: TypedData): Promise<string>;
     /**
-     * Verify a signature of a JSON object
+     * Verify a signature of a given hash
+     * @warning This method is not recommended, use verifyMessage instead
      *
      * @param hash - JSON object to be verified
      * @param signature - signature of the JSON object
@@ -54,8 +55,7 @@ export declare class Account extends Provider implements AccountInterface {
      */
     verifyMessageHash(hash: BigNumberish, signature: Signature): Promise<boolean>;
     /**
-     * Verify a signature of a given hash
-     * @warning This method is not recommended, use verifyMessage instead
+     * Verify a signature of a JSON object
      *
      * @param hash - hash to be verified
      * @param signature - signature of the hash

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");
@@ -117,7 +119,7 @@ var Account = /** @class */ (function (_super) {
     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, _d, signerDetails, signature, calldata;
+            var transactions, nonce, _d, version, signerDetails, signature, calldata;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -131,19 +133,23 @@ var Account = /** @class */ (function (_super) {
                         _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 4:
                         signature = _e.sent();
-                        calldata = __spreadArray(__spreadArray([], __read((0, transaction_1.fromCallsToExecuteCalldata)(transactions)), false), [signerDetails.nonce.toString()], false);
+                        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),
                             })];
                 }
@@ -159,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, { 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,
@@ -227,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,
@@ -331,7 +340,8 @@ var Account = /** @class */ (function (_super) {
         });
     };
     /**
-     * Verify a signature of a JSON object
+     * Verify a signature of a given hash
+     * @warning This method is not recommended, use verifyMessage instead
      *
      * @param hash - JSON object to be verified
      * @param signature - signature of the JSON object
@@ -365,8 +375,7 @@ var Account = /** @class */ (function (_super) {
         });
     };
     /**
-     * Verify a signature of a given hash
-     * @warning This method is not recommended, use verifyMessage instead
+     * Verify a signature of a JSON object
      *
      * @param hash - hash to be verified
      * @param signature - signature of the hash

package/dist/account/interface.d.ts

@@ -1,9 +1,11 @@
 import { ProviderInterface } from '../provider';
+import { SignerInterface } from '../signer';
 import { Abi, AddTransactionResponse, Call, DeployContractPayload, EstimateFeeResponse, Invocation, InvocationsDetails, Signature } from '../types';
 import { BigNumberish } from '../utils/number';
 import { TypedData } from '../utils/typedData/types';
 export declare abstract class AccountInterface extends ProviderInterface {
     abstract address: string;
+    abstract signer: SignerInterface;
     /**
      * Deploys a given compiled contract (json) to starknet
      *

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.