AA-381: Create a "pull bundle" block building mode and a 'getRip7560Bundle' method #214

forshtat · 2024-07-25T12:18:40Z

No description provided.

…eation

…lter

…create-getRip7560Bundle-api

shahafn · 2024-07-29T09:59:52Z

packages/bundler/src/BundlerServer.ts

+  }
+
+  // TODO: deduplicate!
+  async handleRpcPrivate (reqItem: any): Promise<any> {


I don't understand this private/public distinction then - They just sit on different ports, but there are no restrictions on who can call the "private" api. Are we only planning to block requests on the "devops" side and not in code?
if so, shouldn't we just name it "blockBuilderRpcHandler" and "clientRpcHandler" since there is not private/public distinction in code? we basically rely on the cloud configuration to make sense of these names

I can rename it but I think in the future we may end up creating other use cases for an API that is only available "internally".
I think as long as it is trivial to prevent access to the "private" API with i.e. basic docker configuration there is no point in writing any access control code.

I don't understand why modify all existing support: we're adding a new express and handler for the (single) private API.

…create-getRip7560Bundle-api

…undle"

drortirosh · 2024-07-30T16:43:32Z

packages/bundler/localconfig/bundler.config.json

@@ -1,6 +1,7 @@
 {
  "gasFactor": "1",
-  "port": "3000",
+  "publicApiPort": "3000",


I'd leave it as "port", and add a new "privateApiPort"

drortirosh · 2024-07-30T16:47:01Z

packages/bundler/src/BundlerServer.ts

+  }
+
+  // TODO: deduplicate!
+  async handleRpcPrivate (reqItem: any): Promise<any> {


I don't understand why modify all existing support: we're adding a new express and handler for the (single) private API.

drortirosh · 2024-07-30T16:56:51Z

packages/bundler/src/modules/BundleManager.ts

@@ -193,7 +198,11 @@ export class BundleManager {
    }
  }

-  async createBundle (): Promise<[OperationBase[], StorageMap]> {
+  async createBundle (
+    minBaseFee: BigNumberish,


maybe make param optional, and missing param means "unlimited"
e.g.

baseFee = minBaseFee==null ? 0 : BigNumber.from(minBaseFee) maxSize = maxBundleSize==null ? MAXINT : BigNumber.from(maxBundleSize).toNumber()

All params are now optional, but '0' still means 'no limit', right?

drortirosh · 2024-07-30T16:58:10Z

packages/bundler/src/modules/BundleManager.ts

@@ -290,6 +309,20 @@ export class BundleManager {
      }
      mergeStorageMap(storageMap, validationResult.storageMap)

+      const userOpGas =
+        BigNumber


this value is useful. I thnk we should add it to "entry"

packages/bundler/src/modules/BundleManagerRIP7560.ts

packages/bundler/src/runBundler.ts

drortirosh · 2024-07-30T22:29:35Z

packages/bundler/src/modules/BundleManagerRIP7560.ts

@@ -94,4 +125,15 @@ export class BundleManagerRIP7560 extends BundleManager implements IBundleManage
  async getPaymasterBalance (paymaster: string): Promise<BigNumber> {
    return await this.provider.getBalance(paymaster)
  }
+
+  private computeBundleHash (userOps: OperationBase[]): string {


this is a hash for a new entity that doesn't go on-chain. is it not needed

Why not? What should we use as a bundle identifier instead? I think we need a way to identify a bundler, as I currently use eth_getRip7560BundleStatus to check if it was included, I think.

drortirosh · 2024-07-30T22:31:59Z

packages/bundler/src/runBundler.ts

    .option('--config <string>', 'path to config file', CONFIG_FILE_NAME)
    .option('--auto', 'automatic bundling (bypass config.autoBundleMempoolSize)', false)
    .option('--unsafe', 'UNSAFE mode: no storage or opcode checks (safe mode requires geth)')
    .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('--createMnemonic <file>', 'create the mnemonic file')
-    .option('--useRip7560Mode', 'Use this bundler for RIP-7560 node instead of ERC-4337 (experimental).')
+    .option('--useRip7560Mode <string>', 'Use this bundler for RIP-7560 node instead of ERC-4337 (experimental).')


our bundler already have "--dev" mode.
the userRip7560Mode should stay as boolean. push mode should be triggered by "--dev"

Co-authored-by: Dror Tirosh <dror.tirosh@gmail.com>

…in CLI

* Add parameter and send 1 wei transaction in 'sendBundle' * Upd * Fix lint

forshtat · 2024-08-05T11:41:30Z

@drortirosh I also created an issue to migrate to some official jsonrpc library:
https://opengsn.atlassian.net/browse/AA-410

drortirosh · 2024-08-05T12:24:11Z

packages/bundler/src/modules/BundleManagerRIP7560.ts

  async sendBundle (userOps: OperationBase[], _beneficiary: string, _storageMap: StorageMap): Promise<any> {
+    if (this.useRip7560Mode === 'PULL') {


why does it silently return ? either do something, or (more likely) return an error, since sendBundle is not allowed in pull mode.

drortirosh · 2024-08-05T12:49:46Z

packages/bundler/src/BundlerServer.ts

  }

  async _preflightCheck (): Promise<void> {
-    if (this.config.useRip7560Mode) {
+    if (this.config.rip7560) {


probably check the geth node supports eip7560...

(agressive wait, as ethers "wait()" is very slow...

Create 'useRip7560Mode' and 'gethDevMode' configuration parameters

f26a19e

forshtat changed the title ~~Create 'useRip7560Mode' and 'gethDevMode' configuration parameters~~ AA-381: Create a "pull bundle" block building mode and a 'getRip7560Bundle' method Jul 25, 2024

forshtat added 6 commits July 28, 2024 02:24

WIP: Implement "pull" mode

96ad45e

Fix localconfig bundler config

fd20fa7

Remove 'gethDevMode' parameter and let the tests trigger the block cr…

304a358

…eation

Fix local config

c5ac7c5

WIP: Use different ports for public and private bundler APIs

2fbe74c

WIP: Wrap the express callbacks with parser and private-public API fi…

83a9f46

…lter

forshtat marked this pull request as ready for review July 28, 2024 14:18

Merge branch 'main' of github.com:eth-infinitism/bundler into AA-381-…

6a96569

…create-getRip7560Bundle-api

shahafn reviewed Jul 29, 2024

View reviewed changes

forshtat added 3 commits July 29, 2024 12:53

Remove 'hello' and add TODO to provide correct 'validForBlock'

d984a60

Merge branch 'main' of github.com:eth-infinitism/bundler into AA-381-…

9215666

…create-getRip7560Bundle-api

Account for "minBaseFee", "maxBundleGas", "maxBundleSize" in "createB…

d6c58bc

…undle"

drortirosh reviewed Jul 30, 2024

View reviewed changes

forshtat and others added 12 commits August 3, 2024 23:04

Fixes

5267719

Update packages/bundler/src/runBundler.ts

68eb2a9

Co-authored-by: Dror Tirosh <dror.tirosh@gmail.com>

Move 'userOpMaxGas' calculation into the MempoolEntry class

7f2c4f3

Check configuration for valid RIP-7560 mode parameters; explain them …

e4e6d41

…in CLI

Rename 'eth_getRip7560Bundle' to 'aa_getRip7560Bundle'

b42d8d4

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

79577d8

* Add parameter and send 1 wei transaction in 'sendBundle' * Upd * Fix lint

Fix config

80197b9

Fix: remove unnecessary command line default params

52baf83

Wtf?

1a0a1d5

Fix depcheck

53c3eb4

Wtf??

794e0ea

Fix

e368fa3

drortirosh reviewed Aug 5, 2024

View reviewed changes

Remove the "short-circuit" out of 'sendBundle'

7f6451f

drortirosh reviewed Aug 5, 2024

View reviewed changes

forshtat and others added 4 commits August 5, 2024 14:56

Fix check

e566fa8

Wait for block in SendBundleNow

f8ee2df

Fix

35e27eb

wait for tx to get mined

f4c8e56

(agressive wait, as ethers "wait()" is very slow...

drortirosh approved these changes Aug 5, 2024

View reviewed changes

drortirosh merged commit 151c133 into main Aug 5, 2024
4 checks passed

drortirosh deleted the AA-381-create-getRip7560Bundle-api branch August 5, 2024 14:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AA-381: Create a "pull bundle" block building mode and a 'getRip7560Bundle' method #214

AA-381: Create a "pull bundle" block building mode and a 'getRip7560Bundle' method #214

forshtat commented Jul 25, 2024

shahafn Jul 29, 2024

forshtat Jul 29, 2024

drortirosh Jul 30, 2024

drortirosh Jul 30, 2024

drortirosh Jul 30, 2024

drortirosh Jul 30, 2024

forshtat Aug 4, 2024

drortirosh Jul 30, 2024

drortirosh Jul 30, 2024

forshtat Aug 4, 2024

drortirosh Jul 30, 2024

forshtat Aug 4, 2024

forshtat commented Aug 5, 2024

drortirosh Aug 5, 2024

drortirosh Aug 5, 2024

		async sendBundle (userOps: OperationBase[], _beneficiary: string, _storageMap: StorageMap): Promise<any> {
		if (this.useRip7560Mode === 'PULL') {

AA-381: Create a "pull bundle" block building mode and a 'getRip7560Bundle' method #214

AA-381: Create a "pull bundle" block building mode and a 'getRip7560Bundle' method #214

Conversation

forshtat commented Jul 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

forshtat commented Aug 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment