Sov 3884 cleanup vestingregistry #540

cwsnt · 2024-02-28T08:48:15Z

No description provided.

add sip args add on-chain test

ran prettier

tjcloa · 2024-03-05T08:54:31Z

contracts/governance/Vesting/VestingRegistry.sol

-
-    event CSOVReImburse(address from, uint256 CSOVamount, uint256 reImburseAmount);
-    event CSOVTokensExchanged(address indexed caller, uint256 amount);
+contract VestingRegistry is VestingRegistryStorage {


pls add natspec - clear description of the purpose of this contract

updated in this commit

tjcloa · 2024-03-05T09:38:14Z

tests/Locked/anyone.test.js

-        );
+
+        vestingRegistry = await VestingRegistry.new();
+        vesting = await VestingRegistryProxy.new();


Suggested change

vesting = await VestingRegistryProxy.new();

vestingRegistryProxy = await VestingRegistryProxy.new();

updated in this commit

tjcloa · 2024-03-05T09:39:29Z

tests/Locked/event.test.js

-            creator // This should be Governance Timelock Contract.
-        );
+        vestingRegistry = await VestingRegistry.new();
+        vesting = await VestingRegistryProxy.new();


Suggested change

vesting = await VestingRegistryProxy.new();

vestingRegistryProxy = await VestingRegistryProxy.new();

updated in this commit

tjcloa · 2024-03-05T09:40:05Z

tests/Locked/state.test.js

-        );
+
+        vestingRegistry = await VestingRegistry.new();
+        vesting = await VestingRegistryProxy.new();


Suggested change

vesting = await VestingRegistryProxy.new();

vestingRegistryProxy = await VestingRegistryProxy.new();

updated in this commit

tjcloa · 2024-03-05T09:40:52Z

tests/staking/ExtendedStakingTest.js

        // Upgradable Vesting Registry
-        vestingRegistryLogic = await VestingRegistryLogic.new();
+        vestingRegistry = await VestingRegistry.new();
        vesting = await VestingRegistryProxy.new();


Suggested change

vesting = await VestingRegistryProxy.new();

vestingRegistryProxy = await VestingRegistryProxy.new();

updated in this commit

tjcloa · 2024-03-05T09:42:05Z

tests/staking/PauseStaking.test.js

        // Upgradable Vesting Registry
-        vestingRegistryLogic = await VestingRegistryLogic.new();
+        vestingRegistry = await VestingRegistry.new();
        vesting = await VestingRegistryProxy.new();


pls replace all the occurences in the tests for better readability

Suggested change

vesting = await VestingRegistryProxy.new();

vestingRegistryProxy = await VestingRegistryProxy.new();

updated in this commit

tjcloa · 2024-03-05T09:45:15Z

contracts/mockup/VestingRegistryLogicMockUp.sol

+import "../governance/Vesting/VestingRegistry.sol";

-contract VestingRegistryLogicMockup is VestingRegistryLogic {
+contract VestingRegistryMockup is VestingRegistry {


pls also rename the contract file

updated in this commit

tests/vesting/VestingCreator.js

tjcloa · 2024-03-05T09:58:50Z

tests/OriginInvestorsClaim.test.js

        });

-        it("should create vesting contract within vesting period", async () => {
+        it("should be able to sert investor initial amount list", async () => {


looks like a typo in the test description.

also, the test does nothing, pls check the removed tests.

Apparently, we need to update the OriginInvestorsClaim contract (because initially it was using cliff & duration from staking contract), meanwhile when trying to get the vesting, it's using the cliff & duration from lockedSOV

updated in this commit

tjcloa · 2024-03-05T10:01:35Z

tests/OriginInvestorsClaim.test.js

-                investorsClaim.claim({ from: investor1 }),
-                "OriginInvestorsClaim::onlyWhitelisted: not whitelisted or already claimed"
-            );
+        it("investors should be able to claim", async () => {


this test was inverted - why?

updated in this commit

cwsnt added 9 commits January 22, 2024 20:43

introduce: admin manager role

d42a697

add deployment script

10406e3

add sip args add on-chain test

fix: setAdminManager task

88cab53

consider AdminRoleManaged

384a1bc

add deployment file testnet

91c6d50

1/ address comment review

2f4cb38

merge with latest development & fix conflict

0a58303

ran prettier

init: cleanup vestingregistry

e74bad6

fix: unit tests

4b02107

cwsnt requested a review from tjcloa February 28, 2024 08:48

merge with latest development branch & fix conflict

f5658a0

tjcloa changed the base branch from development to SOV-3686-admin-manager-role March 5, 2024 09:14

Merge branch 'development' into SOV-3884-cleanup-vestingregistry

f73a3ba

tjcloa changed the base branch from SOV-3686-admin-manager-role to development March 5, 2024 09:31

tjcloa assigned cwsnt Mar 5, 2024

tjcloa reviewed Mar 5, 2024

View reviewed changes

cwsnt added 3 commits July 22, 2024 09:29

merge with latest development & fix conflict

44dc1f5

1/ address comment review

4075c45

update vestingRegistryLogic to vestingRegistry in py script

74c07fd

	vesting = await VestingRegistryProxy.new();
	vestingRegistryProxy = await VestingRegistryProxy.new();

Sov 3884 cleanup vestingregistry #540

Are you sure you want to change the base?

Sov 3884 cleanup vestingregistry #540

Conversation

cwsnt commented Feb 28, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants