From 314c850961bb43779dd2c16510917f9e24009f80 Mon Sep 17 00:00:00 2001 From: Alex Forshtat Date: Wed, 14 Feb 2024 14:50:24 +0100 Subject: [PATCH] FIX TYPO 'Rip7650' -> 'Rip7560' --- packages/bundler/src/BundlerConfig.ts | 6 +++--- packages/bundler/src/BundlerServer.ts | 6 +++--- packages/bundler/src/modules/initServer.ts | 2 +- packages/bundler/src/runBundler.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/bundler/src/BundlerConfig.ts b/packages/bundler/src/BundlerConfig.ts index 5efc29be..265690a2 100644 --- a/packages/bundler/src/BundlerConfig.ts +++ b/packages/bundler/src/BundlerConfig.ts @@ -24,7 +24,7 @@ export interface BundlerConfig { autoBundleInterval: number autoBundleMempoolSize: number - useRip7650Mode: boolean + useRip7560Mode: boolean } // TODO: implement merging config (args -> config.js -> default) and runtime shape validation @@ -48,7 +48,7 @@ export const BundlerConfigShape = { autoBundleInterval: ow.number, autoBundleMempoolSize: ow.number, - useRip7650Mode: ow.boolean + useRip7560Mode: ow.boolean } // TODO: consider if we want any default fields at all @@ -60,5 +60,5 @@ export const bundlerConfigDefault: Partial = { conditionalRpc: false, minStake: MIN_STAKE_VALUE, minUnstakeDelay: MIN_UNSTAKE_DELAY, - useRip7650Mode: false + useRip7560Mode: false } diff --git a/packages/bundler/src/BundlerServer.ts b/packages/bundler/src/BundlerServer.ts index 57df17a1..ce78b4f5 100644 --- a/packages/bundler/src/BundlerServer.ts +++ b/packages/bundler/src/BundlerServer.ts @@ -63,7 +63,7 @@ export class BundlerServer { } async _preflightCheck (): Promise { - if (this.config.useRip7650Mode) { + if (this.config.useRip7560Mode) { return } if (await this.provider.getCode(this.config.entryPoint) === '0x') { @@ -169,7 +169,7 @@ export class BundlerServer { switch (method) { /** RIP-7560 specific RPC API */ case 'eth_sendTransaction': - if (!this.config.useRip7650Mode) { + if (!this.config.useRip7560Mode) { throw new RpcError(`Method ${method} is not supported`, -32601) } if (params[0].sender != null) { @@ -179,7 +179,7 @@ export class BundlerServer { } break case 'eth_getTransactionReceipt': - if (!this.config.useRip7650Mode) { + if (!this.config.useRip7560Mode) { throw new RpcError(`Method ${method} is not supported`, -32601) } result = await this.rip7560methodHandler.getRIP7560TransactionReceipt(params[0]) diff --git a/packages/bundler/src/modules/initServer.ts b/packages/bundler/src/modules/initServer.ts index 2ff4f5c7..b523cf80 100644 --- a/packages/bundler/src/modules/initServer.ts +++ b/packages/bundler/src/modules/initServer.ts @@ -27,7 +27,7 @@ export function initServer (config: BundlerConfig, signer: Signer): [ExecutionMa const eventsManager = new EventsManager(entryPoint, mempoolManager, reputationManager) let validationManager: IValidationManager let bundleManager: IBundleManager - if (config.useRip7650Mode) { + if (config.useRip7560Mode) { validationManager = new RIP7560ValidationManager() bundleManager = new RIP7560BundleManager(mempoolManager, validationManager, reputationManager, config.maxBundleGas, entryPoint.provider as JsonRpcProvider) } else { diff --git a/packages/bundler/src/runBundler.ts b/packages/bundler/src/runBundler.ts index d183472d..fe5fdbaf 100644 --- a/packages/bundler/src/runBundler.ts +++ b/packages/bundler/src/runBundler.ts @@ -74,7 +74,7 @@ export async function runBundler (argv: string[], overrideExit = true): Promise< .option('--debugRpc', 'enable debug rpc methods (auto-enabled for test node') .option('--conditionalRpc', 'Use eth_sendRawTransactionConditional RPC)') .option('--show-stack-traces', 'Show stack traces.') - .option('--useRip7650Mode', 'Use this bundler for RIP-7560 node instead of ERC-4337 (experimental).') + .option('--useRip7560Mode', 'Use this bundler for RIP-7560 node instead of ERC-4337 (experimental).') .option('--createMnemonic ', 'create the mnemonic file') const programOpts = program.parse(argv).opts() @@ -108,7 +108,7 @@ export async function runBundler (argv: string[], overrideExit = true): Promise< console.log('== debugrpc already st', config.debugRpc) } - if (!config.useRip7650Mode) { + if (!config.useRip7560Mode) { const addr = await new DeterministicDeployer(provider as any).deterministicDeploy(EntryPoint__factory.bytecode) console.log('deployed EntryPoint at', addr) if ((await wallet.getBalance()).eq(0)) {