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
86 changes: 36 additions & 50 deletions src/ForeignController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -550,62 +550,48 @@ contract ForeignController is AccessControl {

// NOTE: These cancelation methods are compatible with ERC-7887

function cancelCentrifugeDepositRequest(address token)
external
onlyRole(RELAYER)
rateLimitExists(RateLimitHelpers.makeAssetKey(LIMIT_7540_DEPOSIT, token))
{
// NOTE: While the cancelation is pending, no new deposit request can be submitted
proxy.doCall(
token,
abi.encodeCall(
ICentrifugeV3VaultLike(token).cancelDepositRequest,
(CENTRIFUGE_REQUEST_ID, address(proxy))
)
);
function cancelCentrifugeDepositRequest(address token) external {
_checkRole(RELAYER);
CentrifugeLib.cancelCentrifugeDepositRequest(CentrifugeLib.CentrifugeRequestParams({
proxy : proxy,
rateLimits : rateLimits,
token : token,
rateLimitId : LIMIT_7540_DEPOSIT,
requestId : CENTRIFUGE_REQUEST_ID
}));
}

function claimCentrifugeCancelDepositRequest(address token)
external
onlyRole(RELAYER)
rateLimitExists(RateLimitHelpers.makeAssetKey(LIMIT_7540_DEPOSIT, token))
{
proxy.doCall(
token,
abi.encodeCall(
ICentrifugeV3VaultLike(token).claimCancelDepositRequest,
(CENTRIFUGE_REQUEST_ID, address(proxy), address(proxy))
)
);
function claimCentrifugeCancelDepositRequest(address token) external {
_checkRole(RELAYER);
CentrifugeLib.claimCentrifugeCancelDepositRequest(CentrifugeLib.CentrifugeRequestParams({
proxy : proxy,
rateLimits : rateLimits,
token : token,
rateLimitId : LIMIT_7540_DEPOSIT,
requestId : CENTRIFUGE_REQUEST_ID
}));
}

function cancelCentrifugeRedeemRequest(address token)
external
onlyRole(RELAYER)
rateLimitExists(RateLimitHelpers.makeAssetKey(LIMIT_7540_REDEEM, token))
{
// NOTE: While the cancelation is pending, no new redeem request can be submitted
proxy.doCall(
token,
abi.encodeCall(
ICentrifugeV3VaultLike(token).cancelRedeemRequest,
(CENTRIFUGE_REQUEST_ID, address(proxy))
)
);
function cancelCentrifugeRedeemRequest(address token) external {
_checkRole(RELAYER);
CentrifugeLib.cancelCentrifugeRedeemRequest(CentrifugeLib.CentrifugeRequestParams({
proxy : proxy,
rateLimits : rateLimits,
token : token,
rateLimitId : LIMIT_7540_REDEEM,
requestId : CENTRIFUGE_REQUEST_ID
}));
}

function claimCentrifugeCancelRedeemRequest(address token)
external
onlyRole(RELAYER)
rateLimitExists(RateLimitHelpers.makeAssetKey(LIMIT_7540_REDEEM, token))
{
proxy.doCall(
token,
abi.encodeCall(
ICentrifugeV3VaultLike(token).claimCancelRedeemRequest,
(CENTRIFUGE_REQUEST_ID, address(proxy), address(proxy))
)
);
function claimCentrifugeCancelRedeemRequest(address token) external {
_checkRole(RELAYER);
CentrifugeLib.claimCentrifugeCancelRedeemRequest(CentrifugeLib.CentrifugeRequestParams({
proxy : proxy,
rateLimits : rateLimits,
token : token,
rateLimitId : LIMIT_7540_REDEEM,
requestId : CENTRIFUGE_REQUEST_ID
}));
}

function transferSharesCentrifuge(
Expand Down
8 changes: 4 additions & 4 deletions test/grove-avalanche-fork/Centrifuge.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ contract ForeignControllerCancelCentrifugeDepositFailureTests is CentrifugeTestB

function test_cancelCentrifugeDepositRequest_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("FC/invalid-action");
vm.expectRevert("CentrifugeLib/invalid-action");
foreignController.cancelCentrifugeDepositRequest(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -399,7 +399,7 @@ contract ForeignControllerClaimCentrifugeCancelDepositFailureTests is Centrifuge

function test_claimCentrifugeCancelDepositRequest_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("FC/invalid-action");
vm.expectRevert("CentrifugeLib/invalid-action");
foreignController.claimCentrifugeCancelDepositRequest(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -795,7 +795,7 @@ contract ForeignControllerCancelCentrifugeRedeemRequestFailureTests is Centrifug

function test_cancelCentrifugeRedeemRequest_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("FC/invalid-action");
vm.expectRevert("CentrifugeLib/invalid-action");
foreignController.cancelCentrifugeRedeemRequest(makeAddr("fake-vault"));
}

Expand Down Expand Up @@ -855,7 +855,7 @@ contract ForeignControllerClaimCentrifugeCancelRedeemRequestFailureTests is Cent

function test_claimCentrifugeCancelRedeemRequest_invalidVault() external {
vm.prank(ALM_RELAYER);
vm.expectRevert("FC/invalid-action");
vm.expectRevert("CentrifugeLib/invalid-action");
foreignController.claimCentrifugeCancelRedeemRequest(makeAddr("fake-vault"));
}

Expand Down
Loading