Fix V3 Serialization (#276)

* Add input to serialization * Correct ordering * fmt
Uniswap · Sep 25, 2024 · 278d265 · 278d265
1 parent 062b516
commit 278d265
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 23 deletions.
diff --git a/.forge-snapshots/Base-V3DutchOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-V3DutchOrder-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-198132
+198780
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-229797
+231116
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-243298
+244626
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-300708
+302041
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-223323
+224642
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingle.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingle.snap
@@ -1 +1 @@
-164517
+165165
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-150079
+150727
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleValidation.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleValidation.snap
@@ -1 +1 @@
-173829
+174481
diff --git a/.forge-snapshots/Base-V3DutchOrder-RevertInvalidNonce.snap b/.forge-snapshots/Base-V3DutchOrder-RevertInvalidNonce.snap
@@ -1 +1 @@
-43133
+43785
diff --git a/.forge-snapshots/Base-V3DutchOrder-V3-ExclusiveFiller.snap b/.forge-snapshots/Base-V3DutchOrder-V3-ExclusiveFiller.snap
@@ -1 +1 @@
-168443
+169089
diff --git a/.forge-snapshots/Base-V3DutchOrder-V3-InputOverride.snap b/.forge-snapshots/Base-V3DutchOrder-V3-InputOverride.snap
@@ -1 +1 @@
-168524
+169170
diff --git a/.forge-snapshots/Base-V3DutchOrder-V3-OutputOverride.snap b/.forge-snapshots/Base-V3DutchOrder-V3-OutputOverride.snap
@@ -1 +1 @@
-168467
+169113
diff --git a/.forge-snapshots/V3-DutchDecay.snap b/.forge-snapshots/V3-DutchDecay.snap
@@ -1 +1 @@
-20920
+13179
diff --git a/.forge-snapshots/V3-DutchDecayBounded.snap b/.forge-snapshots/V3-DutchDecayBounded.snap
@@ -1 +1 @@
-1209
+1199
diff --git a/.forge-snapshots/V3-DutchDecayFullyDecayed.snap b/.forge-snapshots/V3-DutchDecayFullyDecayed.snap
@@ -1 +1 @@
-11797
+6677
diff --git a/.forge-snapshots/V3-DutchDecayFullyDecayedNegative.snap b/.forge-snapshots/V3-DutchDecayFullyDecayedNegative.snap
@@ -1 +1 @@
-11485
+6365
diff --git a/.forge-snapshots/V3-ExtendedMultiPointDutchDecay.snap b/.forge-snapshots/V3-ExtendedMultiPointDutchDecay.snap
@@ -1 +1 @@
-209206
+88354
diff --git a/.forge-snapshots/V3-LocateCurvePositionMulti.snap b/.forge-snapshots/V3-LocateCurvePositionMulti.snap
@@ -1 +1 @@
-40525
+20492
diff --git a/.forge-snapshots/V3-LocateCurvePositionSingle.snap b/.forge-snapshots/V3-LocateCurvePositionSingle.snap
@@ -1 +1 @@
-12623
+6860
diff --git a/.forge-snapshots/V3-MultiPointDutchDecay.snap b/.forge-snapshots/V3-MultiPointDutchDecay.snap
@@ -1 +1 @@
-48878
+26242
diff --git a/src/lib/V3DutchOrderLib.sol b/src/lib/V3DutchOrderLib.sol
@@ -110,8 +110,13 @@ library V3DutchOrderLib {
         abi.encodePacked("NonlinearDutchDecay(", "uint256 relativeBlocks,", "int256[] relativeAmounts)");
     bytes32 internal constant NON_LINEAR_DECAY_TYPE_HASH = keccak256(NON_LINEAR_DECAY_TYPE);
 
-    bytes internal constant ORDER_TYPE =
-        abi.encodePacked(NON_LINEAR_DECAY_TYPE, V3_DUTCH_ORDER_TYPE, V3_DUTCH_OUTPUT_TYPE, OrderInfoLib.ORDER_INFO_TYPE);
+    bytes internal constant ORDER_TYPE = abi.encodePacked(
+        NON_LINEAR_DECAY_TYPE,
+        V3_DUTCH_INPUT_TYPE,
+        V3_DUTCH_ORDER_TYPE,
+        V3_DUTCH_OUTPUT_TYPE,
+        OrderInfoLib.ORDER_INFO_TYPE
+    );
     bytes32 internal constant ORDER_TYPE_HASH = keccak256(ORDER_TYPE);
 
     /// @dev Note that sub-structs have to be defined in alphabetical order in the EIP-712 spec

diff --git a/src/types/Uint16Array.sol b/src/types/Uint16Array.sol
@@ -31,7 +31,7 @@ function toUint16Array(uint16[] memory inputArray) pure returns (Uint16Array uin
 
 library Uint16ArrayLibrary {
     // Retrieve the nth uint16 value from a packed uint256
-    function getElement(Uint16Array packedData, uint256 n) public pure returns (uint16) {
+    function getElement(Uint16Array packedData, uint256 n) internal pure returns (uint16) {
         if (n >= 16) {
             revert IndexOutOfBounds();
         }