prune unused flags (#428)

Co-authored-by: mouseless <[email protected]>
pimlicolabs · Feb 5, 2025 · 8a4e8f8 · 8a4e8f8
1 parent 9a2bb13
commit 8a4e8f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 53 deletions.
diff --git a/src/cli/config/bundler.ts b/src/cli/config/bundler.ts
@@ -32,14 +32,10 @@ export const bundlerArgsSchema = z.object({
     "min-entity-stake": z.number().int().min(0),
     "min-entity-unstake-delay": z.number().int().min(0),
 
-    "max-bundle-wait": z.number().int().min(0),
-    "max-bundle-size": z.number().int().min(0),
-
     "gas-price-bump": z
         .string()
         .transform((val) => BigInt(val))
         .default("100"),
-    "gas-price-floor-percent": z.number().int().min(0),
     "gas-price-expiry": z.number().int().min(0),
     "gas-price-multipliers": z
         .string()
@@ -193,8 +189,7 @@ export const debugArgsSchema = z.object({
     "enable-debug-endpoints": z.boolean(),
     "expiration-check": z.boolean(),
     "dangerous-skip-user-operation-validation": z.boolean(),
-    "deploy-simulations-contract": z.boolean(),
-    tenderly: z.boolean()
+    "deploy-simulations-contract": z.boolean()
 })
 
 export const gasEstimationArgsSchema = z.object({

diff --git a/src/cli/config/options.ts b/src/cli/config/options.ts
@@ -38,19 +38,6 @@ export const bundlerOptions: CliCommandOptions<IBundlerArgsInput> = {
         require: true,
         default: 1
     },
-    "max-bundle-wait": {
-        description: "Maximum time to wait for a bundle to be submitted (ms)",
-        type: "number",
-        require: true,
-        default: 1000
-    },
-    "max-bundle-size": {
-        description:
-            "Maximum number of operations allowed in the mempool before a bundle is submitted",
-        type: "number",
-        require: true,
-        default: 10
-    },
     "safe-mode": {
         description: "Enable safe mode (enforcing all ERC-4337 rules)",
         type: "boolean",
@@ -63,13 +50,6 @@ export const bundlerOptions: CliCommandOptions<IBundlerArgsInput> = {
         require: false,
         default: "100"
     },
-    "gas-price-floor-percent": {
-        description:
-            "The minimum percentage of incoming user operation gas prices compared to the gas price used by the bundler to submit bundles",
-        type: "number",
-        require: true,
-        default: 101
-    },
     "gas-price-expiry": {
         description:
             "Maximum that the gas prices fetched using pimlico_getUserOperationGasPrice will be accepted for (seconds)",
@@ -417,6 +397,7 @@ export const rpcOptions: CliCommandOptions<IRpcArgsInput> = {
     "max-block-range": {
         description: "Max block range for getLogs calls",
         type: "number",
+        default: 2000,
         require: false
     },
     "block-tag-support": {
@@ -536,12 +517,6 @@ export const debugOptions: CliCommandOptions<IDebugArgsInput> = {
         type: "boolean",
         require: true,
         default: true
-    },
-    tenderly: {
-        description: "RPC url follows the tenderly format",
-        type: "boolean",
-        require: true,
-        default: false
     }
 }
 

diff --git a/src/rpc/validation/SafeValidator.ts b/src/rpc/validation/SafeValidator.ts
@@ -189,7 +189,6 @@ export class SafeValidator
 
     async getValidationResultV07({
         userOperation,
-        queuedUserOperations,
         entryPoint,
         preCodeHashes
     }: {
@@ -203,14 +202,6 @@ export class SafeValidator
             referencedContracts?: ReferencedCodeHashes
         }
     > {
-        if (this.config.tenderly) {
-            return super.getValidationResultV07({
-                userOperation,
-                queuedUserOperations,
-                entryPoint
-            })
-        }
-
         if (preCodeHashes && preCodeHashes.addresses.length > 0) {
             const { hash } = await this.getCodeHashes(preCodeHashes.addresses)
             if (hash !== preCodeHashes.hash) {
@@ -278,10 +269,6 @@ export class SafeValidator
             storageMap: StorageMap
         }
     > {
-        if (this.config.tenderly) {
-            return super.getValidationResultV06({ userOperation, entryPoint })
-        }
-
         if (preCodeHashes && preCodeHashes.addresses.length > 0) {
             const { hash } = await this.getCodeHashes(preCodeHashes.addresses)
             if (hash !== preCodeHashes.hash) {

diff --git a/src/rpc/validation/UnsafeValidator.ts b/src/rpc/validation/UnsafeValidator.ts
@@ -21,7 +21,6 @@ import {
     type UserOperation,
     ValidationErrors,
     type ValidationResultWithAggregation,
-    entryPointErrorsSchema,
     entryPointExecutionErrorSchemaV06,
     entryPointExecutionErrorSchemaV07
 } from "@alto/types"
@@ -79,18 +78,16 @@ export class UnsafeValidator implements InterfaceValidator {
         isVersion06: boolean,
         errorResult: unknown,
         logger: Logger,
-        simulationType: "validation" | "execution",
-        usingTenderly = false
+        simulationType: "validation" | "execution"
     ): Promise<
         ValidationResult | ValidationResultWithAggregation | ExecutionResult
     > {
         const entryPointExecutionErrorSchema = isVersion06
             ? entryPointExecutionErrorSchemaV06
             : entryPointExecutionErrorSchemaV07
 
-        const entryPointErrorSchemaParsing = usingTenderly
-            ? entryPointErrorsSchema.safeParse(errorResult)
-            : entryPointExecutionErrorSchema.safeParse(errorResult)
+        const entryPointErrorSchemaParsing =
+            entryPointExecutionErrorSchema.safeParse(errorResult)
 
         if (!entryPointErrorSchemaParsing.success) {
             try {
@@ -236,8 +233,7 @@ export class UnsafeValidator implements InterfaceValidator {
                 isVersion06(userOperation),
                 simulateValidationResult,
                 this.logger,
-                "validation",
-                this.config.tenderly
+                "validation"
             )) as ValidationResultV06 | ValidationResultWithAggregationV06),
             storageMap: {}
         }