fix optional trace config; update prover docker image

Author: tclemos

docker-compose.yml

@@ -107,7 +107,7 @@ services:
   zkevm-prover:
     container_name: zkevm-prover
     restart: unless-stopped
-    image: hermeznetwork/zkevm-prover:6d6e3aa
+    image: hermeznetwork/zkevm-prover:c514cd1
     depends_on:
       zkevm-state-db:
         condition: service_healthy

jsonrpc/endpoints_debug.go

@@ -15,6 +15,14 @@ import (
 	"github.com/jackc/pgx/v4"
 )
 
+var defaultTraceConfig = &traceConfig{
+	DisableStorage:   false,
+	DisableStack:     false,
+	EnableMemory:     false,
+	EnableReturnData: false,
+	Tracer:           nil,
+}
+
 // DebugEndpoints is the debug jsonrpc endpoint
 type DebugEndpoints struct {
 	state types.StateInterface
@@ -125,36 +133,38 @@ func (d *DebugEndpoints) buildTraceBlock(ctx context.Context, txs []*ethTypes.Tr
 }
 
 func (d *DebugEndpoints) buildTraceTransaction(ctx context.Context, hash common.Hash, cfg *traceConfig, dbTx pgx.Tx) (interface{}, types.Error) {
-	traceConfig := state.TraceConfig{}
-
-	if cfg != nil {
-		traceConfig.DisableStack = cfg.DisableStack
-		traceConfig.DisableStorage = cfg.DisableStorage
-		traceConfig.EnableMemory = cfg.EnableMemory
-		traceConfig.EnableReturnData = cfg.EnableReturnData
-		traceConfig.Tracer = cfg.Tracer
+	trcCfg := cfg
+	if trcCfg == nil {
+		trcCfg = defaultTraceConfig
 	}
 
-	result, err := d.state.DebugTransaction(ctx, hash, traceConfig, dbTx)
+	stateTraceConfig := state.TraceConfig{
+		DisableStack:     trcCfg.DisableStack,
+		DisableStorage:   trcCfg.DisableStorage,
+		EnableMemory:     trcCfg.EnableMemory,
+		EnableReturnData: trcCfg.EnableReturnData,
+		Tracer:           trcCfg.Tracer,
+	}
+	result, err := d.state.DebugTransaction(ctx, hash, stateTraceConfig, dbTx)
 	if errors.Is(err, state.ErrNotFound) {
 		return rpcErrorResponse(types.DefaultErrorCode, "transaction not found", nil)
 	} else if err != nil {
 		const errorMessage = "failed to get trace"
-		log.Infof("%v: %v", errorMessage, err)
+		log.Errorf("%v: %v", errorMessage, err)
 		return nil, types.NewRPCError(types.DefaultErrorCode, errorMessage)
 	}
 
-	if traceConfig.Tracer != nil && *traceConfig.Tracer != "" && len(result.ExecutorTraceResult) > 0 {
+	if stateTraceConfig.Tracer != nil && *stateTraceConfig.Tracer != "" && len(result.ExecutorTraceResult) > 0 {
 		return result.ExecutorTraceResult, nil
 	}
 
 	failed := result.Failed()
 	var returnValue interface{}
-	if traceConfig.EnableReturnData {
+	if stateTraceConfig.EnableReturnData {
 		returnValue = common.Bytes2Hex(result.ReturnValue)
 	}
 
-	structLogs := d.buildStructLogs(result.StructLogs, cfg)
+	structLogs := d.buildStructLogs(result.StructLogs, *trcCfg)
 
 	resp := traceTransactionResponse{
 		Gas:         result.GasUsed,
@@ -166,7 +176,7 @@ func (d *DebugEndpoints) buildTraceTransaction(ctx context.Context, hash common.
 	return resp, nil
 }
 
-func (d *DebugEndpoints) buildStructLogs(stateStructLogs []instrumentation.StructLog, cfg *traceConfig) []StructLogRes {
+func (d *DebugEndpoints) buildStructLogs(stateStructLogs []instrumentation.StructLog, cfg traceConfig) []StructLogRes {
 	structLogs := make([]StructLogRes, 0, len(stateStructLogs))
 	for _, structLog := range stateStructLogs {
 		errRes := ""

test/docker-compose.yml

@@ -321,7 +321,7 @@ services:
 
   zkevm-prover:
     container_name: zkevm-prover
-    image: hermeznetwork/zkevm-prover:6d6e3aa
+    image: hermeznetwork/zkevm-prover:c514cd1
     ports:
       # - 50051:50051 # Prover
       - 50052:50052 # Mock prover
@@ -407,7 +407,7 @@ services:
 
   zkevm-permissionless-prover:
     container_name: zkevm-permissionless-prover
-    image: hermeznetwork/zkevm-prover:6d6e3aa
+    image: hermeznetwork/zkevm-prover:c514cd1
     ports:
       # - 50058:50058 # Prover
       - 50059:50052 # Mock prover