Skip to content

Commit

Permalink
Fix/sync halt (#91)
Browse files Browse the repository at this point in the history
* Configured block time shortening epoch for the mainnet

* Fix block time shortening epoch for the mainnet

* Feat/finalizer (#61)

* copy new files from bsc@v1.4.6

* copy from bsc v1.4.6

* resolve interface missing method error for mock structs

* apply finality to our consensus

* add oasys consensus test: env/validators assemble

* whether broadcast vote judging from peers's TD

* fix lots of error to make work voting

* increase vote DOS threadhold

* fix lint error

* modify go.mod according to BSC

* vote attestaion stake weighted

* add MaliciousVoteMonitor

* remove bsc dependent comments/message

* rename finalizer to fast finality

* replace genesis contract by v1.6.0

* update genesis contract submodule (v1.6.0)

* resolved several consensus issue

* increment version to v1.6.0

* print error log: prepareWork and commit

* print warn log in case of invalid vote

* sort validators by owner for fast finality

* apply validators sort changes to snapshot.go

* disable deployments11

* refactor consensus

* upgrade stake manager contract version

* delete unused CeilDiv function

* delete unused metrics.label file copyed from bsc

* add comment to formHeader of finalize and seal case

* add comment why disable fromHeader on Finalize

* fix mainnet sync error: failed to verify header

* fix getValidators marshal error by suppporting old contract interface

* commit leak of previous one

* fix verify header error by adding missing return

* deal with unexpected value is presented to callGetHighStakesCommon

* fix getHighStakes unpack error. replace wrong contract

* sort by owner only fast finality enabled

* Improved performance degradation due to change in json format of consensus snapshot

* Improved EnvironmentValue parsing (#70)

* Add note to BLSPublicKey's Marshaler

* fix null pointer error after taking #69

* temporary set testnet hardfork for private testnet

* increase private testnet hardork block

* bring private hardfork time closer

* fix feedback from @ironbeer part1

* vot validator point to parent block(=target block)

* Add contract deploy test

* Update consensus/oasys/snapshot.go

Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com>

* fix feedback from ironbeer part2

* Added `Equal` method to EnvironmentValue (#71)

* Imported diffs of blockchain.go and headerchain.go from bsc@v1.4.6 (#74)

* Imported diffs of blockchain.go and headerchain.go from bsc@v1.4.6

* Imported fast finality reorganization from bsc@v1.4.6 (#75)

* Imported fast finality reorganization from bsc@v1.4.6

* Fix errors in test code

* elaborate the timeing update finalized and justified gauge (#77)

---------

Co-authored-by: tak <re795h@gmail.com>

* Fix panic when BLS key is nothing & support multiple keys (#81)

* Imported eth.handler from bsc@v1.4.6 (#78)

* Imported stop process of eth.handler from bsc@v1.4.6

* Imported `chainFinalizedHeightFn` of fetcher.BlockFetcher from bsc@v1.4.6

* remove stop chan from eth/handler (#82)

---------

Co-authored-by: tak <re795h@gmail.com>

* fix feadback from ironbeer part3

* Fix reorg when justification chain is split (#85)

* update loas contract & reset testnet hardfork schedule

* Fix misc (#87)

* Fix test error

* Fix image build error

---------

Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com>

* set testnet hardfork for v1.6.0 (#88)

* Fix voting process stopping with each synchronization (#90)

* Fix nil panic in td.Cmp(bestTd)

* Fix voting process stopping with each synchronization.

RelatedCode:
- eth/downloader/downloader.go#L463
- core/vote/vote_manager.go#L108-L110)

---------

Co-authored-by: ironbeer <7997273+ironbeer@users.noreply.github.com>
  • Loading branch information
tak1827 and ironbeer authored Oct 31, 2024
1 parent 02f07e6 commit e150fe9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion eth/peerset.go
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ func (ps *peerSet) peerWithHighestJustifiedBlockAndTD() (bestPeer *eth.Peer, bes
continue
}
_, td := p.Head()
if *justified > bestJustified || (*justified == bestJustified && td.Cmp(bestTd) > 0) {
if bestPeer == nil || *justified > bestJustified || (*justified == bestJustified && td.Cmp(bestTd) > 0) {
bestPeer, bestJustified, bestTd = p.Peer, *justified, td
}
}
Expand Down
4 changes: 2 additions & 2 deletions eth/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ func (cs *chainSyncer) nextSyncOp() *chainSyncOp {
if peerJustified < *ourJustified {
return nil
}
// Ignored because justified block height is the same but TD is lower.
if peerJustified == *ourJustified && peerTD.Cmp(ourTD) < 0 {
// Ignored because justified block height is the same but TD is the same or lower.
if peerJustified == *ourJustified && peerTD.Cmp(ourTD) <= 0 {
return nil
}
}
Expand Down

0 comments on commit e150fe9

Please sign in to comment.