Merge pull request #425 from superform-xyz/SUP-5103

fix: LIFI validator [SUP-5007, SUP-5103]
superform-xyz · Jan 16, 2024 · dbb3385 · dbb3385
2 parents cb87167 + d5fcf36
commit dbb3385
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 7 deletions.
diff --git a/src/crosschain-liquidity/lifi/LiFiValidator.sol b/src/crosschain-liquidity/lifi/LiFiValidator.sol
@@ -13,7 +13,6 @@ import { GenericSwapFacet } from "src/vendor/lifi/GenericSwapFacet.sol";
 /// @dev Asserts LiFi input txData is valid
 /// @author Zeropoint Labs
 contract LiFiValidator is BridgeValidator, LiFiTxDataExtractor {
-
     //////////////////////////////////////////////////////////////
     //                      CONSTRUCTOR                         //
     //////////////////////////////////////////////////////////////
@@ -98,6 +97,12 @@ contract LiFiValidator is BridgeValidator, LiFiTxDataExtractor {
         bytes4 selector = _extractSelector(txData_);
         if (selector == GenericSwapFacet.swapTokensGeneric.selector) {
             (token_, amount_,,,) = extractGenericSwapParameters(txData_);
+
+            /// @dev remap of address 0 to NATIVE because of how LiFi produces txData
+            if (token_ == address(0)) {
+                token_ = NATIVE;
+            }
+
             return (token_, amount_);
         } else {
             revert Error.INVALID_ACTION();
@@ -256,6 +261,7 @@ contract LiFiValidator is BridgeValidator, LiFiTxDataExtractor {
         if (sendingAssetId == address(0)) {
             sendingAssetId = NATIVE;
         }
+
         /// @dev 3. token validations
         if (args_.liqDataToken != sendingAssetId) revert Error.INVALID_TXDATA_TOKEN();
 

diff --git a/src/vendor/lifi/LiFiTxDataExtractor.sol b/src/vendor/lifi/LiFiTxDataExtractor.sol
@@ -122,7 +122,10 @@ contract LiFiTxDataExtractor {
             (bridgeData, stargateData) =
                 abi.decode(_slice(callData, 4, callData.length - 4), (ILiFi.BridgeData, StargateFacet.StargateData));
 
-            receiver = abi.decode(stargateData.callTo, (address));
+            bytes memory to = stargateData.callTo;
+            assembly {
+                receiver := mload(add(to, 20))
+            }
 
             return (bridgeData, receiver);
         }
@@ -132,8 +135,10 @@ contract LiFiTxDataExtractor {
                 _slice(callData, 4, callData.length - 4),
                 (ILiFi.BridgeData, LibSwap.SwapData[], StargateFacet.StargateData)
             );
-            receiver = abi.decode(stargateData.callTo, (address));
-
+            bytes memory to = stargateData.callTo;
+            assembly {
+                receiver := mload(add(to, 20))
+            }
             return (bridgeData, receiver);
         }
 
@@ -143,7 +148,7 @@ contract LiFiTxDataExtractor {
             (bridgeData, celerIMData) =
                 abi.decode(_slice(callData, 4, callData.length - 4), (ILiFi.BridgeData, CelerIM.CelerIMData));
 
-            receiver = abi.decode(celerIMData.callTo, (address));
+            receiver = bridgeData.receiver;
 
             return (bridgeData, receiver);
         }
@@ -153,7 +158,7 @@ contract LiFiTxDataExtractor {
             (bridgeData,, celerIMData) = abi.decode(
                 _slice(callData, 4, callData.length - 4), (ILiFi.BridgeData, LibSwap.SwapData[], CelerIM.CelerIMData)
             );
-            receiver = abi.decode(celerIMData.callTo, (address));
+            receiver = bridgeData.receiver;
 
             return (bridgeData, receiver);
         }