WIP: Remove compression (#407)

* WIP: Remove compression * fix e2e tests * remove unused files --------- Co-authored-by: mouseless <[email protected]>
pimlicolabs · Jan 20, 2025 · a8775cb · a8775cb
1 parent 20bcf51
commit a8775cb
Show file tree

Hide file tree

Showing 33 changed files with 89 additions and 2,559 deletions.
diff --git a/contracts/src/Compression/IBeneficiarySetter.sol b/contracts/src/Compression/IBeneficiarySetter.sol
diff --git a/contracts/src/Compression/PerOpInflator.sol b/contracts/src/Compression/PerOpInflator.sol
diff --git a/contracts/src/Compression/SimpleInflator.sol b/contracts/src/Compression/SimpleInflator.sol
diff --git a/src/cli/alto.ts b/src/cli/alto.ts
@@ -3,7 +3,6 @@ import dotenv from "dotenv"
 import yargs from "yargs"
 import { hideBin } from "yargs/helpers"
 import {
-    bundleCompressionOptions,
     bundlerCommand,
     bundlerOptions,
     compatibilityOptions,
@@ -74,11 +73,6 @@ export function getAltoCli(): yargs.Argv {
         .group(Object.keys(serverOptions), "Server Options:")
         .options(rpcOptions)
         .group(Object.keys(rpcOptions), "RPC Options:")
-        .options(bundleCompressionOptions)
-        .group(
-            Object.keys(bundleCompressionOptions),
-            "Bundle Compression Options:"
-        )
         .options(logOptions)
         .group(Object.keys(logOptions), "Logging Options:")
         .options(debugOptions)

diff --git a/src/cli/config/bundler.ts b/src/cli/config/bundler.ts
@@ -173,11 +173,6 @@ export const rpcArgsSchema = z.object({
     "code-override-support": z.boolean().optional().default(false)
 })
 
-export const bundleCopmressionArgsSchema = z.object({
-    "bundle-bulker-address": addressSchema.optional(),
-    "per-op-inflator-address": addressSchema.optional()
-})
-
 export const logArgsSchema = z.object({
     "redis-queue-endpoint": z.string().optional(),
     "redis-event-manager-queue-name": z.string().optional(),
@@ -244,11 +239,6 @@ export type IServerArgsInput = z.input<typeof serverArgsSchema>
 export type IRpcArgs = z.infer<typeof rpcArgsSchema>
 export type IRpcArgsInput = z.input<typeof rpcArgsSchema>
 
-export type IBundleCompressionArgs = z.infer<typeof bundleCopmressionArgsSchema>
-export type IBundleCompressionArgsInput = z.input<
-    typeof bundleCopmressionArgsSchema
->
-
 export type ILogArgs = z.infer<typeof logArgsSchema>
 export type ILogArgsInput = z.input<typeof logArgsSchema>
 
@@ -264,7 +254,6 @@ export const optionArgsSchema = z.object({
     ...logArgsSchema.shape,
     ...serverArgsSchema.shape,
     ...rpcArgsSchema.shape,
-    ...bundleCopmressionArgsSchema.shape,
     ...debugArgsSchema.shape,
     ...gasEstimationArgsSchema.shape
 })

diff --git a/src/cli/config/options.ts b/src/cli/config/options.ts
@@ -1,7 +1,6 @@
 import { bundlerHandler } from "../handler"
 import type { CliCommand, CliCommandOptions } from "../util"
 import type {
-    IBundleCompressionArgsInput,
     IBundlerArgsInput,
     ICompatibilityArgsInput,
     IDebugArgsInput,
@@ -416,20 +415,6 @@ export const rpcOptions: CliCommandOptions<IRpcArgsInput> = {
     }
 }
 
-export const bundleCompressionOptions: CliCommandOptions<IBundleCompressionArgsInput> =
-    {
-        "bundle-bulker-address": {
-            description: "Address of the BundleBulker contract",
-            type: "string",
-            require: false
-        },
-        "per-op-inflator-address": {
-            description: "Address of the PerOpInflator contract",
-            type: "string",
-            require: false
-        }
-    }
-
 export const logOptions: CliCommandOptions<ILogArgsInput> = {
     "redis-queue-endpoint": {
         description: "redis queue endpoint",

diff --git a/src/cli/setupServer.ts b/src/cli/setupServer.ts
@@ -1,10 +1,6 @@
 import type { SenderManager } from "@alto/executor"
 import { Executor, ExecutorManager } from "@alto/executor"
-import {
-    CompressionHandler,
-    EventManager,
-    type GasPriceManager
-} from "@alto/handlers"
+import { EventManager, type GasPriceManager } from "@alto/handlers"
 import {
     type InterfaceReputationManager,
     MemoryMempool,
@@ -98,30 +94,12 @@ const getEventManager = ({
     return new EventManager({ config, metrics })
 }
 
-const getCompressionHandler = async (
-    config: AltoConfig
-): Promise<CompressionHandler | null> => {
-    let compressionHandler: CompressionHandler | null = null
-    if (
-        config.bundleBulkerAddress !== undefined &&
-        config.perOpInflatorAddress !== undefined
-    ) {
-        compressionHandler = await CompressionHandler.createAsync(
-            config.bundleBulkerAddress,
-            config.perOpInflatorAddress,
-            config.publicClient
-        )
-    }
-    return compressionHandler
-}
-
 const getExecutor = ({
     mempool,
     config,
     senderManager,
     reputationManager,
     metrics,
-    compressionHandler,
     gasPriceManager,
     eventManager
 }: {
@@ -130,7 +108,6 @@ const getExecutor = ({
     senderManager: SenderManager
     reputationManager: InterfaceReputationManager
     metrics: Metrics
-    compressionHandler: CompressionHandler | null
     gasPriceManager: GasPriceManager
     eventManager: EventManager
 }): Executor => {
@@ -140,7 +117,6 @@ const getExecutor = ({
         senderManager,
         reputationManager,
         metrics,
-        compressionHandler,
         gasPriceManager,
         eventManager
     })
@@ -203,7 +179,6 @@ const getRpcHandler = ({
     executorManager,
     reputationManager,
     metrics,
-    compressionHandler,
     gasPriceManager,
     eventManager
 }: {
@@ -216,7 +191,6 @@ const getRpcHandler = ({
     executorManager: ExecutorManager
     reputationManager: InterfaceReputationManager
     metrics: Metrics
-    compressionHandler: CompressionHandler | null
     eventManager: EventManager
     gasPriceManager: GasPriceManager
 }) => {
@@ -230,7 +204,6 @@ const getRpcHandler = ({
         executorManager,
         reputationManager,
         metrics,
-        compressionHandler,
         gasPriceManager,
         eventManager
     })
@@ -276,8 +249,6 @@ export const setupServer = async ({
     })
     const reputationManager = getReputationManager(config)
 
-    const compressionHandler = await getCompressionHandler(config)
-
     const eventManager = getEventManager({
         config,
         metrics
@@ -307,7 +278,6 @@ export const setupServer = async ({
         senderManager,
         reputationManager,
         metrics,
-        compressionHandler,
         gasPriceManager,
         eventManager
     })
@@ -339,7 +309,6 @@ export const setupServer = async ({
         executorManager,
         reputationManager,
         metrics,
-        compressionHandler,
         gasPriceManager,
         eventManager
     })