Fix 712 hashing and comments

Uniswap · Feb 12, 2024 · b537664 · b537664
1 parent 7f462fb
commit b537664
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 26 deletions.
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecute-ClassicSwap.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecute-ClassicSwap.snap
@@ -1 +1 @@
-141167
+141162
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecute.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecute.snap
@@ -1 +1 @@
-237967
+237972
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteAverageCase-ClassicSwap.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteAverageCase-ClassicSwap.snap
@@ -1 +1 @@
-139163
+139167
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteAverageCase.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteAverageCase.snap
@@ -1 +1 @@
-187174
+187172
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteSameToken-ClassicSwap.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteSameToken-ClassicSwap.snap
@@ -1 +1 @@
-141162
+141167
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteSameToken.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteSameToken.snap
@@ -1 +1 @@
-180198
+180193
diff --git a/...snapshots/RelayOrderReactorIntegrationTest-testExecuteWithNativeAsOutput-ClassicSwap.snap b/...snapshots/RelayOrderReactorIntegrationTest-testExecuteWithNativeAsOutput-ClassicSwap.snap
@@ -1 +1 @@
-160343
+160342
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteWithNativeAsOutput.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteWithNativeAsOutput.snap
@@ -1 +1 @@
-267169
+267168
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteWorstCase-ClassicSwap.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteWorstCase-ClassicSwap.snap
@@ -1 +1 @@
-158661
+158666
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testPermitAndExecute-ClassicSwap.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testPermitAndExecute-ClassicSwap.snap
@@ -1 +1 @@
-154377
+154371
diff --git a/src/lib/FeeEscalatorLib.sol b/src/lib/FeeEscalatorLib.sol
@@ -12,16 +12,16 @@ library FeeEscalatorLib {
     bytes32 internal constant FEE_ESCALATOR_TYPEHASH =
         keccak256("FeeEscalator(address token,uint256 startAmount,uint256 maxAmount,uint256 startTime,uint256 endTime)");
 
-    /// @notice Transforms the input data into the TokenPermissions struct needed for the permit call.
+    /// @notice Transforms the fee data into a TokenPermissions struct needed for the permit call.
     function toPermit(FeeEscalator memory fee)
         internal
         pure
         returns (ISignatureTransfer.TokenPermissions memory permission)
     {
         permission = ISignatureTransfer.TokenPermissions({token: fee.token, amount: fee.maxAmount});
     }
-    /// @notice Handles transforming the input data into the the decayed amounts and respective recipients.
 
+    /// @notice Handles transforming the fee data into the the resolved amounts and respective recipients.
     function toTransferDetails(FeeEscalator memory fee, address feeRecipient)
         internal
         view

diff --git a/src/lib/RelayOrderLib.sol b/src/lib/RelayOrderLib.sol
@@ -26,7 +26,7 @@ library RelayOrderLib {
         "RelayOrder(",
         "address reactor,",
         "address swapper,",
-        "uint256[] startAmounts,",
+        "uint256[] amounts,",
         "address[] recipients,",
         "FeeEscalator fee,",
         "bytes[] actions)"
@@ -108,17 +108,17 @@ library RelayOrderLib {
 
     /// @notice hash the given order
     /// @param order the order to hash
-    /// @dev We do not hash the entire Input struct as only some of the input information is required in the witness (recipients, and startAmounts). The token and maxAmount are already hashed in the TokenPermissions struct of the permit.
+    /// @dev We do not hash the entire Input struct as only some of the input information is required in the witness (recipients, and amounts). The token and maxAmount are already hashed in the TokenPermissions struct of the permit.
     /// @return the eip-712 order hash
     function hash(RelayOrder memory order) internal pure returns (bytes32) {
         uint256 inputsLength = order.inputs.length;
-        // Build an array for the startAmounts and recipients.
-        uint256[] memory startAmounts = new uint256[](inputsLength);
+        // Build an array for the input amounts and recipients.
+        uint256[] memory amounts = new uint256[](inputsLength);
         address[] memory recipients = new address[](inputsLength);
 
         for (uint256 i = 0; i < inputsLength; i++) {
             Input memory input = order.inputs[i];
-            startAmounts[i] = input.amount;
+            amounts[i] = input.amount;
             recipients[i] = input.recipient;
         }
 
@@ -134,7 +134,7 @@ library RelayOrderLib {
                 RELAY_ORDER_TYPEHASH,
                 order.info.reactor,
                 order.info.swapper,
-                keccak256(abi.encodePacked(startAmounts)),
+                keccak256(abi.encodePacked(amounts)),
                 keccak256(abi.encodePacked(recipients)),
                 order.fee.hash(),
                 keccak256(abi.encodePacked(hashedActions))

diff --git a/test/foundry-tests/integration/RelayOrderReactorIntegration.t.sol b/test/foundry-tests/integration/RelayOrderReactorIntegration.t.sol
@@ -252,13 +252,6 @@ contract RelayOrderReactorIntegrationTest is GasSnapshot, Test, Interop, PermitS
         MethodParameters memory methodParameters = readFixture(json, "._UNISWAP_V3_DAI_USDC");
         actions[0] = methodParameters.data;
 
-        OrderInfo memory info = OrderInfo({
-            reactor: IRelayOrderReactor(address(reactor)),
-            swapper: swapper,
-            nonce: 1,
-            deadline: block.timestamp + 100
-        });
-
         OrderInfo memory orderInfo = OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(
             block.timestamp + 100
         ).withNonce(1);

diff --git a/test/foundry-tests/util/RelayOrderBuilder.sol b/test/foundry-tests/util/RelayOrderBuilder.sol
@@ -13,7 +13,7 @@ library RelayOrderBuilder {
 
     function init(OrderInfo memory info, Input[] memory inputs, FeeEscalator memory fee)
         internal
-        view
+        pure
         returns (RelayOrder memory)
     {
         return RelayOrder({info: info, inputs: inputs, fee: fee, actions: new bytes[](0)});