modified lending pool class

Author: EhigieO

src/main/java/com/arnAAVE/java_sdk/lendingPool/GasProvider.java

@@ -15,6 +15,7 @@
 
 @Data
 public class LendingPool {
+    private final ILendingPool lendingPool;
     private AaveConnect connection;
 
     private String lendingPoolAddressProvider;
@@ -23,70 +24,53 @@ public class LendingPool {
 
     private ContractGasProvider provider;
 
-    private ILendingPoolAddressesProvider lendingPoolAddress;
-
-    public LendingPool(AaveConnect connection, String lendingPoolAddressProvider, String gasFee, String gasLimit) {
+    public LendingPool(AaveConnect connection, String lendingPoolAddressProvider, String gasFee, String gasLimit) throws Exception {
         this.connection = connection;
         this.lendingPoolAddressProvider = lendingPoolAddressProvider;
         this.provider = new StaticGasProvider(new BigInteger(gasFee),new BigInteger(gasLimit));
-        this.lendingPoolAddress = new ILendingPoolAddressesProvider(lendingPoolAddressProvider,connection.getWeb3j(),connection.getCredentials(),provider);
+        ILendingPoolAddressesProvider lendingPoolAddress = new ILendingPoolAddressesProvider(lendingPoolAddressProvider,connection.getWeb3j(),connection.getCredentials(),provider);
+        String poolAddress = lendingPoolAddress.getLendingPool().send();
+        this.lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
     }
 
     TransactionReceipt deposit(String amount, String assetAddress, String onBehalfOf) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
+
         BigInteger value = new BigInteger(amount);
 
         return lendingPool.deposit(assetAddress, value, onBehalfOf, BigInteger.valueOf(0)).send();
     }
 
     List<ILendingPool.DepositEventResponse> depositEvents(Web3j web3j, TransactionReceipt transactionReceipt) throws Exception {
-        ContractGasProvider provider = new StaticGasProvider(new BigInteger("2000000"),new BigInteger("2000000"));
-        ILendingPoolAddressesProvider lendingPoolAddressesProvider = new ILendingPoolAddressesProvider("0x5E52dEc931FFb32f609681B8438A51c675cc232d",connection.getWeb3j(),connection.getCredentials(),provider);
-        RemoteFunctionCall<String> address = lendingPoolAddressesProvider.getLendingPool();
-        String poolAddress = address.send();
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
+
         return lendingPool.getDepositEvents(transactionReceipt);
     }
 
     ReserveData loadReservedData(String assetAddress) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
-
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
 
         return mapper.map(lendingPool.getReserveData(assetAddress).send(), ReserveData.class);
     }
 
     TransactionReceipt withdraw(String amount, String assetAddress, String toAddress) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
-        BigInteger value = new BigInteger(amount);
+       BigInteger value = new BigInteger(amount);
 
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
         return lendingPool.withdraw(assetAddress,value,toAddress).send();
     }
 
     TransactionReceipt borrow(String amount, String assetAddress, String onBehalfOf) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
         BigInteger value = new BigInteger(amount);
 
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
         return lendingPool.borrow(assetAddress,value, BigInteger.ONE,BigInteger.ZERO, onBehalfOf).send();
     }
 
     TransactionReceipt repay(String amount, String assetAddress, String onBehalfOf) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
-        BigInteger value = new BigInteger(amount);
+       BigInteger value = new BigInteger(amount);
 
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
-       
-        return lendingPool.repay(assetAddress,value,BigInteger.ONE,onBehalfOf).send();
+       return lendingPool.repay(assetAddress,value,BigInteger.ONE,onBehalfOf).send();
     }
 
     TransactionReceipt swapBorrowRate(String assetAddress, String mode) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
         BigInteger value = new BigInteger(mode);
 
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
         return lendingPool.swapBorrowRateMode(assetAddress,value).send();
     }
 

src/main/java/com/arnAAVE/java_sdk/lendingPool/LendingPool.java

@@ -20,7 +20,8 @@ public WethGateway(AaveConnect connection, String assetAddress, String gasFee, S
 
     TransactionReceipt depositEth(String onBehalfOf, String poolAddress) throws Exception {
         IWETHGateway weth = new IWETHGateway(assetAddress,connection.getWeb3j(),connection.getCredentials(),provider);
-        return weth.depositETH(poolAddress,"0xeB538049D10e62ca319c9fF0c9FFF18bF2Ad968e", BigInteger.ZERO).send();
+        return weth.depositETH(poolAddress,onBehalfOf, BigInteger.ZERO).send();
     }
 
+
 }

src/main/java/com/arnAAVE/java_sdk/lendingPool/WethGateway.java

@@ -22,7 +22,11 @@ void connection(){
 
         connection = new AaveConnect(privateKey,nodeUrl);
 
-        lendingPool = new LendingPool(connection, "0x5E52dEc931FFb32f609681B8438A51c675cc232d","20000000","30000000");
+        try {
+            lendingPool = new LendingPool(connection, "0x5E52dEc931FFb32f609681B8438A51c675cc232d","20000000","30000000");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Test
@@ -61,14 +65,15 @@ void testApprove(){
 
     @Test
     void testWethGateway() {
-//        WethGateway weth = new WethGateway(connection,"0x3bd3a20Ac9Ff1dda1D99C0dFCE6D65C4960B3627","2000000","3000000");
-        WethGateway weth = new WethGateway(connection,"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2","2000000","3000000");
-
+        WethGateway weth = new WethGateway(connection,"0x3bd3a20Ac9Ff1dda1D99C0dFCE6D65C4960B3627","2000000","3000000");
+//        WethGateway weth = new WethGateway(connection,"0x6cf3eeAAe068CB8087Ea9e857170f2Ba251F83bF","2000000","3000000");
+        TransactionReceipt wethReceipt = null;
         try {
-            weth.depositEth("0xeB538049D10e62ca319c9fF0c9FFF18bF2Ad968e","0x4bd5643ac6f66a5237E18bfA7d47cF22f1c9F210");
+            wethReceipt = weth.depositEth("0xeB538049D10e62ca319c9fF0c9FFF18bF2Ad968e","0x4bd5643ac6f66a5237E18bfA7d47cF22f1c9F210");
         } catch (Exception e) {
             e.printStackTrace();
         }
+        log.info("Weth Receipt -{}",wethReceipt);
     }
 
     @Test