Skip to content
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
2 changes: 1 addition & 1 deletion lib/grove-address-registry
2 changes: 1 addition & 1 deletion src/MainnetController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { AccessControl } from "openzeppelin-contracts/contracts/access/AccessCon
import { IERC20 } from "openzeppelin-contracts/contracts/interfaces/IERC20.sol";
import { IERC4626 } from "openzeppelin-contracts/contracts/interfaces/IERC4626.sol";

import { Ethereum } from "spark-address-registry/Ethereum.sol";
import { Ethereum } from "grove-address-registry/Ethereum.sol";

import { IALMProxy } from "./interfaces/IALMProxy.sol";
import { ICCTPLike } from "./interfaces/CCTPInterfaces.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ contract SUSDSTestBase is ForkTestBase {
bytes32 depositKey = RateLimitHelpers.makeAssetKey(mainnetController.LIMIT_4626_DEPOSIT(), Ethereum.SUSDS);
bytes32 withdrawKey = RateLimitHelpers.makeAssetKey(mainnetController.LIMIT_4626_WITHDRAW(), Ethereum.SUSDS);

vm.startPrank(Ethereum.SPARK_PROXY);
vm.startPrank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(depositKey, 5_000_000e18, uint256(1_000_000e18) / 4 hours);
rateLimits.setRateLimitData(withdrawKey, 5_000_000e18, uint256(1_000_000e18) / 4 hours);
vm.stopPrank();
Expand Down Expand Up @@ -199,7 +199,7 @@ contract MainnetControllerRedeemERC4626FailureTests is SUSDSTestBase {

function test_redeemERC4626_zeroMaxAmount() external {
// Longer setup because rate limit revert is at the end of the function
vm.startPrank(Ethereum.SPARK_PROXY);
vm.startPrank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(
RateLimitHelpers.makeAssetKey(
mainnetController.LIMIT_4626_WITHDRAW(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ contract AaveV3MainMarketBaseTest is ForkTestBase {
function setUp() public override {
super.setUp();

vm.startPrank(Ethereum.SPARK_PROXY);
vm.startPrank(Ethereum.GROVE_PROXY);

rateLimits.setRateLimitData(
RateLimitHelpers.makeAssetKey(
Expand Down Expand Up @@ -163,7 +163,7 @@ contract AaveV3MainMarketWithdrawFailureTests is AaveV3MainMarketBaseTest {

function test_withdrawAave_zeroMaxAmount() external {
// Longer setup because rate limit revert is at the end of the function
vm.startPrank(Ethereum.SPARK_PROXY);
vm.startPrank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(
RateLimitHelpers.makeAssetKey(
mainnetController.LIMIT_AAVE_WITHDRAW(),
Expand Down Expand Up @@ -265,7 +265,7 @@ contract AaveV3MainMarketWithdrawSuccessTests is AaveV3MainMarketBaseTest {
mainnetController.LIMIT_AAVE_WITHDRAW(),
ATOKEN_USDS
);
vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setUnlimitedRateLimitData(key);

deal(Ethereum.USDS, address(almProxy), 1_000_000e18);
Expand Down Expand Up @@ -345,7 +345,7 @@ contract AaveV3MainMarketWithdrawSuccessTests is AaveV3MainMarketBaseTest {
mainnetController.LIMIT_AAVE_WITHDRAW(),
ATOKEN_USDC
);
vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setUnlimitedRateLimitData(key);

deal(Ethereum.USDC, address(almProxy), 1_000_000e6);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ contract MainnetControllerApproveSuccessTests is ApproveTestBase {
super.setUp();

MainnetControllerHarness harnessCode = new MainnetControllerHarness(
SPARK_PROXY,
GROVE_PROXY,
address(mainnetController.proxy()),
address(mainnetController.rateLimits()),
address(mainnetController.vault()),
Expand Down Expand Up @@ -197,7 +197,7 @@ contract ForeignControllerApproveSuccessTests is ApproveTestBase {
// NOTE: This etching setup is necessary to get coverage to work

ForeignController foreignController = new ForeignController(
SPARK_PROXY,
GROVE_PROXY,
address(almProxy),
makeAddr("rateLimits"),
makeAddr("psm"),
Expand All @@ -206,7 +206,7 @@ contract ForeignControllerApproveSuccessTests is ApproveTestBase {
);

ForeignControllerHarness harnessCode = new ForeignControllerHarness(
SPARK_PROXY,
GROVE_PROXY,
address(almProxy),
makeAddr("rateLimits"),
makeAddr("psm"),
Expand All @@ -215,7 +215,7 @@ contract ForeignControllerApproveSuccessTests is ApproveTestBase {
);

// Allow the foreign controller to call the ALMProxy
vm.startPrank(SPARK_PROXY);
vm.startPrank(GROVE_PROXY);
almProxy.grantRole(almProxy.CONTROLLER(), address(foreignController));
vm.stopPrank();

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ contract MainnetControllerDepositBUIDLFailureTests is MainnetControllerBUIDLTest
address(buidlDeposit)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_000_000e6, uint256(1_000_000e6) / 1 days);

deal(address(usdc), address(almProxy), 1_000_000e6);
Expand All @@ -65,7 +65,7 @@ contract MainnetControllerDepositBUIDLSuccessTests is MainnetControllerBUIDLTest
address(buidlDeposit)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_000_000e6, uint256(1_000_000e6) / 1 days);

deal(address(usdc), address(almProxy), 1_000_000e6);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ contract MainnetControllerRequestDepositERC7540FailureTests is CentrifugeTestBas
}

function test_requestDepositERC7540_rateLimitBoundary() external {
vm.startPrank(Ethereum.SPARK_PROXY);
vm.startPrank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(
RateLimitHelpers.makeAssetKey(
mainnetController.LIMIT_7540_DEPOSIT(),
Expand Down Expand Up @@ -144,7 +144,7 @@ contract MainnetControllerRequestDepositERC7540SuccessTests is CentrifugeTestBas
address(jTreasuryVault)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_000_000e6, uint256(1_000_000e6) / 1 days);
}

Expand Down Expand Up @@ -211,7 +211,7 @@ contract MainnetControllerClaimDepositERC7540SuccessTests is CentrifugeTestBase
address(jTreasuryVault)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_500_000e6, uint256(1_500_000e6) / 1 days);
}

Expand Down Expand Up @@ -360,7 +360,7 @@ contract MainnetControllerCancelCentrifugeDepositSuccessTests is CentrifugeTestB
address(jTreasuryVault)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_000_000e6, uint256(1_000_000e6) / 1 days);
}

Expand Down Expand Up @@ -416,7 +416,7 @@ contract MainnetControllerClaimCentrifugeCancelDepositSuccessTests is Centrifuge
address(jTreasuryVault)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_000_000e6, uint256(1_000_000e6) / 1 days);
}

Expand Down Expand Up @@ -490,7 +490,7 @@ contract MainnetControllerRequestRedeemERC7540FailureTests is CentrifugeTestBase
}

function test_requestRedeemERC7540_rateLimitsBoundary() external {
vm.startPrank(Ethereum.SPARK_PROXY);
vm.startPrank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(
RateLimitHelpers.makeAssetKey(
mainnetController.LIMIT_7540_REDEEM(),
Expand Down Expand Up @@ -536,7 +536,7 @@ contract MainnetControllerRequestRedeemERC7540SuccessTests is CentrifugeTestBase
address(jTreasuryVault)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_000_000e6, uint256(1_000_000e6) / 1 days);
}

Expand Down Expand Up @@ -605,7 +605,7 @@ contract MainnetControllerClaimRedeemERC7540SuccessTests is CentrifugeTestBase {
address(jTreasuryVault)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 2_000_000e6, uint256(2_000_000e6) / 1 days);
}

Expand Down Expand Up @@ -770,7 +770,7 @@ contract MainnetControllerCancelCentrifugeRedeemRequestSuccessTests is Centrifug
address(jTreasuryVault)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_000_000e6, uint256(1_000_000e6) / 1 days);
}

Expand Down Expand Up @@ -830,7 +830,7 @@ contract MainnetControllerClaimCentrifugeCancelRedeemRequestSuccessTests is Cent
address(jTreasuryVault)
);

vm.prank(Ethereum.SPARK_PROXY);
vm.prank(Ethereum.GROVE_PROXY);
rateLimits.setRateLimitData(key, 1_000_000e6, uint256(1_000_000e6) / 1 days);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ contract MainnetControllerTransferSharesCentrifugeFailureTests is CentrifugeTest
}

function test_transferSharesCentrifuge_rateLimitedBoundary() external {
vm.startPrank(SPARK_PROXY);
vm.startPrank(GROVE_PROXY);

bytes32 target = bytes32(uint256(uint160(makeAddr("centrifugeRecipient"))));

Expand Down Expand Up @@ -100,7 +100,7 @@ contract MainnetControllerTransferSharesCentrifugeFailureTests is CentrifugeTest
}

function test_transferSharesCentrifuge_invalidCentrifugeId() external {
vm.startPrank(SPARK_PROXY);
vm.startPrank(GROVE_PROXY);

rateLimits.setRateLimitData(
keccak256(abi.encode(
Expand Down Expand Up @@ -142,7 +142,7 @@ contract MainnetControllerTransferSharesCentrifugeSuccessTests is CentrifugeTest
);

function test_transferSharesCentrifuge() external {
vm.startPrank(SPARK_PROXY);
vm.startPrank(GROVE_PROXY);

bytes32 target = bytes32(uint256(uint160(makeAddr("centrifugeRecipient"))));

Expand Down
Loading
Loading