Align constants with UR (#267)

* Align constants with UR

* rename

* another rename

.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap

@@ -1 +1 @@
-127690
+127708

.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap

@@ -1 +1 @@
-127828
+127846

.forge-snapshots/PositionManager_decrease_take_take.snap

@@ -1 +1 @@
-116639
+116603

.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap

@@ -1 +1 @@
-370975
+370951

.forge-snapshots/V4Router_Bytecode.snap

@@ -1 +1 @@
-8199
+8165

src/base/BaseActionsRouter.sol

@@ -5,7 +5,7 @@ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
 import {SafeCallback} from "./SafeCallback.sol";
 import {CalldataDecoder} from "../libraries/CalldataDecoder.sol";
 import {Actions} from "../libraries/Actions.sol";
-import {Constants} from "../libraries/Constants.sol";
+import {ActionConstants} from "../libraries/ActionConstants.sol";
 
 /// @notice Abstract contract for performing a combination of actions on Uniswap v4.
 /// @dev Suggested uint256 action values are defined in Actions.sol, however any definition can be used
@@ -57,9 +57,9 @@ abstract contract BaseActionsRouter is SafeCallback {
 
     /// @notice Calculates the address for a action
     function _mapRecipient(address recipient) internal view returns (address) {
-        if (recipient == Constants.MSG_SENDER) {
+        if (recipient == ActionConstants.MSG_SENDER) {
             return msgSender();
-        } else if (recipient == Constants.ADDRESS_THIS) {
+        } else if (recipient == ActionConstants.ADDRESS_THIS) {
             return address(this);
         } else {
             return recipient;

src/base/DeltaResolver.sol

@@ -6,7 +6,7 @@ import {TransientStateLibrary} from "@uniswap/v4-core/src/libraries/TransientSta
 import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
 import {ImmutableState} from "./ImmutableState.sol";
 import {SafeCast} from "@uniswap/v4-core/src/libraries/SafeCast.sol";
-import {Constants} from "../libraries/Constants.sol";
+import {ActionConstants} from "../libraries/ActionConstants.sol";
 
 /// @notice Abstract contract used to sync, send, and settle funds to the pool manager
 /// @dev Note that sync() is called before any erc-20 transfer in `settle`.
@@ -71,17 +71,17 @@ abstract contract DeltaResolver is ImmutableState {
 
     /// @notice Calculates the amount for a settle action
     function _mapSettleAmount(uint256 amount, Currency currency) internal view returns (uint256) {
-        if (amount == Constants.CONTRACT_BALANCE) {
+        if (amount == ActionConstants.CONTRACT_BALANCE) {
             return currency.balanceOfSelf();
-        } else if (amount == Constants.OPEN_DELTA) {
+        } else if (amount == ActionConstants.OPEN_DELTA) {
             return _getFullDebt(currency);
         }
         return amount;
     }
 
     /// @notice Calculates the amount for a take action
     function _mapTakeAmount(uint256 amount, Currency currency) internal view returns (uint256) {
-        if (amount == Constants.OPEN_DELTA) {
+        if (amount == ActionConstants.OPEN_DELTA) {
             return _getFullCredit(currency);
         }
         return amount;
@@ -93,9 +93,9 @@ abstract contract DeltaResolver is ImmutableState {
     /// For example USDC-v2->DAI-v4->USDT. This intermediate DAI amount could be swapped using CONTRACT_BALANCE
     /// or settled using CONTRACT_BALANCE then swapped using OPEN_DELTA.
     function _mapInputAmount(uint128 amount, Currency currency) internal view returns (uint128) {
-        if (amount == Constants.CONTRACT_BALANCE) {
+        if (amount == ActionConstants.CONTRACT_BALANCE) {
             return currency.balanceOfSelf().toUint128();
-        } else if (amount == Constants.OPEN_DELTA) {
+        } else if (amount == ActionConstants.OPEN_DELTA) {
             return _getFullCredit(currency).toUint128();
         }
         return amount;

src/libraries/Constants.sol → src/libraries/ActionConstants.sol

@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.19;
 
-library Constants {
+library ActionConstants {
     /// @notice used to signal that an action should use the input value of the open delta on the pool manager
     /// or of the balance that the contract holds
-    uint128 internal constant CONTRACT_BALANCE = 0;
-    uint128 internal constant OPEN_DELTA = 1;
+    uint128 internal constant OPEN_DELTA = 0;
+    /// This value is equivalent to 1<<255, i.e. a singular 1 in the most significant bit.
+    uint256 internal constant CONTRACT_BALANCE = 0x8000000000000000000000000000000000000000000000000000000000000000;
 
     /// @notice used to signal that the recipient of an action should be the msgSender of address(this)
     address internal constant MSG_SENDER = address(1);

test/BaseActionsRouter.t.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.24;
 import {MockBaseActionsRouter} from "./mocks/MockBaseActionsRouter.sol";
 import {Planner, Plan} from "./shared/Planner.sol";
 import {Actions} from "../src/libraries/Actions.sol";
-import {Constants} from "../src/libraries/Constants.sol";
+import {ActionConstants} from "../src/libraries/ActionConstants.sol";
 import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
 import {Test} from "forge-std/Test.sol";
 import {Deployers} from "@uniswap/v4-core/test/utils/Deployers.sol";
@@ -141,9 +141,9 @@ contract BaseActionsRouterTest is Test, Deployers, GasSnapshot {
 
     function test_fuzz_mapRecipient(address recipient) public view {
         address mappedRecipient = router.mapRecipient(recipient);
-        if (recipient == Constants.MSG_SENDER) {
+        if (recipient == ActionConstants.MSG_SENDER) {
             assertEq(mappedRecipient, address(0xdeadbeef));
-        } else if (recipient == Constants.ADDRESS_THIS) {
+        } else if (recipient == ActionConstants.ADDRESS_THIS) {
             assertEq(mappedRecipient, address(router));
         } else {
             assertEq(mappedRecipient, recipient);

test/position-managers/Execute.t.sol

@@ -20,7 +20,7 @@ import {IERC20} from "forge-std/interfaces/IERC20.sol";
 import {IPositionManager} from "../../src/interfaces/IPositionManager.sol";
 import {PositionManager} from "../../src/PositionManager.sol";
 import {PositionConfig} from "../../src/libraries/PositionConfig.sol";
-import {Constants} from "../../src/libraries/Constants.sol";
+import {ActionConstants} from "../../src/libraries/ActionConstants.sol";
 import {Actions} from "../../src/libraries/Actions.sol";
 
 import {LiquidityFuzzers} from "../shared/fuzz/LiquidityFuzzers.sol";
@@ -68,7 +68,7 @@ contract ExecuteTest is Test, PosmTestSetup, LiquidityFuzzers {
         initialLiquidity = bound(initialLiquidity, 1e18, 1000e18);
         liquidityToAdd = bound(liquidityToAdd, 1e18, 1000e18);
         uint256 tokenId = lpm.nextTokenId();
-        mint(config, initialLiquidity, Constants.MSG_SENDER, ZERO_BYTES);
+        mint(config, initialLiquidity, ActionConstants.MSG_SENDER, ZERO_BYTES);
 
         increaseLiquidity(tokenId, config, liquidityToAdd, ZERO_BYTES);
 
@@ -88,7 +88,7 @@ contract ExecuteTest is Test, PosmTestSetup, LiquidityFuzzers {
         liquidityToAdd = bound(liquidityToAdd, 1e18, 1000e18);
         liquidityToAdd2 = bound(liquidityToAdd2, 1e18, 1000e18);
         uint256 tokenId = lpm.nextTokenId();
-        mint(config, initialLiquidity, Constants.MSG_SENDER, ZERO_BYTES);
+        mint(config, initialLiquidity, ActionConstants.MSG_SENDER, ZERO_BYTES);
 
         Plan memory planner = Planner.init();
 
@@ -155,7 +155,12 @@ contract ExecuteTest is Test, PosmTestSetup, LiquidityFuzzers {
         planner.add(
             Actions.MINT_POSITION,
             abi.encode(
-                config, initialLiquidity, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, Constants.MSG_SENDER, ZERO_BYTES
+                config,
+                initialLiquidity,
+                MAX_SLIPPAGE_INCREASE,
+                MAX_SLIPPAGE_INCREASE,
+                ActionConstants.MSG_SENDER,
+                ZERO_BYTES
             )
         );
         planner.add(
@@ -179,7 +184,7 @@ contract ExecuteTest is Test, PosmTestSetup, LiquidityFuzzers {
 
         // mint a position on range [-300, 300]
         uint256 tokenId = lpm.nextTokenId();
-        mint(config, initialLiquidity, Constants.MSG_SENDER, ZERO_BYTES);
+        mint(config, initialLiquidity, ActionConstants.MSG_SENDER, ZERO_BYTES);
         BalanceDelta delta = getLastDelta();
 
         // we'll burn and mint a new position on [-60, 60]; calculate the liquidity units for the new range
@@ -207,7 +212,12 @@ contract ExecuteTest is Test, PosmTestSetup, LiquidityFuzzers {
         planner.add(
             Actions.MINT_POSITION,
             abi.encode(
-                newConfig, newLiquidity, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, Constants.MSG_SENDER, ZERO_BYTES
+                newConfig,
+                newLiquidity,
+                MAX_SLIPPAGE_INCREASE,
+                MAX_SLIPPAGE_INCREASE,
+                ActionConstants.MSG_SENDER,
+                ZERO_BYTES
             )
         );
         bytes memory calls = planner.finalizeModifyLiquidityWithClose(config.poolKey);

test/position-managers/IncreaseLiquidity.t.sol

@@ -28,7 +28,7 @@ import {Actions} from "../../src/libraries/Actions.sol";
 import {Planner, Plan} from "../shared/Planner.sol";
 import {FeeMath} from "../shared/FeeMath.sol";
 import {PosmTestSetup} from "../shared/PosmTestSetup.sol";
-import {Constants} from "../../src/libraries/Constants.sol";
+import {ActionConstants} from "../../src/libraries/ActionConstants.sol";
 
 contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
     using FixedPointMathLib for uint256;
@@ -492,7 +492,7 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
     function test_increaseLiquidity_slippage_revertAmount0() public {
         // increasing liquidity with strict slippage parameters (amount0) will revert
         uint256 tokenId = lpm.nextTokenId();
-        mint(config, 100e18, Constants.MSG_SENDER, ZERO_BYTES);
+        mint(config, 100e18, ActionConstants.MSG_SENDER, ZERO_BYTES);
 
         // revert since amount0Max is too low
         bytes memory calls = getIncreaseEncoded(tokenId, config, 100e18, 1 wei, type(uint128).max, ZERO_BYTES);
@@ -503,7 +503,7 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
     function test_increaseLiquidity_slippage_revertAmount1() public {
         // increasing liquidity with strict slippage parameters (amount1) will revert
         uint256 tokenId = lpm.nextTokenId();
-        mint(config, 100e18, Constants.MSG_SENDER, ZERO_BYTES);
+        mint(config, 100e18, ActionConstants.MSG_SENDER, ZERO_BYTES);
 
         // revert since amount1Max is too low
         bytes memory calls = getIncreaseEncoded(tokenId, config, 100e18, type(uint128).max, 1 wei, ZERO_BYTES);
@@ -514,7 +514,7 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
     function test_increaseLiquidity_slippage_exactDoesNotRevert() public {
         // increasing liquidity with perfect slippage parameters does not revert
         uint256 tokenId = lpm.nextTokenId();
-        mint(config, 100e18, Constants.MSG_SENDER, ZERO_BYTES);
+        mint(config, 100e18, ActionConstants.MSG_SENDER, ZERO_BYTES);
 
         uint128 newLiquidity = 10e18;
         (uint256 amount0, uint256 amount1) = LiquidityAmounts.getAmountsForLiquidity(
@@ -539,7 +539,7 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
     function test_increaseLiquidity_slippage_revert_swap() public {
         // increasing liquidity with perfect slippage parameters does not revert
         uint256 tokenId = lpm.nextTokenId();
-        mint(config, 100e18, Constants.MSG_SENDER, ZERO_BYTES);
+        mint(config, 100e18, ActionConstants.MSG_SENDER, ZERO_BYTES);
 
         uint128 newLiquidity = 10e18;
         (uint256 amount0, uint256 amount1) = LiquidityAmounts.getAmountsForLiquidity(
@@ -567,8 +567,8 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
             Actions.MINT_POSITION,
             abi.encode(config, liquidityAlice, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, alice, ZERO_BYTES)
         );
-        planner.add(Actions.SETTLE, abi.encode(currency0, Constants.OPEN_DELTA, false));
-        planner.add(Actions.SETTLE, abi.encode(currency1, Constants.OPEN_DELTA, false));
+        planner.add(Actions.SETTLE, abi.encode(currency0, ActionConstants.OPEN_DELTA, false));
+        planner.add(Actions.SETTLE, abi.encode(currency1, ActionConstants.OPEN_DELTA, false));
         // this test sweeps to the test contract, even though Alice is the caller of the transaction
         planner.add(Actions.SWEEP, abi.encode(currency0, address(this)));
         planner.add(Actions.SWEEP, abi.encode(currency1, address(this)));
@@ -609,10 +609,10 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
             Actions.MINT_POSITION,
             abi.encode(config, liquidityAlice, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, alice, ZERO_BYTES)
         );
-        planner.add(Actions.SETTLE, abi.encode(currency0, Constants.OPEN_DELTA, false));
-        planner.add(Actions.SETTLE, abi.encode(currency1, Constants.OPEN_DELTA, false));
-        planner.add(Actions.SWEEP, abi.encode(currency0, Constants.MSG_SENDER));
-        planner.add(Actions.SWEEP, abi.encode(currency1, Constants.MSG_SENDER));
+        planner.add(Actions.SETTLE, abi.encode(currency0, ActionConstants.OPEN_DELTA, false));
+        planner.add(Actions.SETTLE, abi.encode(currency1, ActionConstants.OPEN_DELTA, false));
+        planner.add(Actions.SWEEP, abi.encode(currency0, ActionConstants.MSG_SENDER));
+        planner.add(Actions.SWEEP, abi.encode(currency1, ActionConstants.MSG_SENDER));
 
         uint256 balanceBefore0 = currency0.balanceOf(alice);
         uint256 balanceBefore1 = currency1.balanceOf(alice);
@@ -656,8 +656,8 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
             Actions.INCREASE_LIQUIDITY,
             abi.encode(tokenIdAlice, config, liquidityAlice, MAX_SLIPPAGE_INCREASE, MAX_SLIPPAGE_INCREASE, ZERO_BYTES)
         );
-        planner.add(Actions.SETTLE, abi.encode(currency0, Constants.OPEN_DELTA, false));
-        planner.add(Actions.SETTLE, abi.encode(currency1, Constants.OPEN_DELTA, false));
+        planner.add(Actions.SETTLE, abi.encode(currency0, ActionConstants.OPEN_DELTA, false));
+        planner.add(Actions.SETTLE, abi.encode(currency1, ActionConstants.OPEN_DELTA, false));
         // this test sweeps to the test contract, even though Alice is the caller of the transaction
         planner.add(Actions.SWEEP, abi.encode(currency0, address(this)));
         planner.add(Actions.SWEEP, abi.encode(currency1, address(this)));