Skip to content

fix: auth minter helper & bound _mint in depositTransaction tests #17642

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

Merged
agusduha merged 2 commits into from
Sep 26, 2025
Merged

fix: auth minter helper & bound _mint in depositTransaction tests #17642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0caa582
refactor: auth minter helper tests (#618)
0xniha Sep 26, 2025
fe5ad3a
fix: bound _mint correctly in depositTransaction test function (#619)
0xniha Sep 26, 2025
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
9 changes: 5 additions & 4 deletions packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2565,11 +2565,13 @@ contract OptimismPortal2_DepositTransaction_Test is OptimismPortal2_TestInit {
external
{
// Prevent overflow on an upgrade context
if (isUsingLockbox()) {
// Since the value always goes through the portal
_mint = bound(_mint, 0, type(uint256).max - address(optimismPortal2).balance);

if (isUsingLockbox() && address(optimismPortal2).balance > address(ethLockbox).balance) {
_mint = bound(_mint, 0, type(uint256).max - address(ethLockbox).balance);
} else {
_mint = bound(_mint, 0, type(uint256).max - address(optimismPortal2).balance);
}

if (isUsingCustomGasToken()) {
_mint = 0;
}
Expand All @@ -2585,7 +2587,6 @@ contract OptimismPortal2_DepositTransaction_Test is OptimismPortal2_TestInit {

uint256 balanceBefore = address(optimismPortal2).balance;
uint256 lockboxBalanceBefore = address(ethLockbox).balance;
_mint = bound(_mint, 0, type(uint256).max - balanceBefore);

// EOA emulation
vm.expectEmit(address(optimismPortal2));
Expand Down
48 changes: 21 additions & 27 deletions packages/contracts-bedrock/test/L2/LiquidityController.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ contract LiquidityController_TestInit is CommonTest {

/// @notice Helper function to authorize a minter.
function _authorizeMinter(address _minter) internal {
assumeNotForgeAddress(_minter);
assumeNotZeroAddress(_minter);
// Authorize the minter
stdstore.target(address(liquidityController)).sig(liquidityController.minters.selector).with_key(_minter)
.checked_write(true);
Expand Down Expand Up @@ -114,13 +116,10 @@ contract LiquidityController_AuthorizeMinter_Test is LiquidityController_TestIni
/// @title LiquidityController_DeauthorizeMinter_Test
/// @notice Tests the `deauthorizeMinter` function of the `LiquidityController` contract.
contract LiquidityController_DeauthorizeMinter_Test is LiquidityController_TestInit {
using stdStorage for StdStorage;

/// @notice Tests that the deauthorizeMinter function can be called by the owner.
function testFuzz_deauthorizeMinter_fromOwner_succeeds(address _minter) public {
// Set minter to authorized
stdstore.target(address(liquidityController)).sig(liquidityController.minters.selector).with_key(_minter)
.checked_write(true);
_authorizeMinter(_minter);

// Expect emit MinterDeauthorized event
vm.expectEmit(address(liquidityController));
Expand All @@ -138,8 +137,7 @@ contract LiquidityController_DeauthorizeMinter_Test is LiquidityController_TestI
vm.assume(_caller != IProxyAdmin(Predeploys.PROXY_ADMIN).owner());

// Set minter to authorized
stdstore.target(address(liquidityController)).sig(liquidityController.minters.selector).with_key(_minter)
.checked_write(true);
_authorizeMinter(_minter);

// Call the deauthorizeMinter function with non-owner as the caller
vm.prank(_caller);
Expand All @@ -154,11 +152,9 @@ contract LiquidityController_DeauthorizeMinter_Test is LiquidityController_TestI
/// @title LiquidityController_Mint_Test
/// @notice Tests the `mint` function of the `LiquidityController` contract.
contract LiquidityController_Mint_Test is LiquidityController_TestInit {
address authorizedMinter = makeAddr("authorizedMinter");

/// @notice Tests that the mint function can be called by an authorized minter.
function testFuzz_mint_fromAuthorizedMinter_succeeds(address _to, uint256 _amount) public {
_authorizeMinter(authorizedMinter);
function testFuzz_mint_fromAuthorizedMinter_succeeds(address _to, uint256 _amount, address _minter) public {
_authorizeMinter(_minter);
vm.assume(_to != address(nativeAssetLiquidity));
_amount = bound(_amount, 1, address(nativeAssetLiquidity).balance);

Expand All @@ -171,8 +167,8 @@ contract LiquidityController_Mint_Test is LiquidityController_TestInit {
emit LiquidityWithdrawn(address(liquidityController), _amount);
// Expect emit LiquidityMinted event
vm.expectEmit(address(liquidityController));
emit LiquidityMinted(authorizedMinter, _to, _amount);
vm.prank(authorizedMinter);
emit LiquidityMinted(_minter, _to, _amount);
vm.prank(_minter);
liquidityController.mint(_to, _amount);

// Assert recipient and NativeAssetLiquidity balances are updated correctly
Expand All @@ -198,15 +194,15 @@ contract LiquidityController_Mint_Test is LiquidityController_TestInit {
}

/// @notice Tests that the mint function reverts when contract has insufficient balance.
function test_mint_insufficientBalance_fails() public {
_authorizeMinter(authorizedMinter);
function test_mint_insufficientBalance_fails(address _minter) public {
_authorizeMinter(_minter);
// Try to mint more than available balance
uint256 contractBalance = address(nativeAssetLiquidity).balance;
uint256 amount = bound(contractBalance, contractBalance + 1, type(uint256).max);
address to = makeAddr("recipient");

// Call the mint function with insufficient balance
vm.prank(authorizedMinter);
vm.prank(_minter);
// Should revert due to insufficient balance in NativeAssetLiquidity
vm.expectRevert(NativeAssetLiquidity.NativeAssetLiquidity_InsufficientBalance.selector);

Expand All @@ -221,36 +217,34 @@ contract LiquidityController_Mint_Test is LiquidityController_TestInit {
/// @title LiquidityController_Burn_Test
/// @notice Tests the `burn` function of the `LiquidityController` contract.
contract LiquidityController_Burn_Test is LiquidityController_TestInit {
address authorizedMinter = makeAddr("authorizedMinter");

/// @notice Tests that the burn function can be called by an authorized minter.
function testFuzz_burn_fromAuthorizedMinter_succeeds(uint256 _amount) public {
_authorizeMinter(authorizedMinter);
function testFuzz_burn_fromAuthorizedMinter_succeeds(uint256 _amount, address _minter) public {
_authorizeMinter(_minter);
_amount = bound(_amount, 0, address(nativeAssetLiquidity).balance);

// Deal the authorized minter with the amount to burn
vm.deal(authorizedMinter, _amount);
vm.deal(_minter, _amount);
uint256 nativeAssetBalanceBefore = address(nativeAssetLiquidity).balance;
uint256 minterBalanceBefore = authorizedMinter.balance;
uint256 minterBalanceBefore = _minter.balance;

// Expect emit LiquidityDeposited event and call the burn function
vm.expectEmit(address(nativeAssetLiquidity));
emit LiquidityDeposited(address(liquidityController), _amount);
// Expect emit LiquidityBurned event
vm.expectEmit(address(liquidityController));
emit LiquidityBurned(authorizedMinter, _amount);
vm.prank(authorizedMinter);
emit LiquidityBurned(_minter, _amount);
vm.prank(_minter);
liquidityController.burn{ value: _amount }();

// Assert minter and NativeAssetLiquidity balances are updated correctly
assertEq(authorizedMinter.balance, minterBalanceBefore - _amount);
assertEq(_minter.balance, minterBalanceBefore - _amount);
assertEq(address(nativeAssetLiquidity).balance, nativeAssetBalanceBefore + _amount);
}

/// @notice Tests that the burn function reverts when called by unauthorized address.
function testFuzz_burn_fromUnauthorizedCaller_fails(address _caller, uint256 _amount) public {
_authorizeMinter(authorizedMinter);
vm.assume(_caller != authorizedMinter);
function testFuzz_burn_fromUnauthorizedCaller_fails(address _caller, uint256 _amount, address _minter) public {
_authorizeMinter(_minter);
vm.assume(_caller != _minter);
_amount = bound(_amount, 0, address(nativeAssetLiquidity).balance);

// Deal the unauthorized caller with the amount to burn
Expand Down