OZ: Remove contract balance swap input (#286)

* Remove contract balance swap input

* combine take and swap helpers

* remove swap helper function

.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap

@@ -1 +1 @@
-133557
+133206

.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap

@@ -1 +1 @@
-135593
+135242

.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap

@@ -1 +1 @@
-128067
+127716

.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap

@@ -1 +1 @@
-128205
+127854

.forge-snapshots/V4Router_Bytecode.snap

@@ -1 +1 @@
-8454
+8389

.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap

@@ -1 +1 @@
-119572
+119501

.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap

@@ -1 +1 @@
-118767
+118696

.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap

@@ -1 +1 @@
-127639
+127568

.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap

@@ -1 +1 @@
-134469
+134398

.forge-snapshots/V4Router_ExactIn2Hops.snap

@@ -1 +1 @@
-186010
+185939

.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap

@@ -1 +1 @@
-177945
+177874

.forge-snapshots/V4Router_ExactIn3Hops.snap

@@ -1 +1 @@
-237532
+237461

.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap

@@ -1 +1 @@
-229491
+229420

.forge-snapshots/V4Router_ExactInputSingle.snap

@@ -1 +1 @@
-133557
+133206

.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap

@@ -1 +1 @@
-118660
+118309

.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap

@@ -1 +1 @@
-117838
+117482

src/V4Router.sol

@@ -16,6 +16,7 @@ import {BaseActionsRouter} from "./base/BaseActionsRouter.sol";
 import {DeltaResolver} from "./base/DeltaResolver.sol";
 import {Actions} from "./libraries/Actions.sol";
 import {SafeCastTemp} from "./libraries/SafeCast.sol";
+import {ActionConstants} from "./libraries/ActionConstants.sol";
 
 /// @title UniswapV4Router
 /// @notice Abstract contract that contains all internal logic needed for routing through Uniswap V4 pools
@@ -79,8 +80,11 @@ abstract contract V4Router is IV4Router, BaseActionsRouter, DeltaResolver {
     }
 
     function _swapExactInputSingle(IV4Router.ExactInputSingleParams calldata params) private {
-        uint128 amountIn =
-            _mapInputAmount(params.amountIn, params.zeroForOne ? params.poolKey.currency0 : params.poolKey.currency1);
+        uint128 amountIn = params.amountIn;
+        if (amountIn == ActionConstants.OPEN_DELTA) {
+            amountIn =
+                _getFullCredit(params.zeroForOne ? params.poolKey.currency0 : params.poolKey.currency1).toUint128();
+        }
         uint128 amountOut = _swap(
             params.poolKey, params.zeroForOne, int256(-int128(amountIn)), params.sqrtPriceLimitX96, params.hookData
         ).toUint128();
@@ -93,7 +97,8 @@ abstract contract V4Router is IV4Router, BaseActionsRouter, DeltaResolver {
             uint256 pathLength = params.path.length;
             uint128 amountOut;
             Currency currencyIn = params.currencyIn;
-            uint128 amountIn = _mapInputAmount(params.amountIn, currencyIn);
+            uint128 amountIn = params.amountIn;
+            if (amountIn == ActionConstants.OPEN_DELTA) amountIn = _getFullCredit(currencyIn).toUint128();
             PathKey calldata pathKey;
 
             for (uint256 i = 0; i < pathLength; i++) {

src/base/DeltaResolver.sol

@@ -86,18 +86,4 @@ abstract contract DeltaResolver is ImmutableState {
         }
         return amount;
     }
-
-    /// @notice Calculates the amount for a swap action
-    /// @dev This is to be used for swaps where the input amount isn't known before the transaction, and
-    /// isn't possible using a v4 multi-hop command.
-    /// 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 == ActionConstants.CONTRACT_BALANCE) {
-            return currency.balanceOfSelf().toUint128();
-        } else if (amount == ActionConstants.OPEN_DELTA) {
-            return _getFullCredit(currency).toUint128();
-        }
-        return amount;
-    }
 }

src/libraries/ActionConstants.sol

@@ -5,6 +5,7 @@ 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 OPEN_DELTA = 0;
+    /// @notice used to signal that an action should use the contract's entire balance of a currency
     /// This value is equivalent to 1<<255, i.e. a singular 1 in the most significant bit.
     uint256 internal constant CONTRACT_BALANCE = 0x8000000000000000000000000000000000000000000000000000000000000000;