fix tracer previous step memory pointers (#3740)

0xPolygonHermez · Jul 24, 2024 · f594715 · f594715
1 parent 1adc67d
commit f594715
Show file tree

Hide file tree

Showing 8 changed files with 291 additions and 13 deletions.
diff --git a/state/runtime/instrumentation/tracers/structlogger/structlogger.go b/state/runtime/instrumentation/tracers/structlogger/structlogger.go
@@ -27,6 +27,7 @@ type StructLogRes struct {
 	Depth         int                `json:"depth"`
 	Error         string             `json:"error,omitempty"`
 	Stack         *[]string          `json:"stack,omitempty"`
+	ReturnData    *string            `json:"returnData,omitempty"`
 	Memory        *[]string          `json:"memory,omitempty"`
 	Storage       *map[string]string `json:"storage,omitempty"`
 	RefundCounter uint64             `json:"refund,omitempty"`
@@ -123,6 +124,14 @@ func (l *JSONLogger) ParseTrace(result *runtime.ExecutionResult, receipt types.R
 			structLogRes.Storage = &storage
 		}
 
+		var returnData *string
+		if l.cfg.EnableReturnData && len(step.ReturnData) > 0 {
+			rd := hex.EncodeToHex(step.ReturnData)
+			returnData = &rd
+		}
+
+		structLogRes.ReturnData = returnData
+
 		structLogs = append(structLogs, structLogRes)
 	}
 

diff --git a/state/trace.go b/state/trace.go
@@ -502,7 +502,8 @@ func (s *State) buildTrace(evm *fakevm.FakeEVM, result *runtime.ExecutionResult,
 		}
 
 		// Populate the step memory for future steps
-		step.Memory = memory.Data()
+		step.Memory = make([]byte, len(memory.Data()))
+		copy(step.Memory[0:], memory.Data()[0:])
 
 		// set Contract
 		contract := fakevm.NewContract(

diff --git a/test/contracts/auto/Sha.sol b/test/contracts/auto/Sha.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity ^0.8.4;
+
+contract Sha {
+    function hash() public {
+        sha256("hello world");
+    }
+}
diff --git a/test/contracts/bin/Sha/Sha.go b/test/contracts/bin/Sha/Sha.go
diff --git a/test/contracts/bin/triggerErrors/triggerErrors.go b/test/contracts/bin/triggerErrors/triggerErrors.go
diff --git a/test/e2e/debug_calltracer_test.go b/test/e2e/debug_calltracer_test.go
@@ -107,6 +107,7 @@ func TestDebugTraceTransactionCallTracer(t *testing.T) {
 		{name: "log0 all zeros", prepare: prepareLog0, createSignedTx: createLog0AllZeros},
 		{name: "log0 empty", prepare: prepareLog0, createSignedTx: createLog0Empty},
 		{name: "log0 short", prepare: prepareLog0, createSignedTx: createLog0Short},
+		{name: "sha256", prepare: prepareSha256, createSignedTx: createSha256},
 
 		// failed transactions
 		{name: "sc deployment reverted", createSignedTx: createScDeployRevertedSignedTx},

diff --git a/test/e2e/debug_shared.go b/test/e2e/debug_shared.go
@@ -30,6 +30,7 @@ import (
 	"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/Memory"
 	"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/OpCallAux"
 	"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/Revert2"
+	"github.com/0xPolygonHermez/zkevm-node/test/contracts/bin/Sha"
 	"github.com/0xPolygonHermez/zkevm-node/test/operations"
 	"github.com/0xPolygonHermez/zkevm-node/test/testutils"
 	"github.com/ethereum/go-ethereum"
@@ -953,3 +954,29 @@ func createLog0Short(t *testing.T, ctx context.Context, auth *bind.TransactOpts,
 
 	return tx, nil
 }
+
+func prepareSha256(t *testing.T, ctx context.Context, auth *bind.TransactOpts, client *ethclient.Client) (map[string]interface{}, error) {
+	_, tx, sc, err := Sha.DeploySha(auth, client)
+	require.NoError(t, err)
+
+	err = operations.WaitTxToBeMined(ctx, client, tx, operations.DefaultTimeoutTxToBeMined)
+	require.NoError(t, err)
+
+	return map[string]interface{}{
+		"sc": sc,
+	}, nil
+}
+
+func createSha256(t *testing.T, ctx context.Context, auth *bind.TransactOpts, client *ethclient.Client, customData map[string]interface{}) (*ethTypes.Transaction, error) {
+	scInterface := customData["sc"]
+	sc := scInterface.(*Sha.Sha)
+
+	opts := *auth
+	opts.NoSend = true
+	opts.GasLimit = fixedTxGasLimit
+
+	tx, err := sc.Hash(&opts)
+	require.NoError(t, err)
+
+	return tx, nil
+}