eth/tracers: fix omitempty for memory and storage (#31289)

s1na · web-flow · commit 7405dc5c4b51 · 2025-03-04T16:30:03.000+08:00
This fixes a regression in the opcode tracer API where we would log
empty memory and storage fields.
diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go
@@ -177,14 +177,14 @@ func (s *StructLog) toLegacyJSON() json.RawMessage {
 	if len(s.ReturnData) > 0 {
 		msg.ReturnData = hexutil.Bytes(s.ReturnData).String()
 	}
-	if s.Memory != nil {
+	if len(s.Memory) > 0 {
 		memory := make([]string, 0, (len(s.Memory)+31)/32)
 		for i := 0; i+32 <= len(s.Memory); i += 32 {
 			memory = append(memory, fmt.Sprintf("%x", s.Memory[i:i+32]))
 		}
 		msg.Memory = &memory
 	}
-	if s.Storage != nil {
+	if len(s.Storage) > 0 {
 		storage := make(map[string]string)
 		for i, storageValue := range s.Storage {
 			storage[fmt.Sprintf("%x", i)] = fmt.Sprintf("%x", storageValue)

Original file line number	Diff line number	Diff line change
`@@ -177,14 +177,14 @@ func (s *StructLog) toLegacyJSON() json.RawMessage {`
`177`	`177`	`if len(s.ReturnData) > 0 {`
`178`	`178`	`msg.ReturnData = hexutil.Bytes(s.ReturnData).String()`
`179`	`179`	`}`
`180`		`- if s.Memory != nil {`
	`180`	`+ if len(s.Memory) > 0 {`
`181`	`181`	`memory := make([]string, 0, (len(s.Memory)+31)/32)`
`182`	`182`	`for i := 0; i+32 <= len(s.Memory); i += 32 {`
`183`	`183`	`memory = append(memory, fmt.Sprintf("%x", s.Memory[i:i+32]))`
`184`	`184`	`}`
`185`	`185`	`msg.Memory = &memory`
`186`	`186`	`}`
`187`		`- if s.Storage != nil {`
	`187`	`+ if len(s.Storage) > 0 {`
`188`	`188`	`storage := make(map[string]string)`
`189`	`189`	`for i, storageValue := range s.Storage {`
`190`	`190`	`storage[fmt.Sprintf("%x", i)] = fmt.Sprintf("%x", storageValue)`