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

Minor changes to FWR tests #37

Merged
merged 1 commit into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 25 additions & 31 deletions l2-contracts/test/unit/L2RewardManager.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,20 @@ import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy
import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import { BridgeMock } from "../mocks/BridgeMock.sol";
import { Merkle } from "murky/Merkle.sol";
import { ROLE_ID_BRIDGE, PUBLIC_ROLE, ROLE_ID_REWARD_WATCHER } from "mainnet-contracts/script/Roles.sol";
import {
ROLE_ID_BRIDGE,
PUBLIC_ROLE,
ROLE_ID_DAO,
ROLE_ID_REWARD_WATCHER,
ROLE_ID_OPERATIONS_PAYMASTER
} from "mainnet-contracts/script/Roles.sol";
import { XERC20Lockbox } from "mainnet-contracts/src/XERC20Lockbox.sol";
import { xPufETH } from "mainnet-contracts/src/l2/xPufETH.sol";
import { ERC20Mock } from "mainnet-contracts/test/mocks/ERC20Mock.sol";
import { NoImplementation } from "mainnet-contracts/src/NoImplementation.sol";
import { Unauthorized } from "mainnet-contracts/src/Errors.sol";
import { GenerateAccessManagerCalldata3 } from
"mainnet-contracts/script/AccessManagerMigrations/GenerateAccessManagerCalldata3.s.sol";

contract PufferVaultMock is ERC20Mock {
constructor() ERC20Mock("VaultMock", "pufETH") { }
Expand Down Expand Up @@ -66,7 +74,6 @@ contract L2RewardManagerTest is Test {
xPufETH xPufETHProxy;

address l1RewardManagerProxy;
address l2RewardManagerProxy;
L2RewardManager public l2RewardManager;

function setUp() public {
Expand All @@ -87,6 +94,7 @@ contract L2RewardManagerTest is Test {
l1RewardManager = L1RewardManager(address(l1RewardManagerProxy));
vm.label(address(l1RewardManager), "l1RewardManagerProxy");

// Setup xPufETH token
xPufETHProxy = xPufETH(
address(
new ERC1967Proxy{ salt: bytes32("xPufETH") }(
Expand All @@ -96,6 +104,7 @@ contract L2RewardManagerTest is Test {
);
vm.label(address(xPufETHProxy), "xPufETHProxy");

// xPufETH limits & access controls
xPufETHProxy.setLimits(address(mockBridge), type(uint104).max, type(uint104).max);

bytes4[] memory lockBoxSelectors = new bytes4[](2);
Expand Down Expand Up @@ -132,47 +141,32 @@ contract L2RewardManagerTest is Test {
address(l1RewardManagerImpl), abi.encodeCall(L1RewardManager.initialize, (address(accessManager)))
);

bytes[] memory calldatas = new bytes[](6);
bytes4[] memory bridgeSelectors = new bytes4[](1);
bridgeSelectors[0] = L2RewardManager.xReceive.selector;
calldatas[0] = abi.encodeWithSelector(
AccessManager.setTargetFunctionRole.selector, address(l2RewardManager), bridgeSelectors, ROLE_ID_BRIDGE
bytes memory cd = new GenerateAccessManagerCalldata3().generateL1Calldata(
address(l1RewardManager), address(mockBridge), address(pufferVault), address(0)
);

bytes4[] memory publicSelectors = new bytes4[](1);
publicSelectors[0] = IL2RewardManager.claimRewards.selector;
calldatas[1] = abi.encodeWithSelector(
AccessManager.setTargetFunctionRole.selector, address(l2RewardManager), publicSelectors, PUBLIC_ROLE
);

calldatas[2] = abi.encodeWithSelector(AccessManager.grantRole.selector, ROLE_ID_BRIDGE, address(mockBridge), 0);
(bool s,) = address(accessManager).call(cd);
require(s, "failed access manager 1");

bytes4[] memory rewardsWatcherSelectors = new bytes4[](3);
rewardsWatcherSelectors[0] = L2RewardManager.freezeAndRevertInterval.selector;
rewardsWatcherSelectors[1] = L2RewardManager.freezeClaimingForInterval.selector;
rewardsWatcherSelectors[2] = L2RewardManager.revertInterval.selector;
calldatas[3] = abi.encodeWithSelector(
AccessManager.setTargetFunctionRole.selector,
address(l2RewardManager),
rewardsWatcherSelectors,
ROLE_ID_REWARD_WATCHER
);
cd = new GenerateAccessManagerCalldata3().generateL2Calldata(address(l2RewardManager), address(mockBridge));

calldatas[4] =
abi.encodeWithSelector(AccessManager.grantRole.selector, ROLE_ID_REWARD_WATCHER, address(this), 0);
(s,) = address(accessManager).call(cd);
require(s, "failed access manager 2");

calldatas[5] = abi.encodeWithSelector(
AccessManager.setTargetFunctionRole.selector, address(l1RewardManager), bridgeSelectors, ROLE_ID_BRIDGE
);
accessManager.grantRole(ROLE_ID_REWARD_WATCHER, address(this), 0);
accessManager.grantRole(ROLE_ID_DAO, address(this), 0);
accessManager.grantRole(ROLE_ID_OPERATIONS_PAYMASTER, address(this), 0);

vm.label(address(l1RewardManager), "l1RewardManagerProxy");

accessManager.multicall(calldatas);

// set block.timestamp to non zero value
vm.warp(1);
}

function test_Constructor() public {
new L2RewardManager(address(xPufETHProxy), address(l1RewardManager));
}

function test_updateBridgeData() public {
L2RewardManagerStorage.BridgeData memory bridgeData =
L2RewardManagerStorage.BridgeData({ destinationDomainId: 1 });
Expand Down
4 changes: 4 additions & 0 deletions mainnet-contracts/test/unit/L1RewardManager.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ contract L1RewardManagerTest is UnitTestHelper {
_;
}

function test_Constructor() public {
new L1RewardManager(address(0), address(0), address(0), address(0));
}

function testRevert_updateBridgeDataInvalidBridge() public {
vm.startPrank(DAO);

Expand Down
Loading