Merge v0.0.8 into develop (0xPolygonHermez#2077)

TomikQeen · May 4, 2023 · 0b88165 · 0b88165
1 parent 146b3f0
commit 0b88165
Show file tree

Hide file tree

Showing 12 changed files with 693 additions and 483 deletions.
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         go-version: [ 1.19.x ]
         goarch: [ "amd64" ]
-        e2e-group: [ 1, 2, 3, 4, 5, 6, 7 ]
+        e2e-group: [ 1, 2, 3, 4, 5, 6, 7, 8 ]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code

diff --git a/.golangci.yml b/.golangci.yml
@@ -4,6 +4,8 @@ run:
   skip-dirs:
     - state/runtime/fakevm
     - state/runtime/instrumentation
+    - test
+    - ci
 
 linters:
   enable:

diff --git a/ci/e2e-group5/debug_shared.go b/ci/e2e-group5/debug_shared.go
@@ -0,0 +1 @@
+../../test/e2e/debug_shared.go
diff --git a/ci/e2e-group8/debug_calltracer_test.go b/ci/e2e-group8/debug_calltracer_test.go
@@ -0,0 +1 @@
+../../test/e2e/debug_calltracer_test.go
diff --git a/ci/e2e-group8/debug_shared.go b/ci/e2e-group8/debug_shared.go
@@ -0,0 +1 @@
+../../test/e2e/debug_shared.go
diff --git a/ci/e2e-group8/shared.go b/ci/e2e-group8/shared.go
@@ -0,0 +1 @@
+../../test/e2e/shared.go
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -105,7 +105,7 @@ services:
   zkevm-prover:
     container_name: zkevm-prover
     restart: unless-stopped
-    image: hermeznetwork/zkevm-prover:b6fe2db
+    image: hermeznetwork/zkevm-prover:c231382
     depends_on:
       zkevm-state-db:
         condition: service_healthy

diff --git a/jsonrpc/endpoints_debug.go b/jsonrpc/endpoints_debug.go
@@ -62,7 +62,7 @@ type traceTransactionResponse struct {
 }
 
 type traceBlockTransactionResponse struct {
-	Result traceTransactionResponse `json:"result"`
+	Result interface{} `json:"result"`
 }
 
 // TraceTransaction creates a response for debug_traceTransaction request.
@@ -127,7 +127,7 @@ func (d *DebugEndpoints) buildTraceBlock(ctx context.Context, txs []*ethTypes.Tr
 			return rpcErrorResponse(types.DefaultErrorCode, errMsg, err)
 		}
 		traceBlockTransaction := traceBlockTransactionResponse{
-			Result: traceTransaction.(traceTransactionResponse),
+			Result: traceTransaction,
 		}
 		traces = append(traces, traceBlockTransaction)
 	}

diff --git a/test/Makefile b/test/Makefile
@@ -172,6 +172,17 @@ test-e2e-group-7: stop ## Runs group 7 e2e tests checking race conditions
 	docker logs $(DOCKERCOMPOSEZKPROVER)
 	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -count=1 -race -v -p 1 -timeout 600s ../ci/e2e-group7/...
 
+.PHONY: test-e2e-group-8
+test-e2e-group-8: stop ## Runs group 8 e2e tests checking race conditions
+	$(RUNSTATEDB)
+	$(RUNPOOLDB)
+	$(RUNEVENTDB)
+	sleep 5
+	$(RUNZKPROVER)
+	docker ps -a
+	docker logs $(DOCKERCOMPOSEZKPROVER)
+	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -count=1 -race -v -p 1 -timeout 600s ../ci/e2e-group8/...
+
 .PHONY: benchmark-sequencer-eth-transfers
 benchmark-sequencer-eth-transfers: stop
 	$(RUNL1NETWORK)