Refactor system contract upgrade. (node-real#422)

chainstack · Jul 19, 2024 · e465cbc · e465cbc
1 parent 7267989
commit e465cbc
Show file tree

Hide file tree

Showing 6 changed files with 500 additions and 1,274 deletions.
diff --git a/core/system_contract_lookup.go b/core/system_contract_lookup.go
diff --git a/core/systemcontracts/upgrade.go b/core/systemcontracts/upgrade.go
diff --git a/erigon-lib/chain/chain_config.go b/erigon-lib/chain/chain_config.go
@@ -703,10 +703,11 @@ func (c *CliqueConfig) String() string {
 }
 
 type ParliaConfig struct {
- DBPath string
- InMemory bool
- Period uint64 `json:"period"` // Number of seconds between blocks to enforce
- Epoch uint64 `json:"epoch"` // Epoch length to update validatorSet
+ DBPath string
+ InMemory bool
+ Period uint64 `json:"period"` // Number of seconds between blocks to enforce
+ Epoch uint64 `json:"epoch"` // Epoch length to update validatorSet
+ BlockAlloc map[string]interface{} `json:"blockAlloc"` // For systemContract upgrade
 }
 
 // String implements the stringer interface, returning the consensus engine details.

diff --git a/params/chainspecs/bsc.json b/params/chainspecs/bsc.json
diff --git a/params/chainspecs/chapel.json b/params/chainspecs/chapel.json
diff --git a/turbo/stages/headerdownload/header_algos.go b/turbo/stages/headerdownload/header_algos.go
@@ -610,7 +610,7 @@ func (hd *HeaderDownload) InsertHeader(hf FeedHeaderFunc, terminalTotalDifficult
  }
  for hd.persistedLinkQueue.Len() > hd.persistedLinkLimit {
  link := heap.Pop(&hd.persistedLinkQueue).(*Link)
- log.Debug("HeaderEvicted", "link.blockHeight", link.blockHeight)
+ // log.Debug("HeaderEvicted", "link.blockHeight", link.blockHeight)
  dataflow.HeaderDownloadStates.AddChange(link.blockHeight, dataflow.HeaderEvicted)
  delete(hd.links, link.hash)
  link.ClearChildren()
@@ -1117,8 +1117,8 @@ func (hd *HeaderDownload) ProcessHeader(sh ChainSegmentHeader, newBlock bool, pe
  }
  anchor.fLink = link
  hd.anchors[anchor.parentHash] = anchor
- _, success := hd.anchorTree.ReplaceOrInsert(anchor)
- log.Debug("AnchorTree add anchor", "anchor.blockHeight", anchor.blockHeight, "success", success)
+ hd.anchorTree.ReplaceOrInsert(anchor)
+ // log.Debug("AnchorTree add anchor", "anchor.blockHeight", anchor.blockHeight, "success", success)
  return true
  }
  return false