pimlicolabs · plusminushalf · Feb 6, 2024 · Feb 2, 2024 · Feb 4, 2024 · Feb 5, 2024
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,4 +8,4 @@
             "type": "node-terminal"
         }
     ]
-}
+}
diff --git a/biome.json b/biome.json
@@ -1,4 +1,5 @@
 {
+    "$schema": "https://biomejs.dev/schemas/1.0.0/schema.json",
     "files": {
         "ignore": [
             "node_modules",
@@ -33,7 +34,7 @@
         "enabled": true,
         "formatWithErrors": true,
         "lineWidth": 80,
-        "indentSize": 4,
+        "indentWidth": 4,
         "indentStyle": "space"
     },
     "javascript": {

diff --git a/package.json b/package.json
@@ -13,11 +13,12 @@
         "dev": "node --inspect packages/cli/lib/alto.js run",
         "test": "pnpm -r --workspace-concurrency 1 test --verbose=true",
         "test:spec": "./test/spec-tests/run-spec-tests.sh",
-        "lint": "rome check ./",
-        "lint:fix": "rome check ./ --apply",
+        "lint": "biome check .",
+        "lint:fix": "pnpm run lint --apply",
         "format": "biome format . --write"
     },
     "devDependencies": {
+        "biome": "^0.3.3",
         "@biomejs/biome": "^1.5.1",
         "@swc/core": "^1.3.102",
         "@types/mocha": "^10.0.6",
@@ -32,11 +33,5 @@
     "engines": {
         "node": ">=18.0.0"
     },
-    "workspaces": [
-        "packages/*",
-        "test/e2e/*"
-    ],
-    "dependencies": {
-        "biome": "^0.3.3"
-    }
+    "workspaces": ["packages/*", "test/e2e/*"]
 }
diff --git a/packages/cli/src/alto.ts b/packages/cli/src/alto.ts
@@ -1,9 +1,9 @@
-import { bundlerCommand, bundlerOptions } from "./config/options"
-import { registerCommandToYargs } from "./util"
+import * as sentry from "@sentry/node"
 import dotenv from "dotenv"
 import yargs from "yargs"
 import { hideBin } from "yargs/helpers"
-import * as sentry from "@sentry/node"
+import { bundlerCommand, bundlerOptions } from "./config/options"
+import { registerCommandToYargs } from "./util"
 
 // Load environment variables from .env file
 dotenv.config()

diff --git a/packages/cli/src/config/bundler.ts b/packages/cli/src/config/bundler.ts
@@ -98,6 +98,7 @@ export const bundlerArgsSchema = z.object({
 
     tenderlyEnabled: z.boolean().optional(),
     minimumGasPricePercent: z.number().int().min(0),
+    apiVersion: z.enum(["v1", "v2"]),
     noEip1559Support: z.boolean(),
     noEthCallOverrideSupport: z.boolean(),
     balanceOverrideEnabled: z.boolean(),

diff --git a/packages/cli/src/config/options.ts b/packages/cli/src/config/options.ts
@@ -114,37 +114,37 @@ export const bundlerOptions: CliCommandOptions<IBundlerArgsInput> = {
     publicClientLogLevel: {
         description: "Log level for the publicClient module",
         type: "string",
-        require: false,
+        require: false
     },
     walletClientLogLevel: {
         description: "Log level for the walletClient module",
         type: "string",
-        require: false,
+        require: false
     },
     rpcLogLevel: {
         description: "Log level for the rpc module",
         type: "string",
-        require: false,
+        require: false
     },
     mempoolLogLevel: {
         description: "Log level for the mempool module",
         type: "string",
-        require: false,
+        require: false
     },
     executorLogLevel: {
         description: "Log level for the executor module",
         type: "string",
-        require: false,
+        require: false
     },
     reputationManagerLogLevel: {
         description: "Log level for the executor module",
         type: "string",
-        require: false,
+        require: false
     },
     nonceQueuerLogLevel: {
         description: "Log level for the executor module",
         type: "string",
-        require: false,
+        require: false
     },
     environment: {
         description: "Environment",
@@ -171,6 +171,12 @@ export const bundlerOptions: CliCommandOptions<IBundlerArgsInput> = {
         require: true,
         default: 0
     },
+    apiVersion: {
+        description: "API version of the bundler",
+        type: "string",
+        require: false,
+        default: "v1"
+    },
     noEip1559Support: {
         description: "Rpc url does not support EIP1559",
         type: "boolean",

diff --git a/packages/cli/src/handler.ts b/packages/cli/src/handler.ts
@@ -1,10 +1,10 @@
 import { BasicExecutor, ExecutorManager, SenderManager } from "@alto/executor"
 import {
+    type IReputationManager,
     MemoryMempool,
     Monitor,
     NullRepuationManager,
-    ReputationManager,
-    type IReputationManager
+    ReputationManager
 } from "@alto/mempool"
 import {
     NonceQueuer,
@@ -16,24 +16,24 @@ import {
 import type { IValidator } from "@alto/types"
 import {
     CompressionHandler,
+    type Logger,
     createMetrics,
     initDebugLogger,
-    initProductionLogger,
-    type Logger
+    initProductionLogger
 } from "@alto/utils"
 import { Registry } from "prom-client"
 import {
-    createPublicClient,
-    createWalletClient,
     type Chain,
     type PublicClient,
-    type Transport
+    type Transport,
+    createPublicClient,
+    createWalletClient
 } from "viem"
 import { fromZodError } from "zod-validation-error"
 import {
-    bundlerArgsSchema,
     type IBundlerArgs,
-    type IBundlerArgsInput
+    type IBundlerArgsInput,
+    bundlerArgsSchema
 } from "./config"
 import { customTransport } from "./customTransport"
 
@@ -77,12 +77,22 @@ export const bundlerHandler = async (
     } else {
         logger = initProductionLogger(parsedArgs.logLevel)
     }
-    const rootLogger = logger.child({ module: "root" }, { level: parsedArgs.logLevel })
+    const rootLogger = logger.child(
+        { module: "root" },
+        { level: parsedArgs.logLevel }
+    )
 
     const getChainId = async () => {
         const client = createPublicClient({
             transport: customTransport(args.rpcUrl, {
-                logger: logger.child({ module: "public_client" }, { level: parsedArgs.publicClientLogLevel || parsedArgs.logLevel })
+                logger: logger.child(
+                    { module: "public_client" },
+                    {
+                        level:
+                            parsedArgs.publicClientLogLevel ||
+                            parsedArgs.logLevel
+                    }
+                )
             })
         })
         return await client.getChainId()
@@ -106,7 +116,13 @@ export const bundlerHandler = async (
 
     const client = createPublicClient({
         transport: customTransport(args.rpcUrl, {
-            logger: logger.child({ module: "public_client" }, { level: parsedArgs.publicClientLogLevel || parsedArgs.logLevel })
+            logger: logger.child(
+                { module: "public_client" },
+                {
+                    level:
+                        parsedArgs.publicClientLogLevel || parsedArgs.logLevel
+                }
+            )
         }),
         chain
     })
@@ -119,17 +135,27 @@ export const bundlerHandler = async (
 
     const walletClient = createWalletClient({
         transport: customTransport(parsedArgs.executionRpcUrl ?? args.rpcUrl, {
-            logger: logger.child({ module: "wallet_client" }, { level: parsedArgs.walletClientLogLevel || parsedArgs.logLevel })
+            logger: logger.child(
+                { module: "wallet_client" },
+                {
+                    level:
+                        parsedArgs.walletClientLogLevel || parsedArgs.logLevel
+                }
+            )
         }),
         chain
     })
 
     const senderManager = new SenderManager(
         parsedArgs.signerPrivateKeys,
         parsedArgs.utilityPrivateKey,
-        logger.child({ module: "executor" }, { level: parsedArgs.executorLogLevel || parsedArgs.logLevel }),
+        logger.child(
+            { module: "executor" },
+            { level: parsedArgs.executorLogLevel || parsedArgs.logLevel }
+        ),
         metrics,
         parsedArgs.noEip1559Support,
+        parsedArgs.apiVersion,
         parsedArgs.maxSigners
     )
 
@@ -142,16 +168,27 @@ export const bundlerHandler = async (
             parsedArgs.entryPoint,
             BigInt(parsedArgs.minStake),
             BigInt(parsedArgs.minUnstakeDelay),
-            logger.child({ module: "reputation_manager" }, { level: parsedArgs.reputationManagerLogLevel || parsedArgs.logLevel })
+            logger.child(
+                { module: "reputation_manager" },
+                {
+                    level:
+                        parsedArgs.reputationManagerLogLevel ||
+                        parsedArgs.logLevel
+                }
+            )
         )
 
         validator = new SafeValidator(
             client,
             senderManager,
             parsedArgs.entryPoint,
-            logger.child({ module: "rpc" }, { level: parsedArgs.rpcLogLevel || parsedArgs.logLevel }),
+            logger.child(
+                { module: "rpc" },
+                { level: parsedArgs.rpcLogLevel || parsedArgs.logLevel }
+            ),
             metrics,
             parsedArgs.utilityPrivateKey,
+            parsedArgs.apiVersion,
             parsedArgs.tenderlyEnabled,
             parsedArgs.balanceOverrideEnabled
         )
@@ -160,9 +197,13 @@ export const bundlerHandler = async (
         validator = new UnsafeValidator(
             client,
             parsedArgs.entryPoint,
-            logger.child({ module: "rpc" }, { level: parsedArgs.rpcLogLevel || parsedArgs.logLevel }),
+            logger.child(
+                { module: "rpc" },
+                { level: parsedArgs.rpcLogLevel || parsedArgs.logLevel }
+            ),
             metrics,
             parsedArgs.utilityPrivateKey,
+            parsedArgs.apiVersion,
             parsedArgs.tenderlyEnabled,
             parsedArgs.balanceOverrideEnabled
         )
@@ -190,7 +231,10 @@ export const bundlerHandler = async (
         client,
         parsedArgs.entryPoint,
         parsedArgs.safeMode,
-        logger.child({ module: "mempool" }, { level: parsedArgs.mempoolLogLevel || parsedArgs.logLevel }),
+        logger.child(
+            { module: "mempool" },
+            { level: parsedArgs.mempoolLogLevel || parsedArgs.logLevel }
+        ),
         metrics
     )
 
@@ -214,7 +258,10 @@ export const bundlerHandler = async (
         senderManager,
         reputationManager,
         parsedArgs.entryPoint,
-        logger.child({ module: "executor" }, { level: parsedArgs.executorLogLevel || parsedArgs.logLevel }),
+        logger.child(
+            { module: "executor" },
+            { level: parsedArgs.executorLogLevel || parsedArgs.logLevel }
+        ),
         metrics,
         compressionHandler,
         !parsedArgs.tenderlyEnabled,
@@ -231,7 +278,10 @@ export const bundlerHandler = async (
         client,
         parsedArgs.entryPoint,
         parsedArgs.pollingInterval,
-        logger.child({ module: "executor" }, { level: parsedArgs.executorLogLevel || parsedArgs.logLevel }),
+        logger.child(
+            { module: "executor" },
+            { level: parsedArgs.executorLogLevel || parsedArgs.logLevel }
+        ),
         metrics,
         parsedArgs.bundleMode,
         parsedArgs.bundlerFrequency,
@@ -242,7 +292,10 @@ export const bundlerHandler = async (
         mempool,
         client,
         parsedArgs.entryPoint,
-        logger.child({ module: "nonce_queuer" }, { level: parsedArgs.nonceQueuerLogLevel || parsedArgs.logLevel }),
+        logger.child(
+            { module: "nonce_queuer" },
+            { level: parsedArgs.nonceQueuerLogLevel || parsedArgs.logLevel }
+        )
     )
 
     const rpcEndpoint = new RpcHandler(
@@ -257,9 +310,13 @@ export const bundlerHandler = async (
         reputationManager,
         parsedArgs.tenderlyEnabled ?? false,
         parsedArgs.minimumGasPricePercent,
+        parsedArgs.apiVersion,
         parsedArgs.noEthCallOverrideSupport,
         parsedArgs.rpcMaxBlockRange,
-        logger.child({ module: "rpc" }, { level: parsedArgs.rpcLogLevel || parsedArgs.logLevel }),
+        logger.child(
+            { module: "rpc" },
+            { level: parsedArgs.rpcLogLevel || parsedArgs.logLevel }
+        ),
         metrics,
         parsedArgs.environment,
         compressionHandler,
@@ -279,7 +336,10 @@ export const bundlerHandler = async (
         rpcEndpoint,
         parsedArgs.port,
         parsedArgs.requestTimeout,
-        logger.child({ module: "rpc" }, { level: parsedArgs.rpcLogLevel || parsedArgs.logLevel }),
+        logger.child(
+            { module: "rpc" },
+            { level: parsedArgs.rpcLogLevel || parsedArgs.logLevel }
+        ),
         registry,
         metrics
     )
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ @@
                 "type": "node-terminal"
             }
         ]
-    }
+    }