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

[Consolidating] PR#451: Incorporate PR#447 Governance vesting cancelling & PR#448 Staking refactoring #451

Merged

cwsnt merged 44 commits into refactoring/staking-contract-eip170 from feature/governance_vesting_staking_refactoring

Nov 10, 2022

Contributor

cwsnt commented Sep 14, 2022

No description provided.

cwsnt and others added 30 commits

July 11, 2022 07:58


          add max iterations in withdraw vesting

f9c8a66


          feature: enable vesting withdrawal starting from specific date

500412a


          remove counter usage for checking the max iterations

02893f1


          enable governance withdraw vesting directly from staking contract

be2f270


          set max iterations to storage

0a232d7

add team vesting validation for governance withdrawal


          remove irrelevant interface

34d9d9e

adjust four year vesting


          prettier

3d45f2d


          remove max iterations wihtdrawal from vesting storage

f938b80

Adjust script for governance withdraw vesting


          adjust getPriorUserStakeByDate for governance direct withdrawal

7d4a5a3


          hh config add initialBaseFeePerGas: 0

294f94a


          update: remove ganache dependency from tests

8be63db


          fix: governance withdraw vesting script

663d64c


          remove superfluous event

892d1be

revert getPriorUserStakeByDate for backward compatibility


          move vestingCreationType to storage

c4c43c2

improve doc & natspec based on review


          revert the conditional for consistency

2de6d4f


          add checker function of teamvesting in registry logic

19ef0de


          adjust the incremental value for governance cancel vesting to two weeks

eebcc3b

add script for registering vesting detail in registry


          fix: better revert message

d448c62

remove unused event


          fix: consider the governance vesting withdrawal for 1 iteration

3ad39d8


          improve naming storage var

79f72c8


          revert vesting logic contract

21dd284

improve storage variable naming for vesting creation type


          clean code based on pr review

7f1c269


          improve docs

4f318d7


          updateLMConfig script: iXUSD allocation 2500 -> 0

f2bc7c1


          fix conflict with development branch

c36cc0f


          merge: PR#447 with PR#448

2ccf825


          prettier

517922a


          merge with latest staking refactoring branch

68427ec


          Revert back pause staking test

fb64937


          fix unauthorized error message test cases

eedc9b7

cwsnt added 2 commits

September 14, 2022 13:30


          fix vesting unit test

cd81c03


          prettier

c5b06d6

cwsnt requested review from tjcloa and ororopickpocket

September 14, 2022 07:33

cwsnt changed the title ~~[Consolidation] Staking Rewards PR#448 & Fix Governance Withdraw Vesting PR #448~~ Draft - [Consolidation] Staking Rewards PR#448 & Fix Governance Withdraw Vesting PR #448

cwsnt added 2 commits

September 14, 2022 14:57


          fix pause staking unit test

02425da


          fix: bring back set team vesting mockup function

62f0e75

tjcloa changed the base branch from development to refactoring/staking-contract-eip170

September 14, 2022 12:38


          Add SIP tx code for setting max withdraw iterations in staking contract

048c3bb

improve revert message

cwsnt changed the title ~~Draft - [Consolidation] Staking Rewards PR#448 & Fix Governance Withdraw Vesting PR #448~~ [Consolidation] Staking Rewards PR#448 & Fix Governance Withdraw Vesting PR #448

tjcloa requested changes

View reviewed changes

Contributor

tjcloa left a comment

requires a merge from the target branch: (staking-contract-eip170) and conflicts resolution.

contracts/governance/Staking/Staking.sol Outdated Show resolved Hide resolved

contracts/governance/Staking/modules/StakingWithdrawModule.sol Outdated Show resolved Hide resolved

contracts/governance/Staking/modules/StakingWithdrawModule.sol Outdated Show resolved Hide resolved

contracts/governance/Staking/modules/shared/CheckpointsShared.sol Outdated Show resolved Hide resolved

contracts/governance/Staking/modules/shared/StakingStorageShared.sol Outdated Show resolved Hide resolved

contracts/governance/Vesting/VestingRegistryLogic.sol Outdated Show resolved Hide resolved

contracts/governance/Vesting/VestingRegistryLogic.sol Show resolved Hide resolved

scripts/contractInteraction/staking_vesting.py Show resolved Hide resolved

scripts/sip/sip_interaction.py Outdated Show resolved Hide resolved

contracts/governance/Vesting/VestingRegistryLogic.sol Show resolved Hide resolved

tjcloa requested changes

View reviewed changes

Contributor

tjcloa left a comment

requires a merge from the target branch: (staking-contract-eip170) and conflicts resolution.

cwsnt added 2 commits

September 19, 2022 14:40


          vesting registry logic: refactor redundant code

d5acfcd


          merge with staking refactoring branch & fix conflict

7c40c8a

cwsnt requested a review from tjcloa

September 19, 2022 09:48

tjcloa requested changes

View reviewed changes

Contributor

tjcloa left a comment

pls see unresolved issues - clarified all questions hopefully).

scripts/sip/sip_interaction.py Outdated Show resolved Hide resolved

contracts/governance/Vesting/VestingRegistryLogic.sol Show resolved Hide resolved

scripts/contractInteraction/staking_vesting.py Show resolved Hide resolved

contracts/governance/Staking/modules/StakingWithdrawModule.sol Show resolved Hide resolved

contracts/governance/Vesting/VestingRegistryLogic.sol Outdated Show resolved Hide resolved

scripts/contractInteraction/staking_vesting.py Outdated Show resolved Hide resolved


          improve comment

fb0984a

tjcloa reviewed

View reviewed changes

Contributor

tjcloa left a comment

pls complete all conversations

contracts/governance/Vesting/VestingRegistryLogic.sol Show resolved Hide resolved


          remove the parameter for SIP-050 script

c7abe1b

tjcloa changed the title ~~[Consolidation] Staking Rewards PR#448 & Fix Governance Withdraw Vesting PR #448~~ [Consolidating] PR#451: Incorporate PR#447 Governance vesting cancelling & PR#448 Staking refactoring


          Merge branch 'refactoring/staking-contract-eip170' into feature/gover…

e59834e

…nance_vesting_staking_refactoring

ororopickpocket reviewed

View reviewed changes

contracts/governance/Vesting/VestingRegistryStorage.sol Outdated Show resolved Hide resolved

ororopickpocket approved these changes

View reviewed changes

Contributor

ororopickpocket left a comment

I'm approving this already, but please change the type from uint120 to a power of 2.

cwsnt added 2 commits

November 4, 2022 23:49


          update vestingType datatype to uint32

b493b74


          add task script to register the existing vesting address to creation …

4418f6e

…type storage

cwsnt requested a review from tjcloa

November 9, 2022 03:03

tjcloa reviewed

View reviewed changes

scripts/contractInteraction/staking_vesting.py Outdated

                  vesting = Contract.from_abi("VestingLogic", address=vestingAddress, abi=VestingRegistryLogic.abi, owner=conf.acct)

            

Contributor

tjcloa Nov 10, 2022

while it will work, the ABI used in confusing
pls change for VestingLogic?

Contributor Author

cwsnt Nov 10, 2022

updated

tjcloa approved these changes

View reviewed changes

Contributor

tjcloa left a comment

approved
but pls address the last comment on a confusing ABI in a script reading the tokenOwner from vestings


          use vesting logic abi to avoid confusion

fc3b2ac

cwsnt merged commit af24e7e into refactoring/staking-contract-eip170

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet