feat: update addresses to include morpho addresses

OasisDEX · Apr 30, 2024 · 5c7c32e · 5c7c32e
1 parent efdc0a3
commit 5c7c32e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/packages/deploy-configurations/addresses/index.ts b/packages/deploy-configurations/addresses/index.ts
@@ -29,6 +29,7 @@ import {
   MakerProtocolJoins,
   MakerProtocolPips,
 } from '@deploy-configurations/types/deployment-config/maker-protocol'
+import { MorphoBlueProtocol } from '@deploy-configurations/types/deployment-config/morpho-blue'
 import {
   OptionalSparkProtocolContracts,
   SparkProtocol,
@@ -45,7 +46,7 @@ enum AaveKeys {
   V3 = 'v3',
 }
 
-type DefaultDeployment = {
+export type DefaultDeployment = {
   [SystemKeys.MPA]: {
     [MpaKeys.CORE]: Record<Core, Address>
     [MpaKeys.ACTIONS]: Record<Actions, Address>
@@ -63,6 +64,7 @@ type DefaultDeployment = {
   }
   [SystemKeys.AUTOMATION]: Record<Automation, Address>
   [SystemKeys.AJNA]: Record<AjnaProtocol, Address>
+  [SystemKeys.MORPHO_BLUE]: Record<MorphoBlueProtocol, Address>
 }
 
 export type Addresses = {
@@ -78,10 +80,7 @@ export type Addresses = {
 if (!mainnetConfig.aave.v2) throw new Error('Missing aave v2 config on mainnet')
 if (!optimismConfig.aave.v3.L2Encoder) throw new Error('Missing L2Encoder config on optimism')
 
-const createAddressesStructure = (
-  networkConfig: SystemConfig,
-  ajnaConfig?: SystemConfig,
-): DefaultDeployment => ({
+const createAddressesStructure = (networkConfig: SystemConfig): DefaultDeployment => ({
   mpa: {
     core: {
       ...extractAddressesFromConfig<Core>(networkConfig.mpa.core),
@@ -119,7 +118,10 @@ const createAddressesStructure = (
     ...extractAddressesFromConfig(networkConfig.automation),
   },
   ajna: {
-    ...extractAddressesFromConfig(ajnaConfig?.ajna || networkConfig.ajna),
+    ...extractAddressesFromConfig(networkConfig.ajna),
+  },
+  morphoblue: {
+    ...extractAddressesFromConfig(networkConfig.morphoblue),
   },
 })
 
@@ -149,9 +151,9 @@ function extractAddressesFromConfig<T extends Contracts>(
 export const ADDRESSES: Addresses = {
   [Network.MAINNET]: createAddressesStructure(mainnetConfig),
   [Network.OPTIMISM]: createAddressesStructure(optimismConfig),
-  [Network.GOERLI]: createAddressesStructure(goerliConfig, goerliConfig),
-  [Network.ARBITRUM]: createAddressesStructure(arbitrumConfig, mainnetConfig),
-  [Network.BASE]: createAddressesStructure(baseConfig, mainnetConfig),
+  [Network.GOERLI]: createAddressesStructure(goerliConfig),
+  [Network.ARBITRUM]: createAddressesStructure(arbitrumConfig),
+  [Network.BASE]: createAddressesStructure(baseConfig),
   [Network.TEST]: createAddressesStructure(testConfig),
   [Network.SEPOLIA]: createAddressesStructure(sepoliaConfig),
 }

diff --git a/packages/deploy-configurations/configs/mainnet.conf.ts b/packages/deploy-configurations/configs/mainnet.conf.ts
@@ -1476,8 +1476,12 @@ export const config: SystemConfig = {
   morphoblue: {
     MorphoBlue: {
       name: 'MorphoBlue',
-      address: '0x0000000000000000000000000000000000000000',
+      address: '0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb',
       serviceRegistryName: SERVICE_REGISTRY_NAMES.morphoblue.MORPHO_BLUE,
     },
+    AdaptiveCurveIrm: {
+      name: 'AdaptiveCurveIrm',
+      address: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    },
   },
 }