Merge pull request #7 from router-protocol/feat/sushiswap

Feat/sushiswap
router-protocol · Dec 29, 2023 · 0e62fa6 · 0e62fa6
2 parents 838be05 + da8e5d1
commit 0e62fa6
Show file tree

Hide file tree

Showing 39 changed files with 604 additions and 179 deletions.
diff --git a/contracts/BatchTransaction.sol b/contracts/BatchTransaction.sol
@@ -2,8 +2,8 @@
 pragma solidity 0.8.18;
 
 import {ReentrancyGuard} from "./utils/ReentrancyGuard.sol";
-import {Basic} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
+import {Basic} from "router-intents/contracts/BaseAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
 import {CallLib} from "./CallLib.sol";
 import {IERC20, SafeERC20} from "./utils/SafeERC20.sol";
 import {Errors} from "./Errors.sol";

diff --git a/contracts/intent-adapters/erc20/ERC20Approval.sol b/contracts/intent-adapters/erc20/ERC20Approval.sol
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
-import {DefaultRefundable} from "router-intents/contracts/DefaultRefundable.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
+import {DefaultRefundable} from "router-intents/contracts/utils/DefaultRefundable.sol";
 import {IERC20, SafeERC20} from "../../utils/SafeERC20.sol";
 
 /**
@@ -12,7 +13,7 @@ import {IERC20, SafeERC20} from "../../utils/SafeERC20.sol";
  * @notice Providing approval for ERC20 tokens.
  */
 contract ERC20Approval is
-    RouterIntentAdapter,
+    RouterIntentEoaAdapter,
     NitroMessageHandler,
     DefaultRefundable
 {
@@ -26,7 +27,7 @@ contract ERC20Approval is
         address __dexspan,
         address __defaultRefundAddress
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
         DefaultRefundable(__defaultRefundAddress)
     // solhint-disable-next-line no-empty-blocks
@@ -39,7 +40,7 @@ contract ERC20Approval is
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,

diff --git a/contracts/intent-adapters/erc20/ERC20Transfer.sol b/contracts/intent-adapters/erc20/ERC20Transfer.sol
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
-import {DefaultRefundable} from "router-intents/contracts/DefaultRefundable.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
+import {DefaultRefundable} from "router-intents/contracts/utils/DefaultRefundable.sol";
 import {IERC20, SafeERC20} from "../../utils/SafeERC20.sol";
 
 /**
@@ -12,7 +13,7 @@ import {IERC20, SafeERC20} from "../../utils/SafeERC20.sol";
  * @notice Transferring ERC20 tokens.
  */
 contract ERC20Transfer is
-    RouterIntentAdapter,
+    RouterIntentEoaAdapter,
     NitroMessageHandler,
     DefaultRefundable
 {
@@ -26,7 +27,7 @@ contract ERC20Transfer is
         address __dexspan,
         address __defaultRefundAddress
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
         DefaultRefundable(__defaultRefundAddress)
     // solhint-disable-next-line no-empty-blocks
@@ -39,7 +40,7 @@ contract ERC20Transfer is
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,

diff --git a/contracts/intent-adapters/lending-borrowing/AaveV3/AaveV3Borrow.sol b/contracts/intent-adapters/lending-borrowing/AaveV3/AaveV3Borrow.sol
@@ -2,9 +2,10 @@
 pragma solidity 0.8.18;
 
 import {AaveV3Helpers} from "./AaveV3Helpers.sol";
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
-import {DefaultRefundable} from "router-intents/contracts/DefaultRefundable.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
+import {DefaultRefundable} from "router-intents/contracts/utils/DefaultRefundable.sol";
 import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
 
 /**
@@ -13,7 +14,7 @@ import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
  * @notice Borrowing funds on AaveV3.
  */
 contract AaveV3Borrow is
-    RouterIntentAdapter,
+    RouterIntentEoaAdapter,
     NitroMessageHandler,
     DefaultRefundable,
     AaveV3Helpers
@@ -31,7 +32,7 @@ contract AaveV3Borrow is
         address __aaveV3WrappedTokenGateway,
         uint16 __aaveV3ReferralCode
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
         DefaultRefundable(__defaultRefundAddress)
         AaveV3Helpers(
@@ -49,7 +50,7 @@ contract AaveV3Borrow is
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,

diff --git a/contracts/intent-adapters/lending-borrowing/AaveV3/AaveV3Supply.sol b/contracts/intent-adapters/lending-borrowing/AaveV3/AaveV3Supply.sol
@@ -2,8 +2,9 @@
 pragma solidity 0.8.18;
 
 import {AaveV3Helpers} from "./AaveV3Helpers.sol";
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
 import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
 
 /**
@@ -12,7 +13,7 @@ import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
  * @notice Supplying funds on AaveV3.
  */
 contract AaveV3Supply is
-    RouterIntentAdapter,
+    RouterIntentEoaAdapter,
     NitroMessageHandler,
     AaveV3Helpers
 {
@@ -30,7 +31,7 @@ contract AaveV3Supply is
         address __aaveV3WrappedTokenGateway,
         uint16 __aaveV3ReferralCode
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
         AaveV3Helpers(
             __aaveV3Pool,
@@ -47,7 +48,7 @@ contract AaveV3Supply is
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,

diff --git a/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeAvax.sol b/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeAvax.sol
@@ -2,8 +2,9 @@
 pragma solidity 0.8.18;
 
 import {IAnkrStakeAvax} from "./Interfaces.sol";
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
 import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
 
 /**
@@ -12,7 +13,7 @@ import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
  * @notice Staking AVAX to receive AnkrAVAX on Ankr.
  * @notice This contract is only for Avalanche chain.
  */
-contract AnkrStakeAvax is RouterIntentAdapter, NitroMessageHandler {
+contract AnkrStakeAvax is RouterIntentEoaAdapter, NitroMessageHandler {
     using SafeERC20 for IERC20;
 
     address private immutable _ankrAvax;
@@ -33,7 +34,7 @@ contract AnkrStakeAvax is RouterIntentAdapter, NitroMessageHandler {
         address __ankrAvax,
         address __ankrPool
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
     {
         _ankrAvax = __ankrAvax;
@@ -53,7 +54,7 @@ contract AnkrStakeAvax is RouterIntentAdapter, NitroMessageHandler {
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,

diff --git a/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeBsc.sol b/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeBsc.sol
@@ -2,8 +2,9 @@
 pragma solidity 0.8.18;
 
 import {IAnkrStakeBsc} from "./Interfaces.sol";
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
 import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
 
 /**
@@ -12,7 +13,7 @@ import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
  * @notice Staking BSC to receive AnkrBSC on Ankr.
  * @notice This contract is only for BSC chain.
  */
-contract AnkrStakeBsc is RouterIntentAdapter, NitroMessageHandler {
+contract AnkrStakeBsc is RouterIntentEoaAdapter, NitroMessageHandler {
     using SafeERC20 for IERC20;
 
     address private immutable _ankrBsc;
@@ -33,7 +34,7 @@ contract AnkrStakeBsc is RouterIntentAdapter, NitroMessageHandler {
         address __ankrBsc,
         address __ankrPool
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
     {
         _ankrBsc = __ankrBsc;
@@ -53,7 +54,7 @@ contract AnkrStakeBsc is RouterIntentAdapter, NitroMessageHandler {
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,

diff --git a/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeEth.sol b/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeEth.sol
@@ -2,8 +2,9 @@
 pragma solidity 0.8.18;
 
 import {IAnkrStakeEth} from "./Interfaces.sol";
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
 import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
 
 /**
@@ -12,7 +13,7 @@ import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
  * @notice Staking ETH to receive AnkrETH on Ankr.
  * @notice This contract is only for Ethereum chain.
  */
-contract AnkrStakeEth is RouterIntentAdapter, NitroMessageHandler {
+contract AnkrStakeEth is RouterIntentEoaAdapter, NitroMessageHandler {
     using SafeERC20 for IERC20;
 
     address private immutable _ankrEth;
@@ -33,7 +34,7 @@ contract AnkrStakeEth is RouterIntentAdapter, NitroMessageHandler {
         address __ankrEth,
         address __ankrPool
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
     {
         _ankrEth = __ankrEth;
@@ -53,7 +54,7 @@ contract AnkrStakeEth is RouterIntentAdapter, NitroMessageHandler {
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,

diff --git a/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeFantom.sol b/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeFantom.sol
@@ -2,8 +2,9 @@
 pragma solidity 0.8.18;
 
 import {IAnkrStakeFtm} from "./Interfaces.sol";
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
 import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
 
 /**
@@ -12,7 +13,7 @@ import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
  * @notice Staking FTM to receive AnkrFTM on Ankr.
  * @notice This contract is only for Fantom chain.
  */
-contract AnkrStakeFantom is RouterIntentAdapter, NitroMessageHandler {
+contract AnkrStakeFantom is RouterIntentEoaAdapter, NitroMessageHandler {
     using SafeERC20 for IERC20;
 
     address private immutable _ankrFtm;
@@ -33,7 +34,7 @@ contract AnkrStakeFantom is RouterIntentAdapter, NitroMessageHandler {
         address __ankrFtm,
         address __ankrPool
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
     {
         _ankrFtm = __ankrFtm;
@@ -53,7 +54,7 @@ contract AnkrStakeFantom is RouterIntentAdapter, NitroMessageHandler {
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,

diff --git a/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeMatic.sol b/contracts/intent-adapters/liquid-staking/Ankr/AnkrStakeMatic.sol
@@ -2,8 +2,9 @@
 pragma solidity 0.8.18;
 
 import {IAnkrStakeMatic} from "./Interfaces.sol";
-import {RouterIntentAdapter, Errors} from "router-intents/contracts/RouterIntentAdapter.sol";
-import {NitroMessageHandler} from "router-intents/contracts/NitroMessageHandler.sol";
+import {RouterIntentEoaAdapter, EoaExecutor} from "router-intents/contracts/RouterIntentEoaAdapter.sol";
+import {NitroMessageHandler} from "router-intents/contracts/utils/NitroMessageHandler.sol";
+import {Errors} from "router-intents/contracts/utils/Errors.sol";
 import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
 
 /**
@@ -12,7 +13,7 @@ import {IERC20, SafeERC20} from "../../../utils/SafeERC20.sol";
  * @notice Staking MATIC to receive AnkrMATIC on Ankr.
  * @notice This contract is only for Ethereum chain.
  */
-contract AnkrStakeMatic is RouterIntentAdapter, NitroMessageHandler {
+contract AnkrStakeMatic is RouterIntentEoaAdapter, NitroMessageHandler {
     using SafeERC20 for IERC20;
 
     address private immutable _ankrMatic;
@@ -35,7 +36,7 @@ contract AnkrStakeMatic is RouterIntentAdapter, NitroMessageHandler {
         address __matic,
         address __ankrPool
     )
-        RouterIntentAdapter(__native, __wnative, __owner)
+        RouterIntentEoaAdapter(__native, __wnative, __owner)
         NitroMessageHandler(__assetForwarder, __dexspan)
     {
         _ankrMatic = __ankrMatic;
@@ -60,7 +61,7 @@ contract AnkrStakeMatic is RouterIntentAdapter, NitroMessageHandler {
     }
 
     /**
-     * @inheritdoc RouterIntentAdapter
+     * @inheritdoc EoaExecutor
      */
     function execute(
         address,