Merge pull request #8 from alienrobotninja/ehi_v3_try

Ehi v3 try

Author: EhigieO

pom.xml

@@ -12,7 +12,16 @@
 	<artifactId>java_sdk</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>java_sdk</name>
-	<description>Demo project for Spring Boot</description>
+	<description>JAVA AAVE SDK</description>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<java.version>11</java.version>
 	</properties>

src/bin/generated/org.web3j.model/DataTypes.bin

@@ -2,41 +2,34 @@
 
 import com.arnAAVE.java_sdk.contractModels.IStakedToken;
 import com.arnAAVE.java_sdk.lendingPool.AaveConnect;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.RemoteFunctionCall;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.protocol.http.HttpService;
 import org.web3j.tx.gas.ContractGasProvider;
 import org.web3j.tx.gas.StaticGasProvider;
 
 import java.math.BigInteger;
 
 public class StakingAccess {
-
-
-    private IStakedToken iStakedToken;
-
+    private final IStakedToken iStakedToken;
 
     public StakingAccess(AaveConnect connection, String iStakedTokenAddress, String gasFee, String gasLimit) {
         ContractGasProvider provider = new StaticGasProvider(new BigInteger(gasFee), new BigInteger(gasLimit));
         this.iStakedToken = new IStakedToken(iStakedTokenAddress, connection.getWeb3j(), connection.getCredentials(),provider);
     }
 
-    public RemoteFunctionCall<String> staked_token(){
-        return iStakedToken.STAKED_TOKEN();
+    public String staked_token() throws Exception {
+        return iStakedToken.STAKED_TOKEN().send();
     }
 
-    public RemoteFunctionCall<TransactionReceipt> claimRewards(String to, BigInteger amount ){
-        return  iStakedToken.claimRewards(to, amount);
+    public TransactionReceipt claimRewards(String to, BigInteger amount ) throws Exception {
+        return  iStakedToken.claimRewards(to, amount).send();
     }
 
-    public RemoteFunctionCall<TransactionReceipt> stake(String onBehafOf, BigInteger amount) {
-        return  iStakedToken.stake(onBehafOf,amount);
+    public TransactionReceipt stake(String onBehafOf, BigInteger amount) throws Exception {
+        return  iStakedToken.stake(onBehafOf,amount).send();
     }
 
-    public RemoteFunctionCall<TransactionReceipt> redeem(String to, BigInteger amount){
-        return  iStakedToken.redeem(to, amount);
+    public TransactionReceipt redeem(String to, BigInteger amount) throws Exception {
+        return  iStakedToken.redeem(to, amount).send();
     }
 
 }

src/bin/generated/org.web3j.model/IAToken.bin

@@ -9,18 +9,27 @@
 public class Erc20 {
     private final AaveConnect connection;
 
-    private final ContractGasProvider provider;
-    private final String assetAddress;
+    private final IERC20 erc20;
 
     public Erc20(AaveConnect connection, String gasFee, String assetAddress) {
         this.connection = connection;
-        this.provider = new StaticGasProvider(new BigInteger(gasFee),new BigInteger("3000000"));
-        this.assetAddress = assetAddress;
+        ContractGasProvider provider = new StaticGasProvider(new BigInteger(gasFee),new BigInteger("3000000"));
+        this.erc20 = new IERC20(assetAddress, connection.getWeb3j(), connection.getCredentials(), provider);
+
     }
 
     public TransactionReceipt approve(String amount) throws Exception {
-        IERC20 erc20 = new IERC20(assetAddress,connection.getWeb3j(),connection.getCredentials(),provider);
 
         return erc20.approve(connection.getCredentials().getAddress(),new BigInteger(amount)).send();
     }
+
+    public BigInteger supplyBalance() throws Exception {
+
+        return erc20.totalSupply().send();
+    }
+
+    public BigInteger balanceOf(String address) throws Exception {
+
+        return erc20.balanceOf(address).send();
+    }
 }

src/bin/generated/org.web3j.model/IAaveGovernanceV2.bin

@@ -9,7 +9,6 @@
 import org.web3j.tx.gas.ContractGasProvider;
 import org.web3j.tx.gas.StaticGasProvider;
 
-import java.awt.geom.Point2D;
 import java.math.BigInteger;
 import java.util.List;
 
@@ -68,36 +67,26 @@ TransactionReceipt repay(String amount, String assetAddress, String onBehalfOf)
        return lendingPool.repay(assetAddress,value,BigInteger.ONE,onBehalfOf).send();
     }
 
-    TransactionReceipt swapBorrowRate(String amount, String assetAddress, String onBehalfOf) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
+    TransactionReceipt swapBorrowRate(String amount, String assetAddress) throws Exception {
         BigInteger value = new BigInteger(amount);
 
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
-        return lendingPool.swapBorrowRateMode(assetAddress,BigInteger.ONE).send();
+       return lendingPool.swapBorrowRateMode(assetAddress,BigInteger.ONE).send();
     }
 
     public TransactionReceipt setUsageAsCollateral(String asset, Boolean useAsCollateral) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
-        BigInteger value = new BigInteger(asset);
 
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
         return lendingPool.setUserUseReserveAsCollateral(asset, useAsCollateral).send();
     }
 
     public TransactionReceipt liquidationCall(String collateralAsset, String debtAsset, String user, String debtToCover, Boolean receiveAToken) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
         BigInteger value = new BigInteger(debtToCover);
 
-        ILendingPool lendingPool = ILendingPool.load(poolAddress,connection.getWeb3j(),connection.getCredentials(),provider);
         return lendingPool.liquidationCall(collateralAsset,debtAsset,user,value,receiveAToken).send();
     }
 
-    public RemoteFunctionCall<TransactionReceipt> flashLoans(String receiverAddress, List<String> assets, List<BigInteger> amounts, List<BigInteger> modes, String onBehalfOf, byte[] params, BigInteger referralCode) throws Exception {
-        String poolAddress = lendingPoolAddress.getLendingPool().send();
-        BigInteger value = new BigInteger(String.valueOf(amounts));
+    public RemoteFunctionCall<TransactionReceipt> flashLoans(String receiverAddress, List<String> assets, List<BigInteger> amounts, List<BigInteger> modes, String onBehalfOf, byte[] params, BigInteger referralCode) {
 
-        ILendingPool lendingPool = ILendingPool.load(poolAddress, connection.getWeb3j(), connection.getCredentials(), provider);
-        return lendingPool.flashLoan(receiverAddress, assets,amounts, modes,onBehalfOf,params, referralCode);
+       return lendingPool.flashLoan(receiverAddress, assets,amounts, modes,onBehalfOf,params, referralCode);
     }
 
 }

src/bin/generated/org.web3j.model/IBaseUniswapAdapter.bin

@@ -15,7 +15,6 @@
 @EqualsAndHashCode(callSuper = true)
 @Data
 @RequiredArgsConstructor
-@AllArgsConstructor
 public class ReserveData extends StaticStruct {
     public ILendingPool.ReserveConfigurationMap configuration;
 
@@ -41,35 +40,35 @@ public class ReserveData extends StaticStruct {
 
     public BigInteger id;
 
-//    public ReserveData(ILendingPool.ReserveConfigurationMap configuration, BigInteger liquidityIndex, BigInteger variableBorrowIndex, BigInteger currentLiquidityRate, BigInteger currentVariableBorrowRate, BigInteger currentStableBorrowRate, BigInteger lastUpdateTimestamp, String aTokenAddress, String stableDebtTokenAddress, String variableDebtTokenAddress, String interestRateStrategyAddress, BigInteger id) {
-//        super(configuration,new org.web3j.abi.datatypes.generated.Uint128(liquidityIndex),new org.web3j.abi.datatypes.generated.Uint128(variableBorrowIndex),new org.web3j.abi.datatypes.generated.Uint128(currentLiquidityRate),new org.web3j.abi.datatypes.generated.Uint128(currentVariableBorrowRate),new org.web3j.abi.datatypes.generated.Uint128(currentStableBorrowRate),new org.web3j.abi.datatypes.generated.Uint40(lastUpdateTimestamp),new org.web3j.abi.datatypes.Address(aTokenAddress),new org.web3j.abi.datatypes.Address(stableDebtTokenAddress),new org.web3j.abi.datatypes.Address(variableDebtTokenAddress),new org.web3j.abi.datatypes.Address(interestRateStrategyAddress),new org.web3j.abi.datatypes.generated.Uint8(id));
-//        this.configuration = configuration;
-//        this.liquidityIndex = liquidityIndex;
-//        this.variableBorrowIndex = variableBorrowIndex;
-//        this.currentLiquidityRate = currentLiquidityRate;
-//        this.currentVariableBorrowRate = currentVariableBorrowRate;
-//        this.currentStableBorrowRate = currentStableBorrowRate;
-//        this.lastUpdateTimestamp = lastUpdateTimestamp;
-//        this.aTokenAddress = aTokenAddress;
-//        this.stableDebtTokenAddress = stableDebtTokenAddress;
-//        this.variableDebtTokenAddress = variableDebtTokenAddress;
-//        this.interestRateStrategyAddress = interestRateStrategyAddress;
-//        this.id = id;
-//    }
-//
-//    public ReserveData(ILendingPool.ReserveConfigurationMap configuration, Uint128 liquidityIndex, Uint128 variableBorrowIndex, Uint128 currentLiquidityRate, Uint128 currentVariableBorrowRate, Uint128 currentStableBorrowRate, Uint40 lastUpdateTimestamp, Address aTokenAddress, Address stableDebtTokenAddress, Address variableDebtTokenAddress, Address interestRateStrategyAddress, Uint8 id) {
-//        super(configuration,liquidityIndex,variableBorrowIndex,currentLiquidityRate,currentVariableBorrowRate,currentStableBorrowRate,lastUpdateTimestamp,aTokenAddress,stableDebtTokenAddress,variableDebtTokenAddress,interestRateStrategyAddress,id);
-//        this.configuration = configuration;
-//        this.liquidityIndex = liquidityIndex.getValue();
-//        this.variableBorrowIndex = variableBorrowIndex.getValue();
-//        this.currentLiquidityRate = currentLiquidityRate.getValue();
-//        this.currentVariableBorrowRate = currentVariableBorrowRate.getValue();
-//        this.currentStableBorrowRate = currentStableBorrowRate.getValue();
-//        this.lastUpdateTimestamp = lastUpdateTimestamp.getValue();
-//        this.aTokenAddress = aTokenAddress.getValue();
-//        this.stableDebtTokenAddress = stableDebtTokenAddress.getValue();
-//        this.variableDebtTokenAddress = variableDebtTokenAddress.getValue();
-//        this.interestRateStrategyAddress = interestRateStrategyAddress.getValue();
-//        this.id = id.getValue();
-//    }
+    public ReserveData(ILendingPool.ReserveConfigurationMap configuration, BigInteger liquidityIndex, BigInteger variableBorrowIndex, BigInteger currentLiquidityRate, BigInteger currentVariableBorrowRate, BigInteger currentStableBorrowRate, BigInteger lastUpdateTimestamp, String aTokenAddress, String stableDebtTokenAddress, String variableDebtTokenAddress, String interestRateStrategyAddress, BigInteger id) {
+        super(configuration,new org.web3j.abi.datatypes.generated.Uint128(liquidityIndex),new org.web3j.abi.datatypes.generated.Uint128(variableBorrowIndex),new org.web3j.abi.datatypes.generated.Uint128(currentLiquidityRate),new org.web3j.abi.datatypes.generated.Uint128(currentVariableBorrowRate),new org.web3j.abi.datatypes.generated.Uint128(currentStableBorrowRate),new org.web3j.abi.datatypes.generated.Uint40(lastUpdateTimestamp),new org.web3j.abi.datatypes.Address(aTokenAddress),new org.web3j.abi.datatypes.Address(stableDebtTokenAddress),new org.web3j.abi.datatypes.Address(variableDebtTokenAddress),new org.web3j.abi.datatypes.Address(interestRateStrategyAddress),new org.web3j.abi.datatypes.generated.Uint8(id));
+        this.configuration = configuration;
+        this.liquidityIndex = liquidityIndex;
+        this.variableBorrowIndex = variableBorrowIndex;
+        this.currentLiquidityRate = currentLiquidityRate;
+        this.currentVariableBorrowRate = currentVariableBorrowRate;
+        this.currentStableBorrowRate = currentStableBorrowRate;
+        this.lastUpdateTimestamp = lastUpdateTimestamp;
+        this.aTokenAddress = aTokenAddress;
+        this.stableDebtTokenAddress = stableDebtTokenAddress;
+        this.variableDebtTokenAddress = variableDebtTokenAddress;
+        this.interestRateStrategyAddress = interestRateStrategyAddress;
+        this.id = id;
+    }
+
+    public ReserveData(ILendingPool.ReserveConfigurationMap configuration, Uint128 liquidityIndex, Uint128 variableBorrowIndex, Uint128 currentLiquidityRate, Uint128 currentVariableBorrowRate, Uint128 currentStableBorrowRate, Uint40 lastUpdateTimestamp, Address aTokenAddress, Address stableDebtTokenAddress, Address variableDebtTokenAddress, Address interestRateStrategyAddress, Uint8 id) {
+        super(configuration,liquidityIndex,variableBorrowIndex,currentLiquidityRate,currentVariableBorrowRate,currentStableBorrowRate,lastUpdateTimestamp,aTokenAddress,stableDebtTokenAddress,variableDebtTokenAddress,interestRateStrategyAddress,id);
+        this.configuration = configuration;
+        this.liquidityIndex = liquidityIndex.getValue();
+        this.variableBorrowIndex = variableBorrowIndex.getValue();
+        this.currentLiquidityRate = currentLiquidityRate.getValue();
+        this.currentVariableBorrowRate = currentVariableBorrowRate.getValue();
+        this.currentStableBorrowRate = currentStableBorrowRate.getValue();
+        this.lastUpdateTimestamp = lastUpdateTimestamp.getValue();
+        this.aTokenAddress = aTokenAddress.getValue();
+        this.stableDebtTokenAddress = stableDebtTokenAddress.getValue();
+        this.variableDebtTokenAddress = variableDebtTokenAddress.getValue();
+        this.interestRateStrategyAddress = interestRateStrategyAddress.getValue();
+        this.id = id.getValue();
+    }
 }

src/bin/generated/org.web3j.model/ICreditDelegationToken.bin

@@ -1,27 +1,61 @@
 package com.arnAAVE.java_sdk.lendingPool;
 
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.abi.datatypes.Type;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.tx.Transfer;
 import org.web3j.tx.gas.ContractGasProvider;
 import org.web3j.tx.gas.StaticGasProvider;
+import org.web3j.utils.Convert;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collections;
 
 public class WethGateway {
-    private final AaveConnect connection;
 
-    private final ContractGasProvider provider;
-    private final String assetAddress;
+    private final IWETHGateway weth;
 
     public WethGateway(AaveConnect connection, String assetAddress, String gasFee, String gasLimit) {
-        this.connection = connection;
-        this.provider = new StaticGasProvider(new BigInteger(gasFee),new BigInteger(gasLimit));
-        this.assetAddress = assetAddress;
+        ContractGasProvider provider = new StaticGasProvider(new BigInteger(gasFee),new BigInteger(gasLimit));
+        weth = new IWETHGateway(assetAddress,connection.getWeb3j(),connection.getCredentials(),provider);
     }
 
-    TransactionReceipt depositEth(String onBehalfOf, String poolAddress) throws Exception {
-        IWETHGateway weth = new IWETHGateway(assetAddress,connection.getWeb3j(),connection.getCredentials(),provider);
+    public TransactionReceipt depositEth(String onBehalfOf, String poolAddress, String value) throws Exception {
+//        TransactionReceipt transactionReceipt = Transfer.sendFunds(connection.getWeb3j(),connection.getCredentials(),"", new BigDecimal("0.003"), Convert.Unit.ETHER).send();
+
+//        public RemoteFunctionCall<TransactionReceipt> newGreeting(String _greeting, BigInteger weiValue) {
+//            final Function function = new Function(
+//                    FUNC_NEWGREETING,
+//                    Arrays.<Type>asList(new org.web3j.abi.datatypes.Utf8String(onBehalfOf)),
+//                    Collections.<TypeReference<?>>emptyList());
+//            return executeRemoteCallTransaction(function, value);
+//        }
+//        Function function = new Function(
+//                "functionName",  // function we're calling
+//                Arrays.asList(new Type(value), ...),  // Parameters to pass as Solidity Types
+//        Arrays.asList(new TypeReference<Type>() {}, ...));
+//
+//        String encodedFunction = FunctionEncoder.encode(function)
+//        Transaction transaction = Transaction.createFunctionCallTransaction(
+//                <from>, <gasPrice>, <gasLimit>, contractAddress, <funds>, encodedFunction);
+//
+//        org.web3j.protocol.core.methods.response.EthSendTransaction transactionResponse =
+//                web3j.ethSendTransaction(transaction).sendAsync().get();
+//
+//        String transactionHash = transactionResponse.getTransactionHash();
+
+// wait for response using EthGetTransactionReceipt...
         return weth.depositETH(poolAddress,onBehalfOf, BigInteger.ZERO).send();
     }
 
 
+
+    public TransactionReceipt withdrawEth(String onBehalfOf, String amount,String poolAddress) throws Exception {
+        BigInteger value = new BigInteger(amount);
+
+    return weth.withdrawETH(poolAddress,value, onBehalfOf).send();
+    }
 }