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.

Sign up for GitHub

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

Jump to bottom

feat: implement BEP294 and BEP297 #436

Merged
merged 70 commits into from
Feb 26, 2024
Merged

feat: implement BEP294 and BEP297 #436

merged 70 commits into from
Feb 26, 2024

Conversation

unclezoro
Copy link
Collaborator

Description

This pr is to implement BEP-294: BSC Native Staking after BC Fusion

Rationale

See 4. Motivation in BEP-294

Changes

Notable changes:

  • add StakeHub and StakeCredit
  • add new governance module
  • modify stake & slash logic in BSCValidatorSet and SlashIndicator
  • optimize test settings
  • remove old dependencies

pythonberg1997 and others added 9 commits November 27, 2023 09:59
@pythonberg1997 @cosinlink
feat: implement BEP294 and BEP297 (#404)
3224c0a 
* feat: implement BEP294

* feat: add BSCGovernor and GovToken contracts for bc-fusion (#403)

* feat: implement BEP294

---------

Co-authored-by: Ethan <cosinlinker@gmail.com>
@j75689
feat: implement BEP299 (#391)
ab8b38e
@pythonberg1997 @unclezoro
chore: add init lock amount (#425)
66bd1bc 
* chore: add init lock amount

* add annotations

* more comment

---------

Co-authored-by: zjubfd <296179868@qq.com>
@pythonberg1997
chore: add redelegate fee (#426)
cfc0bd1
@cosinlink
feat: add comments and pause for governor (#428)
bfe54a9
@pythonberg1997
chore: fix typo and update scripts (#429)
a8f2b65
@pythonberg1997
feat: add apy and reward record of validators (#430)
1416b07 
* feat: add apy and reward record of validators

* fix review comments
@cosinlink
feat: add ci to bc-fusion contracts and lint code (#431)
4a77036 
* feat: add ci and add lint check script

* chore: lint code in BC_fusion

* chore: add bc-fusion branch to ci

* fix: test error in SlashIndicator.t.sol
@pythonberg1997
feat: add python script (#433)
843e4e3 
* chore: fix typo

* feat: add python script

* fix review comments

* fix review comments
@unclezoro unclezoro changed the base branch from develop to master December 7, 2023 10:14
@unclezoro unclezoro changed the base branch from master to develop December 7, 2023 10:15
@pythonberg1997
Merge branch 'develop' into bc-fusion-bak
7b0e0be 
# Conflicts:
#	contracts/SlashIndicator.sol
#	genesis-template.json
#	genesis.json
#	scripts/generate-tendermintLightClient.sh
#	scripts/generate.sh
pythonberg1997 and others added 19 commits February 14, 2024 11:50
@pythonberg1997
fix report 8 issue 2
c990f51
@pythonberg1997
fix report 9 issue 2
74c0dca
@pythonberg1997
fix report 9 issue 4
f6b4d0f
@pythonberg1997
fix report 9 issue 7
ffe4c8e
@pythonberg1997
fix ToB report issue 5
197d78a
@pythonberg1997
fix ToB report issue 1
7d89be2
@j75689
test: add failed cases to TokenRecoverPortal unit-test (#495)
024babd 
* test: add failed cases to token recover portal ut

* chore: emit owner address after TokenRecoverRequested
@j75689
docs: update token recover portal abi (#498)
94e556b
@pythonberg1997
fix review comments
a454fa3
@pythonberg1997
fix lint issue
e1bc6ce
@unclezoro
Merge pull request #496 from Pythonberg1997/bc-fusion
915412e 
chore: fix audit issues
@unclezoro
fix: improve the code readablity (#499)
44e886b 
* fix: improve the code readablity

* fix: change the wrong comment
@pythonberg1997
fix: add check in _forceMaintainingValidatorsExit (#500)
5b4125b 
* fix: add check in `_forceMaintainingValidatorsExit`

* add `latestConsensusAddress`
@pythonberg1997
chore: update npm script (#501)
1b0e806 
* chore: update generate script

* change default `SOURCE_CHAIN_ID` in `TokenRecoverPortal`

* update testnet asset protector address

* update testnet INIT_VOTING_DELAY

* fix ut
@cosinlink
feat: add more tests for governor (#502)
e235f3b
@cosinlink
feat: remove whitelist check while propose, move the check to queue a…
0d9e767 
…nd execute (#503)
@pythonberg1997
fix: add check to make sure there is at least one validator in `_forc…
ff4a2b1 
…eMaintainingValidatorsExit` (#504)

* fix: add check to make sure there is at least one validator in `_forceMaintainingValidatorsExit`

* optimize code
@unclezoro
fix: add empty address check and clear state before extracall (#507)
84995f8
@pythonberg1997
chore: update tokenrecoverportal.abi (#508)
7e38246
NathanBSC
NathanBSC previously approved these changes Feb 26, 2024
View reviewed changes
NathanBSC
NathanBSC previously approved these changes Feb 26, 2024
View reviewed changes
@unclezoro unclezoro added this pull request to the merge queue Feb 26, 2024
Merged via the queue into develop with commit a563781 Feb 26, 2024
2 checks passed
github-merge-queue bot pushed a commit that referenced this pull request Feb 26, 2024
@unclezoro
Merge pull request #510 from bnb-chain/develop
9d09d0a 
feat: implement BEP294 and BEP297 (#436)
@pythonberg1997 pythonberg1997 deleted the bc-fusion branch September 5, 2024 03:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cosinlink cosinlink cosinlink left review comments

@pythonberg1997 pythonberg1997 pythonberg1997 left review comments

@forcodedancing forcodedancing forcodedancing left review comments

@buddh0 buddh0 buddh0 approved these changes

@NathanBSC NathanBSC NathanBSC left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@unclezoro @buddh0 @cosinlink @pythonberg1997 @forcodedancing @NathanBSC @j75689