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

feat: rewardDistributor ready to be added to prod SUP-6630 #542

Merged
merged 10 commits into from
Jun 3, 2024
Merged

feat: rewardDistributor ready to be added to prod SUP-6630 #542

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9edab65
feat: rewardDistributor ready to be added to prod
0xTimepunk May 30, 2024
f83f5c5
fix: merge with origin / develop
0xTimepunk May 30, 2024
c2dbd90
Merge remote-tracking branch 'origin/develop' into rewardsDistributor…
0xTimepunk May 30, 2024
738a87d
fix: comment
0xTimepunk May 30, 2024
aad667c
chore: deploy rewards distributor to prod
sujithsomraaj May 30, 2024
12bb574
chore: prepare scripts for config on super registry
sujithsomraaj May 30, 2024
e69c292
Merge remote-tracking branch 'origin/develop' into rewardsDistributor…
0xTimepunk Jun 1, 2024
0deb5d4
forge install: forge-std
0xTimepunk Jun 1, 2024
12e0c22
chore: add smoke tests
sujithsomraaj Jun 3, 2024
62cec6c
chore: redo smoke tests for rewards distributor
sujithsomraaj Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: add smoke tests
  • Loading branch information
@sujithsomraaj
sujithsomraaj committed Jun 3, 2024
commit 12e0c2210e362d18894e1ed30c93b2adde3b33e3
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 15 files
+0 −1 .gitattributes
+1 −1 package.json
+0 −635 scripts/vm.py
+1 −7 src/StdChains.sol
+1 −1 src/StdJson.sol
+106 −201 src/StdStorage.sol
+470 −760 src/Vm.sol
+33 −51 src/mocks/MockERC20.sol
+32 −46 src/mocks/MockERC721.sol
+0 −2 test/StdChains.t.sol
+0 −10 test/StdCheats.t.sol
+1 −3 test/StdError.t.sol
+11 −159 test/StdStorage.t.sol
+2 −2 test/StdUtils.t.sol
+2 −2 test/Vm.t.sol
21 changes: 21 additions & 0 deletions test/mainnet/SmokeTest.Staging.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ contract SmokeTestStaging is MainnetBaseSetup {

TARGET_DEPLOYMENT_CHAINS = chains;
EMERGENCY_ADMIN = 0x6A5DD913fE3CB5193E09D1810a3b9ff1C0f9c0D6;
REWARDS_ADMIN = 0x1F05a8Ff6d895Ba04C84c5031c5d63FA1afCDA6F;

super.setUp();
}
Expand Down Expand Up @@ -453,4 +454,24 @@ contract SmokeTestStaging is MainnetBaseSetup {
}
}
}

function test_rewardsDistributorStaging() public {
RewardsDistributor rewardsDistributor;
SuperRegistry superRegistry;
SuperRBAC superRBAC;

for (uint256 i; i < TARGET_DEPLOYMENT_CHAINS.length; ++i) {
uint64 chainId = TARGET_DEPLOYMENT_CHAINS[i];
vm.selectFork(FORKS[chainId]);
rewardsDistributor = RewardsDistributor(getContract(chainId, "RewardsDistributor"));
superRegistry = SuperRegistry(getContract(chainId, "SuperRegistry"));
superRBAC = SuperRBAC(getContract(chainId, "SuperRBAC"));

assertEq(superRBAC.getRoleAdmin(keccak256("REWARDS_ADMIN_ROLE")), superRBAC.PROTOCOL_ADMIN_ROLE());
assertTrue(superRBAC.hasRole(keccak256("REWARDS_ADMIN_ROLE"), REWARDS_ADMIN));

assertEq(superRegistry.getAddress(keccak256("REWARDS_DISTRIBUTOR")), address(rewardsDistributor));
assertEq(address(rewardsDistributor.superRegistry()), address(superRegistry));
}
}
}
20 changes: 20 additions & 0 deletions test/mainnet/SmokeTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,4 +479,24 @@ contract SmokeTest is MainnetBaseSetup {
}
}
}

function test_rewardsDistributor() public {
RewardsDistributor rewardsDistributor;
SuperRegistry superRegistry;
SuperRBAC superRBAC;

for (uint256 i; i < TARGET_DEPLOYMENT_CHAINS.length; ++i) {
uint64 chainId = TARGET_DEPLOYMENT_CHAINS[i];
vm.selectFork(FORKS[chainId]);
rewardsDistributor = RewardsDistributor(getContract(chainId, "RewardsDistributor"));
superRegistry = SuperRegistry(getContract(chainId, "SuperRegistry"));
superRBAC = SuperRBAC(getContract(chainId, "SuperRBAC"));

assertEq(superRBAC.getRoleAdmin(keccak256("REWARDS_ADMIN_ROLE")), superRBAC.PROTOCOL_ADMIN_ROLE());
0xTimepunk marked this conversation as resolved.
Show resolved Hide resolved
assertTrue(superRBAC.hasRole(keccak256("REWARDS_ADMIN_ROLE"), REWARDS_ADMIN));

assertEq(superRegistry.getAddress(keccak256("REWARDS_DISTRIBUTOR")), address(rewardsDistributor));
assertEq(address(rewardsDistributor.superRegistry()), address(superRegistry));
}
}
}
5 changes: 5 additions & 0 deletions test/utils/MainnetBaseSetup.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ abstract contract MainnetBaseSetup is BaseSetup {
address public ownerAddress;

address public EMERGENCY_ADMIN = 0x73009CE7cFFc6C4c5363734d1b429f0b848e0490;
address public REWARDS_ADMIN = 0xf82F3D7Df94FC2994315c32322DA6238cA2A2f7f;

address[] public PROTOCOL_ADMINS = [
0xd26b38a64C812403fD3F87717624C80852cD6D61,
Expand Down Expand Up @@ -176,6 +177,10 @@ abstract contract MainnetBaseSetup is BaseSetup {
/// @dev 14 vault claimer
contracts[chainId][bytes32(bytes("VaultClaimer"))] =
_readContract(chainNames[trueIndex], chainId, "VaultClaimer");

/// @dev 15 rewards distributor
contracts[chainId][bytes32(bytes("RewardsDistributor"))] =
_readContract(chainNames[trueIndex], chainId, "RewardsDistributor");
}

function _readContract(
Expand Down