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: add handleSynPackage to StakeHub #457

Merged
merged 7 commits into from
Jan 6, 2024

Conversation

pythonberg1997
Copy link
Collaborator

Description

This pr is to add handleSynPackage to StakeHub to support cross-chain migration.

Changes

Notable changes:

  • add handleSynPackage to StakeHub

@@ -3,6 +3,9 @@ pragma solidity 0.8.17;

contract System {
/*----------------- constants -----------------*/
uint8 public constant STAKING_CHANNELID = 0x08;
uint8 public constant BC_FUSION_CHANNELID = 0x11;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please comment what is the usage of this channel, as BC_FUSION_CHANNEL can not explain it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new channel id for cross-chain stake migration after BC-fusion ==> new channel id for cross-chain redelegate from Beacon Chain to Smart Chain after Feyman upgrade

contracts/TokenHub.sol Show resolved Hide resolved
contracts/BC_fusion/StakeHub.sol Show resolved Hide resolved
contracts/System.sol Outdated Show resolved Hide resolved
@unclezoro unclezoro merged commit 1abdfbf into bnb-chain:bc-fusion Jan 6, 2024
2 checks passed
github-merge-queue bot pushed a commit that referenced this pull request Feb 26, 2024
* feat: implement BEP294 and BEP297 (#404)

* feat: implement BEP294

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

* feat: implement BEP294

---------

Co-authored-by: Ethan <[email protected]>

* feat: implement BEP299 (#391)

* chore: add init lock amount (#425)

* chore: add init lock amount

* add annotations

* more comment

---------

Co-authored-by: zjubfd <[email protected]>

* chore: add redelegate fee (#426)

* feat: add comments and pause for governor (#428)

* chore: fix typo and update scripts (#429)

* feat: add apy and reward record of validators (#430)

* feat: add apy and reward record of validators

* fix review comments

* feat: add ci to bc-fusion contracts and lint code (#431)

* 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

* feat: add python script (#433)

* chore: fix typo

* feat: add python script

* fix review comments

* fix review comments

* chore: fix bugs and add annotation for error msgs

* fix: init params error in BSCGovernor (#439)

* chore: update storages and generate.py (#440)

* chore: disable editing moniker (#442)

* fix: update slash logic to avoid malicious slash (#444)

* chore: add check for moniker and update script (#445)

* chore: ensure burnRatio plus systemRewardRatio not greater than 100% (#446)

* fix: ensure validator incoming will be clear after distribution (#447)

* chore: add view function and update annotations (#448)

* fix: recover sig failed in token recover portal  (#451)

* fix: token recover contract recover approval sig

* docs: update abi

* fix: add generate option to tokenhub

* fix: lint

* fix: `felonySlashScope` not initialized (#452)

* fix: resolve review comments (#454)

* fix: resolve review comments

* add check to `_jailValidator`

* fix lint issue

* fix review comments

* fix: audit report (#455)

* feat: add whenNotPaused for queue in BSCGovernor (#456)

* feat: add whenNotPaused for queue in BSCGovernor

* chores: lint code

* feat: add comments

* fix: lint

* feat: add `handleSynPackage` to `StakeHub` (#457)

* feat: add `handleSynPackage` to `StakeHub`

* fix lint issue

* fix review comments

* fix unit tests

* remove `delegateVotingPower` from `StakeMigrationPackage`

* fix review comments

* update annotations

* feat: add comment for governorProtector (#460)

* feat: add comment for governorProtector

* feat: add comment for assetProtector

* chore: revert transaction when delegator in blacklist (#461)

* chore: add `tmpValidatorSetUpdated` event (#462)

* fix: sync govToken in `_doMigration` (#463)

* fix: add `isAutoUndelegate` for auto `DistributeUndelegatedSynPackage` (#464)

* fix: add `isAutoUndelegate` for auto `DistributeUndelegatedSynPackage`

* add annotation

* chore: fix issues from audit report (#465)

* chore: fix issues from audit report

* fix unit tests

* feat: deprecate `transferOut` in `TokenHub` (#466)

* feat: deprecate `transferOut` in `TokenHub`

* fix review comments

* fix: wrong jail time in `_checkValidatorSelfDelegation` (#471)

* feat: add `whenNotPaused` to slash functions (#472)

* chore: add annotation (#474)

* chore: add annotation

* chore: add annotation

* fix: disable burn in GovToken (#473)

* fix: disable burn in GovToken contract

* chores: add comments

* fix: check approval address is not 0x0 (#476)

* feat: emit NotBoundToken event (#479)

* feat: emit NotBoundToken event

* chore: add comments

* chore: update contracts init params to be consistent with mainnet setting (#480)

* docs: update tokenhub abi (#482)

* fix: add upper limit for some params (#481)

* fix: add upper limit for some params

* fix lint issue

* chore: fix review comments (#483)

* chore: fix audit issues (#485)

* chore: fix audit issues

* fix review comments

* fix review comments

* fix review comments

* chore: refactor codes (#486)

* chore: refactor codes

* fix review comments

* fmt script

* chore: fix review comments (#489)

* fix: wrong flags passed in generate:dev (#490)

* feat: add governor test (#491)

* feat: add governor test

* fix: rebase interface for stakeHub in latest bc-fusion

* fix test cases

* rename modifier name

---------

Co-authored-by: Roshan <[email protected]>

* test: add unit-test for TokenRecoverPortal (#492)

* fix report 8 issue 1

* fix report 8 issue 2

* fix report 9 issue 2

* fix report 9 issue 4

* fix report 9 issue 7

* fix ToB report issue 5

* fix ToB report issue 1

* test: add failed cases to TokenRecoverPortal unit-test (#495)

* test: add failed cases to token recover portal ut

* chore: emit owner address after TokenRecoverRequested

* docs: update token recover portal abi (#498)

* fix review comments

* fix lint issue

* fix: improve the code readablity (#499)

* fix: improve the code readablity

* fix: change the wrong comment

* fix: add check in `_forceMaintainingValidatorsExit` (#500)

* fix: add check in `_forceMaintainingValidatorsExit`

* add `latestConsensusAddress`

* chore: update npm script (#501)

* chore: update generate script

* change default `SOURCE_CHAIN_ID` in `TokenRecoverPortal`

* update testnet asset protector address

* update testnet INIT_VOTING_DELAY

* fix ut

* feat: add more tests for governor (#502)

* feat: remove whitelist check while propose, move the check to queue and execute (#503)

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

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

* optimize code

* fix: add empty address check and clear state before extracall (#507)

* chore: update tokenrecoverportal.abi (#508)

* chore: update testnet legacy address bytes (#509)

---------

Co-authored-by: Roshan <[email protected]>
Co-authored-by: Ethan <[email protected]>
Co-authored-by: dylanhuang <[email protected]>
Co-authored-by: Roshan <[email protected]>
Co-authored-by: buddho <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants