Merge pull request #123 from zodahu/feature/deploy_morpho_callback_et…

…hereum Deploy MorphoFlashLoanCallback to Ethereum
dinngo · Jan 9, 2024 · 9fce488 · 9fce488
2 parents bb84d99 + 205cd77
commit 9fce488
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/script/DeployEthereum.s.sol b/script/DeployEthereum.s.sol
@@ -5,6 +5,7 @@ import {DeployRouter} from './DeployRouter.s.sol';
 import {DeployAaveV2FlashLoanCallback} from './callbacks/DeployAaveV2FlashLoanCallback.s.sol';
 import {DeployAaveV3FlashLoanCallback} from './callbacks/DeployAaveV3FlashLoanCallback.s.sol';
 import {DeployBalancerV2FlashLoanCallback} from './callbacks/DeployBalancerV2FlashLoanCallback.s.sol';
+import {DeployMorphoFlashLoanCallback} from './callbacks/DeployMorphoFlashLoanCallback.s.sol';
 import {DeployRadiantV2FlashLoanCallback} from './callbacks/DeployRadiantV2FlashLoanCallback.s.sol';
 import {DeploySparkFlashLoanCallback} from './callbacks/DeploySparkFlashLoanCallback.s.sol';
 
@@ -13,6 +14,7 @@ contract DeployEthereum is
     DeployAaveV2FlashLoanCallback,
     DeployAaveV3FlashLoanCallback,
     DeployBalancerV2FlashLoanCallback,
+    DeployMorphoFlashLoanCallback,
     DeployRadiantV2FlashLoanCallback,
     DeploySparkFlashLoanCallback
 {
@@ -54,6 +56,12 @@ contract DeployEthereum is
             feeRate: 5
         });
 
+        morphoFlashLoanCallbackConfig = MorphoFlashLoanCallbackConfig({
+            deployedAddress: 0x24D5b6b712D1f0D0B628E21E39dBaDde3f28C56e,
+            morpho: 0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb,
+            feeRate: 5
+        });
+
         radiantV2FlashLoanCallbackConfig = RadiantV2FlashLoanCallbackConfig({
             deployedAddress: 0x6bfCE075A1c4F0fD4067A401dA8f159354e1a916,
             radiantV2Provider: 0x70e507f1d20AeC229F435cd1EcaC6A7200119B9F,
@@ -75,6 +83,7 @@ contract DeployEthereum is
         _deployAaveV2FlashLoanCallback(CREATE3_FACTORY, deployedRouterAddress);
         _deployAaveV3FlashLoanCallback(CREATE3_FACTORY, deployedRouterAddress);
         _deployBalancerV2FlashLoanCallback(CREATE3_FACTORY, deployedRouterAddress);
+        _deployMorphoFlashLoanCallback(CREATE3_FACTORY, deployedRouterAddress);
         _deployRadiantV2FlashLoanCallback(CREATE3_FACTORY, deployedRouterAddress);
         _deploySparkFlashLoanCallback(CREATE3_FACTORY, deployedRouterAddress);
     }

diff --git a/script/DeployLocal.s.sol b/script/DeployLocal.s.sol
@@ -6,9 +6,9 @@ import {DeployRouter} from './DeployRouter.s.sol';
 import {DeployAaveV2FlashLoanCallback} from './callbacks/DeployAaveV2FlashLoanCallback.s.sol';
 import {DeployAaveV3FlashLoanCallback} from './callbacks/DeployAaveV3FlashLoanCallback.s.sol';
 import {DeployBalancerV2FlashLoanCallback} from './callbacks/DeployBalancerV2FlashLoanCallback.s.sol';
+import {DeployMorphoFlashLoanCallback} from './callbacks/DeployMorphoFlashLoanCallback.s.sol';
 import {DeployRadiantV2FlashLoanCallback} from './callbacks/DeployRadiantV2FlashLoanCallback.s.sol';
 import {DeploySparkFlashLoanCallback} from './callbacks/DeploySparkFlashLoanCallback.s.sol';
-import {DeployMorphoFlashLoanCallback} from './callbacks/DeployMorphoFlashLoanCallback.s.sol';
 import {DeployMakerUtility} from './utilities/DeployMakerUtility.s.sol';
 
 contract DeployLocal is
@@ -61,21 +61,21 @@ contract DeployLocal is
             feeRate: 5
         });
 
-        radiantV2FlashLoanCallbackConfig = RadiantV2FlashLoanCallbackConfig({
+        morphoFlashLoanCallbackConfig = MorphoFlashLoanCallbackConfig({
             deployedAddress: UNDEPLOYED,
-            radiantV2Provider: 0x091d52CacE1edc5527C99cDCFA6937C1635330E4,
+            morpho: 0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb,
             feeRate: 5
         });
 
-        sparkFlashLoanCallbackConfig = SparkFlashLoanCallbackConfig({
+        radiantV2FlashLoanCallbackConfig = RadiantV2FlashLoanCallbackConfig({
             deployedAddress: UNDEPLOYED,
-            sparkProvider: 0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE,
+            radiantV2Provider: 0x091d52CacE1edc5527C99cDCFA6937C1635330E4,
             feeRate: 5
         });
 
-        morphoFlashLoanCallbackConfig = MorphoFlashLoanCallbackConfig({
+        sparkFlashLoanCallbackConfig = SparkFlashLoanCallbackConfig({
             deployedAddress: UNDEPLOYED,
-            morpho: 0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb,
+            sparkProvider: 0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE,
             feeRate: 5
         });
 
@@ -100,9 +100,9 @@ contract DeployLocal is
         _deployAaveV2FlashLoanCallback(deployedCreate3FactoryAddress, deployedRouterAddress);
         _deployAaveV3FlashLoanCallback(deployedCreate3FactoryAddress, deployedRouterAddress);
         _deployBalancerV2FlashLoanCallback(deployedCreate3FactoryAddress, deployedRouterAddress);
+        _deployMorphoFlashLoanCallback(deployedCreate3FactoryAddress, deployedRouterAddress);
         _deployRadiantV2FlashLoanCallback(deployedCreate3FactoryAddress, deployedRouterAddress);
         _deploySparkFlashLoanCallback(deployedCreate3FactoryAddress, deployedRouterAddress);
-        _deployMorphoFlashLoanCallback(deployedCreate3FactoryAddress, deployedRouterAddress);
 
         // utility
         _deployMakerUtility(deployedCreate3FactoryAddress, deployedRouterAddress);