starknet 3.9.0 → 3.10.0

package/provider/default.js

@@ -175,6 +175,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');
@@ -203,16 +204,22 @@ var Provider = /** @class */ (function () {
     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');
     }
@@ -226,6 +233,18 @@ 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/provider/interface.d.ts

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import type {
   AddTransactionResponse,
   Call,
@@ -17,6 +18,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/signer/default.js

@@ -134,6 +134,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) {
@@ -148,17 +149,22 @@ 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,
+        calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(
           transactions,
-          transactionsDetail.nonce.toString(),
-          transactionsDetail.maxFee.toString(),
-          transactionsDetail.version.toString()
+          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/signer/ledger.js

@@ -141,6 +141,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;
@@ -200,13 +201,19 @@ 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,
+        calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(
           transactions,
-          transactionsDetail.nonce.toString(),
-          transactionsDetail.maxFee.toString()
+          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/src/account/default.ts

@@ -1,5 +1,6 @@
 import assert from 'minimalistic-assert';
 
+import { ZERO } from '../constants';
 import { Provider } from '../provider';
 import { BlockIdentifier } from '../provider/utils';
 import { Signer, SignerInterface } from '../signer';
@@ -9,6 +10,7 @@ import {
   Call,
   EstimateFeeResponse,
   InvocationsDetails,
+  InvocationsSignerDetails,
   InvokeFunctionTransaction,
   KeyPair,
   Signature,
@@ -19,12 +21,12 @@ import {
   computeHashOnElements,
   feeTransactionVersion,
   getSelectorFromName,
-  transactionPrefix,
   transactionVersion,
 } from '../utils/hash';
 import { BigNumberish, bigNumberishArrayToDecimalStringArray, toBN, toHex } from '../utils/number';
+import { encodeShortString } from '../utils/shortString';
 import { compileCalldata, estimatedFeeToMaxFee } from '../utils/stark';
-import { fromCallsToExecuteCalldata } from '../utils/transaction';
+import { fromCallsToExecuteCalldataWithNonce } from '../utils/transaction';
 import { TypedData, getMessageHash } from '../utils/typedData';
 import { AccountInterface } from './interface';
 
@@ -58,15 +60,18 @@ export class Account extends Provider implements AccountInterface {
     const transactions = Array.isArray(calls) ? calls : [calls];
     const nonce = providedNonce ?? (await this.getNonce());
     const version = toBN(feeTransactionVersion);
-    const signerDetails = {
+
+    const signerDetails: InvocationsSignerDetails = {
       walletAddress: this.address,
       nonce: toBN(nonce),
-      maxFee: toBN('0'),
+      maxFee: ZERO,
       version,
+      chainId: this.chainId,
     };
+
     const signature = await this.signer.signTransaction(transactions, signerDetails);
 
-    const calldata = [...fromCallsToExecuteCalldata(transactions), signerDetails.nonce.toString()];
+    const calldata = fromCallsToExecuteCalldataWithNonce(transactions, nonce);
     return this.fetchEndpoint(
       'estimate_fee',
       { blockIdentifier },
@@ -96,22 +101,24 @@ export class Account extends Provider implements AccountInterface {
     const transactions = Array.isArray(calls) ? calls : [calls];
     const nonce = toBN(transactionsDetail.nonce ?? (await this.getNonce()));
     let maxFee: BigNumberish = '0';
-    if (transactionsDetail.maxFee) {
+    if (transactionsDetail.maxFee || transactionsDetail.maxFee === 0) {
       maxFee = transactionsDetail.maxFee;
     } else {
       const estimatedFee = (await this.estimateFee(transactions, { nonce })).amount;
       maxFee = estimatedFeeToMaxFee(estimatedFee).toString();
     }
-    const signerDetails = {
+
+    const signerDetails: InvocationsSignerDetails = {
       walletAddress: this.address,
       nonce,
       maxFee,
       version: toBN(transactionVersion),
+      chainId: this.chainId,
     };
 
     const signature = await this.signer.signTransaction(transactions, signerDetails, abis);
 
-    const calldata = [...fromCallsToExecuteCalldata(transactions), signerDetails.nonce.toString()];
+    const calldata = fromCallsToExecuteCalldataWithNonce(transactions, nonce);
     return this.fetchEndpoint('add_transaction', undefined, {
       type: 'INVOKE_FUNCTION',
       contract_address: this.address,
@@ -161,7 +168,7 @@ export class Account extends Provider implements AccountInterface {
         .map(computeHashOnElements);
 
       return computeHashOnElements([
-        transactionPrefix,
+        encodeShortString('StarkNet Transaction'),
         account,
         computeHashOnElements(hashArray),
         nonce,

package/src/constants.ts

@@ -8,6 +8,16 @@ export const TWO = toBN(2);
 export const MASK_250 = TWO.pow(toBN(250)).sub(ONE); // 2 ** 250 - 1
 export const MASK_251 = TWO.pow(toBN(251));
 
+export enum StarknetChainId {
+  MAINNET = '0x534e5f4d41494e', // encodeShortString('SN_MAIN'),
+  TESTNET = '0x534e5f474f45524c49', // encodeShortString('SN_GOERLI'),
+}
+export enum TransactionHashPrefix {
+  DEPLOY = '0x6465706c6f79', // encodeShortString('deploy'),
+  INVOKE = '0x696e766f6b65', // encodeShortString('invoke'),
+  L1_HANDLER = '0x6c315f68616e646c6572', // encodeShortString('l1_handler'),
+}
+
 /**
  * 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/src/provider/default.ts

@@ -1,6 +1,7 @@
 import axios, { AxiosRequestHeaders } from 'axios';
 import urljoin from 'url-join';
 
+import { StarknetChainId } from '../constants';
 import {
   Abi,
   AddTransactionResponse,
@@ -49,17 +50,22 @@ export class Provider implements ProviderInterface {
 
   public gatewayUrl: string;
 
+  public chainId: StarknetChainId;
+
   constructor(optionsOrProvider: ProviderOptions | Provider = { network: 'goerli-alpha' }) {
     if (optionsOrProvider instanceof Provider) {
       this.baseUrl = optionsOrProvider.baseUrl;
       this.feederGatewayUrl = optionsOrProvider.feederGatewayUrl;
       this.gatewayUrl = optionsOrProvider.gatewayUrl;
+      this.chainId =
+        optionsOrProvider.chainId ?? Provider.getChainIdFromBaseUrl(optionsOrProvider.baseUrl);
     } else {
       const baseUrl =
         'baseUrl' in optionsOrProvider
           ? optionsOrProvider.baseUrl
           : Provider.getNetworkFromName(optionsOrProvider.network);
       this.baseUrl = baseUrl;
+      this.chainId = Provider.getChainIdFromBaseUrl(baseUrl);
       this.feederGatewayUrl = urljoin(baseUrl, 'feeder_gateway');
       this.gatewayUrl = urljoin(baseUrl, 'gateway');
     }
@@ -75,6 +81,19 @@ export class Provider implements ProviderInterface {
     }
   }
 
+  protected static getChainIdFromBaseUrl(baseUrl: string): StarknetChainId {
+    try {
+      const url = new URL(baseUrl);
+      if (url.host.includes('mainnet.starknet.io')) {
+        return StarknetChainId.MAINNET;
+      }
+    } catch {
+      // eslint-disable-next-line no-console
+      console.error(`Could not parse baseUrl: ${baseUrl}`);
+    }
+    return StarknetChainId.TESTNET;
+  }
+
   private getFetchUrl(endpoint: keyof Endpoints) {
     const gatewayUrlEndpoints = ['add_transaction'];
 

package/src/provider/interface.ts

@@ -1,3 +1,4 @@
+import { StarknetChainId } from '../constants';
 import type {
   AddTransactionResponse,
   Call,
@@ -21,6 +22,8 @@ export abstract class ProviderInterface {
 
   public abstract gatewayUrl: string;
 
+  public abstract chainId: StarknetChainId;
+
   /**
    * Gets the smart contract address on the goerli testnet.
    *

package/src/signer/default.ts

@@ -1,6 +1,7 @@
 import { Abi, Invocation, InvocationsSignerDetails, KeyPair, Signature } from '../types';
 import { getStarkKey, sign } from '../utils/ellipticCurve';
-import { hashMulticall } from '../utils/hash';
+import { calculcateTransactionHash, getSelectorFromName } from '../utils/hash';
+import { fromCallsToExecuteCalldataWithNonce } from '../utils/transaction';
 import { TypedData, getMessageHash } from '../utils/typedData';
 import { SignerInterface } from './interface';
 
@@ -25,12 +26,15 @@ export class Signer implements SignerInterface {
     }
     // now use abi to display decoded data somewhere, but as this signer is headless, we can't do that
 
-    const msgHash = hashMulticall(
+    const calldata = fromCallsToExecuteCalldataWithNonce(transactions, transactionsDetail.nonce);
+
+    const msgHash = calculcateTransactionHash(
       transactionsDetail.walletAddress,
-      transactions,
-      transactionsDetail.nonce.toString(),
-      transactionsDetail.maxFee.toString(),
-      transactionsDetail.version.toString()
+      transactionsDetail.version,
+      getSelectorFromName('__execute__'),
+      calldata,
+      transactionsDetail.maxFee,
+      transactionsDetail.chainId
     );
 
     return sign(this.keyPair, msgHash);

package/src/signer/ledger.ts

@@ -4,7 +4,8 @@ import TransportWebHID from '@ledgerhq/hw-transport-webhid';
 
 import { Invocation, InvocationsSignerDetails, Signature } from '../types';
 import { addHexPrefix } from '../utils/encode';
-import { hashMulticall } from '../utils/hash';
+import { calculcateTransactionHash, getSelectorFromName } from '../utils/hash';
+import { fromCallsToExecuteCalldataWithNonce } from '../utils/transaction';
 import { TypedData, getMessageHash } from '../utils/typedData';
 import { SignerInterface } from './interface';
 
@@ -46,11 +47,15 @@ export class LedgerBlindSigner implements SignerInterface {
     transactions: Invocation[],
     transactionsDetail: InvocationsSignerDetails
   ): Promise<Signature> {
-    const msgHash = hashMulticall(
+    const calldata = fromCallsToExecuteCalldataWithNonce(transactions, transactionsDetail.nonce);
+
+    const msgHash = calculcateTransactionHash(
       transactionsDetail.walletAddress,
-      transactions,
-      transactionsDetail.nonce.toString(),
-      transactionsDetail.maxFee.toString()
+      transactionsDetail.version,
+      getSelectorFromName('__execute__'),
+      calldata,
+      transactionsDetail.maxFee,
+      transactionsDetail.chainId
     );
 
     return this.sign(msgHash);

package/src/types/signer.ts

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

package/src/utils/hash.ts

@@ -2,14 +2,19 @@ import BN from 'bn.js';
 import { keccak256 } from 'ethereum-cryptography/keccak';
 import assert from 'minimalistic-assert';
 
-import { CONSTANT_POINTS, FIELD_PRIME, MASK_250, ONE, ZERO } from '../constants';
-import { Call } from '../types';
+import {
+  CONSTANT_POINTS,
+  FIELD_PRIME,
+  MASK_250,
+  ONE,
+  StarknetChainId,
+  TransactionHashPrefix,
+  ZERO,
+} from '../constants';
 import { ec } from './ellipticCurve';
 import { addHexPrefix, buf2hex, utf8ToArray } from './encode';
-import { BigNumberish, bigNumberishArrayToDecimalStringArray, toBN, toHex } from './number';
-import { encodeShortString } from './shortString';
+import { BigNumberish, toBN, toHex } from './number';
 
-export const transactionPrefix = encodeShortString('StarkNet Transaction');
 export const transactionVersion = 0;
 export const feeTransactionVersion = toBN(2).pow(toBN(128)).add(toBN(transactionVersion));
 
@@ -65,28 +70,65 @@ export function computeHashOnElements(data: BigNumberish[]) {
   return [...data, data.length].reduce((x, y) => pedersen([x, y]), 0).toString();
 }
 
-export function hashMulticall(
-  account: string,
-  transactions: Call[],
-  nonce: string,
-  maxFee: string,
-  version: string | number = transactionVersion
-) {
-  const hashArray = transactions
-    .map(({ contractAddress, entrypoint, calldata }) => [
-      contractAddress,
-      getSelectorFromName(entrypoint),
-      computeHashOnElements(calldata || []),
-    ])
-    .map(bigNumberishArrayToDecimalStringArray)
-    .map(computeHashOnElements);
+// 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
 
-  return computeHashOnElements([
-    transactionPrefix,
-    account,
-    computeHashOnElements(hashArray),
-    nonce,
+export function calculateTransactionHashCommon(
+  txHashPrefix: TransactionHashPrefix,
+  version: BigNumberish,
+  contractAddress: BigNumberish,
+  entryPointSelector: BigNumberish,
+  calldata: BigNumberish[],
+  maxFee: BigNumberish,
+  chainId: StarknetChainId,
+  additionalData: BigNumberish[] = []
+): string {
+  const calldataHash = computeHashOnElements(calldata);
+  const dataToHash = [
+    txHashPrefix,
+    version,
+    contractAddress,
+    entryPointSelector,
+    calldataHash,
     maxFee,
+    chainId,
+    ...additionalData,
+  ];
+  return computeHashOnElements(dataToHash);
+}
+
+export function calculateDeployTransactionHash(
+  contractAddress: BigNumberish,
+  constructorCalldata: BigNumberish[],
+  version: BigNumberish,
+  chainId: StarknetChainId
+): string {
+  return calculateTransactionHashCommon(
+    TransactionHashPrefix.DEPLOY,
     version,
-  ]);
+    contractAddress,
+    getSelectorFromName('constructor'),
+    constructorCalldata,
+    ZERO,
+    chainId
+  );
+}
+
+export function calculcateTransactionHash(
+  contractAddress: BigNumberish,
+  version: BigNumberish,
+  entryPointSelector: BigNumberish,
+  calldata: BigNumberish[],
+  maxFee: BigNumberish,
+  chainId: StarknetChainId
+): string {
+  return calculateTransactionHashCommon(
+    TransactionHashPrefix.INVOKE,
+    version,
+    contractAddress,
+    entryPointSelector,
+    calldata,
+    maxFee,
+    chainId
+  );
 }

package/src/utils/transaction.ts

@@ -47,3 +47,10 @@ export const fromCallsToExecuteCalldata = (calls: Call[]): string[] => {
     ...calldata,
   ];
 };
+
+export const fromCallsToExecuteCalldataWithNonce = (
+  calls: Call[],
+  nonce: BigNumberish
+): string[] => {
+  return [...fromCallsToExecuteCalldata(calls), toBN(nonce).toString()];
+};

package/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/utils/hash.d.ts

@@ -1,8 +1,7 @@
 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;
 /**
@@ -23,10 +22,27 @@ 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
+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/utils/hash.js

@@ -39,14 +39,15 @@ var __importDefault =
     return mod && mod.__esModule ? mod : { default: mod };
   };
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.hashMulticall =
+exports.calculcateTransactionHash =
+  exports.calculateDeployTransactionHash =
+  exports.calculateTransactionHashCommon =
   exports.computeHashOnElements =
   exports.pedersen =
   exports.getSelectorFromName =
   exports.starknetKeccak =
   exports.feeTransactionVersion =
   exports.transactionVersion =
-  exports.transactionPrefix =
     void 0;
 var keccak_1 = require('ethereum-cryptography/keccak');
 var minimalistic_assert_1 = __importDefault(require('minimalistic-assert'));
@@ -54,8 +55,6 @@ 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))
@@ -120,30 +119,58 @@ function computeHashOnElements(data) {
     .toString();
 }
 exports.computeHashOnElements = computeHashOnElements;
-function hashMulticall(account, transactions, nonce, maxFee, version) {
-  if (version === void 0) {
-    version = exports.transactionVersion;
+// 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 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,
+  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;