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] Bridge Manager Rebase #264

Merged
merged 234 commits into from
Aug 9, 2023
Merged

[Feat] Bridge Manager Rebase #264

merged 234 commits into from
Aug 9, 2023

Conversation

TuDo1403
Copy link
Contributor

@TuDo1403 TuDo1403 commented Jul 19, 2023 •
edited
Loading

Description

This PR rebase brach dev into branch feat/bridge-admin
Flowchart: https://www.notion.so/Bridge-Manager-Interaction-Flow-a51619f3e31549e78b6b8630ba79df74?pvs=4

Contract changes

The table below shows the following info:

  • Logic: the logic is changed.
  • ABI: the ABI is changed.
  • Init data: new storage field is declared and needs initializing.
  • Dependent: needs to be changed due to changes in other contracts.
Contract name Logic ABI Init data Dependent
BridgeTracking x x x
GovernanceAdmin x x x x
Maintenance
SlashIndicator
Staking
StakingVesting
ValidatorSet x

Checklist

  • I have clearly commented on all the main functions following the NatSpec Format
  • The box that allows repo maintainers to update this PR is checked
  • I tested locally to make sure this feature/fix works

TuDo1403 and others added 30 commits June 15, 2023 12:06
@TuDo1403
clmcc
cdeec9d
@TuDo1403
feat: remove bridge logic & comment test
917e5e2
@TuDo1403
Merge branch 'dev' into feat/bridge-removal
29d7339
@TuDo1403 @nxqbao
Update contracts/ronin/validator/RoninValidatorSet.sol
7373bb3 
Co-authored-by: Bao <[email protected]>
@TuDo1403
featL remove bridge operator in applyValidatorCandidate
19cceec
@TuDo1403
format: named args
98e58c8
@TuDo1403
feat: remove bridge reward deprecated at period
137b13d
@TuDo1403
feat: remove ValidatorFlag from getValidators()
d85f1b8
@TuDo1403
feat: remove isValidator & deprecate bridge enum
d70c2e9
@TuDo1403
fix: fix test
201575d
@TuDo1403 @ducthotran2010
Update contracts/ronin/staking/CandidateStaking.sol
30751e7 
Co-authored-by: Duc Tho Tran <[email protected]>
@TuDo1403
format: skip test
24b16c2
@TuDo1403
format: add comments
6d9583d
@TuDo1403
feat: update bridge admin contract
ef28904
@TuDo1403
Merge branch 'feat/bridge-removal' into feat/bridge-admin
9183146
@TuDo1403
feat: add more checks
5b926c8
@TuDo1403
feat: allow secondary address to update bridge operators
6ddc741
@TuDo1403
feat: auth accounts
4ad6382
@TuDo1403
fix: downgrade openzeppelin packages
16e884a
@TuDo1403
feat: getBridgeOperatorOf
397a80e
@TuDo1403
feat: bridge proposal
9d5de96
@TuDo1403
feat: bridge voter weight
f9b1b96
@TuDo1403
feat: update domain separator
ea202a3
@TuDo1403
format: minor refactor
c839866
@TuDo1403
fix: fix logic
a62c475
@TuDo1403
feat: add minor test cases
78f72cf
@TuDo1403
feat: add more tests
dea84e4
@TuDo1403
feat: update tests
522b7ab
@TuDo1403
feat: main chain bridge admin
4496a64
@TuDo1403
format: delete unused import
aa883aa
TuDo1403 and others added 26 commits July 25, 2023 14:15
@TuDo1403
format: add doc
b146510
@TuDo1403
fix: remove BridgeSlash:setContract
4f99ef0
@TuDo1403
feat: only slash if totalVotes >= MINIMUM_VOTE_THRESHOLD
a21b7c4
@TuDo1403
fix: BridgeReward:LATEST_REWARDED_PERIOD_SLOT empty value when `syncR…
10821c2 
…eward`
@TuDo1403
fix: fix mishandle execSyncReward
d4b9baa 
format: add comments
feat: add `getTotalRewardsToppedUp`, `getTotalRewardsScattered`
feat: prevent mis transfer RON to logic contract
@TuDo1403
format: rename var
0bc71a8
@TuDo1403
feat: remove dead code
969901d
@TuDo1403
format: minor refactor
78649f2
@TuDo1403
format: minor refactor
41e74ee
@TuDo1403
feat: add _requireNonZeroAddress in _requireCreatedEOA
cd504ed
@nxqbao
fix: emit event
980c9fa
@nxqbao
chore: remove plural form of total- var
b0930f7
@TuDo1403
fix: prevent reverting in BridgeTracking:recordVote
08e5cf7
@nxqbao
chore: fix convention
d3bf9e4
@nxqbao
fix test
5cf2daa
@nxqbao
fix: collided vars
53fa49a
@TuDo1403
fix: revert when invalidperiodLength
a9ae305
@TuDo1403
feat: add ErrSyncTooFarPeriod if period > latestRewardedPeriod + 1
ed2aade
@TuDo1403
fix: use getBridgeOperatorOf instead of getBridgeOperators
b347d75
@TuDo1403
feat: add fork test
fe21702
@TuDo1403
feat: allow proxyAdmin to query for supportsInterface
28e28d5
@nxqbao
chore: update comment, fix test method visibility
82d745f
@TuDo1403
ci: exclude fork test
945050c
@TuDo1403
fix: exclude fork test
11c6cdf
@TuDo1403
fix: exclude fork test in ci
a842994
@TuDo1403
fix: remove _requireCreatedEOA
cf85ebe
nxqbao
nxqbao approved these changes Aug 9, 2023
View reviewed changes
Copy link
Contributor

@nxqbao nxqbao left a comment

Choose a reason for hiding this comment

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

Approved after deployment done.

ducthotran2010
ducthotran2010 approved these changes Aug 9, 2023
View reviewed changes
Copy link
Collaborator

@ducthotran2010 ducthotran2010 left a comment

Choose a reason for hiding this comment

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

Too many changes in this PR. Should put a limitation on a single PR next time (eg, won't merge for PR with more than +-1000 loc)

@nxqbao nxqbao merged commit dbefba9 into dev Aug 9, 2023
1 check passed
@nxqbao nxqbao deleted the feat/bridge-admin-rebase branch August 9, 2023 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nxqbao nxqbao nxqbao approved these changes

@ducthotran2010 ducthotran2010 ducthotran2010 approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@TuDo1403 @nxqbao @ducthotran2010