diff --git a/src/LBToken.sol b/src/LBToken.sol index bc7fe862..ede1db05 100644 --- a/src/LBToken.sol +++ b/src/LBToken.sol @@ -129,8 +129,8 @@ contract LBToken is ILBToken { * @param spender The address of the spender. * @param approved The boolean value to grant or revoke permission. */ - function setApprovalForAll(address spender, bool approved) public virtual override { - _setApprovalForAll(msg.sender, spender, approved); + function approveForAll(address spender, bool approved) public virtual override { + _approveForAll(msg.sender, spender, approved); } /** @@ -261,7 +261,7 @@ contract LBToken is ILBToken { * @param spender The address of the spender * @param approved The boolean value to grant or revoke permission */ - function _setApprovalForAll(address owner, address spender, bool approved) internal { + function _approveForAll(address owner, address spender, bool approved) internal { if (owner == spender) revert LBToken__SelfApproval(owner); _spenderApprovals[owner][spender] = approved; diff --git a/src/interfaces/ILBToken.sol b/src/interfaces/ILBToken.sol index e20c67c8..06352194 100644 --- a/src/interfaces/ILBToken.sol +++ b/src/interfaces/ILBToken.sol @@ -36,7 +36,7 @@ interface ILBToken { function isApprovedForAll(address owner, address spender) external view returns (bool); - function setApprovalForAll(address spender, bool approved) external; + function approveForAll(address spender, bool approved) external; function batchTransferFrom(address from, address to, uint256[] calldata ids, uint256[] calldata amounts) external; } diff --git a/src/libraries/math/PackedUint128Math.sol b/src/libraries/math/PackedUint128Math.sol index e68624e1..ed6e79b0 100644 --- a/src/libraries/math/PackedUint128Math.sol +++ b/src/libraries/math/PackedUint128Math.sol @@ -3,7 +3,6 @@ pragma solidity 0.8.10; import {Constants} from "../Constants.sol"; -import {SafeCast} from "./SafeCast.sol"; /** * @title Liquidity Book Packed Uint128 Math Library @@ -12,11 +11,8 @@ import {SafeCast} from "./SafeCast.sol"; * and interact with the encoded bytes32. */ library PackedUint128Math { - using SafeCast for uint256; - error PackedUint128Math__AddOverflow(); error PackedUint128Math__SubUnderflow(); - error PackedUint128Math__AddFirstSubSecondOverflow(); error PackedUint128Math__MultiplierTooLarge(); uint256 private constant OFFSET = 128; diff --git a/src/libraries/math/Uint128x128Math.sol b/src/libraries/math/Uint128x128Math.sol index 510005f6..3ac8712e 100644 --- a/src/libraries/math/Uint128x128Math.sol +++ b/src/libraries/math/Uint128x128Math.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.10; import {Constants} from "../Constants.sol"; import {BitMath} from "./BitMath.sol"; -import {Uint256x256Math} from "./Uint256x256Math.sol"; /** * @title Liquidity Book Uint128x128 Math Library @@ -12,7 +11,6 @@ import {Uint256x256Math} from "./Uint256x256Math.sol"; * @notice Helper contract used for power and log calculations */ library Uint128x128Math { - using Uint256x256Math for uint256; using BitMath for uint256; error Uint128x128Math__LogUnderflow(); diff --git a/src/libraries/math/Uint256x256Math.sol b/src/libraries/math/Uint256x256Math.sol index 7322b8b9..817543df 100644 --- a/src/libraries/math/Uint256x256Math.sol +++ b/src/libraries/math/Uint256x256Math.sol @@ -2,16 +2,12 @@ pragma solidity 0.8.10; -import {BitMath} from "./BitMath.sol"; - /** * @title Liquidity Book Uint256x256 Math Library * @author Trader Joe * @notice Helper contract used for full precision calculations */ library Uint256x256Math { - using BitMath for uint256; - error Uint256x256Math__MulShiftOverflow(); error Uint256x256Math__MulDivOverflow(); diff --git a/test/LBRouter.Liquidity.t.sol b/test/LBRouter.Liquidity.t.sol index 402ef85a..e375fda0 100644 --- a/test/LBRouter.Liquidity.t.sol +++ b/test/LBRouter.Liquidity.t.sol @@ -328,7 +328,7 @@ contract LiquidityBinRouterTest is TestHelper { ILBPair pair = factory.getLBPairInformation(usdt, usdc, DEFAULT_BIN_STEP).LBPair; - pair.setApprovalForAll(address(router), true); + pair.approveForAll(address(router), true); (uint256 amountXOut, uint256 amountYOut) = router.removeLiquidity( usdt, usdc, DEFAULT_BIN_STEP, 0, 0, depositIds, liquidityMinted, address(this), block.timestamp @@ -382,7 +382,7 @@ contract LiquidityBinRouterTest is TestHelper { router.addLiquidity(liquidityParameters); ILBPair pair = factory.getLBPairInformation(usdt, usdc, DEFAULT_BIN_STEP).LBPair; - pair.setApprovalForAll(address(router), true); + pair.approveForAll(address(router), true); // Revert if the deadline is passed vm.expectRevert( @@ -441,7 +441,7 @@ contract LiquidityBinRouterTest is TestHelper { router.addLiquidityNATIVE{value: liquidityParameters.amountX}(liquidityParameters); ILBPair pair = factory.getLBPairInformation(wnative, usdc, DEFAULT_BIN_STEP).LBPair; - pair.setApprovalForAll(address(router), true); + pair.approveForAll(address(router), true); uint256 balanceNATIVEBefore = address(this).balance; uint256 balanceUSDCBefore = usdc.balanceOf(address(this)); @@ -470,7 +470,7 @@ contract LiquidityBinRouterTest is TestHelper { router.addLiquidityNATIVE{value: liquidityParameters.amountX}(liquidityParameters); ILBPair pair = factory.getLBPairInformation(wnative, usdc, DEFAULT_BIN_STEP).LBPair; - pair.setApprovalForAll(address(router), true); + pair.approveForAll(address(router), true); // Revert if the deadline is passed vm.expectRevert( diff --git a/test/LBToken.t.sol b/test/LBToken.t.sol index 96e74178..76e82bdf 100644 --- a/test/LBToken.t.sol +++ b/test/LBToken.t.sol @@ -236,7 +236,7 @@ contract LBTokenTest is Test { vm.stopPrank(); vm.startPrank(from); - lbToken.setApprovalForAll(to, true); + lbToken.approveForAll(to, true); vm.stopPrank(); assertEq(lbToken.isApprovedForAll(from, to), true, "testFuzz_ApprovedForAll::1"); @@ -249,7 +249,7 @@ contract LBTokenTest is Test { assertEq(lbToken.balanceOf(to, id), amount, "testFuzz_ApprovedForAll::3"); vm.startPrank(from); - lbToken.setApprovalForAll(to, false); + lbToken.approveForAll(to, false); vm.stopPrank(); assertEq(lbToken.isApprovedForAll(from, to), false, "testFuzz_ApprovedForAll::4"); @@ -292,7 +292,7 @@ contract LBTokenTest is Test { vm.startPrank(account); vm.expectRevert(abi.encodeWithSelector(ILBToken.LBToken__SelfApproval.selector, account)); - lbToken.setApprovalForAll(account, true); + lbToken.approveForAll(account, true); vm.stopPrank(); assertEq(lbToken.isApprovedForAll(account, account), true, "testFuzz_SetApprovalOnSelf::1");