change typehashes to be EIP712 compliant

derivexyz · Nov 16, 2023 · b243008 · b243008
1 parent 444b035
commit b243008
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/lib/lyra-utils b/lib/lyra-utils
diff --git a/src/libraries/PermitAllowanceLib.sol b/src/libraries/PermitAllowanceLib.sol
@@ -9,15 +9,15 @@ import {IAllowances} from "../interfaces/IAllowances.sol";
  * @notice hash function for PermitAllowance object
  */
 library PermitAllowanceLib {
-  bytes32 public constant _PERMIT_ALLOWANCE_TYPEHASH = keccak256(
-    "PermitAllowance(address delegate,uint256 nonce,uint256 accountId,uint256 deadline,AssetAllowance[] assetAllowances,SubIdAllowance[] subIdAllowances)"
+  bytes32 public constant PERMIT_ALLOWANCE_TYPEHASH = keccak256(
+    "PermitAllowance(address delegate,uint256 nonce,uint256 accountId,uint256 deadline,(address asset,uint256 positive,uint256 negative)[] assetAllowances,(address asset,uint256 subId,uint256 positive,uint256 negative)[] subIdAllowances)"
   );
 
-  bytes32 public constant _ASSET_ALLOWANCE_TYPEHASH =
-    keccak256("AssetAllowance(address delegate,uint256 positive,uint256 negative)");
+  bytes32 public constant ASSET_ALLOWANCE_TYPEHASH =
+    keccak256("AssetAllowance(address asset,uint256 positive,uint256 negative)");
 
-  bytes32 public constant _SUBID_ALLOWANCE_TYPEHASH =
-    keccak256("SubIdAllowance(address delegate,uint256 subId,uint256 positive,uint256 negative)");
+  bytes32 public constant SUBID_ALLOWANCE_TYPEHASH =
+    keccak256("SubIdAllowance(address asset,uint256 subId,uint256 positive,uint256 negative)");
 
   /**
    * @dev hash the permit struct
@@ -41,7 +41,7 @@ library PermitAllowanceLib {
 
     return keccak256(
       abi.encode(
-        _PERMIT_ALLOWANCE_TYPEHASH,
+        PERMIT_ALLOWANCE_TYPEHASH,
         permit.delegate,
         permit.nonce,
         permit.accountId,
@@ -53,10 +53,10 @@ library PermitAllowanceLib {
   }
 
   function _hashAssetAllowance(IAllowances.AssetAllowance memory allowance) private pure returns (bytes32) {
-    return keccak256(abi.encode(_ASSET_ALLOWANCE_TYPEHASH, allowance));
+    return keccak256(abi.encode(ASSET_ALLOWANCE_TYPEHASH, allowance));
   }
 
   function _hashSubIdAllowance(IAllowances.SubIdAllowance memory allowance) private pure returns (bytes32) {
-    return keccak256(abi.encode(_SUBID_ALLOWANCE_TYPEHASH, allowance));
+    return keccak256(abi.encode(SUBID_ALLOWANCE_TYPEHASH, allowance));
   }
 }
diff --git a/test/feed/unit-tests/LyraForwardFeed.t.sol b/test/feed/unit-tests/LyraForwardFeed.t.sol
@@ -268,7 +268,7 @@ contract UNIT_LyraForwardFeed is LyraFeedTestUtils {
     feed.acceptData(data);
   }
 
-  function testEncodeFwdFeedData() public {
+  function testEncodeFwdFeedData() public view {
     uint64 expiry_ = 1698998400;
     uint settlementStartAggregate_ = 1;
     uint currentSpotAggregate_ = 3211595747743195673395200;