chore: fix types

OasisDEX · Nov 12, 2024 · dc7acd1 · dc7acd1
1 parent 4a71674
commit dc7acd1
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 8 deletions.
diff --git a/packages/deploy-configurations/configs/arbitrum.conf.ts b/packages/deploy-configurations/configs/arbitrum.conf.ts
@@ -1082,5 +1082,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: '0x0000000000000000000000000000000000000000',
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/base.conf.ts b/packages/deploy-configurations/configs/base.conf.ts
@@ -1603,5 +1603,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: '0x46415998764C29aB2a25CbeA6254146D50D22687',
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/goerli.conf.ts b/packages/deploy-configurations/configs/goerli.conf.ts
@@ -1259,5 +1259,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: '0xC71F367DABb23E85E5FC6FdaD1a28F2240326b87',
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/hardhat.conf.ts b/packages/deploy-configurations/configs/hardhat.conf.ts
@@ -1467,5 +1467,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: ADDRESS_ZERO,
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/local.conf.ts b/packages/deploy-configurations/configs/local.conf.ts
@@ -1420,5 +1420,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: ADDRESS_ZERO,
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/optimism.conf.ts b/packages/deploy-configurations/configs/optimism.conf.ts
@@ -1305,5 +1305,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: ADDRESS_ZERO,
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/sepolia.conf.ts b/packages/deploy-configurations/configs/sepolia.conf.ts
@@ -1263,5 +1263,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: ADDRESS_ZERO,
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/tenderly.conf.ts b/packages/deploy-configurations/configs/tenderly.conf.ts
@@ -1469,5 +1469,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: ADDRESS_ZERO,
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/test.conf.ts b/packages/deploy-configurations/configs/test.conf.ts
@@ -1526,5 +1526,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: ADDRESS_ZERO,
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/test/arbitrum.conf.ts b/packages/deploy-configurations/configs/test/arbitrum.conf.ts
@@ -421,6 +421,10 @@ export const config: SystemConfig = {
       name: 'MORPHO',
       address: ADDRESS_ZERO,
     },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
+      address: ADDRESS_ZERO,
+    },
     OSETH: {
       name: 'OSETH',
       address: ADDRESS_ZERO,
@@ -930,5 +934,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: ADDRESS_ZERO,
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/test/mainnet.conf.ts b/packages/deploy-configurations/configs/test/mainnet.conf.ts
@@ -1334,5 +1334,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/test/optimism.conf.ts b/packages/deploy-configurations/configs/test/optimism.conf.ts
@@ -1229,5 +1229,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: ADDRESS_ZERO,
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: ADDRESS_ZERO,
+    },
   },
 }
diff --git a/packages/deploy-configurations/types/deployment-config/config-entries.ts b/packages/deploy-configurations/types/deployment-config/config-entries.ts
@@ -8,7 +8,7 @@ import { Automation } from './automation'
 import { Common } from './common'
 import { Core, CoreMainnetOnly, USwapContract } from './core'
 import { MakerProtocol, MakerProtocolJoins, MakerProtocolPips } from './maker-protocol'
-import { MorphoBlueProtocol, Wrapper } from './morpho-blue'
+import { MorphoBlueProtocol } from './morpho-blue'
 import { SparkProtocol } from './spark-protocol'
 import { TestContractNames } from './test'
 

diff --git a/packages/deploy-configurations/types/deployment-config/deployment-config.ts b/packages/deploy-configurations/types/deployment-config/deployment-config.ts
@@ -15,7 +15,7 @@ import {
   MakerProtocolJoinContracts,
   MakerProtocolPipContracts,
 } from './maker-protocol'
-import { MorphoBlueProtocolContracts, OptionalBlueProtocolContracts } from './morpho-blue'
+import { MorphoBlueProtocolContracts } from './morpho-blue'
 import { OptionalSparkProtocolContracts } from './spark-protocol'
 import { TestContracts } from './test'
 
@@ -41,6 +41,6 @@ export type SystemConfig = {
   spark: OptionalSparkProtocolContracts
   automation: AutomationContracts
   ajna: AjnaProtocolContracts
-  morphoblue: MorphoBlueProtocolContracts & OptionalBlueProtocolContracts
+  morphoblue: MorphoBlueProtocolContracts 
   test?: TestContracts
 }
diff --git a/packages/deploy-configurations/types/deployment-config/morpho-blue.ts b/packages/deploy-configurations/types/deployment-config/morpho-blue.ts
@@ -1,8 +1,5 @@
 import { ConfigEntry } from './config-entries'
 
-export type MorphoBlueProtocol = 'MorphoBlue' | 'AdaptiveCurveIrm' 
-export type Wrapper = 'Wrapper'
+export type MorphoBlueProtocol = 'MorphoBlue' | 'AdaptiveCurveIrm' | 'Wrapper'
 
-export type MorphoBlueProtocolContracts = Record<MorphoBlueProtocol, ConfigEntry>
-
-export type OptionalBlueProtocolContracts = Partial<Record<Wrapper, ConfigEntry>>
+export type MorphoBlueProtocolContracts = Record<MorphoBlueProtocol, ConfigEntry>