Add parameter and send 1 wei transaction in 'sendBundle' (#218)

* Add parameter and send 1 wei transaction in 'sendBundle'

* Upd

* Fix lint

packages/bundler/src/BundlerConfig.ts

@@ -26,6 +26,7 @@ export interface BundlerConfig {
   autoBundleMempoolSize: number
   rip7560: boolean
   rip7560Mode: string
+  gethDevMode: boolean
 }
 
 // TODO: implement merging config (args -> config.js -> default) and runtime shape validation
@@ -50,7 +51,8 @@ export const BundlerConfigShape = {
   autoBundleInterval: ow.number,
   autoBundleMempoolSize: ow.number,
   rip7560: ow.boolean,
-  rip7560Mode: ow.string.oneOf(['PULL', 'PUSH'])
+  rip7560Mode: ow.string.oneOf(['PULL', 'PUSH']),
+  gethDevMode: ow.boolean
 }
 
 // TODO: consider if we want any default fields at all

packages/bundler/src/modules/BundleManagerRIP7560.ts

@@ -119,6 +119,7 @@ export class BundleManagerRIP7560 extends BundleManager {
       transactionHash: bundleHash,
       userOpHashes
     })
+
     return bundleHash
   }
 

packages/bundler/src/modules/ExecutionManager.ts

@@ -9,7 +9,7 @@ import { ReputationManager } from './ReputationManager'
 import { IBundleManager } from './IBundleManager'
 import { IValidationManager } from '@account-abstraction/validation-manager'
 import { DepositManager } from './DepositManager'
-import { BigNumberish } from 'ethers'
+import { BigNumberish, Signer } from 'ethers'
 
 const debug = Debug('aa.exec')
 
@@ -28,7 +28,9 @@ export class ExecutionManager {
     private readonly mempoolManager: MempoolManager,
     private readonly bundleManager: IBundleManager,
     private readonly validationManager: IValidationManager,
-    private readonly depositManager: DepositManager
+    private readonly depositManager: DepositManager,
+    private readonly signer: Signer,
+    private readonly gethDevMode: boolean
   ) {
   }
 
@@ -90,6 +92,12 @@ export class ExecutionManager {
    */
   async attemptBundle (force = true): Promise<SendBundleReturn | undefined> {
     debug('attemptBundle force=', force, 'count=', this.mempoolManager.count(), 'max=', this.maxMempoolSize)
+    if (this.gethDevMode && force) {
+      await this.signer.sendTransaction({
+        to: this.signer.getAddress(),
+        value: 1
+      })
+    }
     if (force || this.mempoolManager.count() >= this.maxMempoolSize) {
       const ret = await this.bundleManager.sendNextBundle()
       if (this.maxMempoolSize === 0) {

packages/bundler/src/modules/initServer.ts

@@ -43,7 +43,7 @@ export function initServer (config: BundlerConfig, signer: Signer): [ExecutionMa
       config.beneficiary, parseEther(config.minBalance), config.maxBundleGas, config.conditionalRpc, false, config.rip7560Mode)
   }
   const depositManager = new DepositManager(entryPoint, mempoolManager, bundleManager)
-  const executionManager = new ExecutionManager(reputationManager, mempoolManager, bundleManager, validationManager, depositManager)
+  const executionManager = new ExecutionManager(reputationManager, mempoolManager, bundleManager, validationManager, depositManager, signer, config.gethDevMode)
 
   reputationManager.addWhitelist(...config.whitelist ?? [])
   reputationManager.addBlacklist(...config.blacklist ?? [])

packages/bundler/src/runBundler.ts

@@ -85,6 +85,7 @@ export async function runBundler (argv: string[], overrideExit = true): Promise<
     .option('--createMnemonic <file>', 'create the mnemonic file')
     .option('--rip7560', 'Use this bundler as an RIP-7560 node', false)
     .option('--rip7560Mode <string>', 'PUSH mode sends bundles to node at an interval, PULL mode waits for node to query bundle', 'PULL')
+    .option('--gethDevMode', 'In PULL mode send 1 wei transaction to trigger block creation', false)
 
   const programOpts = program.parse(argv).opts()
   showStackTraces = programOpts.showStackTraces

packages/bundler/test/BundlerManager.test.ts

@@ -53,6 +53,7 @@ describe('#BundlerManager', () => {
       minUnstakeDelay: 0,
       rip7560: false,
       rip7560Mode: 'PULL',
+      gethDevMode: false,
       conditionalRpc: false
     }
 
@@ -106,6 +107,7 @@ describe('#BundlerManager', () => {
         minStake: '0',
         rip7560: false,
         rip7560Mode: 'PULL',
+        gethDevMode: false,
         minUnstakeDelay: 0
       }
       const repMgr = new ReputationManager(provider, BundlerReputationParams, parseEther(config.minStake), config.minUnstakeDelay)
@@ -114,7 +116,7 @@ describe('#BundlerManager', () => {
       const evMgr = new EventsManager(_entryPoint, mempoolMgr, repMgr)
       bundleMgr = new BundleManager(_entryPoint, _entryPoint.provider as JsonRpcProvider, _entryPoint.signer, evMgr, mempoolMgr, validMgr, repMgr, config.beneficiary, parseEther(config.minBalance), config.maxBundleGas, false)
       const depositManager = new DepositManager(entryPoint, mempoolMgr, bundleMgr)
-      const execManager = new ExecutionManager(repMgr, mempoolMgr, bundleMgr, validMgr, depositManager)
+      const execManager = new ExecutionManager(repMgr, mempoolMgr, bundleMgr, validMgr, depositManager, _entryPoint.signer, false)
       execManager.setAutoBundler(0, 1000)
 
       methodHandler = new MethodHandlerERC4337(

packages/bundler/test/BundlerServer.test.ts

@@ -49,6 +49,7 @@ describe('BundleServer', function () {
       minStake: '0',
       rip7560: false,
       rip7560Mode: 'PULL',
+      gethDevMode: false,
       minUnstakeDelay: 0
     }
 
@@ -58,7 +59,7 @@ describe('BundleServer', function () {
     const evMgr = new EventsManager(entryPoint, mempoolMgr, repMgr)
     const bundleMgr = new BundleManager(entryPoint, entryPoint.provider as JsonRpcProvider, entryPoint.signer, evMgr, mempoolMgr, validMgr, repMgr, config.beneficiary, parseEther(config.minBalance), config.maxBundleGas, false)
     const depositManager = new DepositManager(entryPoint, mempoolMgr, bundleMgr)
-    const execManager = new ExecutionManager(repMgr, mempoolMgr, bundleMgr, validMgr, depositManager)
+    const execManager = new ExecutionManager(repMgr, mempoolMgr, bundleMgr, validMgr, depositManager, entryPoint.signer, false)
     const methodHandler = new MethodHandlerERC4337(
       execManager,
       provider,

packages/bundler/test/DebugMethodHandler.test.ts

@@ -60,6 +60,7 @@ describe('#DebugMethodHandler', () => {
       minStake: '0',
       rip7560: false,
       rip7560Mode: 'PULL',
+      gethDevMode: false,
       minUnstakeDelay: 0
     }
 
@@ -70,7 +71,7 @@ describe('#DebugMethodHandler', () => {
     const bundleMgr = new BundleManager(entryPoint, entryPoint.provider as JsonRpcProvider, entryPoint.signer, eventsManager, mempoolMgr, validMgr, repMgr,
       config.beneficiary, parseEther(config.minBalance), config.maxBundleGas, false)
     const depositManager = new DepositManager(entryPoint, mempoolMgr, bundleMgr)
-    const execManager = new ExecutionManager(repMgr, mempoolMgr, bundleMgr, validMgr, depositManager)
+    const execManager = new ExecutionManager(repMgr, mempoolMgr, bundleMgr, validMgr, depositManager, entryPoint.signer, false)
     methodHandler = new MethodHandlerERC4337(
       execManager,
       provider,

packages/bundler/test/UserOpMethodHandler.test.ts

@@ -78,6 +78,7 @@ describe('UserOpMethodHandler', function () {
       minStake: '0',
       rip7560: false,
       rip7560Mode: 'PULL',
+      gethDevMode: false,
       minUnstakeDelay: 0
     }
 
@@ -87,7 +88,7 @@ describe('UserOpMethodHandler', function () {
     const evMgr = new EventsManager(entryPoint, mempoolMgr, repMgr)
     const bundleMgr = new BundleManager(entryPoint, entryPoint.provider as JsonRpcProvider, entryPoint.signer, evMgr, mempoolMgr, validMgr, repMgr, config.beneficiary, parseEther(config.minBalance), config.maxBundleGas, false)
     const depositManager = new DepositManager(entryPoint, mempoolMgr, bundleMgr)
-    const execManager = new ExecutionManager(repMgr, mempoolMgr, bundleMgr, validMgr, depositManager)
+    const execManager = new ExecutionManager(repMgr, mempoolMgr, bundleMgr, validMgr, depositManager, entryPoint.signer, false)
     methodHandler = new MethodHandlerERC4337(
       execManager,
       provider,