feat: add callback in LiFiDEXAggregator [LiFiDEXAggregator v1.5.0]

config/dexs.json

@@ -298,7 +298,8 @@
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
     "0x70D6cFE9146D6B6ebEb88BcB22fa220E78058D6F",
     "0x11d40Dc8Ff0CE92F54A315aD8e674a55a866cBEe",
-    "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55"
+    "0xf2614A233c7C3e7f08b1F887Ba133a13f1eb2c55",
+    "0xf88F6948C8AFf60c0B011f3175CDF459c66Ed035"
   ],
   "evmos": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -415,8 +416,8 @@
   "fraxtal": [
     "0x7956280Ec4B4d651C4083Ca737a1fa808b5319D8",
     "0x9870F0C91D722B3393383722968269496d919bD8",
-    "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
-    "0xC82fd49be3F3D851b9E10589C50784cEAC7114a5"
+    "0xC82fd49be3F3D851b9E10589C50784cEAC7114a5",
+    "0xE38621607316cB43367c134C65dca3f41B61250f"
   ],
   "harmony": [
     "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6",
@@ -482,7 +483,7 @@
     "0xf3552b98BB4234B47674700A99a0308D74B40F51",
     "0xF2ee649caB7a0edEdED7a27821B0aCDF77778aeD",
     "0x0263180888007D45340F86eC0b610d250BbDcB23",
-    "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
+    "0xEcf953290D36fA96236356e171044DC802EeC598",
     "0x6131b5fae19ea4f9d964eac0408e4408b66337b5"
   ],
   "metis": [
@@ -706,7 +707,7 @@
     "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
     "0x7956280Ec4B4d651C4083Ca737a1fa808b5319D8",
     "0x9870F0C91D722B3393383722968269496d919bD8",
-    "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
+    "0xfdE9CE4e17B650efdcA13d524F132876700d806f",
     "0xC82fd49be3F3D851b9E10589C50784cEAC7114a5"
   ],
   "scroll": [

deployments/_deployments_log_file.json

@@ -23114,6 +23114,16 @@
             "SALT": "",
             "VERIFIED": "false"
           }
+        ],
+        "1.2.0": [
+          {
+            "ADDRESS": "0xfdE9CE4e17B650efdcA13d524F132876700d806f",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-10-17 07:16:41",
+            "CONSTRUCTOR_ARGS": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000003b6211981d47fb6375e0125a6a401830616f7906",
+            "SALT": "20241016",
+            "VERIFIED": "true"
+          }
         ]
       }
     },
@@ -23128,6 +23138,16 @@
             "SALT": "",
             "VERIFIED": "true"
           }
+        ],
+        "1.3.0": [
+          {
+            "ADDRESS": "0xEcf953290D36fA96236356e171044DC802EeC598",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-11-08 06:54:16",
+            "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
         ]
       }
     },
@@ -23184,6 +23204,16 @@
             "SALT": "",
             "VERIFIED": "true"
           }
+        ],
+        "1.1.0": [
+          {
+            "ADDRESS": "0xE38621607316cB43367c134C65dca3f41B61250f",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-10-11 15:46:23",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d38743b48d26743c0ec6898d699394fbc94657ee",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
         ]
       }
     },
@@ -23450,6 +23480,16 @@
             "SALT": "",
             "VERIFIED": "true"
           }
+        ],
+        "1.4.0": [
+          {
+            "ADDRESS": "0xf88F6948C8AFf60c0B011f3175CDF459c66Ed035",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-11-14 11:54:19",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d38743b48d26743c0ec6898d699394fbc94657ee",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
         ]
       }
     }

deployments/cronos.diamond.json

@@ -62,8 +62,8 @@
       "ERC20Proxy": "0x9B112948F3c71eBFb59961657b37c21328cFb01e",
       "Executor": "0xd00DaEC49Cd4F33Fe8542050294759cD971c7116",
       "FeeCollector": "0x11d40Dc8Ff0CE92F54A315aD8e674a55a866cBEe",
-      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
-      "LiFuelFeeCollector": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
+      "LiFiDEXAggregator": "",
+      "LiFuelFeeCollector": "0x70D6cFE9146D6B6ebEb88BcB22fa220E78058D6F",
       "ReceiverAcrossV3": "",
       "Receiver": "0x4891e076b18FccEBE62962A26e74df85BB04168b",
       "ReceiverStargateV2": "",

deployments/cronos.json

@@ -24,5 +24,5 @@
   "SymbiosisFacet": "0x70a51Bbc58D6180709D99a759bd91A3feD212fD3",
   "EmergencyPauseFacet": "0x3CDDc79Da7c829643F5b2378110158Ea6ff349F9",
   "TokenWrapper": "0x693c18A628866BdD04956d9544Ce769C0e468149",
-  "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc"
+  "LiFiDEXAggregator": "0xf88F6948C8AFf60c0B011f3175CDF459c66Ed035"
 }

deployments/fraxtal.diamond.json

@@ -72,7 +72,8 @@
       "ReceiverAcrossV3": "",
       "ReceiverStargateV2": "",
       "RelayerCelerIM": "",
+      "ServiceFeeCollector": "0x45d69A8a07F79DE2364F0B80F78af86e99015162",
       "TokenWrapper": "0xC82fd49be3F3D851b9E10589C50784cEAC7114a5"
     }
   }
-}
+}

deployments/fraxtal.json

@@ -21,6 +21,6 @@
   "ServiceFeeCollector": "0x45d69A8a07F79DE2364F0B80F78af86e99015162",
   "TokenWrapper": "0xC82fd49be3F3D851b9E10589C50784cEAC7114a5",
   "SymbiosisFacet": "0x095857146B116802fBf4f75D96CC1b35c5F3ad1a",
-  "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
+  "LiFiDEXAggregator": "0xE38621607316cB43367c134C65dca3f41B61250f",
   "EmergencyPauseFacet": "0x6F2baA7cd5F156CA1B132F7FF11E0fa2aD775F61"
-}
+}

deployments/mantle.diamond.json

@@ -70,7 +70,7 @@
       "ERC20Proxy": "0xA950Ac46b0b844c0564d18A54A9685e614B9086C",
       "Executor": "0x7078d1DE45C7D3e87f71D5DA663db2a8Ee1dfEbe",
       "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5",
-      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
+      "LiFiDEXAggregator": "0xEcf953290D36fA96236356e171044DC802EeC598",
       "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C",
       "Receiver": "0x2fA14922ABc117c4737260032C8fD6D9Ab35395A",
       "ReceiverAcrossV3": "",
@@ -79,4 +79,4 @@
       "TokenWrapper": "0x0263180888007D45340F86eC0b610d250BbDcB23"
     }
   }
-}
+}

deployments/mantle.json

@@ -24,6 +24,6 @@
   "SquidFacet": "0xc23ae3A8d74C0a428FA59E4AD3EB6aa4b2330530",
   "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61",
   "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A",
-  "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
+  "LiFiDEXAggregator": "0xEcf953290D36fA96236356e171044DC802EeC598",
   "EmergencyPauseFacet": "0x6F2baA7cd5F156CA1B132F7FF11E0fa2aD775F61"
-}
+}

deployments/sei.json

@@ -22,6 +22,6 @@
   "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
   "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A",
   "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61",
-  "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
+  "LiFiDEXAggregator": "0xfdE9CE4e17B650efdcA13d524F132876700d806f",
   "EmergencyPauseFacet": "0x6F2baA7cd5F156CA1B132F7FF11E0fa2aD775F61"
-}
+}

src/Periphery/LiFiDEXAggregator.sol

@@ -22,7 +22,7 @@ uint160 constant MAX_SQRT_RATIO = 1461446703485210103287273052203988822378723970
 /// @title LiFi DEX Aggregator
 /// @author Ilya Lyalin (contract copied from: https://github.com/sushiswap/sushiswap/blob/c8c80dec821003eb72eb77c7e0446ddde8ca9e1e/protocols/route-processor/contracts/RouteProcessor4.sol)
 /// @notice Processes calldata to swap using various DEXs
-/// @custom:version 1.0.0
+/// @custom:version 1.4.0
 contract LiFiDEXAggregator is Ownable {
     using SafeERC20 for IERC20;
     using Approve for IERC20;
@@ -575,6 +575,96 @@ contract LiFiDEXAggregator is Ownable {
         uniswapV3SwapCallback(amount0Delta, amount1Delta, data);
     }
 
+    /// @notice Called to `msg.sender` after executing a swap via RaExchangeV3#swap.
+    /// @dev In the implementation you must pay the pool tokens owed for the swap.
+    /// @param amount0Delta The amount of token0 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token0 to the pool.
+    /// @param amount1Delta The amount of token1 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token1 to the pool.
+    /// @param data Any data passed through by the caller via the RaExchangeV3#swap call
+    function ramsesV2SwapCallback(
+        int256 amount0Delta,
+        int256 amount1Delta,
+        bytes calldata data
+    ) external {
+        uniswapV3SwapCallback(amount0Delta, amount1Delta, data);
+    }
+
+    /// @notice Called to `msg.sender` after executing a swap via XeiV3#swap.
+    /// @dev In the implementation you must pay the pool tokens owed for the swap.
+    /// @param amount0Delta The amount of token0 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token0 to the pool.
+    /// @param amount1Delta The amount of token1 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token1 to the pool.
+    /// @param data Any data passed through by the caller via the XeiV3#swap call
+    function xeiV3SwapCallback(
+        int256 amount0Delta,
+        int256 amount1Delta,
+        bytes calldata data
+    ) external {
+        uniswapV3SwapCallback(amount0Delta, amount1Delta, data);
+    }
+
+    /// @notice Called to `msg.sender` after executing a swap via DragonSwapV2#swap.
+    /// @dev In the implementation you must pay the pool tokens owed for the swap.
+    /// @param amount0Delta The amount of token0 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token0 to the pool.
+    /// @param amount1Delta The amount of token1 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token1 to the pool.
+    /// @param data Any data passed through by the caller via the DragonSwapV2#swap call
+    function dragonswapV2SwapCallback(
+        int256 amount0Delta,
+        int256 amount1Delta,
+        bytes calldata data
+    ) external {
+        uniswapV3SwapCallback(amount0Delta, amount1Delta, data);
+    }
+
+    /// @notice Called to `msg.sender` after executing a swap via AgniV3#swap.
+    /// @dev In the implementation you must pay the pool tokens owed for the swap.
+    /// @param amount0Delta The amount of token0 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token0 to the pool.
+    /// @param amount1Delta The amount of token1 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token1 to the pool.
+    /// @param data Any data passed through by the caller via the AgniV3#swap call
+    function agniSwapCallback(
+        int256 amount0Delta,
+        int256 amount1Delta,
+        bytes calldata data
+    ) external {
+        uniswapV3SwapCallback(amount0Delta, amount1Delta, data);
+    }
+
+    /// @notice Called to `msg.sender` after executing a swap via FusionXV3#swap.
+    /// @dev In the implementation you must pay the pool tokens owed for the swap.
+    /// @param amount0Delta The amount of token0 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token0 to the pool.
+    /// @param amount1Delta The amount of token1 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token1 to the pool.
+    /// @param data Any data passed through by the caller via the FusionXV3#swap call
+    function fusionXV3SwapCallback(
+        int256 amount0Delta,
+        int256 amount1Delta,
+        bytes calldata data
+    ) external {
+        uniswapV3SwapCallback(amount0Delta, amount1Delta, data);
+    }
+
+    /// @notice Called to `msg.sender` after executing a swap via VVS FinanceV3#swap.
+    /// @dev In the implementation you must pay the pool tokens owed for the swap.
+    /// @param amount0Delta The amount of token0 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token0 to the pool.
+    /// @param amount1Delta The amount of token1 that was sent (negative) or must be received (positive) by the pool by
+    /// the end of the swap. If positive, the callback must send that amount of token1 to the pool.
+    /// @param data Any data passed through by the caller via the VVS Finance V3#swap call
+    function vvsV3SwapCallback(
+        int256 amount0Delta,
+        int256 amount1Delta,
+        bytes calldata data
+    ) external {
+        uniswapV3SwapCallback(amount0Delta, amount1Delta, data);
+    }
+
     /// @notice Curve pool swap. Legacy pools that don't return amountOut and have native coins are not supported
     /// @param stream [pool, poolType, fromIndex, toIndex, recipient, output token]
     /// @param from Where to take liquidity for swap