From ac1d68e4ab2a9d3014ecd8631162ddbc2355fd39 Mon Sep 17 00:00:00 2001
From: Alan Wu <60207036+alanhwu@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:57:19 -0500
Subject: [PATCH] fix: EIP-712 nested types hash (#281)

* fix: EIP-712 nested types hash

* style: lint

* test: assert eip 712 type hashes
---
 src/lib/V3DutchOrderLib.sol |  6 +++--
 test/lib/EIP712.t.sol       | 46 +++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 test/lib/EIP712.t.sol

diff --git a/src/lib/V3DutchOrderLib.sol b/src/lib/V3DutchOrderLib.sol
index 41798218..8350cadd 100644
--- a/src/lib/V3DutchOrderLib.sol
+++ b/src/lib/V3DutchOrderLib.sol
@@ -95,7 +95,8 @@ library V3DutchOrderLib {
         "uint256 maxAmount,",
         "uint256 adjustmentPerGweiBaseFee)"
     );
-    bytes32 internal constant V3_DUTCH_INPUT_TYPE_HASH = keccak256(V3_DUTCH_INPUT_TYPE);
+    bytes32 internal constant V3_DUTCH_INPUT_TYPE_HASH =
+        keccak256(abi.encodePacked(V3_DUTCH_INPUT_TYPE, NON_LINEAR_DECAY_TYPE));
     bytes internal constant V3_DUTCH_OUTPUT_TYPE = abi.encodePacked(
         "V3DutchOutput(",
         "address token,",
@@ -105,7 +106,8 @@ library V3DutchOrderLib {
         "uint256 minAmount,",
         "uint256 adjustmentPerGweiBaseFee)"
     );
-    bytes32 internal constant V3_DUTCH_OUTPUT_TYPE_HASH = keccak256(V3_DUTCH_OUTPUT_TYPE);
+    bytes32 internal constant V3_DUTCH_OUTPUT_TYPE_HASH =
+        keccak256(abi.encodePacked(V3_DUTCH_OUTPUT_TYPE, NON_LINEAR_DECAY_TYPE));
     bytes internal constant NON_LINEAR_DECAY_TYPE =
         abi.encodePacked("NonlinearDutchDecay(", "uint256 relativeBlocks,", "int256[] relativeAmounts)");
     bytes32 internal constant NON_LINEAR_DECAY_TYPE_HASH = keccak256(NON_LINEAR_DECAY_TYPE);
diff --git a/test/lib/EIP712.t.sol b/test/lib/EIP712.t.sol
new file mode 100644
index 00000000..2b74e690
--- /dev/null
+++ b/test/lib/EIP712.t.sol
@@ -0,0 +1,46 @@
+import {Test} from "forge-std/Test.sol";
+import {NonlinearDutchDecay, V3DutchOrderLib, V3DutchOutput} from "../../src/lib/V3DutchOrderLib.sol";
+
+contract EIP712Test is Test {
+    function test_NonlinearDutchDecayHash() public pure {
+        assertEq(
+            V3DutchOrderLib.NON_LINEAR_DECAY_TYPE_HASH,
+            hex"30c39ae6ecb284279579f99803ba5d7b54275a8a6a04180056b5031b8c19a01a"
+        );
+
+        int256[] memory amounts = new int256[](1);
+        amounts[0] = 1;
+        NonlinearDutchDecay memory curve = NonlinearDutchDecay(1, amounts);
+        assertEq(V3DutchOrderLib.hash(curve), hex"ad28931e960b684a49cdf1aca21bd966df5bac39996c5a0615c0a54f2f22a06f");
+    }
+
+    function test_V3DutchInputHash() public pure {
+        assertEq(
+            V3DutchOrderLib.V3_DUTCH_INPUT_TYPE_HASH,
+            hex"2cc4ccc271072d8b406616a16a6e9a3935dea10f0eb920f44737e1855ecc68eb"
+        );
+    }
+
+    function test_V3DutchOutputHash() public pure {
+        assertEq(
+            V3DutchOrderLib.V3_DUTCH_OUTPUT_TYPE_HASH,
+            hex"7fd857ffad1736e72f90e17c9d15cabe562b86b45c6e618ae0e7fa92c4a6fde9"
+        );
+
+        address token = address(0);
+        uint256 startAmount = 21;
+        int256[] memory amounts = new int256[](1);
+        amounts[0] = 1;
+        NonlinearDutchDecay memory curve = NonlinearDutchDecay(1, amounts);
+        address recipient = address(0);
+        uint256 minAmount = 20;
+        uint256 adjustmentPerGweiBaseFee = 0;
+        V3DutchOutput memory output =
+            V3DutchOutput(token, startAmount, curve, recipient, minAmount, adjustmentPerGweiBaseFee);
+        assertEq(V3DutchOrderLib.hash(output), hex"c57ac5e0436939ec593af412dde4a05d4972a0a8a56bbdb63ca7cd949c5326e2");
+    }
+
+    function test_OrderTypeHash() public pure {
+        assertEq(V3DutchOrderLib.ORDER_TYPE_HASH, hex"186c8af0344af94faab60c9dc413f68b8ca7aea1aded04a300c7fa35562ed1b7");
+    }
+}