fix memory copy util func

eth/tracers/directory/util.go

@@ -18,8 +18,6 @@ package directory
 import (
 	"errors"
 	"fmt"
-
-	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 const (
@@ -28,20 +26,36 @@ const (
 
 // GetMemoryCopyPadded returns offset + size as a new slice.
 // It zero-pads the slice if it extends beyond memory bounds.
-func GetMemoryCopyPadded(m *vm.Memory, offset, size int64) ([]byte, error) {
+func GetMemoryCopyPadded(m []byte, offset, size int64) ([]byte, error) {
 	if offset < 0 || size < 0 {
 		return nil, errors.New("offset or size must not be negative")
 	}
-	if int(offset+size) < m.Len() { // slice fully inside memory
+	length := int64(len(m))
-		return m.GetCopy(offset, size), nil
+	if offset+size < length { // slice fully inside memory
+		return memoryCopy(m, offset, size), nil
 	}
-	paddingNeeded := int(offset+size) - m.Len()
+	paddingNeeded := offset + size - length
 	if paddingNeeded > memoryPadLimit {
 		return nil, fmt.Errorf("reached limit for padding memory slice: %d", paddingNeeded)
 	}
 	cpy := make([]byte, size)
-	if overlap := int64(m.Len()) - offset; overlap > 0 {
+	if overlap := length - offset; overlap > 0 {
-		copy(cpy, m.GetPtr(offset, overlap))
+		copy(cpy, m[offset:offset+overlap])
 	}
 	return cpy, nil
 }
+
+func memoryCopy(m []byte, offset, size int64) (cpy []byte) {
+	if size == 0 {
+		return nil
+	}
+
+	if len(m) > int(offset) {
+		cpy = make([]byte, size)
+		copy(cpy, m[offset:offset+size])
+
+		return
+	}
+
+	return
+}

eth/tracers/directory/util_test.go

@@ -40,7 +40,7 @@ func TestMemCopying(t *testing.T) {
 	} {
 		mem := vm.NewMemory()
 		mem.Resize(uint64(tc.memsize))
-		cpy, err := GetMemoryCopyPadded(mem, tc.offset, tc.size)
+		cpy, err := GetMemoryCopyPadded(mem.Data(), tc.offset, tc.size)
 		if want := tc.wantErr; want != "" {
 			if err == nil {
 				t.Fatalf("test %d: want '%v' have no error", i, want)

eth/tracers/native/prestate.go

@@ -133,7 +133,7 @@ func (t *prestateTracer) CaptureState(pc uint64, opcode live.OpCode, gas, cost u
 	case stackLen >= 4 && op == vm.CREATE2:
 		offset := stackData[stackLen-2]
 		size := stackData[stackLen-3]
-		init, err := directory.GetMemoryCopyPadded(scope.Memory, int64(offset.Uint64()), int64(size.Uint64()))
+		init, err := directory.GetMemoryCopyPadded(scope.GetMemoryData(), int64(offset.Uint64()), int64(size.Uint64()))
 		if err != nil {
 			log.Warn("failed to copy CREATE2 input", "err", err, "tracer", "prestateTracer", "offset", offset, "size", size)
 			return