Feat/v3.2 gateway (#595)

* feat: new weth gateway and tests * feat: fixed test for wrapped new interface * feat: added renamed v3 gateway * feat: go back to old pool weth gateway for v2
aave · Oct 9, 2024 · 6b7a707 · 6b7a707
1 parent 446d9af
commit 6b7a707
Show file tree

Hide file tree

Showing 8 changed files with 2,378 additions and 25 deletions.
diff --git a/packages/contract-helpers/src/v3-pool-contract-bundle/index.ts b/packages/contract-helpers/src/v3-pool-contract-bundle/index.ts
@@ -37,7 +37,7 @@ import { L2Pool, L2PoolInterface } from '../v3-pool-rollups';
 import {
   WETHGatewayInterface,
   WETHGatewayService,
-} from '../wethgateway-contract';
+} from '../v3-wethgateway-contract';
 
 export type SupplyTxBuilder = {
   generateTxData: ({
@@ -316,7 +316,6 @@ export class PoolBundle
             user,
             amount,
             debtTokenAddress,
-            interestRateMode,
             referralCode: referralCodeParam,
           });
         } else {
@@ -375,7 +374,6 @@ export class PoolBundle
             lendingPool: this.poolAddress,
             user,
             amount,
-            interestRateMode,
             onBehalfOf: onBehalfOfParam,
           });
         }

diff --git a/packages/contract-helpers/src/v3-pool-contract-bundle/pool-bundle.test.ts b/packages/contract-helpers/src/v3-pool-contract-bundle/pool-bundle.test.ts
@@ -475,16 +475,6 @@ describe('PoolBundle', () => {
         debtTokenAddress: API_ETH_MOCK_ADDRESS.toLowerCase(),
       });
 
-      const resultStable = instance.borrowTxBuilder.generateTxData({
-        user: USER,
-        reserve: API_ETH_MOCK_ADDRESS.toLowerCase(),
-        amount: '1',
-        onBehalfOf: USER,
-        interestRateMode: InterestRate.Stable,
-        referralCode: '0',
-        debtTokenAddress: API_ETH_MOCK_ADDRESS.toLowerCase(),
-      });
-
       const differentParamsSameResult = instance.borrowTxBuilder.generateTxData(
         {
           user: USER,
@@ -495,20 +485,14 @@ describe('PoolBundle', () => {
         },
       );
       const variableTxData =
-        '0x66514c970000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000';
-      const stableTxData =
-        '0x66514c970000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000';
+        '0xe74f7b85000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000';
       expect(result.to).toEqual(WETH_GATEWAY);
       expect(result.from).toEqual(USER);
       expect(result.value).toEqual(undefined);
       expect(result.data).toEqual(variableTxData);
       expect(differentParamsSameResult.to).toEqual(WETH_GATEWAY);
       expect(differentParamsSameResult.from).toEqual(USER);
       expect(differentParamsSameResult.data).toEqual(variableTxData);
-      expect(resultStable.to).toEqual(WETH_GATEWAY);
-      expect(resultStable.from).toEqual(USER);
-      expect(resultStable.value).toEqual(undefined);
-      expect(resultStable.data).toEqual(stableTxData);
     });
 
     it('generates borrow tx data with generateTxData and L2POOL', () => {
@@ -711,12 +695,12 @@ describe('PoolBundle', () => {
       expect(result.from).toEqual(USER);
       expect(result.value).toEqual(BigNumber.from('1'));
       expect(result.data).toEqual(
-        '0x02c5fcf80000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003',
+        '0xbcc3c255000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003',
       );
       expect(differentParamsSameResult.to).toEqual(WETH_GATEWAY);
       expect(differentParamsSameResult.from).toEqual(USER);
       expect(differentParamsSameResult.data).toEqual(
-        '0x02c5fcf80000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003',
+        '0xbcc3c255000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003',
       );
     });
 

diff --git a/packages/contract-helpers/src/v3-pool-contract/index.ts b/packages/contract-helpers/src/v3-pool-contract/index.ts
@@ -53,7 +53,7 @@ import { L2Pool, L2PoolInterface } from '../v3-pool-rollups';
 import {
   WETHGatewayInterface,
   WETHGatewayService,
-} from '../wethgateway-contract';
+} from '../v3-wethgateway-contract';
 import {
   LPBorrowParamsType,
   LPSupplyParamsType,
@@ -681,7 +681,6 @@ export class Pool extends BaseService<IPool> implements PoolInterface {
         user,
         amount,
         debtTokenAddress,
-        interestRateMode,
         referralCode,
       });
     }
@@ -750,7 +749,6 @@ export class Pool extends BaseService<IPool> implements PoolInterface {
         lendingPool: this.poolAddress,
         user,
         amount,
-        interestRateMode,
         onBehalfOf,
       });
     }