Merge pull request #710 from OasisDEX/kk/morpho-wrapper

feat: add erc20 wrapper
OasisDEX · Nov 12, 2024 · 4be9981 · 4be9981
2 parents ab3f190 + aad0a6c
commit 4be9981
Show file tree

Hide file tree

Showing 18 changed files with 164 additions and 16 deletions.
diff --git a/packages/addresses/package.json b/packages/addresses/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oasisdex/addresses",
-  "version": "0.1.88",
+  "version": "0.1.89",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",

diff --git a/packages/deploy-configurations/configs/arbitrum.conf.ts b/packages/deploy-configurations/configs/arbitrum.conf.ts
@@ -482,6 +482,10 @@ export const config: SystemConfig = {
       name: 'MORPHO',
       address: ADDRESS_ZERO,
     },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
+      address: ADDRESS_ZERO,
+    },
     OSETH: {
       name: 'OSETH',
       address: '0x0000000000000000000000000000000000000000',
@@ -1078,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
@@ -97,13 +97,13 @@ export const config: SystemConfig = {
       ERC20ProxyActions: {
         name: 'ERC20ProxyActions',
         deploy: false,
-        address: '0xfcf904440a91905DcEFa9C89d044A83608D2472E',
-        history: [],
+        address: '0xF55228CEDC8bEdF62E71eF207B0dEC1B46BA8338',
+        history: ['0xfcf904440a91905DcEFa9C89d044A83608D2472E'],
         constructorArgs: [],
       },
       AaveRewardsProxyActions: {
         name: 'AaveRewardsProxyActions',
-        deploy: true,
+        deploy: false,
         address: '0x2b1c1925987009Fd39ced009a1b11Db21BE3c2AC',
         history: [],
         constructorArgs: [],
@@ -640,6 +640,10 @@ export const config: SystemConfig = {
     },
     MORPHO: {
       name: 'MORPHO',
+      address: '0xBAa5CC21fd487B8Fcc2F632f3F4E8D37262a0842',
+    },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
       address: ADDRESS_ZERO,
     },
     OSETH: {
@@ -1599,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
@@ -476,6 +476,10 @@ export const config: SystemConfig = {
       name: 'MORPHO',
       address: ADDRESS_ZERO,
     },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
+      address: ADDRESS_ZERO,
+    },
     OSETH: {
       name: 'OSETH',
       address: '0x0000000000000000000000000000000000000000',
@@ -1255,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
@@ -580,6 +580,10 @@ export const config: SystemConfig = {
     },
     MORPHO: {
       name: 'MORPHO',
+      address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+    },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
       address: '0x9994e35db50125e0df82e4c2dde62496ce330999',
     },
     OSETH: {
@@ -1463,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
@@ -551,6 +551,10 @@ export const config: SystemConfig = {
     },
     MORPHO: {
       name: 'MORPHO',
+      address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+    },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
       address: '0x9994e35db50125e0df82e4c2dde62496ce330999',
     },
     OSETH: {
@@ -1416,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/mainnet.conf.ts b/packages/deploy-configurations/configs/mainnet.conf.ts
@@ -2,8 +2,6 @@ import { loadContractNames } from '@deploy-configurations/constants'
 import { SystemConfig } from '@deploy-configurations/types/deployment-config'
 import { Network } from '@deploy-configurations/types/network'
 
-import { commonDefaults } from './shared/common-defaults'
-
 const SERVICE_REGISTRY_NAMES = loadContractNames(Network.MAINNET)
 
 export const config: SystemConfig = {
@@ -96,14 +94,14 @@ export const config: SystemConfig = {
       },
       ERC20ProxyActions: {
         name: 'ERC20ProxyActions',
-        deploy: false,
-        address: '0x50A9ceC5AB2E2e0D350dACeb10bA769EbCbc49F3',
-        history: [],
+        deploy: true,
+        address: '0x4e42C2366a8C35D6Db276056AB75823aB9f16B54',
+        history: ['0x50A9ceC5AB2E2e0D350dACeb10bA769EbCbc49F3'],
         constructorArgs: [],
       },
       AaveRewardsProxyActions: {
         name: 'AaveRewardsProxyActions',
-        deploy: true,
+        deploy: false,
         address: '0x1498fEb3731b3ED60443F67dB323f0807d887a4a',
         history: ['0x8aD75eFF83EbcB2E343b1b8d76eFBC796Cf38594'],
         constructorArgs: [],
@@ -412,7 +410,6 @@ export const config: SystemConfig = {
     },
   },
   common: {
-    ...commonDefaults,
     ARB: {
       name: 'ARB',
       address: '0x0000000000000000000000000000000000000000',
@@ -645,6 +642,14 @@ export const config: SystemConfig = {
       name: 'WSUPEROETHB',
       address: '0x0000000000000000000000000000000000000000',
     },
+    CBBTC: {
+      name: 'CBBTC',
+      address: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    },
+    EURC: {
+      name: 'EURC',
+      address: '0x0000000000000000000000000000000000000000',
+    },
     GnosisSafe: {
       name: 'GnosisSafe',
       address: '0x85f9b7408afE6CEb5E46223451f5d4b832B522dc',
@@ -790,10 +795,6 @@ export const config: SystemConfig = {
       name: 'CBETH',
       address: '0xbe9895146f7af43049ca1c1ae358b0541ea49704',
     },
-    CBBTC: {
-      name: 'CBBTC',
-      address: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
-    },
     COMP: {
       name: 'COMP',
       address: '0xc00e94Cb662C3520282E6f5717214004A7f26888',
@@ -865,6 +866,10 @@ export const config: SystemConfig = {
     },
     MORPHO: {
       name: 'MORPHO',
+      address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+    },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
       address: '0x9994e35db50125e0df82e4c2dde62496ce330999',
     },
     OSETH: {
@@ -1866,5 +1871,9 @@ export const config: SystemConfig = {
       name: 'AdaptiveCurveIrm',
       address: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     },
+    Wrapper: {
+      name: 'Wrapper',
+      address: '0x9D03bb2092270648d7480049d0E58d2FcF0E5123',
+    },
   },
 }
diff --git a/packages/deploy-configurations/configs/optimism.conf.ts b/packages/deploy-configurations/configs/optimism.conf.ts
@@ -536,6 +536,10 @@ export const config: SystemConfig = {
       name: 'MORPHO',
       address: ADDRESS_ZERO,
     },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
+      address: ADDRESS_ZERO,
+    },
     OSETH: {
       name: 'OSETH',
       address: ADDRESS_ZERO,
@@ -1301,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
@@ -480,6 +480,10 @@ export const config: SystemConfig = {
       name: 'MORPHO',
       address: ADDRESS_ZERO,
     },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
+      address: ADDRESS_ZERO,
+    },
     OSETH: {
       name: 'OSETH',
       address: '0x0000000000000000000000000000000000000000',
@@ -1259,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
@@ -597,6 +597,10 @@ export const config: SystemConfig = {
     },
     MORPHO: {
       name: 'MORPHO',
+      address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+    },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
       address: '0x9994e35db50125e0df82e4c2dde62496ce330999',
     },
     OSETH: {
@@ -1465,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
@@ -638,6 +638,10 @@ export const config: SystemConfig = {
     },
     MORPHO: {
       name: 'MORPHO',
+      address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+    },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
       address: '0x9994e35db50125e0df82e4c2dde62496ce330999',
     },
     OSETH: {
@@ -1522,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
@@ -526,6 +526,10 @@ export const config: SystemConfig = {
       name: 'MORPHO',
       address: '0x9994e35db50125e0df82e4c2dde62496ce330999',
     },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
+      address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+    },
     OSETH: {
       name: 'OSETH',
       address: '0xf1c9acdc66974dfb6decb12aa385b9cd01190e38',
@@ -1330,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
@@ -449,6 +449,10 @@ export const config: SystemConfig = {
       name: 'MORPHO',
       address: '0x9994e35db50125e0df82e4c2dde62496ce330999',
     },
+    MORPHO_LEGACY: {
+      name: 'MORPHO_LEGACY',
+      address: ADDRESS_ZERO,
+    },
     OSETH: {
       name: 'OSETH',
       address: ADDRESS_ZERO,
@@ -1225,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/morpho-blue.ts b/packages/deploy-configurations/types/deployment-config/morpho-blue.ts
@@ -1,5 +1,5 @@
 import { ConfigEntry } from './config-entries'
 
-export type MorphoBlueProtocol = 'MorphoBlue' | 'AdaptiveCurveIrm'
+export type MorphoBlueProtocol = 'MorphoBlue' | 'AdaptiveCurveIrm' | 'Wrapper'
 
 export type MorphoBlueProtocolContracts = Record<MorphoBlueProtocol, ConfigEntry>
diff --git a/packages/deploy-configurations/types/deployment-config/tokens.ts b/packages/deploy-configurations/types/deployment-config/tokens.ts
@@ -33,6 +33,7 @@ export type Tokens =
   | 'MATIC'
   | 'MKR'
   | 'MORPHO'
+  | 'MORPHO_LEGACY'
   | 'MEVETH'
   | 'MPETH'
   | 'OP'