Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/finalizer #61

Merged
merged 61 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
7c21bc4
copy new files from bsc@v1.4.6
tak1827 Jul 27, 2024
8852877
copy from bsc v1.4.6
tak1827 Jul 28, 2024
9f2ccd7
resolve interface missing method error for mock structs
tak1827 Jul 28, 2024
3d5fc85
apply finality to our consensus
tak1827 Jul 29, 2024
097c93a
add oasys consensus test: env/validators assemble
tak1827 Jul 30, 2024
4b9038b
whether broadcast vote judging from peers's TD
tak1827 Aug 12, 2024
070c954
fix lots of error to make work voting
tak1827 Aug 12, 2024
af33110
increase vote DOS threadhold
tak1827 Aug 15, 2024
4bec839
fix lint error
tak1827 Aug 15, 2024
1590a49
modify go.mod according to BSC
tak1827 Aug 15, 2024
6b71356
vote attestaion stake weighted
tak1827 Aug 20, 2024
5cadf47
add MaliciousVoteMonitor
tak1827 Aug 20, 2024
7d4fdca
remove bsc dependent comments/message
tak1827 Aug 21, 2024
9f92ca2
Merge branch 'main' into feat/finalizer
tak1827 Aug 21, 2024
516ae84
rename finalizer to fast finality
tak1827 Aug 21, 2024
875473c
replace genesis contract by v1.6.0
tak1827 Aug 27, 2024
bc75b00
update genesis contract submodule (v1.6.0)
tak1827 Aug 27, 2024
5ffb890
Merge branch 'main' into feat/finalizer
tak1827 Aug 27, 2024
14252ba
resolved several consensus issue
tak1827 Aug 29, 2024
5124d78
increment version to v1.6.0
tak1827 Aug 30, 2024
a7a6003
print error log: prepareWork and commit
tak1827 Aug 30, 2024
30fc4a0
print warn log in case of invalid vote
tak1827 Aug 30, 2024
14d9b09
sort validators by owner for fast finality
tak1827 Aug 30, 2024
222e80c
apply validators sort changes to snapshot.go
tak1827 Aug 30, 2024
6612551
disable deployments11
tak1827 Aug 30, 2024
c1bd48e
refactor consensus
tak1827 Sep 3, 2024
d30eb16
upgrade stake manager contract version
tak1827 Sep 4, 2024
1a21c49
Merge branch 'main' into feat/finalizer
tak1827 Sep 5, 2024
6a738bf
delete unused CeilDiv function
tak1827 Sep 5, 2024
67d100a
delete unused metrics.label file copyed from bsc
tak1827 Sep 5, 2024
2a2c9b3
add comment to formHeader of finalize and seal case
tak1827 Sep 5, 2024
3eee4b2
add comment why disable fromHeader on Finalize
tak1827 Sep 5, 2024
11cf29a
fix mainnet sync error: failed to verify header
tak1827 Sep 9, 2024
2db1fd2
fix getValidators marshal error by suppporting old contract interface
tak1827 Sep 10, 2024
75d597b
commit leak of previous one
tak1827 Sep 10, 2024
315a60f
fix verify header error by adding missing return
tak1827 Sep 10, 2024
11fb9a2
deal with unexpected value is presented to callGetHighStakesCommon
tak1827 Sep 10, 2024
7b155a8
fix getHighStakes unpack error. replace wrong contract
tak1827 Sep 10, 2024
5128b1e
sort by owner only fast finality enabled
tak1827 Sep 11, 2024
1ac532b
Improved performance degradation due to change in json format of cons…
ironbeer Sep 21, 2024
8f8b387
Improved EnvironmentValue parsing (#70)
ironbeer Sep 24, 2024
762087e
Add note to BLSPublicKey's Marshaler
ironbeer Sep 24, 2024
ca83aec
Merge pull request #69 from ironbeer/feat/finalizer-imp-snapshot
ironbeer Sep 24, 2024
23ed73f
fix null pointer error after taking #69
tak1827 Sep 24, 2024
57b7649
temporary set testnet hardfork for private testnet
tak1827 Sep 25, 2024
c5b13d7
increase private testnet hardork block
tak1827 Sep 25, 2024
41822a6
bring private hardfork time closer
tak1827 Sep 25, 2024
4062955
fix feedback from @ironbeer part1
tak1827 Oct 7, 2024
5bc3c9c
vot validator point to parent block(=target block)
tak1827 Oct 7, 2024
eabbd29
Add contract deploy test
ironbeer Oct 8, 2024
c2a27c5
Merge pull request #72 from ironbeer/feat/finalizer-add-dep12-test
ironbeer Oct 8, 2024
265d88a
Update consensus/oasys/snapshot.go
tak1827 Oct 8, 2024
15a868c
fix feedback from ironbeer part2
tak1827 Oct 8, 2024
1097101
Added `Equal` method to EnvironmentValue (#71)
ironbeer Oct 8, 2024
0461c1f
Imported diffs of blockchain.go and headerchain.go from bsc@v1.4.6 (#74)
ironbeer Oct 17, 2024
fb4a70c
Fix panic when BLS key is nothing & support multiple keys (#81)
ironbeer Oct 18, 2024
aeff5e9
Imported eth.handler from bsc@v1.4.6 (#78)
ironbeer Oct 18, 2024
c43480c
fix feadback from ironbeer part3
tak1827 Oct 20, 2024
11b4efc
Fix reorg when justification chain is split (#85)
ironbeer Oct 23, 2024
53082cd
update loas contract & reset testnet hardfork schedule
tak1827 Oct 24, 2024
d947de1
Fix misc (#87)
ironbeer Oct 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@
[submodule "oasys-genesis-contract-6037082"]
path = consensus/oasys/oasys-genesis-contract-6037082
url = https://github.com/oasysgames/oasys-genesis-contract.git
[submodule "consensus/oasys/oasys-genesis-contract-5675779"]
path = consensus/oasys/oasys-genesis-contract-5675779
url = https://github.com/oasysgames/oasys-genesis-contract.git
8 changes: 8 additions & 0 deletions accounts/abi/bind/backends/simulated.go
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,10 @@ func (fb *filterBackend) SubscribeChainEvent(ch chan<- core.ChainEvent) event.Su
return fb.bc.SubscribeChainEvent(ch)
}

func (fb *filterBackend) SubscribeFinalizedHeaderEvent(ch chan<- core.FinalizedHeaderEvent) event.Subscription {
return nil
}

func (fb *filterBackend) SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent) event.Subscription {
return fb.bc.SubscribeRemovedLogsEvent(ch)
}
Expand All @@ -953,6 +957,10 @@ func (fb *filterBackend) SubscribePendingLogsEvent(ch chan<- []*types.Log) event
return nullSubscription()
}

func (fb *filterBackend) SubscribeNewVoteEvent(ch chan<- core.NewVoteEvent) event.Subscription {
return nil
}

func (fb *filterBackend) BloomStatus() (uint64, uint64) { return 4096, 0 }

func (fb *filterBackend) ServiceFilter(ctx context.Context, ms *bloombits.MatcherSession) {
Expand Down
2 changes: 1 addition & 1 deletion accounts/scwallet/securechannel.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func NewSecureChannelSession(card *pcsc.Card, keyData []byte) (*SecureChannelSes
return &SecureChannelSession{
card: card,
secret: secret.Bytes(),
publicKey: elliptic.Marshal(crypto.S256(), key.PublicKey.X, key.PublicKey.Y),
publicKey: elliptic.Marshal(crypto.S256(), key.PublicKey.X, key.PublicKey.Y), //nolint:all //TODO
}, nil
}

Expand Down
Loading