feat: added wnative flag

Author: maxencerb

script/strategies/kandel/deployers/ArbitrumKandelSeederDeployer.s.sol

@@ -34,7 +34,8 @@ contract ArbitrumKandelSeederDeployer is Deployer {
       deployERC4626Kandel: true,
       deployKandel: true,
       testBase: IERC20(fork.get("WETH.e")),
-      testQuote: IERC20(fork.get("DAI.e"))
+      testQuote: IERC20(fork.get("DAI.e")),
+      wnative: address(0)
     });
 
     // Pass the struct to innerRun

script/strategies/kandel/deployers/KandelSeederDeployer.s.sol

@@ -33,6 +33,7 @@ contract KandelSeederDeployer is Deployer, Test2 {
     bool deployAaveKandel = true;
     bool deployERC4626Kandel = true;
     bool deployKandel = true;
+    address wnative = vm.envAddress("WETH");
 
     try vm.envBool("DEPLOY_AAVE_KANDEL") returns (bool deployAaveKandel_) {
       deployAaveKandel = deployAaveKandel_;
@@ -57,7 +58,8 @@ contract KandelSeederDeployer is Deployer, Test2 {
       deployERC4626Kandel: deployERC4626Kandel,
       deployKandel: deployKandel,
       testBase: IERC20(envAddressOrName("TEST_BASE")),
-      testQuote: IERC20(envAddressOrName("TEST_QUOTE"))
+      testQuote: IERC20(envAddressOrName("TEST_QUOTE")),
+      wnative: wnative
     });
 
     innerRun(params);
@@ -75,6 +77,7 @@ contract KandelSeederDeployer is Deployer, Test2 {
     bool deployKandel;
     IERC20 testBase;
     IERC20 testQuote;
+    address wnative;
   }
 
   function innerRun(DeploymentParams memory params)
@@ -113,7 +116,7 @@ contract KandelSeederDeployer is Deployer, Test2 {
       //                 We therefore ensure that this happens.
       uint64 nonce = vm.getNonce(broadcaster());
       broadcast();
-      aaveSeeder = new AaveKandelSeeder(params.mgv, params.addressesProvider, params.aaveKandelGasreq);
+      aaveSeeder = new AaveKandelSeeder(params.mgv, params.addressesProvider, params.aaveKandelGasreq, params.wnative);
       // Bug workaround: See comment above `nonce` further up
       if (nonce == vm.getNonce(broadcaster())) {
         vm.setNonce(broadcaster(), nonce + 1);

script/strategies/kandel/deployers/MumbaiKandelSeederDeployer.s.sol

@@ -34,7 +34,8 @@ contract MumbaiKandelSeederDeployer is Deployer {
       deployERC4626Kandel: true,
       deployKandel: true,
       testBase: IERC20(fork.get("CRV.T/AAVEv3")), // make sure to use an AAVE faucet
-      testQuote: IERC20(fork.get("WBTC.T/AAVEv3")) // make sure to use an AAVE faucet
+      testQuote: IERC20(fork.get("WBTC.T/AAVEv3")), // make sure to use an AAVE faucet,
+      wnative: address(0)
     });
 
     // Pass the struct to innerRun

script/strategies/kandel/deployers/PolygonKandelSeederDeployer.s.sol

@@ -34,7 +34,8 @@ contract PolygonKandelSeederDeployer is Deployer {
       deployERC4626Kandel: true,
       deployKandel: true,
       testBase: IERC20(fork.get("WETH.e")),
-      testQuote: IERC20(fork.get("DAI.e"))
+      testQuote: IERC20(fork.get("DAI.e")),
+      wnative: address(0)
     });
 
     // Pass the struct to innerRun

src/strategies/offer_maker/market_making/kandel/AaveKandel.sol

@@ -22,18 +22,27 @@ contract AaveKandel is GeometricKandel {
   ///@notice Indication that this is first puller (returned from __lastLook__) so posthook should deposit liquidity on AAVE
   bytes32 internal constant IS_FIRST_PULLER = "IS_FIRST_PULLER";
 
+  ///@notice the address of the WETH9 token.
+  address internal immutable wnative;
+
   ///@notice Constructor
   ///@param mgv The Mangrove deployment.
   ///@param olKeyBaseQuote The OLKey for the outbound_tkn base and inbound_tkn quote offer list Kandel will act on, the flipped OLKey is used for the opposite offer list.
   ///@param gasreq the gas required by the strat to execute
   ///@param routerParams routing policy parameters for this contract
-  constructor(IMangrove mgv, OLKey memory olKeyBaseQuote, uint gasreq, RouterParams memory routerParams)
-    GeometricKandel(mgv, olKeyBaseQuote, routerParams)
-  {
+  ///@param wnative_ the address of the WETH9 token.
+  constructor(
+    IMangrove mgv,
+    OLKey memory olKeyBaseQuote,
+    uint gasreq,
+    RouterParams memory routerParams,
+    address wnative_
+  ) GeometricKandel(mgv, olKeyBaseQuote, routerParams) {
     // one makes sure it is not possible to deploy an AAVE kandel on aTokens
     // allowing Kandel to deposit aUSDC for instance would conflict with other Kandel instances bound to the same router
     // and trading on USDC.
     // The code in isOverlying verifies that neither base nor quote are official AAVE overlyings.
+    wnative = wnative_;
     require(
       !isOverlying(olKeyBaseQuote.outbound_tkn) && !isOverlying(olKeyBaseQuote.inbound_tkn),
       "AaveKandel/cannotTradeAToken"
@@ -47,6 +56,7 @@ contract AaveKandel is GeometricKandel {
   /// @param token the token to verify.
   /// @return true if overlying; otherwise, false.
   function isOverlying(address token) internal view returns (bool) {
+    if (token == wnative) return false;
     try IAToken(token).UNDERLYING_ASSET_ADDRESS() returns (address) {
       return true;
     } catch {}

src/strategies/offer_maker/market_making/kandel/AaveKandelSeeder.sol

@@ -28,16 +28,21 @@ contract AaveKandelSeeder is AbstractKandelSeeder {
   ///@notice the Aave router.
   AavePooledRouter public immutable AAVE_ROUTER;
 
+  ///@notice the address of the WETH9 token.
+  address internal immutable wnative;
+
   ///@notice constructor for `AaveKandelSeeder`. Initializes an `AavePooledRouter` with this seeder as manager.
   ///@param mgv The Mangrove deployment.
   ///@param addressesProvider address of AAVE's address provider
   ///@param aaveKandelGasreq the total gasreq to use for executing a kandel offer
-  constructor(IMangrove mgv, IPoolAddressesProvider addressesProvider, uint aaveKandelGasreq)
+  ///@param wnative_ the address of the WETH9 token.
+  constructor(IMangrove mgv, IPoolAddressesProvider addressesProvider, uint aaveKandelGasreq, address wnative_)
     AbstractKandelSeeder(mgv, aaveKandelGasreq)
   {
     AavePooledRouter router = new AavePooledRouter(addressesProvider);
     AAVE_ROUTER = router;
     router.setAaveManager(msg.sender);
+    wnative = wnative_;
   }
 
   ///@inheritdoc AbstractKandelSeeder
@@ -59,7 +64,8 @@ contract AaveKandelSeeder is AbstractKandelSeeder {
         routerImplementation: AAVE_ROUTER, // using aave pooled router to source liquidity
         fundOwner: owner,
         strict: liquiditySharing
-      })
+      }),
+      wnative
     );
     // Allowing newly deployed Kandel to bind to the AaveRouter
     AAVE_ROUTER.bind(address(kandel));

test/strategies/kandel/AaveKandel.t.sol

@@ -66,7 +66,8 @@ contract AaveKandelTest is CoreKandelTest {
       mgv: IMangrove($(mgv)),
       olKeyBaseQuote: olKey,
       gasreq: kandel_gasreq,
-      routerParams: Direct.RouterParams({routerImplementation: router, fundOwner: id, strict: strict})
+      routerParams: Direct.RouterParams({routerImplementation: router, fundOwner: id, strict: strict}),
+      wnative_: address(0)
     });
 
     router.bind(address(aaveKandel_));
@@ -368,7 +369,8 @@ contract AaveKandelTest is CoreKandelTest {
       mgv: IMangrove($(mgv)),
       gasreq: 700_000,
       olKeyBaseQuote: OLKey(address(aToken), address(quote), 1),
-      routerParams: Direct.RouterParams({routerImplementation: router, fundOwner: address(0), strict: false})
+      routerParams: Direct.RouterParams({routerImplementation: router, fundOwner: address(0), strict: false}),
+      wnative_: address(0)
     });
   }
 
@@ -380,7 +382,8 @@ contract AaveKandelTest is CoreKandelTest {
       mgv: IMangrove($(mgv)),
       gasreq: 700_000,
       olKeyBaseQuote: OLKey(address(base), address(aToken), 1),
-      routerParams: Direct.RouterParams({routerImplementation: router, fundOwner: address(0), strict: false})
+      routerParams: Direct.RouterParams({routerImplementation: router, fundOwner: address(0), strict: false}),
+      wnative_: address(0)
     });
   }
 }

test/strategies/kandel/Kandel.gasreq.t.sol

@@ -235,7 +235,8 @@ abstract contract AaveKandelGasreqBaseTest is CoreKandelGasreqBaseTest {
       mgv: mgv,
       olKeyBaseQuote: olKey,
       gasreq: 1_000_000,
-      routerParams: Direct.RouterParams({routerImplementation: router, fundOwner: address(this), strict: false})
+      routerParams: Direct.RouterParams({routerImplementation: router, fundOwner: address(this), strict: false}),
+      wnative_: address(0)
     });
     router.bind(address(aaveKandel));
     return aaveKandel;

test/strategies/kandel/KandelSeeder.t.sol

@@ -79,7 +79,8 @@ contract KandelSeederTest is StratTest {
     AaveKandelSeeder aaveKandelSeeder = new AaveKandelSeeder({
       mgv: IMangrove($(mgv)),
       addressesProvider: IPoolAddressesProvider(fork.get("AaveAddressProvider")),
-      aaveKandelGasreq: 628_000
+      aaveKandelGasreq: 628_000,
+      wnative_: address(0)
     });
     aaveSeeder = aaveKandelSeeder;
     aaveRouter = aaveKandelSeeder.AAVE_ROUTER();