mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-27 23:26:44 +00:00
* Milestone Implementation * Merge branch 'POS-347' into reciept-e2e-test * Changes for testing, will be removed after testing * Debugged the error * Just for testing purpose * refactor debug api methods, rename whitelist -> checkpoint * remove first iteration based vars * fix linters * Rewind Changes * Error changes * RewindBack function in bor_checkpoint_verifier * Testcases * Added the fetch test for milestone and checkpoint * Debugged the lint changes * Debugged the lint changes * Debugged the lint changes * Debugged the lint changes * Improved the error in Miner test file * Improved the error of pointing to the wrong function * Locking the sprint after the vote has been made on it. * Adding more logs for testing * Adding more logs for testing * Adding more logs for testing * Implemented the NoAckMilestone fetching mechanism * Testcases for milestone implementation * Testing code for fetchNoAckMilestone and fetchLastNoAckMilestone * Testing changes * refactor else-if * Corrected the number of params in bor_ext.go * Dummy API for testing * Defined the GetVoteOnRootHash in interface * Defined the GetVoteOnRootHash in interface * Made changes in the web3ext file * Added the GetVoteOnRootHash in PublicBlockChain API * Added the GetVoteOnRootHash in filterBackend * Added the log of Root and RooHash * Removed the 0x from rootHash * Just for testing purpose * "GetVoteOnRootHash" mock implementation * bor_test.go * Added the test for milestone implementation * Added service for fetching milestone by ID * Improved the comments * Removed the duplicate code * use setter for borVerifier * use setter for borVerifier * refactor handleNoAckMilestone * remove code repetition with retry function * Converged the repetitive code * after CR * persistence * persistence implementation * feature flag * Persistence Changes * cr * initial * fix * fix * Whitelist Flag * 1 Add:Included the milestone flag 2.Add:Hardlimit the rewind to maximum of 255 blocks * Chg:Updated go.mod file * Remove:Dubai Hardfork code * Add:checked errors for call functions to the Db, Rmv: Remote Header variable from the IsValidPeer() function * Fix:Linting issues' * Add:MilestoneGRPC functions * Fix:Lint issues * Fix:Lint issues * Fix: TestFetchMilestoneFromMockHeimdall * Fix:Integrations tests * Add:Test for sprint length and milestone changes * Add:Functionality to fetch the finalized block * Chg:Changed default val of TriesInmemory to 1024 * fix:Some functions of heimdallGRPC client * Restored the GRPC functionality, was commented out for developing purpose * Fix:Bor_checkpoint_Verfier function * Test:Added the chain Rewinding test * Test:Added the Sprint Length + Milestone merge test * Add:Implemented the future milestone * Add:Future milestone changes * Add:Future milestone changes * Chg: Voting on endBlockHash rather than rootHash * Chg: Changed the logic of future milestone from rootHash checking to endBlockHash checking * Fix:Using endBockHash while verifying the incoming milestone * Chg:Variable names for better readiblity * Fix:Testing changes * Add:metrics for milestone implementation * Add:Metrics for milestone implementatian * Fix:Order of statements in a function for better optimization * Chg:Removed unrequired file * Fix:new variable intialization * Add:Comment to increase readiblity * Fix:Logs * Chg:Name of GetVoteOnRootHash to GetVoteOnHash * Fix:Linting issues * Fixed linting issues * Rmv: Unnecessary logs and Add:Skip test for long tests * Fix:Checking current chain with whitelisted milestone or checkpoint in Finalized block function * Fix:Test * Fix:Whitelisting of Milestone and Checkpoint process * Fix: Milestone JSON structure * Chg:Testcases changes * Fix:Change from VoteOnRootHash to VoteOnHash * Fix:Variable name fix * Fix:Finalized API * internal/jsre/deps: update web3.js bundle * Fix:milestone verifier * Chg:Handling the long future chain import issue * Fix:Lint issues * Fix:TestLowDiffLongChain and TestPrunedImportSide tests, used hardcoded value 128 instead of DefaultTriesInMemory value * Chg:Testcode for producing metrics * Chg:Milestong polling value to 32 secs * Add:Testcases * Add:Implemented the check to fetch the milestoneId from heimdall before locking the fork * Added GRPC method for FetchMilestoneID * Fix:lint issue * Fix:lint issue * Skiped out the tests which were mainly used to produce the supporting data * remove vcs build when running snyk * Add:Improved the logs and comments * fix linters * Skipped some test as they are panic due to timeout issue in github * Chg:Variable name LockerSprintNumber to LockedMilestoneNumber for better readablity and clarity * Chg:Conflicting variable names in milestone test file * Chg:Conflicting function names in milestone test file * fix : minor fix in TestInsertingSpanSizeBlocks * Fix:Mocking issue in TestInsertingSpanSizeBlocks * Fix:GRPC Polyproto Version * eth/downloader: skip peer drop due to whitelisting err * eth, tests/bor: bug fixes and minor refactor * Add:Implemented the milestone related functions in the HeimdallApp * Fix:Lint Errors & Remove:Redundant Code * Fix:Testing Errors * Fix:Bor integeration tests * Fix:Test errors * update heimdall client mock files * remove unused arguments * remove redundant code * Chg:Changed the milestone polling intervals * Add: added block finality from whitelisted checkpoint * skip future chain validation * Add:confirmation check of 16 blocks over the end block while voting for the milestone in GetVoteHash() function * Chg:Included endBlockNum in UnlockMutex function * Add:Property based test for milestone * Fix:Opening the lock while processing future milestone * Add:Property based test for futureMilestone * Defined the value of TempTriesInMemory * Fixed the finalized api * Fixed lint issues * eth: add logs while fetching and rewinding * fix linters: use default returns instead of recursive calls * Fix:Milestone intergration test * Add:GetVoteHash fn in mock backend * tests/bor: fix mock span * tests/bor: remove t.Parallel() * use bor namespace in ethclient, fix mock function --------- Co-authored-by: Vaibhav Jindal <vaibhavjindal29@gmail.com> Co-authored-by: VaibhavJindal <74560896+VAIBHAVJINDAL3012@users.noreply.github.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Shivam Sharma <shivam691999@gmail.com> Co-authored-by: Anshal Shukla <shukla.anshal85@gmail.com>
315 lines
9.3 KiB
Go
315 lines
9.3 KiB
Go
package whitelist
|
|
|
|
import (
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/flags"
|
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/ethereum/go-ethereum/metrics"
|
|
)
|
|
|
|
type milestone struct {
|
|
finality[*rawdb.Milestone]
|
|
|
|
LockedMilestoneNumber uint64 // Locked sprint number
|
|
LockedMilestoneHash common.Hash //Hash for the locked endBlock
|
|
Locked bool //
|
|
LockedMilestoneIDs map[string]struct{} //list of milestone ids
|
|
|
|
FutureMilestoneList map[uint64]common.Hash // Future Milestone list
|
|
FutureMilestoneOrder []uint64 // Future Milestone Order
|
|
MaxCapacity int //Capacity of future Milestone list
|
|
}
|
|
|
|
type milestoneService interface {
|
|
finalityService
|
|
|
|
GetMilestoneIDsList() []string
|
|
RemoveMilestoneID(milestoneId string)
|
|
LockMutex(endBlockNum uint64) bool
|
|
UnlockMutex(doLock bool, milestoneId string, endBlockNum uint64, endBlockHash common.Hash)
|
|
UnlockSprint(endBlockNum uint64)
|
|
ProcessFutureMilestone(num uint64, hash common.Hash)
|
|
}
|
|
|
|
var (
|
|
//Metrics for collecting the whitelisted milestone number
|
|
whitelistedMilestoneMeter = metrics.NewRegisteredGauge("chain/milestone/latest", nil)
|
|
|
|
//Metrics for collecting the future milestone number
|
|
FutureMilestoneMeter = metrics.NewRegisteredGauge("chain/milestone/future", nil)
|
|
|
|
//Metrics for collecting the length of the MilestoneIds map
|
|
MilestoneIdsLengthMeter = metrics.NewRegisteredGauge("chain/milestone/idslength", nil)
|
|
|
|
//Metrics for collecting the number of valid chains received
|
|
MilestoneChainMeter = metrics.NewRegisteredMeter("chain/milestone/isvalidchain", nil)
|
|
|
|
//Metrics for collecting the number of valid peers received
|
|
MilestonePeerMeter = metrics.NewRegisteredMeter("chain/milestone/isvalidpeer", nil)
|
|
)
|
|
|
|
// IsValidChain checks the validity of chain by comparing it
|
|
// against the local milestone entries
|
|
func (m *milestone) IsValidChain(currentHeader *types.Header, chain []*types.Header) (bool, error) {
|
|
//Checking for the milestone flag
|
|
if !flags.Milestone {
|
|
return true, nil
|
|
}
|
|
|
|
m.finality.RLock()
|
|
defer m.finality.RUnlock()
|
|
|
|
var isValid bool = false
|
|
|
|
defer func() {
|
|
if isValid {
|
|
MilestoneChainMeter.Mark(int64(1))
|
|
} else {
|
|
MilestoneChainMeter.Mark(int64(-1))
|
|
}
|
|
}()
|
|
|
|
res, err := m.finality.IsValidChain(currentHeader, chain)
|
|
|
|
if !res {
|
|
isValid = false
|
|
return isValid, err
|
|
}
|
|
|
|
if m.Locked && !m.IsReorgAllowed(chain, m.LockedMilestoneNumber, m.LockedMilestoneHash) {
|
|
isValid = false
|
|
return isValid, nil
|
|
}
|
|
|
|
if !m.IsFutureMilestoneCompatible(chain) {
|
|
isValid = false
|
|
return isValid, nil
|
|
}
|
|
|
|
isValid = true
|
|
|
|
return isValid, nil
|
|
}
|
|
|
|
// IsValidPeer checks if the chain we're about to receive from a peer is valid or not
|
|
// in terms of reorgs. We won't reorg beyond the last bor finality submitted to mainchain.
|
|
func (m *milestone) IsValidPeer(fetchHeadersByNumber func(number uint64, amount int, skip int, reverse bool) ([]*types.Header, []common.Hash, error)) (bool, error) {
|
|
if !flags.Milestone {
|
|
return true, nil
|
|
}
|
|
|
|
res, err := m.finality.IsValidPeer(fetchHeadersByNumber)
|
|
|
|
if res {
|
|
MilestonePeerMeter.Mark(int64(1))
|
|
} else {
|
|
MilestonePeerMeter.Mark(int64(-1))
|
|
}
|
|
|
|
return res, err
|
|
}
|
|
|
|
func (m *milestone) Process(block uint64, hash common.Hash) {
|
|
m.finality.Lock()
|
|
defer m.finality.Unlock()
|
|
|
|
m.finality.Process(block, hash)
|
|
|
|
for i := 0; i < len(m.FutureMilestoneOrder); i++ {
|
|
if m.FutureMilestoneOrder[i] <= block {
|
|
m.dequeueFutureMilestone()
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
|
|
whitelistedMilestoneMeter.Update(int64(block))
|
|
|
|
m.UnlockSprint(block)
|
|
}
|
|
|
|
// This function will Lock the mutex at the time of voting
|
|
// fixme: get rid of it
|
|
func (m *milestone) LockMutex(endBlockNum uint64) bool {
|
|
m.finality.Lock()
|
|
|
|
if m.doExist && endBlockNum <= m.Number { //if endNum is less than whitelisted milestone, then we won't lock the sprint
|
|
log.Debug("endBlockNumber is less than or equal to latesMilestoneNumber", "endBlock Number", endBlockNum, "LatestMilestone Number", m.Number)
|
|
return false
|
|
}
|
|
|
|
if m.Locked && endBlockNum < m.LockedMilestoneNumber {
|
|
log.Debug("endBlockNum is less than locked milestone number", "endBlock Number", endBlockNum, "Locked Milestone Number", m.LockedMilestoneNumber)
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
// This function will unlock the mutex locked in LockMutex
|
|
// fixme: get rid of it
|
|
func (m *milestone) UnlockMutex(doLock bool, milestoneId string, endBlockNum uint64, endBlockHash common.Hash) {
|
|
m.Locked = m.Locked || doLock
|
|
|
|
if doLock {
|
|
m.UnlockSprint(m.LockedMilestoneNumber)
|
|
m.Locked = true
|
|
m.LockedMilestoneHash = endBlockHash
|
|
m.LockedMilestoneNumber = endBlockNum
|
|
m.LockedMilestoneIDs[milestoneId] = struct{}{}
|
|
}
|
|
|
|
err := rawdb.WriteLockField(m.db, m.Locked, m.LockedMilestoneNumber, m.LockedMilestoneHash, m.LockedMilestoneIDs)
|
|
if err != nil {
|
|
log.Error("Error in writing lock data of milestone to db", "err", err)
|
|
}
|
|
|
|
milestoneIDLength := int64(len(m.LockedMilestoneIDs))
|
|
MilestoneIdsLengthMeter.Update(milestoneIDLength)
|
|
|
|
m.finality.Unlock()
|
|
}
|
|
|
|
// This function will unlock the locked sprint
|
|
func (m *milestone) UnlockSprint(endBlockNum uint64) {
|
|
if endBlockNum < m.LockedMilestoneNumber {
|
|
return
|
|
}
|
|
|
|
m.Locked = false
|
|
m.purgeMilestoneIDsList()
|
|
|
|
err := rawdb.WriteLockField(m.db, m.Locked, m.LockedMilestoneNumber, m.LockedMilestoneHash, m.LockedMilestoneIDs)
|
|
|
|
if err != nil {
|
|
log.Error("Error in writing lock data of milestone to db", "err", err)
|
|
}
|
|
}
|
|
|
|
// This function will remove the stored milestoneID
|
|
func (m *milestone) RemoveMilestoneID(milestoneId string) {
|
|
m.finality.Lock()
|
|
|
|
delete(m.LockedMilestoneIDs, milestoneId)
|
|
|
|
if len(m.LockedMilestoneIDs) == 0 {
|
|
m.Locked = false
|
|
}
|
|
|
|
err := rawdb.WriteLockField(m.db, m.Locked, m.LockedMilestoneNumber, m.LockedMilestoneHash, m.LockedMilestoneIDs)
|
|
if err != nil {
|
|
log.Error("Error in writing lock data of milestone to db", "err", err)
|
|
}
|
|
|
|
m.finality.Unlock()
|
|
}
|
|
|
|
// This will check whether the incoming chain matches the locked sprint hash
|
|
func (m *milestone) IsReorgAllowed(chain []*types.Header, lockedMilestoneNumber uint64, lockedMilestoneHash common.Hash) bool {
|
|
if chain[len(chain)-1].Number.Uint64() <= lockedMilestoneNumber { //Can't reorg if the end block of incoming
|
|
return false //chain is less than locked sprint number
|
|
}
|
|
|
|
for i := 0; i < len(chain); i++ {
|
|
if chain[i].Number.Uint64() == lockedMilestoneNumber {
|
|
return chain[i].Hash() == lockedMilestoneHash
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
// This will return the list of milestoneIDs stored.
|
|
func (m *milestone) GetMilestoneIDsList() []string {
|
|
m.finality.RLock()
|
|
defer m.finality.RUnlock()
|
|
|
|
// fixme: use generics :)
|
|
keys := make([]string, 0, len(m.LockedMilestoneIDs))
|
|
for key := range m.LockedMilestoneIDs {
|
|
keys = append(keys, key)
|
|
}
|
|
|
|
return keys
|
|
}
|
|
|
|
// This is remove the milestoneIDs stored in the list.
|
|
func (m *milestone) purgeMilestoneIDsList() {
|
|
m.LockedMilestoneIDs = make(map[string]struct{})
|
|
}
|
|
|
|
func (m *milestone) IsFutureMilestoneCompatible(chain []*types.Header) bool {
|
|
//Tip of the received chain
|
|
chainTipNumber := chain[len(chain)-1].Number.Uint64()
|
|
|
|
for i := len(m.FutureMilestoneOrder) - 1; i >= 0; i-- {
|
|
//Finding out the highest future milestone number
|
|
//which is less or equal to received chain tip
|
|
if chainTipNumber >= m.FutureMilestoneOrder[i] {
|
|
//Looking for the received chain 's particular block number(matching future milestone number)
|
|
for j := len(chain) - 1; j >= 0; j-- {
|
|
if chain[j].Number.Uint64() == m.FutureMilestoneOrder[i] {
|
|
endBlockNum := m.FutureMilestoneOrder[i]
|
|
endBlockHash := m.FutureMilestoneList[endBlockNum]
|
|
|
|
//Checking the received chain matches with future milestone
|
|
return chain[j].Hash() == endBlockHash
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
func (m *milestone) ProcessFutureMilestone(num uint64, hash common.Hash) {
|
|
if len(m.FutureMilestoneOrder) < m.MaxCapacity {
|
|
m.enqueueFutureMilestone(num, hash)
|
|
}
|
|
|
|
if num < m.LockedMilestoneNumber {
|
|
return
|
|
}
|
|
|
|
m.Locked = false
|
|
m.purgeMilestoneIDsList()
|
|
|
|
err := rawdb.WriteLockField(m.db, m.Locked, m.LockedMilestoneNumber, m.LockedMilestoneHash, m.LockedMilestoneIDs)
|
|
|
|
if err != nil {
|
|
log.Error("Error in writing lock data of milestone to db", "err", err)
|
|
}
|
|
}
|
|
|
|
// EnqueueFutureMilestone add the future milestone to the list
|
|
func (m *milestone) enqueueFutureMilestone(key uint64, hash common.Hash) {
|
|
if _, ok := m.FutureMilestoneList[key]; ok {
|
|
log.Debug("Future milestone already exist", "endBlockNumber", key, "futureMilestoneHash", hash)
|
|
return
|
|
}
|
|
|
|
log.Debug("Enqueing new future milestone", "endBlockNumber", key, "futureMilestoneHash", hash)
|
|
|
|
m.FutureMilestoneList[key] = hash
|
|
m.FutureMilestoneOrder = append(m.FutureMilestoneOrder, key)
|
|
|
|
err := rawdb.WriteFutureMilestoneList(m.db, m.FutureMilestoneOrder, m.FutureMilestoneList)
|
|
if err != nil {
|
|
log.Error("Error in writing future milestone data to db", "err", err)
|
|
}
|
|
|
|
FutureMilestoneMeter.Update(int64(key))
|
|
}
|
|
|
|
// DequeueFutureMilestone remove the future milestone entry from the list.
|
|
func (m *milestone) dequeueFutureMilestone() {
|
|
delete(m.FutureMilestoneList, m.FutureMilestoneOrder[0])
|
|
m.FutureMilestoneOrder = m.FutureMilestoneOrder[1:]
|
|
|
|
err := rawdb.WriteFutureMilestoneList(m.db, m.FutureMilestoneOrder, m.FutureMilestoneList)
|
|
if err != nil {
|
|
log.Error("Error in writing future milestone data to db", "err", err)
|
|
}
|
|
}
|