Skip to content

Commit 42a40eb

Browse files
fix: review
1 parent 49f822d commit 42a40eb

4 files changed

Lines changed: 21 additions & 16 deletions

File tree

src/MainnetController.sol

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { ERC4626Lib } from "./libraries/ERC4626Lib.sol";
2424
import { LayerZeroLib } from "./libraries/LayerZeroLib.sol";
2525
import { IDaiUsdsLike, IPSMLike, PSMLib } from "./libraries/PSMLib.sol";
2626
import { UniswapV4Lib } from "./libraries/UniswapV4Lib.sol";
27-
import { WeETHLib } from "./libraries/WeETHLib.sol";
27+
import { WEETHLib } from "./libraries/WEETHLib.sol";
2828

2929
import { RateLimitHelpers } from "./RateLimitHelpers.sol";
3030

@@ -165,9 +165,9 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
165165
bytes32 public LIMIT_USDE_MINT = keccak256("LIMIT_USDE_MINT");
166166
bytes32 public LIMIT_USDS_MINT = keccak256("LIMIT_USDS_MINT");
167167
bytes32 public LIMIT_USDS_TO_USDC = keccak256("LIMIT_USDS_TO_USDC");
168-
bytes32 public LIMIT_WEETH_CLAIM_WITHDRAW = WeETHLib.LIMIT_WEETH_CLAIM_WITHDRAW;
169-
bytes32 public LIMIT_WEETH_DEPOSIT = WeETHLib.LIMIT_WEETH_DEPOSIT;
170-
bytes32 public LIMIT_WEETH_REQUEST_WITHDRAW = WeETHLib.LIMIT_WEETH_REQUEST_WITHDRAW;
168+
bytes32 public LIMIT_WEETH_CLAIM_WITHDRAW = WEETHLib.LIMIT_WEETH_CLAIM_WITHDRAW;
169+
bytes32 public LIMIT_WEETH_DEPOSIT = WEETHLib.LIMIT_WEETH_DEPOSIT;
170+
bytes32 public LIMIT_WEETH_REQUEST_WITHDRAW = WEETHLib.LIMIT_WEETH_REQUEST_WITHDRAW;
171171
bytes32 public LIMIT_WSTETH_DEPOSIT = keccak256("LIMIT_WSTETH_DEPOSIT");
172172
bytes32 public LIMIT_WSTETH_REQUEST_WITHDRAW = keccak256("LIMIT_WSTETH_REQUEST_WITHDRAW");
173173

@@ -497,7 +497,7 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
497497
{
498498
_checkRole(RELAYER);
499499

500-
shares = WeETHLib.deposit({
500+
shares = WEETHLib.deposit({
501501
proxy : proxy,
502502
rateLimits : rateLimits,
503503
amount : amount,
@@ -513,7 +513,7 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
513513
{
514514
_checkRole(RELAYER);
515515

516-
requestId = WeETHLib.requestWithdraw({
516+
requestId = WEETHLib.requestWithdraw({
517517
proxy : proxy,
518518
rateLimits : rateLimits,
519519
weETHShares : weETHShares,
@@ -529,7 +529,7 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
529529
{
530530
_checkRole(RELAYER);
531531

532-
ethReceived = WeETHLib.claimWithdrawal({
532+
ethReceived = WEETHLib.claimWithdrawal({
533533
proxy : proxy,
534534
rateLimits : rateLimits,
535535
requestId : requestId,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ interface IWithdrawRequestNFTLike {
1414
function isValid(uint256 requestId) external view returns (bool);
1515
}
1616

17-
contract WeEthModule is AccessControlEnumerable {
17+
contract WEETHModule is AccessControlEnumerable {
1818

1919
address public immutable almProxy;
2020

src/libraries/WEETHLib.sol

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ interface ILiquidityPoolLike {
2121
function amountForShare(uint256 shareAmount) external view returns (uint256);
2222
function deposit() external;
2323
function requestWithdraw(address receiver,uint256 amount) external returns (uint256 requestId);
24-
function sharesForAmount(uint256 amount) external view returns (uint256);
2524
function withdrawRequestNFT() external view returns (address);
2625
}
2726

@@ -41,7 +40,7 @@ interface IWETHLike {
4140
function withdraw(uint256 amount) external;
4241
}
4342

44-
library WeETHLib {
43+
library WEETHLib {
4544

4645
bytes32 public constant LIMIT_WEETH_CLAIM_WITHDRAW = keccak256("LIMIT_WEETH_CLAIM_WITHDRAW");
4746
bytes32 public constant LIMIT_WEETH_DEPOSIT = keccak256("LIMIT_WEETH_DEPOSIT");

test/mainnet-fork/weETH.t.sol

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@ pragma solidity >=0.8.0;
33

44
import { ReentrancyGuard } from "../../lib/openzeppelin-contracts/contracts/utils/ReentrancyGuard.sol";
55

6-
import { IWEETHLike, ILiquidityPoolLike, IEETHLike } from "../../src/libraries/WeETHLib.sol";
6+
import { IWEETHLike, IEETHLike } from "../../src/libraries/WeETHLib.sol";
77

8-
import { WeEthModule } from "../../src/WeEthModule.sol";
8+
import { WEETHModule } from "../../src/WEETHModule.sol";
99

1010
import "./ForkTestBase.t.sol";
1111

12+
interface ILiquidityPoolLike {
13+
function amountForShare(uint256 shareAmount) external view returns (uint256);
14+
function sharesForAmount(uint256 amount) external view returns (uint256);
15+
function withdrawRequestNFT() external view returns (address);
16+
}
17+
1218
interface IWithdrawRequestNFTLike {
1319
function finalizeRequests(uint256 requestId) external;
1420
function getClaimableAmount(uint256 requestId) external view returns (uint256);
@@ -39,15 +45,15 @@ contract MainnetControllerWeETHTestBase is ForkTestBase {
3945
eETH = IEETHLike(address(IWEETHLike(Ethereum.WEETH).eETH()));
4046
liquidityPool = ILiquidityPoolLike(IEETHLike(eETH).liquidityPool());
4147

42-
weETHModule = address(new WeEthModule(Ethereum.SPARK_PROXY, address(almProxy)));
48+
weETHModule = address(new WEETHModule(Ethereum.SPARK_PROXY, address(almProxy)));
4349
}
4450

4551
function _getBlock() internal override pure returns (uint256) {
4652
return 23469772; // September 29, 2025
4753
}
4854

4955
function _getMinSharesOut(uint256 amount) internal view returns (uint256) {
50-
return liquidityPool.sharesForAmount(amount) * 99 / 100;
56+
return liquidityPool.sharesForAmount(amount) - 1;
5157
}
5258

5359
}
@@ -91,7 +97,7 @@ contract MainnetControllerDepositToWeETHFailureTests is MainnetControllerWeETHTe
9197
mainnetController.depositToWeETH(1_000e18, 0);
9298
}
9399

94-
function test_depositToWeETH_slippageTooHigh() external {
100+
function test_depositToWeETH_slippageTooHighBoundary() external {
95101
bytes32 key = mainnetController.LIMIT_WEETH_DEPOSIT();
96102

97103
vm.prank(Ethereum.SPARK_PROXY);
@@ -103,7 +109,7 @@ contract MainnetControllerDepositToWeETHFailureTests is MainnetControllerWeETHTe
103109

104110
vm.prank(relayer);
105111
vm.expectRevert("MC/slippage-too-high");
106-
mainnetController.depositToWeETH(1_000e18, 1_000e18);
112+
mainnetController.depositToWeETH(1_000e18, minSharesOut + 1);
107113

108114
vm.prank(relayer);
109115
mainnetController.depositToWeETH(1_000e18, minSharesOut);

0 commit comments

Comments
 (0)