feat: v3.1 upgrade (#585)

* feat: updated ui pool data provider * fix: tests * fix: tests * fix: types * fix: temp disable coverage * fix: types * fix: types * fix: revert * fix: borrow usage ratio calcs * fix: types * feat: handle v3 and v3.1 providers * fix: testing * fix: build * feat: legacy version * fix: tests, comment
aave · Jul 26, 2024 · c65037e · c65037e
1 parent ecc96db
commit c65037e
Show file tree

Hide file tree

Showing 16 changed files with 2,097 additions and 2 deletions.
diff --git a/packages/contract-helpers/src/index.ts b/packages/contract-helpers/src/index.ts
@@ -5,6 +5,7 @@ export {
 } from './permissions-manager/types/PermissionManagerTypes';
 export * from './v3-UiIncentiveDataProvider-contract';
 export * from './v3-UiPoolDataProvider-contract';
+export * from './v3-UiPoolDataProvider-legacy-contract';
 export * from './wallet-balance-provider';
 export * from './cl-feed-registry';
 // export * from './uiStakeDataProvider-contract';

diff --git a/packages/contract-helpers/src/v3-UiPoolDataProvider-contract/_mocks.ts b/packages/contract-helpers/src/v3-UiPoolDataProvider-contract/_mocks.ts
@@ -149,6 +149,11 @@ export const reservesMock: ReservesData = {
         _hex: '0x0',
         _isBigNumber: true,
       }),
+      virtualAccActive: false,
+      virtualUnderlyingBalance: BigNumber.from({
+        _hex: '0x0',
+        _isBigNumber: true,
+      }),
     },
     {
       underlyingAsset: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11',
@@ -296,6 +301,11 @@ export const reservesMock: ReservesData = {
         _hex: '0x0',
         _isBigNumber: true,
       }),
+      virtualAccActive: false,
+      virtualUnderlyingBalance: BigNumber.from({
+        _hex: '0x0',
+        _isBigNumber: true,
+      }),
     },
   ],
   1: {

diff --git a/packages/contract-helpers/src/v3-UiPoolDataProvider-contract/index.ts b/packages/contract-helpers/src/v3-UiPoolDataProvider-contract/index.ts
@@ -58,6 +58,7 @@ export class UiPoolDataProvider implements UiPoolDataProviderInterface {
   private readonly _contract: UiPoolDataProviderContract;
 
   private readonly chainId: number;
+
   /**
    * Constructor
    * @param context The ui pool data provider context
@@ -190,6 +191,9 @@ export class UiPoolDataProvider implements UiPoolDataProviderInterface {
         debtCeilingDecimals: reserveRaw.debtCeilingDecimals.toNumber(),
         isSiloedBorrowing: reserveRaw.isSiloedBorrowing,
         flashLoanEnabled: reserveRaw.flashLoanEnabled,
+        virtualAccActive: reserveRaw.virtualAccActive,
+        virtualUnderlyingBalance:
+          reserveRaw.virtualUnderlyingBalance.toString(),
       }),
     );
 

diff --git a/.../contract-helpers/src/v3-UiPoolDataProvider-contract/typechain/IUiPoolDataProviderV3.d.ts b/.../contract-helpers/src/v3-UiPoolDataProvider-contract/typechain/IUiPoolDataProviderV3.d.ts
@@ -157,6 +157,8 @@ export class IUiPoolDataProviderV3 extends BaseContract {
           string,
           string,
           boolean,
+          boolean?,
+          BigNumber?,
         ] & {
           underlyingAsset: string;
           name: string;
@@ -212,6 +214,8 @@ export class IUiPoolDataProviderV3 extends BaseContract {
           eModePriceSource: string;
           eModeLabel: string;
           borrowableInIsolation: boolean;
+          virtualAccActive?: boolean;
+          virtualUnderlyingBalance?: BigNumber;
         })[],
         [BigNumber, BigNumber, BigNumber, number] & {
           marketReferenceCurrencyUnit: BigNumber;
@@ -315,6 +319,8 @@ export class IUiPoolDataProviderV3 extends BaseContract {
         string,
         string,
         boolean,
+        boolean,
+        BigNumber,
       ] & {
         underlyingAsset: string;
         name: string;
@@ -370,6 +376,8 @@ export class IUiPoolDataProviderV3 extends BaseContract {
         eModePriceSource: string;
         eModeLabel: string;
         borrowableInIsolation: boolean;
+        virtualAccActive: boolean;
+        virtualUnderlyingBalance: BigNumber;
       })[],
       [BigNumber, BigNumber, BigNumber, number] & {
         marketReferenceCurrencyUnit: BigNumber;
@@ -473,6 +481,8 @@ export class IUiPoolDataProviderV3 extends BaseContract {
           string,
           string,
           boolean,
+          boolean,
+          BigNumber,
         ] & {
           underlyingAsset: string;
           name: string;
@@ -528,6 +538,8 @@ export class IUiPoolDataProviderV3 extends BaseContract {
           eModePriceSource: string;
           eModeLabel: string;
           borrowableInIsolation: boolean;
+          virtualAccActive: boolean;
+          virtualUnderlyingBalance: BigNumber;
         })[],
         [BigNumber, BigNumber, BigNumber, number] & {
           marketReferenceCurrencyUnit: BigNumber;

diff --git a/...ct-helpers/src/v3-UiPoolDataProvider-contract/typechain/IUiPoolDataProviderV3__factory.ts b/...ct-helpers/src/v3-UiPoolDataProvider-contract/typechain/IUiPoolDataProviderV3__factory.ts
@@ -291,6 +291,16 @@ const _abi = [
             name: 'borrowableInIsolation',
             type: 'bool',
           },
+          {
+            internalType: 'bool',
+            name: 'virtualAccActive',
+            type: 'bool',
+          },
+          {
+            internalType: 'uint128',
+            name: 'virtualUnderlyingBalance',
+            type: 'uint128',
+          },
         ],
         internalType: 'struct IUiPoolDataProviderV3.AggregatedReserveData[]',
         name: '',
@@ -412,7 +422,33 @@ const _abi = [
     stateMutability: 'view',
     type: 'function',
   },
-];
+  {
+    inputs: [],
+    name: 'marketReferenceCurrencyPriceInUsdProxyAggregator',
+    outputs: [
+      {
+        internalType: 'contract IEACAggregatorProxy',
+        name: '',
+        type: 'address',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'networkBaseTokenPriceInUsdProxyAggregator',
+    outputs: [
+      {
+        internalType: 'contract IEACAggregatorProxy',
+        name: '',
+        type: 'address',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const;
 
 export class IUiPoolDataProviderV3__factory {
   static readonly abi = _abi;

diff --git a/packages/contract-helpers/src/v3-UiPoolDataProvider-contract/types.ts b/packages/contract-helpers/src/v3-UiPoolDataProvider-contract/types.ts
@@ -56,6 +56,8 @@ export interface ReservesData {
     eModeLabel: string;
     borrowableInIsolation: boolean;
     flashLoanEnabled: boolean;
+    virtualAccActive: boolean;
+    virtualUnderlyingBalance: BigNumber;
   }>;
   1: {
     marketReferenceCurrencyUnit: BigNumber;
@@ -141,6 +143,8 @@ export interface ReserveDataHumanized {
   eModeLabel: string;
   borrowableInIsolation: boolean;
   flashLoanEnabled: boolean;
+  virtualAccActive: boolean;
+  virtualUnderlyingBalance: string;
 }
 
 export interface ReservesDataHumanized {

diff --git a/packages/contract-helpers/src/v3-UiPoolDataProvider-contract/uiPoolDataProvider.test.ts b/packages/contract-helpers/src/v3-UiPoolDataProvider-contract/uiPoolDataProvider.test.ts
@@ -196,6 +196,8 @@ describe('UiPoolDataProvider', () => {
             debtCeilingDecimals: 0,
             borrowableInIsolation: false,
             flashLoanEnabled: false,
+            virtualAccActive: false,
+            virtualUnderlyingBalance: '0',
           },
           {
             id: '137-0xa478c2975ab1ea89e8196811f51a7b7ade33eb11-0x88757f2f99175387ab4c6a4b3067c77a695b0349',
@@ -257,6 +259,8 @@ describe('UiPoolDataProvider', () => {
             debtCeilingDecimals: 0,
             borrowableInIsolation: false,
             flashLoanEnabled: false,
+            virtualAccActive: false,
+            virtualUnderlyingBalance: '0',
           },
         ],
         baseCurrencyData: {