Morpho rebase (consensys-vertical-apps#163)

morpho-labs · Feb 22, 2024 · 5b54ccd · 5b54ccd
1 parent 69d9f4e
commit 5b54ccd
Show file tree

Hide file tree

Showing 239 changed files with 52,309 additions and 152 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -90,6 +90,7 @@
   "dependencies": {
     "dotenv": "^16.3.1",
     "ethers": "^6.7.1",
+    "evm-maths": "^6.0.0",
     "pino": "^8.15.0",
     "zod": "^3.22.4"
   }

diff --git a/src/adapters/aave-v2/products/a-token/aaveV2ATokenPoolAdapter.ts b/src/adapters/aave-v2/products/a-token/aaveV2ATokenPoolAdapter.ts
@@ -1,5 +1,9 @@
 import { CacheToFile } from '../../../../core/decorators/cacheToFile'
-import { PositionType, ProtocolDetails } from '../../../../types/adapter'
+import {
+  AssetType,
+  PositionType,
+  ProtocolDetails,
+} from '../../../../types/adapter'
 import { AaveBasePoolAdapter } from '../../common/aaveBasePoolAdapter'
 import { ProtocolDataProvider } from '../../contracts'
 
@@ -16,6 +20,9 @@ export class AaveV2ATokenPoolAdapter extends AaveBasePoolAdapter {
       positionType: PositionType.Lend,
       chainId: this.chainId,
       productId: this.productId,
+      assetDetails: {
+        type: AssetType.StandardErc20,
+      },
     }
   }
 

diff --git a/src/adapters/aave-v2/products/stable-debt-token/aaveV2StableDebtTokenPoolAdapter.ts b/src/adapters/aave-v2/products/stable-debt-token/aaveV2StableDebtTokenPoolAdapter.ts
@@ -1,5 +1,9 @@
 import { CacheToFile } from '../../../../core/decorators/cacheToFile'
-import { PositionType, ProtocolDetails } from '../../../../types/adapter'
+import {
+  AssetType,
+  PositionType,
+  ProtocolDetails,
+} from '../../../../types/adapter'
 import { AaveBasePoolAdapter } from '../../common/aaveBasePoolAdapter'
 import { ProtocolDataProvider } from '../../contracts'
 
@@ -16,6 +20,9 @@ export class AaveV2StableDebtTokenPoolAdapter extends AaveBasePoolAdapter {
       positionType: PositionType.Borrow,
       chainId: this.chainId,
       productId: this.productId,
+      assetDetails: {
+        type: AssetType.NonStandardErc20,
+      },
     }
   }
 

diff --git a/src/adapters/aave-v2/products/variable-debt-token/aaveV2VariableDebtTokenPoolAdapter.ts b/src/adapters/aave-v2/products/variable-debt-token/aaveV2VariableDebtTokenPoolAdapter.ts
@@ -1,5 +1,9 @@
 import { CacheToFile } from '../../../../core/decorators/cacheToFile'
-import { PositionType, ProtocolDetails } from '../../../../types/adapter'
+import {
+  AssetType,
+  PositionType,
+  ProtocolDetails,
+} from '../../../../types/adapter'
 import { AaveBasePoolAdapter } from '../../common/aaveBasePoolAdapter'
 import { ProtocolDataProvider } from '../../contracts'
 
@@ -16,6 +20,9 @@ export class AaveV2VariableDebtTokenPoolAdapter extends AaveBasePoolAdapter {
       positionType: PositionType.Borrow,
       chainId: this.chainId,
       productId: this.productId,
+      assetDetails: {
+        type: AssetType.NonStandardErc20,
+      },
     }
   }
 

diff --git a/src/adapters/aave-v2/tests/snapshots/ethereum.apr.json b/src/adapters/aave-v2/tests/snapshots/ethereum.apr.json
@@ -10,6 +10,9 @@
       "positionType": "lend",
       "chainId": 1,
       "productId": "a-token",
+      "assetDetails": {
+        "type": "StandardErc20"
+      },
       "success": true,
       "tokens": [
         {
@@ -107,6 +110,9 @@
       "positionType": "borrow",
       "chainId": 1,
       "productId": "stable-debt-token",
+      "assetDetails": {
+        "type": "NonStandardErc20"
+      },
       "success": true,
       "tokens": [
         {
@@ -204,6 +210,9 @@
       "positionType": "borrow",
       "chainId": 1,
       "productId": "variable-debt-token",
+      "assetDetails": {
+        "type": "NonStandardErc20"
+      },
       "success": true,
       "tokens": [
         {

diff --git a/src/adapters/aave-v2/tests/snapshots/ethereum.apy.json b/src/adapters/aave-v2/tests/snapshots/ethereum.apy.json
@@ -10,6 +10,9 @@
       "positionType": "lend",
       "chainId": 1,
       "productId": "a-token",
+      "assetDetails": {
+        "type": "StandardErc20"
+      },
       "success": true,
       "tokens": [
         {
@@ -107,6 +110,9 @@
       "positionType": "borrow",
       "chainId": 1,
       "productId": "stable-debt-token",
+      "assetDetails": {
+        "type": "NonStandardErc20"
+      },
       "success": true,
       "tokens": [
         {
@@ -204,6 +210,9 @@
       "positionType": "borrow",
       "chainId": 1,
       "productId": "variable-debt-token",
+      "assetDetails": {
+        "type": "NonStandardErc20"
+      },
       "success": true,
       "tokens": [
         {