Skip to content

Commit d05ac79

Browse files
committed
modified lending pool class
1 parent 51049fb commit d05ac79

File tree

4 files changed

+22
-62
lines changed

4 files changed

+22
-62
lines changed

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

Lines changed: 0 additions & 30 deletions
This file was deleted.

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

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
@Data
1717
public class LendingPool {
18+
private final ILendingPool lendingPool;
1819
private AaveConnect connection;
1920

2021
private String lendingPoolAddressProvider;
@@ -23,70 +24,53 @@ public class LendingPool {
2324

2425
private ContractGasProvider provider;
2526

26-
private ILendingPoolAddressesProvider lendingPoolAddress;
27-
28-
public LendingPool(AaveConnect connection, String lendingPoolAddressProvider, String gasFee, String gasLimit) {
27+
public LendingPool(AaveConnect connection, String lendingPoolAddressProvider, String gasFee, String gasLimit) throws Exception {
2928
this.connection = connection;
3029
this.lendingPoolAddressProvider = lendingPoolAddressProvider;
3130
this.provider = new StaticGasProvider(new BigInteger(gasFee),new BigInteger(gasLimit));
32-
this.lendingPoolAddress = new ILendingPoolAddressesProvider(lendingPoolAddressProvider,connection.getWeb3j(),connection.getCredentials(),provider);
31+
ILendingPoolAddressesProvider lendingPoolAddress = new ILendingPoolAddressesProvider(lendingPoolAddressProvider,connection.getWeb3j(),connection.getCredentials(),provider);
32+
String poolAddress = lendingPoolAddress.getLendingPool().send();
33+
this.lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
3334
}
3435

3536
TransactionReceipt deposit(String amount, String assetAddress, String onBehalfOf) throws Exception {
36-
String poolAddress = lendingPoolAddress.getLendingPool().send();
37-
ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
37+
3838
BigInteger value = new BigInteger(amount);
3939

4040
return lendingPool.deposit(assetAddress, value, onBehalfOf, BigInteger.valueOf(0)).send();
4141
}
4242

4343
List<ILendingPool.DepositEventResponse> depositEvents(Web3j web3j, TransactionReceipt transactionReceipt) throws Exception {
44-
ContractGasProvider provider = new StaticGasProvider(new BigInteger("2000000"),new BigInteger("2000000"));
45-
ILendingPoolAddressesProvider lendingPoolAddressesProvider = new ILendingPoolAddressesProvider("0x5E52dEc931FFb32f609681B8438A51c675cc232d",connection.getWeb3j(),connection.getCredentials(),provider);
46-
RemoteFunctionCall<String> address = lendingPoolAddressesProvider.getLendingPool();
47-
String poolAddress = address.send();
48-
ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
44+
4945
return lendingPool.getDepositEvents(transactionReceipt);
5046
}
5147

5248
ReserveData loadReservedData(String assetAddress) throws Exception {
53-
String poolAddress = lendingPoolAddress.getLendingPool().send();
54-
55-
ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
5649

5750
return mapper.map(lendingPool.getReserveData(assetAddress).send(), ReserveData.class);
5851
}
5952

6053
TransactionReceipt withdraw(String amount, String assetAddress, String toAddress) throws Exception {
61-
String poolAddress = lendingPoolAddress.getLendingPool().send();
62-
BigInteger value = new BigInteger(amount);
54+
BigInteger value = new BigInteger(amount);
6355

64-
ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
6556
return lendingPool.withdraw(assetAddress,value,toAddress).send();
6657
}
6758

6859
TransactionReceipt borrow(String amount, String assetAddress, String onBehalfOf) throws Exception {
69-
String poolAddress = lendingPoolAddress.getLendingPool().send();
7060
BigInteger value = new BigInteger(amount);
7161

72-
ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
7362
return lendingPool.borrow(assetAddress,value, BigInteger.ONE,BigInteger.ZERO, onBehalfOf).send();
7463
}
7564

7665
TransactionReceipt repay(String amount, String assetAddress, String onBehalfOf) throws Exception {
77-
String poolAddress = lendingPoolAddress.getLendingPool().send();
78-
BigInteger value = new BigInteger(amount);
66+
BigInteger value = new BigInteger(amount);
7967

80-
ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
81-
82-
return lendingPool.repay(assetAddress,value,BigInteger.ONE,onBehalfOf).send();
68+
return lendingPool.repay(assetAddress,value,BigInteger.ONE,onBehalfOf).send();
8369
}
8470

8571
TransactionReceipt swapBorrowRate(String assetAddress, String mode) throws Exception {
86-
String poolAddress = lendingPoolAddress.getLendingPool().send();
8772
BigInteger value = new BigInteger(mode);
8873

89-
ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
9074
return lendingPool.swapBorrowRateMode(assetAddress,value).send();
9175
}
9276

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public WethGateway(AaveConnect connection, String assetAddress, String gasFee, S
2020

2121
TransactionReceipt depositEth(String onBehalfOf, String poolAddress) throws Exception {
2222
IWETHGateway weth = new IWETHGateway(assetAddress,connection.getWeb3j(),connection.getCredentials(),provider);
23-
return weth.depositETH(poolAddress,"0xeB538049D10e62ca319c9fF0c9FFF18bF2Ad968e", BigInteger.ZERO).send();
23+
return weth.depositETH(poolAddress,onBehalfOf, BigInteger.ZERO).send();
2424
}
2525

26+
2627
}

src/test/java/com/arnAAVE/java_sdk/lendingPool/LendingPoolTest.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ void connection(){
2222

2323
connection = new AaveConnect(privateKey,nodeUrl);
2424

25-
lendingPool = new LendingPool(connection, "0x5E52dEc931FFb32f609681B8438A51c675cc232d","20000000","30000000");
25+
try {
26+
lendingPool = new LendingPool(connection, "0x5E52dEc931FFb32f609681B8438A51c675cc232d","20000000","30000000");
27+
} catch (Exception e) {
28+
e.printStackTrace();
29+
}
2630
}
2731

2832
@Test
@@ -61,14 +65,15 @@ void testApprove(){
6165

6266
@Test
6367
void testWethGateway() {
64-
// WethGateway weth = new WethGateway(connection,"0x3bd3a20Ac9Ff1dda1D99C0dFCE6D65C4960B3627","2000000","3000000");
65-
WethGateway weth = new WethGateway(connection,"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2","2000000","3000000");
66-
68+
WethGateway weth = new WethGateway(connection,"0x3bd3a20Ac9Ff1dda1D99C0dFCE6D65C4960B3627","2000000","3000000");
69+
// WethGateway weth = new WethGateway(connection,"0x6cf3eeAAe068CB8087Ea9e857170f2Ba251F83bF","2000000","3000000");
70+
TransactionReceipt wethReceipt = null;
6771
try {
68-
weth.depositEth("0xeB538049D10e62ca319c9fF0c9FFF18bF2Ad968e","0x4bd5643ac6f66a5237E18bfA7d47cF22f1c9F210");
72+
wethReceipt = weth.depositEth("0xeB538049D10e62ca319c9fF0c9FFF18bF2Ad968e","0x4bd5643ac6f66a5237E18bfA7d47cF22f1c9F210");
6973
} catch (Exception e) {
7074
e.printStackTrace();
7175
}
76+
log.info("Weth Receipt -{}",wethReceipt);
7277
}
7378

7479
@Test

0 commit comments

Comments
 (0)