e3: don't loose nil-value in reconstitution (erigontech#7117)

calmbeing · Apr 24, 2023 · 7c19d9f · 7c19d9f
1 parent ac23b2d
commit 7c19d9f
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/eth/stagedsync/exec3.go b/eth/stagedsync/exec3.go
@@ -1213,7 +1213,11 @@ func reconstituteStep(last bool,
 				}
 				lastKey = append(lastKey[:0], k[:len(k)-8]...)
 			}
-			lastVal = append(lastVal[:0], v...)
+			if v == nil { // `nil` value means delete, `empty value []byte{}` means empty value
+				lastVal = nil
+			} else {
+				lastVal = append(lastVal[:0], v...)
+			}
 			return nil
 		}, etl.TransformArgs{}); err != nil {
 			return err
@@ -1241,7 +1245,11 @@ func reconstituteStep(last bool,
 				}
 				lastKey = append(lastKey[:0], k[:len(k)-8]...)
 			}
-			lastVal = append(lastVal[:0], v...)
+			if v == nil {
+				lastVal = nil
+			} else {
+				lastVal = append(lastVal[:0], v...)
+			}
 			return nil
 		}, etl.TransformArgs{}); err != nil {
 			return err
@@ -1269,7 +1277,11 @@ func reconstituteStep(last bool,
 				}
 				lastKey = append(lastKey[:0], k[:len(k)-8]...)
 			}
-			lastVal = append(lastVal[:0], v...)
+			if v == nil {
+				lastVal = nil
+			} else {
+				lastVal = append(lastVal[:0], v...)
+			}
 			return nil
 		}, etl.TransformArgs{}); err != nil {
 			return err