Merge tag 'v1.10.12' into HEAD

2021-11-29 10:16:13 -06:00
parent efb6546a11 6c4dc6c388
commit 6060d4adc9
107 changed files with 2249 additions and 811 deletions
@@ -388,7 +388,7 @@ func BenchmarkJournal(b *testing.B) {
 		}
 		return newDiffLayer(parent, common.Hash{}, destructs, accounts, storage)
 	}
-	layer := snapshot(new(diskLayer))
+	layer := snapshot(emptyLayer())
 	for i := 1; i < 128; i++ {
 		layer = fill(layer)
 	}