eth/tracers: make 4byte tracer not care about create

holiman · Nov 11, 2021 · d57724b · d57724b
1 parent a276328
commit d57724b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/eth/tracers/js/internal/tracers/4byte_tracer.js b/eth/tracers/js/internal/tracers/4byte_tracer.js
@@ -37,11 +37,16 @@
 		this.ids[key] = this.ids[key] + 1 || 1;
 	},
 
-	enter: function(frame) {
+	enter: function(frame, log) {
 		// Skip any pre-compile invocations, those are just fancy opcodes
 		if (isPrecompiled(frame.getTo())) {
 			return;
 		}
+		var type = frame.getType()
+		if (type !== "CALL" && type !== "STATICCALL" &&
+			type !== "DELEGATECALL" && type !== "CALLCODE"){
+			return;
+		}
 		var input = frame.getInput()
 		if (input.length >= 4) {
 			this.store(slice(input, 0, 4), input.length - 4);

diff --git a/eth/tracers/js/internal/tracers/assets.go b/eth/tracers/js/internal/tracers/assets.go
diff --git a/eth/tracers/native/4byte.go b/eth/tracers/native/4byte.go
@@ -97,7 +97,7 @@ func (t *fourByteTracer) CaptureState(pc uint64, op vm.OpCode, gas, cost uint64,
 }
 
 // CaptureEnter is called when EVM enters a new scope (via call, create or selfdestruct).
-func (t *fourByteTracer) CaptureEnter(typ vm.OpCode, from common.Address, to common.Address, input []byte, gas uint64, value *big.Int) {
+func (t *fourByteTracer) CaptureEnter(op vm.OpCode, from common.Address, to common.Address, input []byte, gas uint64, value *big.Int) {
 	// Skip if tracing was interrupted
 	if atomic.LoadUint32(&t.interrupt) > 0 {
 		t.env.Cancel()
@@ -106,6 +106,11 @@ func (t *fourByteTracer) CaptureEnter(typ vm.OpCode, from common.Address, to com
 	if len(input) < 4 {
 		return
 	}
+	// primarily we want to avoid CREATE/CREATE2/SELFDESTRUCT
+	if op != vm.DELEGATECALL && op != vm.STATICCALL &&
+		op != vm.CALL && op != vm.CALLCODE {
+		return
+	}
 	// Skip any pre-compile invocations, those are just fancy opcodes
 	if t.isPrecompiled(to) {
 		return