starknet 3.18.2 → 4.0.1

package/utils/responseParser/rpc.js

@@ -0,0 +1,96 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RPCResponseParser = void 0;
+var number_1 = require("../number");
+var _1 = require(".");
+var RPCResponseParser = /** @class */ (function (_super) {
+    __extends(RPCResponseParser, _super);
+    function RPCResponseParser() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    RPCResponseParser.prototype.parseGetBlockResponse = function (res) {
+        return {
+            accepted_time: res.accepted_time,
+            block_hash: res.block_hash,
+            block_number: res.block_number,
+            gas_price: res.gas_price,
+            new_root: res.new_root,
+            old_root: res.old_root,
+            parent_hash: res.parent_hash,
+            sequencer: res.sequencer,
+            status: res.status,
+            transactions: res.transactions,
+        };
+    };
+    RPCResponseParser.prototype.parseGetTransactionResponse = function (res) {
+        return {
+            calldata: res.calldata || [],
+            contract_address: res.contract_address,
+            contract_class: res.contract_class,
+            entry_point_selector: res.entry_point_selector,
+            max_fee: res.max_fee,
+            nonce: res.nonce,
+            sender_address: res.sender_address,
+            signature: res.signature || [],
+            transaction_hash: res.txn_hash,
+            version: res.version,
+        };
+    };
+    RPCResponseParser.prototype.parseGetTransactionReceiptResponse = function (res) {
+        return {
+            transaction_hash: res.txn_hash,
+            actual_fee: res.actual_fee,
+            status: res.status,
+            status_data: res.status_data,
+            messages_sent: res.messages_sent,
+            l1_origin_message: res.l1_origin_message,
+            events: res.events,
+        };
+    };
+    RPCResponseParser.prototype.parseFeeEstimateResponse = function (res) {
+        return {
+            overall_fee: (0, number_1.toBN)(res.overall_fee),
+            gas_consumed: (0, number_1.toBN)(res.gas_consumed),
+            gas_price: (0, number_1.toBN)(res.gas_price),
+        };
+    };
+    RPCResponseParser.prototype.parseCallContractResponse = function (res) {
+        return {
+            result: res,
+        };
+    };
+    RPCResponseParser.prototype.parseInvokeFunctionResponse = function (res) {
+        return {
+            transaction_hash: res.transaction_hash,
+        };
+    };
+    RPCResponseParser.prototype.parseDeployContractResponse = function (res) {
+        return {
+            transaction_hash: res.transaction_hash,
+            contract_address: res.contract_address,
+        };
+    };
+    RPCResponseParser.prototype.parseDeclareContractResponse = function (res) {
+        return {
+            transaction_hash: res.transaction_hash,
+            class_hash: res.class_hash,
+        };
+    };
+    return RPCResponseParser;
+}(_1.ResponseParser));
+exports.RPCResponseParser = RPCResponseParser;

package/utils/responseParser/sequencer.d.ts

@@ -0,0 +1,13 @@
+import { CallContractResponse, DeclareContractResponse, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetTransactionReceiptResponse, GetTransactionResponse, InvokeFunctionResponse } from '../../types';
+import { Sequencer } from '../../types/api';
+import { ResponseParser } from '.';
+export declare class SequencerAPIResponseParser extends ResponseParser {
+    parseGetBlockResponse(res: Sequencer.GetBlockResponse): GetBlockResponse;
+    parseGetTransactionResponse(res: Sequencer.GetTransactionResponse): GetTransactionResponse;
+    parseGetTransactionReceiptResponse(res: Sequencer.TransactionReceiptResponse): GetTransactionReceiptResponse;
+    parseFeeEstimateResponse(res: Sequencer.EstimateFeeResponse): EstimateFeeResponse;
+    parseCallContractResponse(res: Sequencer.CallContractResponse): CallContractResponse;
+    parseInvokeFunctionResponse(res: Sequencer.AddTransactionResponse): InvokeFunctionResponse;
+    parseDeployContractResponse(res: Sequencer.AddTransactionResponse): DeployContractResponse;
+    parseDeclareContractResponse(res: Sequencer.AddTransactionResponse): DeclareContractResponse;
+}

package/utils/responseParser/sequencer.js

@@ -0,0 +1,124 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SequencerAPIResponseParser = void 0;
+var number_1 = require("../number");
+var _1 = require(".");
+var SequencerAPIResponseParser = /** @class */ (function (_super) {
+    __extends(SequencerAPIResponseParser, _super);
+    function SequencerAPIResponseParser() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    SequencerAPIResponseParser.prototype.parseGetBlockResponse = function (res) {
+        return {
+            accepted_time: res.timestamp,
+            block_hash: res.block_hash,
+            block_number: res.block_number,
+            gas_price: res.gas_price,
+            new_root: res.state_root,
+            old_root: undefined,
+            parent_hash: res.parent_block_hash,
+            sequencer: res.sequencer_address,
+            status: res.status,
+            transactions: Object.values(res.transactions)
+                .map(function (value) { return 'transaction_hash' in value && value.transaction_hash; })
+                .filter(Boolean),
+        };
+    };
+    SequencerAPIResponseParser.prototype.parseGetTransactionResponse = function (res) {
+        return {
+            calldata: 'calldata' in res.transaction ? res.transaction.calldata : [],
+            contract_address: 'contract_address' in res.transaction ? res.transaction.contract_address : undefined,
+            contract_class: 'contract_class' in res.transaction ? res.transaction.contract_class : undefined,
+            entry_point_selector: 'entry_point_selector' in res.transaction
+                ? res.transaction.entry_point_selector
+                : undefined,
+            max_fee: 'max_fee' in res.transaction ? res.transaction.max_fee : undefined,
+            nonce: res.transaction.nonce,
+            sender_address: 'sender_address' in res.transaction
+                ? res.transaction.sender_address
+                : undefined,
+            signature: 'signature' in res.transaction ? res.transaction.signature : undefined,
+            transaction_hash: 'transaction_hash' in res.transaction ? res.transaction.transaction_hash : undefined,
+            version: 'version' in res.transaction ? res.transaction.version : undefined,
+        };
+    };
+    SequencerAPIResponseParser.prototype.parseGetTransactionReceiptResponse = function (res) {
+        return {
+            transaction_hash: res.transaction_hash,
+            actual_fee: 'actual_fee' in res ? res.actual_fee : undefined,
+            status: res.status,
+            status_data: undefined,
+            messages_sent: res.l2_to_l1_messages,
+            events: res.events,
+            l1_origin_message: undefined,
+        };
+    };
+    SequencerAPIResponseParser.prototype.parseFeeEstimateResponse = function (res) {
+        if ('overall_fee' in res) {
+            var gasInfo = {};
+            try {
+                gasInfo = {
+                    gas_consumed: (0, number_1.toBN)(res.gas_usage),
+                    gas_price: (0, number_1.toBN)(res.gas_price),
+                };
+            }
+            catch (_a) {
+                // do nothing
+            }
+            return __assign({ overall_fee: (0, number_1.toBN)(res.overall_fee) }, gasInfo);
+        }
+        return {
+            overall_fee: (0, number_1.toBN)(res.amount),
+        };
+    };
+    SequencerAPIResponseParser.prototype.parseCallContractResponse = function (res) {
+        return {
+            result: res.result,
+        };
+    };
+    SequencerAPIResponseParser.prototype.parseInvokeFunctionResponse = function (res) {
+        return {
+            transaction_hash: res.transaction_hash,
+        };
+    };
+    SequencerAPIResponseParser.prototype.parseDeployContractResponse = function (res) {
+        return {
+            transaction_hash: res.transaction_hash,
+            contract_address: res.address,
+        };
+    };
+    SequencerAPIResponseParser.prototype.parseDeclareContractResponse = function (res) {
+        return {
+            transaction_hash: res.transaction_hash,
+            class_hash: res.class_hash,
+        };
+    };
+    return SequencerAPIResponseParser;
+}(_1.ResponseParser));
+exports.SequencerAPIResponseParser = SequencerAPIResponseParser;

package/utils/shortString.js

@@ -1,34 +1,26 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-exports.decodeShortString =
-  exports.encodeShortString =
-  exports.isShortString =
-  exports.isASCII =
-    void 0;
-var encode_1 = require('./encode');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeShortString = exports.encodeShortString = exports.isShortString = exports.isASCII = void 0;
+var encode_1 = require("./encode");
 function isASCII(str) {
-  // eslint-disable-next-line no-control-regex
-  return /^[\x00-\x7F]*$/.test(str);
+    // eslint-disable-next-line no-control-regex
+    return /^[\x00-\x7F]*$/.test(str);
 }
 exports.isASCII = isASCII;
 // function to check if string has less or equal 31 characters
 function isShortString(str) {
-  return str.length <= 31;
+    return str.length <= 31;
 }
 exports.isShortString = isShortString;
 function encodeShortString(str) {
-  if (!isASCII(str)) throw new Error(''.concat(str, ' is not an ASCII string'));
-  if (!isShortString(str)) throw new Error(''.concat(str, ' is too long'));
-  return (0, encode_1.addHexPrefix)(
-    str.replace(/./g, function (char) {
-      return char.charCodeAt(0).toString(16);
-    })
-  );
+    if (!isASCII(str))
+        throw new Error("".concat(str, " is not an ASCII string"));
+    if (!isShortString(str))
+        throw new Error("".concat(str, " is too long"));
+    return (0, encode_1.addHexPrefix)(str.replace(/./g, function (char) { return char.charCodeAt(0).toString(16); }));
 }
 exports.encodeShortString = encodeShortString;
 function decodeShortString(str) {
-  return (0, encode_1.removeHexPrefix)(str).replace(/.{2}/g, function (hex) {
-    return String.fromCharCode(parseInt(hex, 16));
-  });
+    return (0, encode_1.removeHexPrefix)(str).replace(/.{2}/g, function (hex) { return String.fromCharCode(parseInt(hex, 16)); });
 }
 exports.decodeShortString = decodeShortString;

package/utils/stark.d.ts

@@ -1,5 +1,4 @@
 import BN from 'bn.js';
-
 import { Calldata, CompressedProgram, Program, RawArgs, Signature } from '../types';
 import { BigNumberish } from './number';
 /**

package/utils/stark.js

@@ -1,51 +1,36 @@
-'use strict';
-var __read =
-  (this && this.__read) ||
-  function (o, n) {
-    var m = typeof Symbol === 'function' && o[Symbol.iterator];
+"use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
-    var i = m.call(o),
-      r,
-      ar = [],
-      e;
+    var i = m.call(o), r, ar = [], e;
     try {
-      while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    } catch (error) {
-      e = { error: error };
-    } finally {
-      try {
-        if (r && !r.done && (m = i['return'])) m.call(i);
-      } finally {
-        if (e) throw e.error;
-      }
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
     }
     return ar;
-  };
-var __spreadArray =
-  (this && this.__spreadArray) ||
-  function (to, from, pack) {
-    if (pack || arguments.length === 2)
-      for (var i = 0, l = from.length, ar; i < l; i++) {
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
-          if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-          ar[i] = from[i];
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
         }
-      }
+    }
     return to.concat(ar || Array.prototype.slice.call(from));
-  };
-Object.defineProperty(exports, '__esModule', { value: true });
-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');
-var json_1 = require('./json');
-var number_1 = require('./number');
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+var json_1 = require("./json");
+var number_1 = require("./number");
 /**
  * Function to compress compiled cairo program
  *
@@ -54,72 +39,53 @@ var number_1 = require('./number');
  * @returns Compressed cairo program
  */
 function compressProgram(jsonProgram) {
-  var stringified =
-    typeof jsonProgram === 'string' ? jsonProgram : (0, json_1.stringify)(jsonProgram);
-  var compressedProgram = (0, pako_1.gzip)(stringified);
-  return (0, encode_1.btoaUniversal)(compressedProgram);
+    var stringified = typeof jsonProgram === 'string' ? jsonProgram : (0, json_1.stringify)(jsonProgram);
+    var compressedProgram = (0, pako_1.gzip)(stringified);
+    return (0, encode_1.btoaUniversal)(compressedProgram);
 }
 exports.compressProgram = compressProgram;
 function randomAddress() {
-  var randomKeyPair = (0, ellipticCurve_1.genKeyPair)();
-  return (0, ellipticCurve_1.getStarkKey)(randomKeyPair);
+    var randomKeyPair = (0, ellipticCurve_1.genKeyPair)();
+    return (0, ellipticCurve_1.getStarkKey)(randomKeyPair);
 }
 exports.randomAddress = randomAddress;
 function makeAddress(input) {
-  return (0, encode_1.addHexPrefix)(input).toLowerCase();
+    return (0, encode_1.addHexPrefix)(input).toLowerCase();
 }
 exports.makeAddress = makeAddress;
 function formatSignature(sig) {
-  if (!sig) return [];
-  try {
-    return sig
-      .map(function (x) {
-        return (0, number_1.toBN)(x);
-      })
-      .map(function (x) {
-        return x.toString();
-      });
-  } catch (e) {
-    return [];
-  }
+    if (!sig)
+        return [];
+    try {
+        return sig.map(function (x) { return (0, number_1.toBN)(x); }).map(function (x) { return x.toString(); });
+    }
+    catch (e) {
+        return [];
+    }
 }
 exports.formatSignature = formatSignature;
 function compileCalldata(args) {
-  return Object.values(args).flatMap(function (value) {
-    if (Array.isArray(value))
-      return __spreadArray(
-        [(0, number_1.toBN)(value.length).toString()],
-        __read(
-          value.map(function (x) {
-            return (0, number_1.toBN)(x).toString();
-          })
-        ),
-        false
-      );
-    if (typeof value === 'object' && 'type' in value)
-      return Object.entries(value)
-        .filter(function (_a) {
-          var _b = __read(_a, 1),
-            k = _b[0];
-          return k !== 'type';
-        })
-        .map(function (_a) {
-          var _b = __read(_a, 2),
-            v = _b[1];
-          return (0, number_1.toBN)(v).toString();
-        });
-    return (0, number_1.toBN)(value).toString();
-  });
+    return Object.values(args).flatMap(function (value) {
+        if (Array.isArray(value))
+            return __spreadArray([(0, number_1.toBN)(value.length).toString()], __read(value.map(function (x) { return (0, number_1.toBN)(x).toString(); })), false);
+        if (typeof value === 'object' && 'type' in value)
+            return Object.entries(value)
+                .filter(function (_a) {
+                var _b = __read(_a, 1), k = _b[0];
+                return k !== 'type';
+            })
+                .map(function (_a) {
+                var _b = __read(_a, 2), v = _b[1];
+                return (0, number_1.toBN)(v).toString();
+            });
+        return (0, number_1.toBN)(value).toString();
+    });
 }
 exports.compileCalldata = compileCalldata;
 function estimatedFeeToMaxFee(estimatedFee, overhead) {
-  if (overhead === void 0) {
-    overhead = 0.5;
-  }
-  // 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));
+    if (overhead === void 0) { overhead = 0.5; }
+    // 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/utils/transaction.d.ts

@@ -7,8 +7,8 @@ import { BigNumberish } from './number';
  * @returns
  */
 export declare const transformCallsToMulticallArrays: (calls: Call[]) => {
-  callArray: ParsedStruct[];
-  calldata: string[];
+    callArray: ParsedStruct[];
+    calldata: string[];
 };
 /**
  * Transforms a list of calls in the full flattened calldata expected
@@ -17,7 +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[];
+export declare const fromCallsToExecuteCalldataWithNonce: (calls: Call[], nonce: BigNumberish) => string[];

package/utils/transaction.js

@@ -1,45 +1,33 @@
-'use strict';
-var __read =
-  (this && this.__read) ||
-  function (o, n) {
-    var m = typeof Symbol === 'function' && o[Symbol.iterator];
+"use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
-    var i = m.call(o),
-      r,
-      ar = [],
-      e;
+    var i = m.call(o), r, ar = [], e;
     try {
-      while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    } catch (error) {
-      e = { error: error };
-    } finally {
-      try {
-        if (r && !r.done && (m = i['return'])) m.call(i);
-      } finally {
-        if (e) throw e.error;
-      }
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
     }
     return ar;
-  };
-var __spreadArray =
-  (this && this.__spreadArray) ||
-  function (to, from, pack) {
-    if (pack || arguments.length === 2)
-      for (var i = 0, l = from.length, ar; i < l; i++) {
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
-          if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-          ar[i] = from[i];
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
         }
-      }
+    }
     return to.concat(ar || Array.prototype.slice.call(from));
-  };
-Object.defineProperty(exports, '__esModule', { value: true });
-exports.fromCallsToExecuteCalldataWithNonce =
-  exports.fromCallsToExecuteCalldata =
-  exports.transformCallsToMulticallArrays =
-    void 0;
-var hash_1 = require('./hash');
-var number_1 = require('./number');
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromCallsToExecuteCalldataWithNonce = exports.fromCallsToExecuteCalldata = exports.transformCallsToMulticallArrays = void 0;
+var hash_1 = require("./hash");
+var number_1 = require("./number");
 /**
  * Transforms a list of Calls, each with their own calldata, into
  * two arrays: one with the entrypoints, and one with the concatenated calldata.
@@ -47,22 +35,22 @@ var number_1 = require('./number');
  * @returns
  */
 var transformCallsToMulticallArrays = function (calls) {
-  var callArray = [];
-  var calldata = [];
-  calls.forEach(function (call) {
-    var data = call.calldata || [];
-    callArray.push({
-      to: (0, number_1.toBN)(call.contractAddress).toString(10),
-      selector: (0, number_1.toBN)((0, hash_1.getSelectorFromName)(call.entrypoint)).toString(10),
-      data_offset: calldata.length.toString(),
-      data_len: data.length.toString(),
+    var callArray = [];
+    var calldata = [];
+    calls.forEach(function (call) {
+        var data = call.calldata || [];
+        callArray.push({
+            to: (0, number_1.toBN)(call.contractAddress).toString(10),
+            selector: (0, number_1.toBN)((0, hash_1.getSelectorFromName)(call.entrypoint)).toString(10),
+            data_offset: calldata.length.toString(),
+            data_len: data.length.toString(),
+        });
+        calldata.push.apply(calldata, __spreadArray([], __read(data), false));
     });
-    calldata.push.apply(calldata, __spreadArray([], __read(data), false));
-  });
-  return {
-    callArray: callArray,
-    calldata: (0, number_1.bigNumberishArrayToDecimalStringArray)(calldata),
-  };
+    return {
+        callArray: callArray,
+        calldata: (0, number_1.bigNumberishArrayToDecimalStringArray)(calldata),
+    };
 };
 exports.transformCallsToMulticallArrays = transformCallsToMulticallArrays;
 /**
@@ -72,39 +60,20 @@ exports.transformCallsToMulticallArrays = transformCallsToMulticallArrays;
  * @returns
  */
 var fromCallsToExecuteCalldata = function (calls) {
-  var _a = (0, exports.transformCallsToMulticallArrays)(calls),
-    callArray = _a.callArray,
-    calldata = _a.calldata;
-  return __spreadArray(
-    __spreadArray(
-      __spreadArray(
-        [callArray.length.toString()],
-        __read(
-          callArray
-            .map(function (_a) {
-              var to = _a.to,
-                selector = _a.selector,
-                data_offset = _a.data_offset,
-                data_len = _a.data_len;
-              return [to, selector, data_offset, data_len];
-            })
-            .flat()
-        ),
-        false
-      ),
-      [calldata.length.toString()],
-      false
-    ),
-    __read(calldata),
-    false
-  );
+    var _a = (0, exports.transformCallsToMulticallArrays)(calls), callArray = _a.callArray, calldata = _a.calldata;
+    return __spreadArray(__spreadArray(__spreadArray([
+        callArray.length.toString()
+    ], __read(callArray
+        .map(function (_a) {
+        var to = _a.to, selector = _a.selector, data_offset = _a.data_offset, data_len = _a.data_len;
+        return [to, selector, data_offset, data_len];
+    })
+        .flat()), false), [
+        calldata.length.toString()
+    ], 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
-  );
+    return __spreadArray(__spreadArray([], __read((0, exports.fromCallsToExecuteCalldata)(calls)), false), [(0, number_1.toBN)(nonce).toString()], false);
 };
 exports.fromCallsToExecuteCalldataWithNonce = fromCallsToExecuteCalldataWithNonce;