E3 agg commitment (#647)

* added commitment to aggregator * added commitment evaluation by updates, fixed mainnet roothash mismatch * added ability to change starting state of hph * replayable erigon23 with commitment * possible fix for eliasfano index read after close * fixed db pruning and restart * Initial fixes * Debug * clear downHashedLen for branch nodes * Fix key length, cleanup * Cleanup * Cleanup * picked aggregator updates * fixed empty cell hash for ProcessUpdate evaluation * hashBuffer moved from Cell to HexPatriciaHashed * fixed codeHash incorrect renewal * lint * removed valuemergefn from history * fixed lint * fixed test * rewritten fuzz test on hph * fix for Win tests - do not remove tmp dir after test * win * fixup after merge * close aggregator after test Co-authored-by: Alexey Sharp <[email protected]> Co-authored-by: Alex Sharp <[email protected]>
ledgerwatch · Sep 26, 2022 · 4f52325 · 4f52325
1 parent 7790688
commit 4f52325
Show file tree

Hide file tree

Showing 16 changed files with 2,005 additions and 457 deletions.
diff --git a/commitment/commitment.go b/commitment/commitment.go
@@ -351,6 +351,13 @@ func (branchData BranchData) IsComplete() bool {
 
 // MergeHexBranches combines two branchData, number 2 coming after (and potentially shadowing) number 1
 func (branchData BranchData) MergeHexBranches(branchData2 BranchData, newData []byte) (BranchData, error) {
+	if branchData2 == nil {
+		return branchData, nil
+	}
+	if branchData == nil {
+		return branchData2, nil
+	}
+
 	touchMap1 := binary.BigEndian.Uint16(branchData[0:])
 	afterMap1 := binary.BigEndian.Uint16(branchData[2:])
 	bitmap1 := touchMap1 & afterMap1