Add support for Erigon client (#299)

Author: hazim-j

.github/workflows/compliance.yml

@@ -49,13 +49,13 @@ jobs:
 
       - name: Install Geth
         run: |
-          sudo add-apt-repository -y ppa:ethereum/ethereum && \
-          sudo apt-get update && \
-          sudo apt-get install ethereum
+          wget https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.12.2-bed84606.tar.gz && \
+          tar -xvf geth-linux-amd64-1.12.2-bed84606.tar.gz
 
       - name: Run Geth
         run: |
-          geth \
+          cd geth-linux-amd64-1.12.2-bed84606 && \
+          ./geth \
           --verbosity 1 \
           --http.vhosts '*,localhost,host.docker.internal' \
           --http \
@@ -83,7 +83,8 @@ jobs:
 
       - name: Fund bundler
         run: |
-          geth \
+          cd geth-linux-amd64-1.12.2-bed84606 && \
+          ./geth \
           --exec "eth.sendTransaction({from: eth.accounts[0], to: \"0x43378ff8C70109Ee4Dbe85aF34428ab0615EBd23\", value: web3.toWei(10000, \"ether\")})" \
           attach http://localhost:8545/
 

pkg/entrypoint/execution/trace.go

@@ -27,8 +27,9 @@ type TraceInput struct {
 	ChainID    *big.Int
 
 	// Optional params for simulateHandleOps
-	Target common.Address
-	Data   []byte
+	Target      common.Address
+	Data        []byte
+	TraceFeeCap *big.Int
 }
 
 type TraceOutput struct {
@@ -78,6 +79,10 @@ func TraceSimulateHandleOp(in *TraceInput) (*TraceOutput, error) {
 	}
 	auth.GasLimit = math.MaxUint64
 	auth.NoSend = true
+	mf := in.Op.MaxFeePerGas
+	if in.TraceFeeCap != nil {
+		mf = in.TraceFeeCap
+	}
 	tx, err := ep.SimulateHandleOp(auth, entrypoint.UserOperation(*in.Op), in.Target, in.Data)
 	if err != nil {
 		return nil, err
@@ -86,12 +91,14 @@ func TraceSimulateHandleOp(in *TraceInput) (*TraceOutput, error) {
 
 	var res tracer.BundlerExecutionReturn
 	req := utils.TraceCallReq{
-		From: common.HexToAddress("0x"),
-		To:   in.EntryPoint,
-		Data: tx.Data(),
+		From:         common.HexToAddress("0x"),
+		To:           in.EntryPoint,
+		Data:         tx.Data(),
+		MaxFeePerGas: hexutil.Big(*mf),
 	}
 	opts := utils.TraceCallOpts{
-		Tracer: tracer.Loaded.BundlerExecutionTracer,
+		Tracer:         tracer.Loaded.BundlerExecutionTracer,
+		StateOverrides: utils.DefaultStateOverrides,
 	}
 	if err := in.Rpc.CallContext(context.Background(), &res, "debug_traceCall", &req, "latest", &opts); err != nil {
 		return nil, err

pkg/entrypoint/simulation/tracevalidation.go

@@ -10,6 +10,7 @@ import (
 	mapset "github.com/deckarep/golang-set/v2"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/stackup-wallet/stackup-bundler/pkg/entrypoint"
@@ -45,12 +46,14 @@ func TraceSimulateValidation(
 
 	var res tracer.BundlerCollectorReturn
 	req := utils.TraceCallReq{
-		From: common.HexToAddress("0x"),
-		To:   entryPoint,
-		Data: tx.Data(),
+		From:         common.HexToAddress("0x"),
+		To:           entryPoint,
+		Data:         tx.Data(),
+		MaxFeePerGas: hexutil.Big(*op.MaxFeePerGas),
 	}
 	opts := utils.TraceCallOpts{
-		Tracer: tracer.Loaded.BundlerCollectorTracer,
+		Tracer:         tracer.Loaded.BundlerCollectorTracer,
+		StateOverrides: utils.DefaultStateOverrides,
 	}
 	if err := rpc.CallContext(context.Background(), &res, "debug_traceCall", &req, "latest", &opts); err != nil {
 		return nil, err

pkg/entrypoint/utils/tracing.go

@@ -1,22 +1,36 @@
 package utils
 
 import (
+	"math"
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
 type TraceCallReq struct {
-	From common.Address `json:"from"`
-	To   common.Address `json:"to"`
-	Data hexutil.Bytes  `json:"data"`
+	From         common.Address `json:"from"`
+	To           common.Address `json:"to"`
+	Data         hexutil.Bytes  `json:"data"`
+	MaxFeePerGas hexutil.Big    `json:"maxFeePerGas"`
+}
+
+type TraceStateOverrides struct {
+	Balance hexutil.Big `json:"balance"`
 }
 
 type TraceCallOpts struct {
-	Tracer string `json:"tracer"`
+	Tracer         string                         `json:"tracer"`
+	StateOverrides map[string]TraceStateOverrides `json:"stateOverrides"`
 }
 
 var (
 	// A dummy private key used to build *bind.TransactOpts for simulation.
 	DummyPk, _ = crypto.GenerateKey()
+
+	// A default state override to ensure the zero address always has sufficient funds.
+	DefaultStateOverrides = map[string]TraceStateOverrides{
+		common.HexToAddress("0x").Hex(): {Balance: hexutil.Big(*big.NewInt(0).SetUint64(math.MaxUint64))},
+	}
 )

pkg/gas/estimate.go

@@ -131,10 +131,11 @@ func EstimateGas(in *EstimateInput) (verificationGas uint64, callGas uint64, err
 		return 0, 0, err
 	}
 	out, err := execution.TraceSimulateHandleOp(&execution.TraceInput{
-		Rpc:        in.Rpc,
-		EntryPoint: in.EntryPoint,
-		Op:         simOp,
-		ChainID:    in.ChainID,
+		Rpc:         in.Rpc,
+		EntryPoint:  in.EntryPoint,
+		Op:          simOp,
+		ChainID:     in.ChainID,
+		TraceFeeCap: in.Op.MaxFeePerGas,
 	})
 	if err != nil {
 		return 0, 0, err