Merge branch 'develop' into feature/v3-parity

0xPolygon · Jan 12, 2023 · 6e8478a · 6e8478a
2 parents 9e9bd63 + af4b991
commit 6e8478a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 78 deletions.
diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml
@@ -17,25 +17,7 @@ services:
     build:
       context: ../../
       dockerfile: docker/local/Dockerfile
-    command:
-      [
-        "server",
-        "--data-dir",
-        "/data",
-        "--chain",
-        "/genesis/genesis.json",
-        "--grpc-address",
-        "0.0.0.0:9632",
-        "--libp2p",
-        "0.0.0.0:1478",
-        "--jsonrpc",
-        "0.0.0.0:8545",
-        "--prometheus",
-        "0.0.0.0:5001",
-        "--seal",
-        "--log-level",
-        "DEBUG"
-      ]
+    command: ["server", "--data-dir", "/data/data-1", "--chain", "/data/genesis.json", "--grpc-address", "0.0.0.0:9632", "--libp2p", "0.0.0.0:1478", "--jsonrpc", "0.0.0.0:8545", "--prometheus", "0.0.0.0:5001", "--seal"]
     depends_on:
       init:
         condition: service_completed_successfully
@@ -53,25 +35,7 @@ services:
     build:
       context: ../../
       dockerfile: docker/local/Dockerfile
-    command:
-      [
-        "server",
-        "--data-dir",
-        "/data",
-        "--chain",
-        "/genesis/genesis.json",
-        "--grpc-address",
-        "0.0.0.0:9632",
-        "--libp2p",
-        "0.0.0.0:1478",
-        "--jsonrpc",
-        "0.0.0.0:8545",
-        "--prometheus",
-        "0.0.0.0:5001",
-        "--seal",
-        "--log-level",
-        "DEBUG"
-      ]
+    command: ["server", "--data-dir", "/data/data-2", "--chain", "/data/genesis.json", "--grpc-address", "0.0.0.0:9632", "--libp2p", "0.0.0.0:1478", "--jsonrpc", "0.0.0.0:8545", "--prometheus", "0.0.0.0:5001", "--seal"]
     depends_on:
       init:
         condition: service_completed_successfully
@@ -89,25 +53,7 @@ services:
     build:
       context: ../../
       dockerfile: docker/local/Dockerfile
-    command:
-      [
-        "server",
-        "--data-dir",
-        "/data",
-        "--chain",
-        "/genesis/genesis.json",
-        "--grpc-address",
-        "0.0.0.0:9632",
-        "--libp2p",
-        "0.0.0.0:1478",
-        "--jsonrpc",
-        "0.0.0.0:8545",
-        "--prometheus",
-        "0.0.0.0:5001",
-        "--seal",
-        "--log-level",
-        "DEBUG"
-      ]
+    command: ["server", "--data-dir", "/data/data-3", "--chain", "/data/genesis.json", "--grpc-address", "0.0.0.0:9632", "--libp2p", "0.0.0.0:1478", "--jsonrpc", "0.0.0.0:8545", "--prometheus", "0.0.0.0:5001", "--seal"]
     depends_on:
       init:
         condition: service_completed_successfully
@@ -125,25 +71,7 @@ services:
     build:
       context: ../../
       dockerfile: docker/local/Dockerfile
-    command:
-      [
-        "server",
-        "--data-dir",
-        "/data",
-        "--chain",
-        "/genesis/genesis.json",
-        "--grpc-address",
-        "0.0.0.0:9632",
-        "--libp2p",
-        "0.0.0.0:1478",
-        "--jsonrpc",
-        "0.0.0.0:8545",
-        "--prometheus",
-        "0.0.0.0:5001",
-        "--seal",
-        "--log-level",
-        "DEBUG"
-      ]
+    command: ["server", "--data-dir", "/data/data-4", "--chain", "/data/genesis.json", "--grpc-address", "0.0.0.0:9632", "--libp2p", "0.0.0.0:1478", "--jsonrpc", "0.0.0.0:8545", "--prometheus", "0.0.0.0:5001", "--seal"]
     depends_on:
       init:
         condition: service_completed_successfully

diff --git a/state/runtime/tracer/structtracer/tracer.go b/state/runtime/tracer/structtracer/tracer.go
@@ -143,7 +143,7 @@ func (t *StructTracer) CaptureState(
 
 	t.captureMemory(memory)
 
-	t.captureStack(stack)
+	t.captureStack(stack, sp)
 
 	t.captureStorage(
 		stack,
@@ -169,14 +169,19 @@ func (t *StructTracer) captureMemory(
 
 func (t *StructTracer) captureStack(
 	stack []*big.Int,
+	sp int,
 ) {
 	if !t.Config.EnableStack {
 		return
 	}
 
-	t.currentStack = make([]*big.Int, len(stack))
+	t.currentStack = make([]*big.Int, sp)
 
 	for i, v := range stack {
+		if i >= sp {
+			break
+		}
+
 		t.currentStack[i] = new(big.Int).Set(v)
 	}
 }