Allow nil state override set in gas.EstimateInput (#349)

Author: hazim-j

pkg/client/client.go

@@ -177,7 +177,7 @@ func (i *Client) EstimateUserOperationGas(
 	}
 
 	// Estimate gas limits
-	vg, cg, err := i.getGasEstimate(epAddr, userOp, state.WithZeroAddressOverride(sos))
+	vg, cg, err := i.getGasEstimate(epAddr, userOp, sos)
 	if err != nil {
 		l.Error(err, "eth_estimateUserOperationGas error")
 		return nil, err

pkg/entrypoint/execution/trace.go

@@ -100,7 +100,7 @@ func TraceSimulateHandleOp(in *TraceInput) (*TraceOutput, error) {
 	}
 	opts := utils.TraceCallOpts{
 		Tracer:         tracer.Loaded.BundlerExecutionTracer,
-		StateOverrides: in.Sos,
+		StateOverrides: state.WithZeroAddressOverride(in.Sos),
 	}
 	if err := in.Rpc.CallContext(context.Background(), &res, "debug_traceCall", &req, "latest", &opts); err != nil {
 		return nil, err

pkg/entrypoint/simulation/tracevalidation.go

@@ -63,7 +63,7 @@ func TraceSimulateValidation(in *TraceInput) (*TraceOutput, error) {
 	}
 	opts := utils.TraceCallOpts{
 		Tracer:         tracer.Loaded.BundlerCollectorTracer,
-		StateOverrides: state.WithZeroAddressOverride(state.OverrideSet{}),
+		StateOverrides: state.WithZeroAddressOverride(nil),
 	}
 	if err := in.Rpc.CallContext(context.Background(), &res, "debug_traceCall", &req, "latest", &opts); err != nil {
 		return nil, err

pkg/state/zeroaddr.go

@@ -14,6 +14,10 @@ var (
 // WithZeroAddressOverride takes a set and appends an override for the zero address to have a balance equal to
 // max uint96.
 func WithZeroAddressOverride(os OverrideSet) OverrideSet {
+	if os == nil {
+		os = OverrideSet{}
+	}
+
 	bal := hexutil.Big(*maxUint96)
 	os[common.HexToAddress("0x")] = OverrideAccount{
 		Balance: &bal,

pkg/state/zeroaddr_test.go

@@ -21,3 +21,12 @@ func TestWithZeroAddressOverride(t *testing.T) {
 		t.Fatalf("got %s, want %s", oa.Balance.ToInt().String(), maxUint96.String())
 	}
 }
+
+func TestWithZeroAddressOverrideNil(t *testing.T) {
+	os := WithZeroAddressOverride(nil)
+	if oa, ok := os[common.HexToAddress("0x")]; !ok {
+		t.Fatal("OverrideSet does not contain OverrideAccount")
+	} else if oa.Balance.ToInt().String() != maxUint96.String() {
+		t.Fatalf("got %s, want %s", oa.Balance.ToInt().String(), maxUint96.String())
+	}
+}