starknet 3.9.0 → 3.10.0

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/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');
@@ -259,21 +261,14 @@ var Account = /** @class */ (function (_super) {
             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(
@@ -327,7 +322,8 @@ var Account = /** @class */ (function (_super) {
           case 3:
             nonce = _b.apply(void 0, [_c]);
             maxFee = '0';
-            if (!transactionsDetail.maxFee) return [3 /*break*/, 4];
+            if (!(transactionsDetail.maxFee || transactionsDetail.maxFee === 0))
+              return [3 /*break*/, 4];
             maxFee = transactionsDetail.maxFee;
             return [3 /*break*/, 6];
           case 4:
@@ -342,19 +338,12 @@ var Account = /** @class */ (function (_super) {
               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 = _d.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('add_transaction', undefined, {
@@ -391,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,

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/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");
@@ -135,13 +137,14 @@ var Account = /** @class */ (function (_super) {
                         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__'),
@@ -182,7 +185,7 @@ var Account = /** @class */ (function (_super) {
                     case 3:
                         nonce = _b.apply(void 0, [_c]);
                         maxFee = '0';
-                        if (!transactionsDetail.maxFee) return [3 /*break*/, 4];
+                        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 })];
@@ -196,11 +199,12 @@ var Account = /** @class */ (function (_super) {
                             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 = _d.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('add_transaction', undefined, {
                                 type: 'INVOKE_FUNCTION',
                                 contract_address: this.address,
@@ -232,7 +236,7 @@ var Account = /** @class */ (function (_super) {
                     .map(number_1.bigNumberishArrayToDecimalStringArray)
                     .map(hash_1.computeHashOnElements);
                 return (0, hash_1.computeHashOnElements)([
-                    hash_1.transactionPrefix,
+                    (0, shortString_1.encodeShortString)('StarkNet Transaction'),
                     account,
                     (0, hash_1.computeHashOnElements)(hashArray),
                     nonce,

package/dist/constants.d.ts

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

package/dist/constants.js

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

package/dist/provider/default.d.ts

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

package/dist/provider/default.js

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

package/dist/provider/interface.d.ts

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

package/dist/signer/default.js

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

package/dist/signer/ledger.js

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

package/dist/types/signer.d.ts

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

package/dist/utils/hash.d.ts

@@ -1,7 +1,6 @@
 import BN from 'bn.js';
-import { Call } from '../types';
+import { StarknetChainId, TransactionHashPrefix } from '../constants';
 import { BigNumberish } from './number';
-export declare const transactionPrefix: string;
 export declare const transactionVersion = 0;
 export declare const feeTransactionVersion: BN;
 /**
@@ -22,4 +21,6 @@ export declare function starknetKeccak(value: string): BN;
 export declare function getSelectorFromName(funcName: string): string;
 export declare function pedersen(input: [BigNumberish, BigNumberish]): string;
 export declare function computeHashOnElements(data: BigNumberish[]): string;
-export declare function hashMulticall(account: string, transactions: Call[], nonce: string, maxFee: string, version?: string | number): string;
+export declare function calculateTransactionHashCommon(txHashPrefix: TransactionHashPrefix, version: BigNumberish, contractAddress: BigNumberish, entryPointSelector: BigNumberish, calldata: BigNumberish[], maxFee: BigNumberish, chainId: StarknetChainId, additionalData?: BigNumberish[]): string;
+export declare function calculateDeployTransactionHash(contractAddress: BigNumberish, constructorCalldata: BigNumberish[], version: BigNumberish, chainId: StarknetChainId): string;
+export declare function calculcateTransactionHash(contractAddress: BigNumberish, version: BigNumberish, entryPointSelector: BigNumberish, calldata: BigNumberish[], maxFee: BigNumberish, chainId: StarknetChainId): string;

package/dist/utils/hash.js

@@ -28,15 +28,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashMulticall = exports.computeHashOnElements = exports.pedersen = exports.getSelectorFromName = exports.starknetKeccak = exports.feeTransactionVersion = exports.transactionVersion = exports.transactionPrefix = void 0;
+exports.calculcateTransactionHash = exports.calculateDeployTransactionHash = exports.calculateTransactionHashCommon = exports.computeHashOnElements = exports.pedersen = exports.getSelectorFromName = exports.starknetKeccak = exports.feeTransactionVersion = exports.transactionVersion = void 0;
 var keccak_1 = require("ethereum-cryptography/keccak");
 var minimalistic_assert_1 = __importDefault(require("minimalistic-assert"));
 var constants_1 = require("../constants");
 var ellipticCurve_1 = require("./ellipticCurve");
 var encode_1 = require("./encode");
 var number_1 = require("./number");
-var shortString_1 = require("./shortString");
-exports.transactionPrefix = (0, shortString_1.encodeShortString)('StarkNet Transaction');
 exports.transactionVersion = 0;
 exports.feeTransactionVersion = (0, number_1.toBN)(2).pow((0, number_1.toBN)(128)).add((0, number_1.toBN)(exports.transactionVersion));
 function keccakHex(value) {
@@ -89,26 +87,28 @@ function computeHashOnElements(data) {
     return __spreadArray(__spreadArray([], __read(data), false), [data.length], false).reduce(function (x, y) { return pedersen([x, y]); }, 0).toString();
 }
 exports.computeHashOnElements = computeHashOnElements;
-function hashMulticall(account, transactions, nonce, maxFee, version) {
-    if (version === void 0) { version = exports.transactionVersion; }
-    var hashArray = transactions
-        .map(function (_a) {
-        var contractAddress = _a.contractAddress, entrypoint = _a.entrypoint, calldata = _a.calldata;
-        return [
-            contractAddress,
-            getSelectorFromName(entrypoint),
-            computeHashOnElements(calldata || []),
-        ];
-    })
-        .map(number_1.bigNumberishArrayToDecimalStringArray)
-        .map(computeHashOnElements);
-    return computeHashOnElements([
-        exports.transactionPrefix,
-        account,
-        computeHashOnElements(hashArray),
-        nonce,
-        maxFee,
+// following implementation is based on this python implementation:
+// https://github.com/starkware-libs/cairo-lang/blob/b614d1867c64f3fb2cf4a4879348cfcf87c3a5a7/src/starkware/starknet/core/os/transaction_hash/transaction_hash.py
+function calculateTransactionHashCommon(txHashPrefix, version, contractAddress, entryPointSelector, calldata, maxFee, chainId, additionalData) {
+    if (additionalData === void 0) { additionalData = []; }
+    var calldataHash = computeHashOnElements(calldata);
+    var dataToHash = __spreadArray([
+        txHashPrefix,
         version,
-    ]);
+        contractAddress,
+        entryPointSelector,
+        calldataHash,
+        maxFee,
+        chainId
+    ], __read(additionalData), false);
+    return computeHashOnElements(dataToHash);
+}
+exports.calculateTransactionHashCommon = calculateTransactionHashCommon;
+function calculateDeployTransactionHash(contractAddress, constructorCalldata, version, chainId) {
+    return calculateTransactionHashCommon(constants_1.TransactionHashPrefix.DEPLOY, version, contractAddress, getSelectorFromName('constructor'), constructorCalldata, constants_1.ZERO, chainId);
+}
+exports.calculateDeployTransactionHash = calculateDeployTransactionHash;
+function calculcateTransactionHash(contractAddress, version, entryPointSelector, calldata, maxFee, chainId) {
+    return calculateTransactionHashCommon(constants_1.TransactionHashPrefix.INVOKE, version, contractAddress, entryPointSelector, calldata, maxFee, chainId);
 }
-exports.hashMulticall = hashMulticall;
+exports.calculcateTransactionHash = calculcateTransactionHash;

package/dist/utils/transaction.d.ts

@@ -1,4 +1,5 @@
 import { Call, ParsedStruct } from '../types';
+import { BigNumberish } from './number';
 /**
  * Transforms a list of Calls, each with their own calldata, into
  * two arrays: one with the entrypoints, and one with the concatenated calldata.
@@ -16,3 +17,4 @@ export declare const transformCallsToMulticallArrays: (calls: Call[]) => {
  * @returns
  */
 export declare const fromCallsToExecuteCalldata: (calls: Call[]) => string[];
+export declare const fromCallsToExecuteCalldataWithNonce: (calls: Call[], nonce: BigNumberish) => string[];

package/dist/utils/transaction.js

@@ -25,7 +25,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromCallsToExecuteCalldata = exports.transformCallsToMulticallArrays = void 0;
+exports.fromCallsToExecuteCalldataWithNonce = exports.fromCallsToExecuteCalldata = exports.transformCallsToMulticallArrays = void 0;
 var hash_1 = require("./hash");
 var number_1 = require("./number");
 /**
@@ -73,3 +73,7 @@ var fromCallsToExecuteCalldata = function (calls) {
     ], false), __read(calldata), false);
 };
 exports.fromCallsToExecuteCalldata = fromCallsToExecuteCalldata;
+var fromCallsToExecuteCalldataWithNonce = function (calls, nonce) {
+    return __spreadArray(__spreadArray([], __read((0, exports.fromCallsToExecuteCalldata)(calls)), false), [(0, number_1.toBN)(nonce).toString()], false);
+};
+exports.fromCallsToExecuteCalldataWithNonce = fromCallsToExecuteCalldataWithNonce;

package/dist/utils/typedData/index.d.ts

@@ -48,8 +48,8 @@ export declare const encodeData: <T extends {
     primaryType: string;
     domain: {
         version?: string | undefined;
-        name?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 }>(typedData: T, type: string, data: T["message"]) => string[][];
@@ -75,8 +75,8 @@ export declare const getStructHash: <T extends {
     primaryType: string;
     domain: {
         version?: string | undefined;
-        name?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 }>(typedData: T, type: string, data: T["message"]) => string;

package/dist/utils/typedData/types.d.ts

@@ -26,8 +26,8 @@ export declare const STARKNET_TYPE: import("superstruct").Struct<{
 export declare type StarkNetType = Infer<typeof STARKNET_TYPE>;
 export declare const STARKNET_DOMAIN_TYPE: import("superstruct").Struct<{
     version?: string | undefined;
-    name?: string | undefined;
     chainId?: string | number | undefined;
+    name?: string | undefined;
 }, {
     name: import("superstruct").Struct<string | undefined, null>;
     version: import("superstruct").Struct<string | undefined, null>;
@@ -50,8 +50,8 @@ export declare const STARKNET_TYPED_DATA_TYPE: import("superstruct").Struct<{
     primaryType: string;
     domain: {
         version?: string | undefined;
-        name?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 }, {
@@ -67,8 +67,8 @@ export declare const STARKNET_TYPED_DATA_TYPE: import("superstruct").Struct<{
     primaryType: import("superstruct").Struct<string, null>;
     domain: import("superstruct").Struct<{
         version?: string | undefined;
-        name?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     }, {
         name: import("superstruct").Struct<string | undefined, null>;
         version: import("superstruct").Struct<string | undefined, null>;

package/dist/utils/typedData/utils.d.ts

@@ -17,8 +17,8 @@ export declare const validateTypedData: (data: unknown) => data is {
     primaryType: string;
     domain: {
         version?: string | undefined;
-        name?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 };

package/package.json

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

package/provider/default.d.ts

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import {
   Abi,
   AddTransactionResponse,
@@ -29,10 +30,12 @@ export declare class Provider implements ProviderInterface {
   baseUrl: string;
   feederGatewayUrl: string;
   gatewayUrl: string;
+  chainId: StarknetChainId;
   constructor(optionsOrProvider?: ProviderOptions | Provider);
   protected static getNetworkFromName(
     name: NetworkName
   ): 'https://alpha-mainnet.starknet.io' | 'https://alpha4.starknet.io';
+  protected static getChainIdFromBaseUrl(baseUrl: string): StarknetChainId;
   private getFetchUrl;
   private getFetchMethod;
   private getQueryString;