eth/tracers: fix callTracer fault handling (ethereum#23667)

* eth/tracers: fix calltracer fault handling * eth/tracers: fix calltracer indentation
wemixarchive · Oct 1, 2021 · b522f5e · b522f5e
1 parent a47b8cf
commit b522f5e
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 76 deletions.
diff --git a/eth/tracers/internal/tracers/assets.go b/eth/tracers/internal/tracers/assets.go
diff --git a/eth/tracers/internal/tracers/call_tracer.js b/eth/tracers/internal/tracers/call_tracer.js
@@ -18,77 +18,68 @@
 // callFrameTracer uses the new call frame tracing methods to report useful information
 // about internal messages of a transaction.
 {
-    callstack: [{}],
-    fault: function(log, db) {
-        var len = this.callstack.length
-        if (len > 1) {
-            var call = this.callstack.pop()
-            if (this.callstack[len-1].calls === undefined) {
-                this.callstack[len-1].calls = []
-            }
-            this.callstack[len-1].calls.push(call)
-        }
-    },
-    result: function(ctx, db) {
-        // Prepare outer message info
-        var result = {
-            type:    ctx.type,
-            from:    toHex(ctx.from),
-            to:      toHex(ctx.to),
-            value:   '0x' + ctx.value.toString(16),
-            gas:     '0x' + bigInt(ctx.gas).toString(16),
-            gasUsed: '0x' + bigInt(ctx.gasUsed).toString(16),
-            input:   toHex(ctx.input),
-            output:  toHex(ctx.output),
-        }
-        if (this.callstack[0].calls !== undefined) {
-          result.calls = this.callstack[0].calls
-        }
-        if (this.callstack[0].error !== undefined) {
-          result.error = this.callstack[0].error
-        } else if (ctx.error !== undefined) {
-          result.error = ctx.error
-        }
-        if (result.error !== undefined && (result.error !== "execution reverted" || result.output ==="0x")) {
-          delete result.output
-        }
+	callstack: [{}],
+	fault: function(log, db) {},
+	result: function(ctx, db) {
+		// Prepare outer message info
+		var result = {
+			type:    ctx.type,
+			from:    toHex(ctx.from),
+			to:      toHex(ctx.to),
+			value:   '0x' + ctx.value.toString(16),
+			gas:     '0x' + bigInt(ctx.gas).toString(16),
+			gasUsed: '0x' + bigInt(ctx.gasUsed).toString(16),
+			input:   toHex(ctx.input),
+			output:  toHex(ctx.output),
+		}
+		if (this.callstack[0].calls !== undefined) {
+			result.calls = this.callstack[0].calls
+		}
+		if (this.callstack[0].error !== undefined) {
+			result.error = this.callstack[0].error
+		} else if (ctx.error !== undefined) {
+			result.error = ctx.error
+		}
+		if (result.error !== undefined && (result.error !== "execution reverted" || result.output ==="0x")) {
+			delete result.output
+		}
 
-        return this.finalize(result)
-    },
-    enter: function(frame) {
-        var call = {
-            type: frame.getType(),
-            from: toHex(frame.getFrom()),
-            to: toHex(frame.getTo()),
-            input: toHex(frame.getInput()),
-            gas: '0x' + bigInt(frame.getGas()).toString('16'),
-        }
-        if (frame.getValue() !== undefined){
-            call.value='0x' + bigInt(frame.getValue()).toString(16)
-        }
-        this.callstack.push(call)
-    },
-    exit: function(frameResult) {
-        var len = this.callstack.length
-        if (len > 1) {
-            var call = this.callstack.pop()
-            call.gasUsed = '0x' + bigInt(frameResult.getGasUsed()).toString('16')
-            var error = frameResult.getError()
-            if (error === undefined) {
-                call.output = toHex(frameResult.getOutput())
-            } else {
-                call.error = error
-                if (call.type === 'CREATE' || call.type === 'CREATE2') {
-                    delete call.to
-                }
-            }
-            len -= 1
-            if (this.callstack[len-1].calls === undefined) {
-                this.callstack[len-1].calls = []
-            }
-            this.callstack[len-1].calls.push(call)
-        }
-    },
+		return this.finalize(result)
+	},
+	enter: function(frame) {
+		var call = {
+			type: frame.getType(),
+			from: toHex(frame.getFrom()),
+			to: toHex(frame.getTo()),
+			input: toHex(frame.getInput()),
+			gas: '0x' + bigInt(frame.getGas()).toString('16'),
+		}
+		if (frame.getValue() !== undefined){
+			call.value='0x' + bigInt(frame.getValue()).toString(16)
+		}
+		this.callstack.push(call)
+	},
+	exit: function(frameResult) {
+		var len = this.callstack.length
+		if (len > 1) {
+			var call = this.callstack.pop()
+			call.gasUsed = '0x' + bigInt(frameResult.getGasUsed()).toString('16')
+			var error = frameResult.getError()
+			if (error === undefined) {
+				call.output = toHex(frameResult.getOutput())
+			} else {
+				call.error = error
+				if (call.type === 'CREATE' || call.type === 'CREATE2') {
+					delete call.to
+				}
+			}
+			len -= 1
+			if (this.callstack[len-1].calls === undefined) {
+				this.callstack[len-1].calls = []
+			}
+			this.callstack[len-1].calls.push(call)
+		}
+	},
 	// finalize recreates a call object using the final desired field oder for json
 	// serialization. This is a nicety feature to pass meaningfully ordered results
 	// to users who don't interpret it, just display it.

diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go
@@ -795,9 +795,6 @@ func (jst *Tracer) CaptureExit(output []byte, gasUsed uint64, err error) {
 	if !jst.traceCallFrames {
 		return
 	}
-	if jst.err != nil {
-		return
-	}
 	// If tracing was interrupted, set the error and stop
 	if atomic.LoadUint32(&jst.interrupt) > 0 {
 		jst.err = jst.reason