LogQuery builders for log api part

Providers improvements
Providers contracts
Other models improvements & refactoring

Author: GoodforGod

src/main/java/io/api/core/EtherScanApi.java

@@ -35,13 +35,10 @@ public EtherScanApi(final String apiKey) {
 
     public EtherScanApi(final String apiKey,
                         final EthereumNetwork network) {
-        final EthereumNetwork usedNetwork = (network == null)
-                ? EthereumNetwork.MAINNET
-                : network;
-
         // EtherScan 5req\sec limit support
         final IQueueManager masterQueue = new QueueManager(5, 1);
 
+        final EthereumNetwork usedNetwork = (network == null) ? EthereumNetwork.MAINNET : network;
         final String url = "https://" + usedNetwork.getDomain() + ".etherscan.io/api" + "?apikey=" + apiKey;
         this.contract = new ContractProvider(masterQueue, url, HEADERS);
         this.account = new AccountProvider(masterQueue, url, HEADERS);

src/main/java/io/api/core/IAccountProvider.java

@@ -19,27 +19,27 @@ public interface IAccountProvider {
     @NotNull Balance balance(String address) throws ApiException;
 
     /**
-     * Maximum 20 address for batch request
+     * Maximum 20 address for single batch request
      * If address > 20, then there will be more than 1 request performed
      */
     @NotNull List<Balance> balances(List<String> addresses) throws ApiException;
 
     /** All txs */
     @NotNull List<Tx> txs(String address) throws ApiException;
-    @NotNull List<Tx> txs(String address, long startBlock);
-    @NotNull List<Tx> txs(String address, long startBlock, long endBlock);
+    @NotNull List<Tx> txs(String address, long startBlock) throws ApiException;
+    @NotNull List<Tx> txs(String address, long startBlock, long endBlock) throws ApiException;
 
     /** All internal txs */
-    @NotNull List<TxInternal> txsInternal(String address);
-    @NotNull List<TxInternal> txsInternal(String address, long startBlock);
-    @NotNull List<TxInternal> txsInternal(String address, long startBlock, long endBlock);
+    @NotNull List<TxInternal> txsInternal(String address) throws ApiException;
+    @NotNull List<TxInternal> txsInternal(String address, long startBlock) throws ApiException;
+    @NotNull List<TxInternal> txsInternal(String address, long startBlock, long endBlock) throws ApiException;
     @NotNull List<TxInternal> txsInternalByHash(String txhash);
 
     /** All token txs */
-    @NotNull List<TxToken> txsToken(String address);
-    @NotNull List<TxToken> txsToken(String address, long startBlock);
-    @NotNull List<TxToken> txsToken(String address, long startBlock, long endBlock);
+    @NotNull List<TxToken> txsToken(String address) throws ApiException;
+    @NotNull List<TxToken> txsToken(String address, long startBlock) throws ApiException;
+    @NotNull List<TxToken> txsToken(String address, long startBlock, long endBlock) throws ApiException;
 
     /** All blocks mined by address */
-    @NotNull List<Block> minedBlocks(String address);
+    @NotNull List<Block> minedBlocks(String address) throws ApiException;
 }

src/main/java/io/api/core/IBlockProvider.java

@@ -11,5 +11,6 @@
  */
 public interface IBlockProvider {
 
+    /** Return uncle blocks */
     UncleBlock uncles(long blockNumber);
 }

src/main/java/io/api/core/ILogsProvider.java

@@ -1,5 +1,9 @@
 package io.api.core;
 
+import io.api.model.Log;
+
+import java.util.List;
+
 /**
  * EtherScan - API Descriptions
  * https://etherscan.io/apis#logs
@@ -9,4 +13,7 @@
  */
 public interface ILogsProvider {
 
+    List<Log> logs(String address);
+    List<Log> logs(String address, long startBlock);
+    List<Log> logs(String address, long startBlock, long endBlock);
 }

src/main/java/io/api/core/IParityProvider.java

@@ -9,4 +9,5 @@
  */
 public interface IParityProvider {
 
+    //TODO implement
 }

src/main/java/io/api/core/IStatisticProvider.java

@@ -1,5 +1,8 @@
 package io.api.core;
 
+import io.api.model.Price;
+import io.api.model.Supply;
+
 /**
  * EtherScan - API Descriptions
  * https://etherscan.io/apis#stats
@@ -9,4 +12,9 @@
  */
 public interface IStatisticProvider {
 
+    /** Eth Total Supply */
+    Supply supply();
+
+    /** Eth last USD and BTC price */
+    Price lastPrice();
 }

src/main/java/io/api/core/ITokenProvider.java

@@ -1,5 +1,7 @@
 package io.api.core;
 
+import java.math.BigInteger;
+
 /**
  * EtherScan - API Descriptions
  * https://etherscan.io/apis#tokens
@@ -9,4 +11,9 @@
  */
 public interface ITokenProvider {
 
+    /** ERC20 Total Supply */
+    BigInteger supply(String contract);
+
+    /** ERC20 token balance for address */
+    BigInteger balance(String address, String contract);
 }

src/main/java/io/api/core/impl/AccountProvider.java

@@ -8,6 +8,7 @@
 import io.api.util.BasicUtils;
 import org.jetbrains.annotations.NotNull;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -61,7 +62,7 @@ public Balance balance(final String address) {
         if (response.getStatus() != 1)
             throw new EtherScanException(response.getMessage() + ", with status " + response.getStatus());
 
-        return new Balance(address, Long.valueOf(response.getResult()));
+        return new Balance(address, new BigInteger(response.getResult()));
     }
 
     @NotNull

src/main/java/io/api/core/impl/BlockProvider.java

@@ -1,11 +1,20 @@
 package io.api.core.impl;
 
+import io.api.manager.IQueueManager;
+
+import java.util.Map;
+
 /**
  * ! NO DESCRIPTION !
  *
  * @author GoodforGod
  * @since 28.10.2018
  */
-public class BlockProvider {
+public class BlockProvider extends BasicProvider {
 
+    public BlockProvider(final IQueueManager queue,
+                  final String baseUrl,
+                  final Map<String, String> headers) {
+        super(queue, "", baseUrl, headers);
+    }
 }

src/main/java/io/api/core/impl/LogsProvider.java

@@ -1,11 +1,20 @@
 package io.api.core.impl;
 
+import io.api.manager.IQueueManager;
+
+import java.util.Map;
+
 /**
  * ! NO DESCRIPTION !
  *
  * @author GoodforGod
  * @since 28.10.2018
  */
-public class LogsProvider {
+public class LogsProvider extends BasicProvider {
 
+    public LogsProvider(final IQueueManager queue,
+                        final String baseUrl,
+                        final Map<String, String> headers) {
+        super(queue, "", baseUrl, headers);
+    }
 }

src/main/java/io/api/core/impl/ParityProvider.java

@@ -1,11 +1,20 @@
 package io.api.core.impl;
 
+import io.api.manager.IQueueManager;
+
+import java.util.Map;
+
 /**
  * ! NO DESCRIPTION !
  *
  * @author GoodforGod
  * @since 28.10.2018
  */
-public class ParityProvider {
+public class ParityProvider extends BasicProvider {
 
+    public ParityProvider(final IQueueManager queue,
+                   final String baseUrl,
+                   final Map<String, String> headers) {
+        super(queue, "", baseUrl, headers);
+    }
 }

src/main/java/io/api/core/impl/StatisticProvider.java

@@ -1,11 +1,20 @@
 package io.api.core.impl;
 
+import io.api.manager.IQueueManager;
+
+import java.util.Map;
+
 /**
  * ! NO DESCRIPTION !
  *
  * @author GoodforGod
  * @since 28.10.2018
  */
-public class StatisticProvider {
+public class StatisticProvider extends BasicProvider {
 
+    public StatisticProvider(final IQueueManager queue,
+                      final String baseUrl,
+                      final Map<String, String> headers) {
+        super(queue, "", baseUrl, headers);
+    }
 }

src/main/java/io/api/core/impl/TokenProvider.java

@@ -1,11 +1,20 @@
 package io.api.core.impl;
 
+import io.api.manager.IQueueManager;
+
+import java.util.Map;
+
 /**
  * ! NO DESCRIPTION !
  *
  * @author GoodforGod
  * @since 28.10.2018
  */
-public class TokenProvider {
+public class TokenProvider extends BasicProvider {
 
+    public TokenProvider(final IQueueManager queue,
+                  final String baseUrl,
+                  final Map<String, String> headers) {
+        super(queue, "", baseUrl, headers);
+    }
 }

src/main/java/io/api/core/impl/TransactionProvider.java

@@ -1,11 +1,20 @@
 package io.api.core.impl;
 
+import io.api.manager.IQueueManager;
+
+import java.util.Map;
+
 /**
  * ! NO DESCRIPTION !
  *
  * @author GoodforGod
  * @since 28.10.2018
  */
-public class TransactionProvider {
+public class TransactionProvider extends BasicProvider {
 
+    public TransactionProvider(final IQueueManager queue,
+                        final String baseUrl,
+                        final Map<String, String> headers) {
+        super(queue, "", baseUrl, headers);
+    }
 }

src/main/java/io/api/error/LogQueryException.java

@@ -0,0 +1,14 @@
+package io.api.error;
+
+/**
+ * ! NO DESCRIPTION !
+ *
+ * @author GoodforGod
+ * @since 31.10.2018
+ */
+public class LogQueryException extends ApiException {
+
+    public LogQueryException(String message) {
+        super(message);
+    }
+}

src/main/java/io/api/model/Balance.java

@@ -2,6 +2,8 @@
 
 import io.api.model.temporary.BalanceTO;
 
+import java.math.BigInteger;
+
 /**
  * ! NO DESCRIPTION !
  *
@@ -11,42 +13,42 @@
 public class Balance {
 
     /** Balance in Wei */
-    private final long balance;
+    private final Wei balance;
     private final String address;
 
     public Balance(final String address,
-                   final long balance) {
+                   final BigInteger balance) {
         this.address = address;
-        this.balance = balance;
+        this.balance = new Wei(balance);
     }
 
     public static Balance of(BalanceTO balance) {
-        return new Balance(balance.getAccount(), Long.valueOf(balance.getBalance()));
+        return new Balance(balance.getAccount(), new BigInteger(balance.getBalance()));
     }
 
     //<editor-fold desc="Getters">
     public String getAddress() {
         return address;
     }
 
-    public long getWei() {
-        return balance;
+    public BigInteger getWei() {
+        return balance.getValue();
     }
 
-    public double getKwei() {
-        return balance / 1000;
+    public BigInteger getKwei() {
+        return balance.getKwei();
     }
 
-    public double getMwei() {
-        return balance / 1000000;
+    public BigInteger getMwei() {
+        return balance.getMwei();
     }
 
-    public double getGwei() {
-        return balance / 1000000000;
+    public BigInteger getGwei() {
+        return balance.getGwei();
     }
 
-    public double getEther() {
-        return balance / 1000000000000000L;
+    public BigInteger getEther() {
+        return balance.getEther();
     }
     //</editor-fold>
 
@@ -57,17 +59,14 @@ public boolean equals(Object o) {
 
         Balance balance1 = (Balance) o;
 
-        if (Double.compare(balance1.balance, balance) != 0) return false;
-        return address.equals(balance1.address);
+        if (!balance.equals(balance1.balance)) return false;
+        return address != null ? address.equals(balance1.address) : balance1.address == null;
     }
 
     @Override
     public int hashCode() {
-        int result;
-        long temp;
-        result = address.hashCode();
-        temp = Double.doubleToLongBits(balance);
-        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        int result = balance.hashCode();
+        result = 31 * result + (address != null ? address.hashCode() : 0);
         return result;
     }