starknet 3.7.0 → 3.10.0

package/dist/utils/hash.d.ts

@@ -1,8 +1,8 @@
 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;
 /**
  * Function to get the starknet keccak hash from a string
  *
@@ -21,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): 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,16 +28,15 @@ 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.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) {
     return (0, encode_1.addHexPrefix)((0, encode_1.buf2hex)((0, keccak_1.keccak256)((0, encode_1.utf8ToArray)(value))));
 }
@@ -88,25 +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) {
-    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,
+// 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,
-        exports.transactionVersion,
-    ]);
+        chainId
+    ], __read(additionalData), false);
+    return computeHashOnElements(dataToHash);
 }
-exports.hashMulticall = hashMulticall;
+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.calculcateTransactionHash = calculcateTransactionHash;

package/dist/utils/stark.d.ts

@@ -1,4 +1,6 @@
+import BN from 'bn.js';
 import { Calldata, CompressedProgram, Program, RawArgs, Signature } from '../types';
+import { BigNumberish } from './number';
 /**
  * Function to compress compiled cairo program
  *
@@ -11,3 +13,4 @@ export declare function randomAddress(): string;
 export declare function makeAddress(input: string): string;
 export declare function formatSignature(sig?: Signature): string[];
 export declare function compileCalldata(args: RawArgs): Calldata;
+export declare function estimatedFeeToMaxFee(estimatedFee: BigNumberish, overhead?: number): BN;

package/dist/utils/stark.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.compileCalldata = exports.formatSignature = exports.makeAddress = exports.randomAddress = exports.compressProgram = void 0;
+exports.estimatedFeeToMaxFee = exports.compileCalldata = exports.formatSignature = exports.makeAddress = exports.randomAddress = exports.compressProgram = void 0;
 var pako_1 = require("pako");
 var ellipticCurve_1 = require("./ellipticCurve");
 var encode_1 = require("./encode");
@@ -82,3 +82,10 @@ function compileCalldata(args) {
     });
 }
 exports.compileCalldata = compileCalldata;
+function estimatedFeeToMaxFee(estimatedFee, overhead) {
+    if (overhead === void 0) { overhead = 0.15; }
+    // BN can only handle Integers, so we need to do all calulations with integers
+    var overHeadPercent = Math.round((1 + overhead) * 100);
+    return (0, number_1.toBN)(estimatedFee).mul((0, number_1.toBN)(overHeadPercent)).div((0, number_1.toBN)(100));
+}
+exports.estimatedFeeToMaxFee = estimatedFeeToMaxFee;

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

@@ -47,9 +47,9 @@ export declare const encodeData: <T extends {
     }[]>;
     primaryType: string;
     domain: {
-        name?: string | undefined;
         version?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 }>(typedData: T, type: string, data: T["message"]) => string[][];
@@ -74,9 +74,9 @@ export declare const getStructHash: <T extends {
     }[]>;
     primaryType: string;
     domain: {
-        name?: string | undefined;
         version?: 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

@@ -25,9 +25,9 @@ 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<{
-    name?: string | undefined;
     version?: string | undefined;
     chainId?: string | number | undefined;
+    name?: string | undefined;
 }, {
     name: import("superstruct").Struct<string | undefined, null>;
     version: import("superstruct").Struct<string | undefined, null>;
@@ -49,9 +49,9 @@ export declare const STARKNET_TYPED_DATA_TYPE: import("superstruct").Struct<{
     }[]>;
     primaryType: string;
     domain: {
-        name?: string | undefined;
         version?: string | undefined;
         chainId?: string | number | undefined;
+        name?: string | undefined;
     };
     message: Record<string, unknown>;
 }, {
@@ -66,9 +66,9 @@ export declare const STARKNET_TYPED_DATA_TYPE: import("superstruct").Struct<{
     }[]>, null>;
     primaryType: import("superstruct").Struct<string, null>;
     domain: import("superstruct").Struct<{
-        name?: string | undefined;
         version?: 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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "3.7.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;
@@ -66,8 +69,10 @@ export declare class Provider implements ProviderInterface {
    */
   callContract(
     { contractAddress, entrypoint, calldata }: Call,
-    options?: {
-      blockIdentifier: BlockIdentifier;
+    {
+      blockIdentifier,
+    }?: {
+      blockIdentifier?: BlockIdentifier;
     }
   ): Promise<CallContractResponse>;
   /**

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;
@@ -343,24 +362,28 @@ var Provider = /** @class */ (function () {
    * @param blockNumber
    * @returns the result of the function on the smart contract.
    */
-  Provider.prototype.callContract = function (_a, options) {
+  Provider.prototype.callContract = function (_a, _b) {
     var contractAddress = _a.contractAddress,
       entrypoint = _a.entrypoint,
-      _b = _a.calldata,
-      calldata = _b === void 0 ? [] : _b;
-    if (options === void 0) {
-      options = { blockIdentifier: null };
-    }
+      _c = _a.calldata,
+      calldata = _c === void 0 ? [] : _c;
+    var _d = _b === void 0 ? {} : _b,
+      _e = _d.blockIdentifier,
+      blockIdentifier = _e === void 0 ? 'pending' : _e;
     return __awaiter(this, void 0, void 0, function () {
-      return __generator(this, function (_c) {
+      return __generator(this, function (_f) {
         return [
           2 /*return*/,
-          this.fetchEndpoint('call_contract', options, {
-            signature: [],
-            contract_address: contractAddress,
-            entry_point_selector: (0, hash_1.getSelectorFromName)(entrypoint),
-            calldata: calldata,
-          }),
+          this.fetchEndpoint(
+            'call_contract',
+            { blockIdentifier: blockIdentifier },
+            {
+              signature: [],
+              contract_address: contractAddress,
+              entry_point_selector: (0, hash_1.getSelectorFromName)(entrypoint),
+              calldata: calldata,
+            }
+          ),
         ];
       });
     });
@@ -399,7 +422,7 @@ var Provider = /** @class */ (function () {
    */
   Provider.prototype.getCode = function (contractAddress, blockIdentifier) {
     if (blockIdentifier === void 0) {
-      blockIdentifier = null;
+      blockIdentifier = 'pending';
     }
     return __awaiter(this, void 0, void 0, function () {
       return __generator(this, function (_a) {
@@ -427,7 +450,7 @@ var Provider = /** @class */ (function () {
    */
   Provider.prototype.getStorageAt = function (contractAddress, key, blockIdentifier) {
     if (blockIdentifier === void 0) {
-      blockIdentifier = null;
+      blockIdentifier = 'pending';
     }
     return __awaiter(this, void 0, void 0, function () {
       return __generator(this, function (_a) {
@@ -586,28 +609,27 @@ var Provider = /** @class */ (function () {
       retryInterval = 8000;
     }
     return __awaiter(this, void 0, void 0, function () {
-      var onchain, res, message, error;
+      var onchain, res, successStates, errorStates, message, error;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             onchain = false;
-            return [4 /*yield*/, wait(retryInterval)];
+            _a.label = 1;
           case 1:
-            _a.sent();
-            _a.label = 2;
-          case 2:
-            if (!!onchain) return [3 /*break*/, 5];
+            if (!!onchain) return [3 /*break*/, 4];
             // eslint-disable-next-line no-await-in-loop
             return [4 /*yield*/, wait(retryInterval)];
-          case 3:
+          case 2:
             // eslint-disable-next-line no-await-in-loop
             _a.sent();
             return [4 /*yield*/, this.getTransactionStatus(txHash)];
-          case 4:
+          case 3:
             res = _a.sent();
-            if (res.tx_status === 'ACCEPTED_ON_L1' || res.tx_status === 'ACCEPTED_ON_L2') {
+            successStates = ['ACCEPTED_ON_L1', 'ACCEPTED_ON_L2', 'PENDING'];
+            errorStates = ['REJECTED', 'NOT_RECEIVED'];
+            if (successStates.includes(res.tx_status)) {
               onchain = true;
-            } else if (res.tx_status === 'REJECTED' || res.tx_status === 'NOT_RECEIVED') {
+            } else if (errorStates.includes(res.tx_status)) {
               message = res.tx_failure_reason
                 ? res.tx_status +
                   ': ' +
@@ -619,8 +641,8 @@ var Provider = /** @class */ (function () {
               error.response = res;
               throw error;
             }
-            return [3 /*break*/, 2];
-          case 5:
+            return [3 /*break*/, 1];
+          case 4:
             return [2 /*return*/];
         }
       });

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

@@ -37,8 +37,7 @@ export declare function getBlockIdentifier(blockIdentifier: BlockIdentifier): Bl
  *
  * [Reference](https://github.com/starkware-libs/cairo-lang/blob/fc97bdd8322a7df043c87c371634b26c15ed6cee/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L164-L173)
  *
- * @param blockNumber
- * @param blockHash
+ * @param blockIdentifier
  * @returns block identifier for API request
  */
 export declare function getFormattedBlockIdentifier(blockIdentifier?: BlockIdentifier): string;

package/provider/utils.js

@@ -39,6 +39,12 @@ exports.txIdentifier = txIdentifier;
  * @returns block identifier object
  */
 function getBlockIdentifier(blockIdentifier) {
+  if (blockIdentifier === null) {
+    return { type: 'BLOCK_NUMBER', data: null };
+  }
+  if (blockIdentifier === 'pending') {
+    return { type: 'BLOCK_NUMBER', data: 'pending' };
+  }
   if (typeof blockIdentifier === 'number') {
     return { type: 'BLOCK_NUMBER', data: blockIdentifier };
   }
@@ -48,12 +54,6 @@ function getBlockIdentifier(blockIdentifier) {
   if (typeof blockIdentifier === 'string' && !Number.isNaN(parseInt(blockIdentifier, 10))) {
     return { type: 'BLOCK_NUMBER', data: parseInt(blockIdentifier, 10) };
   }
-  if (blockIdentifier === null) {
-    return { type: 'BLOCK_NUMBER', data: null };
-  }
-  if (blockIdentifier === 'pending') {
-    return { type: 'BLOCK_NUMBER', data: 'pending' };
-  }
   if (typeof blockIdentifier === 'string') {
     throw new Error('Invalid block identifier: ' + blockIdentifier);
   }
@@ -65,8 +65,7 @@ exports.getBlockIdentifier = getBlockIdentifier;
  *
  * [Reference](https://github.com/starkware-libs/cairo-lang/blob/fc97bdd8322a7df043c87c371634b26c15ed6cee/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L164-L173)
  *
- * @param blockNumber
- * @param blockHash
+ * @param blockIdentifier
  * @returns block identifier for API request
  */
 function getFormattedBlockIdentifier(blockIdentifier) {

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,16 +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.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)];
       });