Fix null ptr in debug_traceTransaction (#8593)

Cherry pick #8585 --------- Co-authored-by: Somnath <[email protected]>
erigontech · Oct 26, 2023 · 0930daa · 0930daa
1 parent 656c3d2
commit 0930daa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/eth/tracers/native/call.go b/eth/tracers/native/call.go
@@ -145,15 +145,11 @@ func (t *callTracer) CaptureStart(env *vm.EVM, from libcommon.Address, to libcom
 	if create {
 		t.callstack[0].Type = vm.CREATE
 	}
-	t.logIndex = 0
-	t.logGaps = make(map[uint64]int)
 }
 
 // CaptureEnd is called after the call finishes to finalize the tracing.
 func (t *callTracer) CaptureEnd(output []byte, gasUsed uint64, err error) {
 	t.callstack[0].processOutput(output, err)
-	t.logIndex = 0
-	t.logGaps = nil
 }
 
 // CaptureState implements the EVMLogger interface to trace a single step of VM execution.
@@ -241,8 +237,9 @@ func (t *callTracer) CaptureExit(output []byte, gasUsed uint64, err error) {
 }
 
 func (t *callTracer) CaptureTxStart(gasLimit uint64) {
-
 	t.gasLimit = gasLimit
+	t.logIndex = 0
+	t.logGaps = make(map[uint64]int)
 }
 
 func (t *callTracer) CaptureTxEnd(restGas uint64) {
@@ -252,6 +249,8 @@ func (t *callTracer) CaptureTxEnd(restGas uint64) {
 		clearFailedLogs(&t.callstack[0], false, 0, t.logGaps)
 		fixLogIndexGap(&t.callstack[0], t.logGaps)
 	}
+	t.logIndex = 0
+	t.logGaps = nil
 }
 
 // GetResult returns the json-encoded nested list of call traces, and any
@@ -282,7 +281,7 @@ func clearFailedLogs(cf *callFrame, parentFailed bool, gap int, logGaps map[uint
 		gap += len(cf.Logs)
 		if gap > 0 {
 			lastIdx := len(cf.Logs) - 1
-			if lastIdx > 0 {
+			if lastIdx > 0 && logGaps != nil {
 				idx := cf.Logs[lastIdx].Index
 				logGaps[idx] = gap
 			}

diff --git a/params/version.go b/params/version.go
@@ -33,7 +33,7 @@ var (
 const (
 	VersionMajor       = 2  // Major version component of the current release
 	VersionMinor       = 53 // Minor version component of the current release
-	VersionMicro       = 0  // Patch version component of the current release
+	VersionMicro       = 1  // Patch version component of the current release
 	VersionModifier    = "" // Modifier component of the current release
 	VersionKeyCreated  = "ErigonVersionCreated"
 	VersionKeyFinished = "ErigonVersionFinished"