Merge pull request #28 from Ion-Protocol/jun/seiyanETH-decoder

seiyanETH Decoder
Ion-Protocol · Oct 2, 2024 · 030dd4c · 030dd4c
2 parents 5721dcc + 9234795
commit 030dd4c
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 62 deletions.
diff --git a/src/base/DecodersAndSanitizers/BaseDecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/BaseDecoderAndSanitizer.sol
@@ -5,6 +5,8 @@ pragma solidity 0.8.21;
 import { DecoderCustomTypes } from "src/interfaces/DecoderCustomTypes.sol";
 
 contract BaseDecoderAndSanitizer {
+    error NotVault();
+
     //============================== IMMUTABLES ===============================
 
     /**

diff --git a/src/base/DecodersAndSanitizers/LayerZeroOFTDecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/LayerZeroOFTDecoderAndSanitizer.sol
@@ -5,11 +5,8 @@ import { BaseDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/BaseDeco
 import { SendParam } from "@layerzerolabs/oft-evm/contracts/interfaces/IOFT.sol";
 import { MessagingFee } from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
 
-contract LayerZeroOFTDecoderAndSanitizer is BaseDecoderAndSanitizer {
+abstract contract LayerZeroOFTDecoderAndSanitizer is BaseDecoderAndSanitizer {
     error LayerZeroOFTDecoderAndSanitizer_ComposedMsgNotSupported();
-    error LayerZeroOFTDecoderAndSanitizer_NotVault();
-
-    constructor(address _boringVault) BaseDecoderAndSanitizer(_boringVault) { }
 
     /**
      * @dev _sendParam:
@@ -19,7 +16,8 @@ contract LayerZeroOFTDecoderAndSanitizer is BaseDecoderAndSanitizer {
      *     uint256 minAmountLD; // Minimum amount to send in local decimals.
      *     bytes extraOptions; // Additional options supplied by the caller to be used in the LayerZero message.
      *     bytes composeMsg; // The composed message for the send() operation.                                     [NONE]
-     *     bytes oftCmd; // The OFT command to be executed, unused in default OFT implementations.                 [NONE]
+     *     bytes oftCmd; // The OFT command to be executed, unused in default OFT implementations. 0 for Taxi (faster,
+     * expensive) 1 for Bus (slower, cheaper)
      * @dev _fee:
      *     uint256 nativeFee;
      *     uint256 lzTokenFee;
@@ -33,8 +31,8 @@ contract LayerZeroOFTDecoderAndSanitizer is BaseDecoderAndSanitizer {
         view
         returns (bytes memory)
     {
-        if (bytes32ToAddress(_sendParam.to) != boringVault) {
-            revert LayerZeroOFTDecoderAndSanitizer_NotVault();
+        if (bytes32ToAddress(_sendParam.to) != boringVault || refundReceiver != boringVault) {
+            revert NotVault();
         }
         if (_sendParam.composeMsg.length > 0) {
             revert LayerZeroOFTDecoderAndSanitizer_ComposedMsgNotSupported();

diff --git a/src/base/DecodersAndSanitizers/Protocols/CurveDecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/Protocols/CurveDecoderAndSanitizer.sol
@@ -29,7 +29,10 @@ abstract contract CurveDecoderAndSanitizer is BaseDecoderAndSanitizer {
         return addressesFound;
     }
 
-    function deposit(uint256, address receiver) external pure virtual returns (bytes memory addressesFound) {
+    function deposit(uint256, address receiver) external view virtual returns (bytes memory addressesFound) {
+        if (receiver != boringVault) {
+            revert NotVault();
+        }
         addressesFound = abi.encodePacked(receiver);
     }
 

diff --git a/src/base/DecodersAndSanitizers/Protocols/ERC4626DecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/Protocols/ERC4626DecoderAndSanitizer.sol
@@ -6,11 +6,17 @@ import { BaseDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/BaseDeco
 abstract contract ERC4626DecoderAndSanitizer is BaseDecoderAndSanitizer {
     //============================== ERC4626 ===============================
 
-    function deposit(uint256, address receiver) external pure virtual returns (bytes memory addressesFound) {
+    function deposit(uint256, address receiver) external view virtual returns (bytes memory addressesFound) {
+        if (receiver != boringVault) {
+            revert NotVault();
+        }
         addressesFound = abi.encodePacked(receiver);
     }
 
-    function mint(uint256, address receiver) external pure virtual returns (bytes memory addressesFound) {
+    function mint(uint256, address receiver) external view virtual returns (bytes memory addressesFound) {
+        if (receiver != boringVault) {
+            revert NotVault();
+        }
         addressesFound = abi.encodePacked(receiver);
     }
 
@@ -20,10 +26,13 @@ abstract contract ERC4626DecoderAndSanitizer is BaseDecoderAndSanitizer {
         address owner
     )
         external
-        pure
+        view
         virtual
         returns (bytes memory addressesFound)
     {
+        if (receiver != boringVault) {
+            revert NotVault();
+        }
         addressesFound = abi.encodePacked(receiver, owner);
     }
 
@@ -33,10 +42,13 @@ abstract contract ERC4626DecoderAndSanitizer is BaseDecoderAndSanitizer {
         address owner
     )
         external
-        pure
+        view
         virtual
         returns (bytes memory addressesFound)
     {
+        if (receiver != boringVault) {
+            revert NotVault();
+        }
         addressesFound = abi.encodePacked(receiver, owner);
     }
 }
diff --git a/src/base/DecodersAndSanitizers/Protocols/NativeWrapperDecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/Protocols/NativeWrapperDecoderAndSanitizer.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.21;
 import { BaseDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/BaseDecoderAndSanitizer.sol";
 
 abstract contract NativeWrapperDecoderAndSanitizer is BaseDecoderAndSanitizer {
-    //============================== ETHERFI ===============================
+    //============================== WETH/ETHERFI ===============================
 
     function deposit() external pure virtual returns (bytes memory addressesFound) {
         // Nothing to sanitize or return

diff --git a/src/base/DecodersAndSanitizers/Protocols/PirexEthDecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/Protocols/PirexEthDecoderAndSanitizer.sol
@@ -5,6 +5,9 @@ import { BaseDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/BaseDeco
 
 abstract contract PirexEthDecoderAndSanitizer is BaseDecoderAndSanitizer {
     function deposit(address receiver, bool) external returns (bytes memory) {
+        if (receiver != boringVault) {
+            revert NotVault();
+        }
         return abi.encodePacked(receiver);
     }
 }
diff --git a/src/base/DecodersAndSanitizers/SeiyanEthRebalanceDecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/SeiyanEthRebalanceDecoderAndSanitizer.sol
@@ -2,16 +2,49 @@
 pragma solidity 0.8.21;
 
 import { BaseDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/BaseDecoderAndSanitizer.sol";
-import { ERC4626DecoderAndSanitizer } from "src/base/DecodersAndSanitizers/Protocols/ERC4626DecoderAndSanitizer.sol";
 import { PirexEthDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/Protocols/PirexEthDecoderAndSanitizer.sol";
+import { LayerZeroOFTDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/LayerZeroOFTDecoderAndSanitizer.sol";
 import { NativeWrapperDecoderAndSanitizer } from
     "src/base/DecodersAndSanitizers/Protocols/NativeWrapperDecoderAndSanitizer.sol";
+import { ERC4626DecoderAndSanitizer } from "src/base/DecodersAndSanitizers/Protocols/ERC4626DecoderAndSanitizer.sol";
+import { CurveDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/Protocols/CurveDecoderAndSanitizer.sol";
 
 contract SeiyanEthRebalanceDecoderAndSanitizer is
     BaseDecoderAndSanitizer,
-    ERC4626DecoderAndSanitizer,
     PirexEthDecoderAndSanitizer,
-    NativeWrapperDecoderAndSanitizer
+    LayerZeroOFTDecoderAndSanitizer,
+    NativeWrapperDecoderAndSanitizer,
+    ERC4626DecoderAndSanitizer,
+    CurveDecoderAndSanitizer
 {
     constructor(address _boringVault) BaseDecoderAndSanitizer(_boringVault) { }
+
+    function deposit(
+        uint256,
+        address receiver
+    )
+        external
+        view
+        override(CurveDecoderAndSanitizer, ERC4626DecoderAndSanitizer)
+        returns (bytes memory addressesFound)
+    {
+        if (receiver != boringVault) {
+            revert NotVault();
+        }
+        addressesFound = abi.encodePacked(receiver);
+    }
+
+    /**
+     * @notice Curve and WETH both specifies a `withdraw(uint256)`, but all
+     * cases are handled the same way.
+     */
+    function withdraw(uint256)
+        external
+        pure
+        override(CurveDecoderAndSanitizer, NativeWrapperDecoderAndSanitizer)
+        returns (bytes memory addressesFound)
+    {
+        // Nothing to sanitize or return
+        return addressesFound;
+    }
 }
diff --git a/src/base/DecodersAndSanitizers/StargateV2DecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/StargateV2DecoderAndSanitizer.sol