Proxy provider fixes

Model fixes & refactoring
Test improvements & fixes

Author: GoodforGod

src/main/java/io/api/etherscan/App.java

@@ -1,10 +1,7 @@
 package io.api.etherscan;
 
 import io.api.etherscan.core.impl.EtherScanApi;
-import io.api.etherscan.model.*;
-
-import java.util.List;
-import java.util.Optional;
+import io.api.etherscan.model.Balance;
 
 /**
  *
@@ -13,16 +10,6 @@ public class App {
     public static void main(String[] args) {
         EtherScanApi api = new EtherScanApi();
         Balance balance = api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
-        Balance balance1 = api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
-        Balance balance2 = api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
-        Balance balance3 = api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
-        Balance balance4 = api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
-        Balance balance5 = api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
-        List<Tx> txs = api.account().txs("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
-        List<TxToken> txTokens = api.account().txsToken("0xf261B3A60Ef40eE0B369B0705c1a2c58B02799DF");
-        List<TxInternal> txInternals = api.account().txsInternal("0x2c1ba59d6f58433fb1eaee7d20b26ed83bda51a3");
-        Optional<UncleBlock> uncles = api.block().uncles(2165403);
-        Optional<UncleBlock> uncleEmpty = api.block().uncles(999965403);
         System.out.println("Test");
     }
 }

src/main/java/io/api/etherscan/core/IProxyApi.java

@@ -2,7 +2,7 @@
 
 import io.api.etherscan.error.ApiException;
 import io.api.etherscan.model.proxy.BlockProxy;
-import io.api.etherscan.model.proxy.TxInfoProxy;
+import io.api.etherscan.model.proxy.ReceiptProxy;
 import io.api.etherscan.model.proxy.TxProxy;
 import org.jetbrains.annotations.NotNull;
 
@@ -70,7 +70,7 @@ public interface IProxyApi {
      * Returns the receipt of a transaction by transaction hash
      * eth_getTransactionReceipt
      */
-    @NotNull Optional<TxInfoProxy> txReceipt(String txhash) throws ApiException;
+    @NotNull Optional<ReceiptProxy> txReceipt(String txhash) throws ApiException;
 
     /**
      * Executes a new message call immediately without creating a transaction on the block chain

src/main/java/io/api/etherscan/core/impl/ProxyApiProvider.java

@@ -7,7 +7,7 @@
 import io.api.etherscan.executor.IHttpExecutor;
 import io.api.etherscan.manager.IQueueManager;
 import io.api.etherscan.model.proxy.BlockProxy;
-import io.api.etherscan.model.proxy.TxInfoProxy;
+import io.api.etherscan.model.proxy.ReceiptProxy;
 import io.api.etherscan.model.proxy.TxProxy;
 import io.api.etherscan.model.proxy.utility.BlockProxyTO;
 import io.api.etherscan.model.proxy.utility.StringProxyTO;
@@ -148,7 +148,7 @@ public Optional<String> txSendRaw(final String hexEncodedTx) throws ApiException
 
     @NotNull
     @Override
-    public Optional<TxInfoProxy> txReceipt(final String txhash) throws ApiException {
+    public Optional<ReceiptProxy> txReceipt(final String txhash) throws ApiException {
         BasicUtils.validateTxHash(txhash);
 
         final String urlParams = ACT_TX_RECEIPT_PARAM + TXHASH_PARAM + txhash;

src/main/java/io/api/etherscan/error/ConnectionException.java

@@ -8,10 +8,6 @@
  */
 public class ConnectionException extends ApiException {
 
-    public ConnectionException(String message) {
-        super(message);
-    }
-
     public ConnectionException(String message, Throwable cause) {
         super(message, cause);
     }

src/main/java/io/api/etherscan/model/BaseTx.java

@@ -23,25 +23,8 @@ abstract class BaseTx {
     private BigInteger value;
     private String contractAddress;
     private String input;
-    private long gas;
-    private long gasUsed;
-
-    BaseTx() { }
-
-    public BaseTx(long blockNumber, LocalDateTime _timeStamp, String hash,
-                  String from, String to, BigInteger value, String contractAddress,
-                  String input, long gas, long gasUsed) {
-        this.blockNumber = blockNumber;
-        this._timeStamp = _timeStamp;
-        this.hash = hash;
-        this.from = from;
-        this.to = to;
-        this.value = value;
-        this.contractAddress = contractAddress;
-        this.input = input;
-        this.gas = gas;
-        this.gasUsed = gasUsed;
-    }
+    private BigInteger gas;
+    private BigInteger gasUsed;
 
     //<editor-fold desc="Getter">
     public long getBlockNumber() {
@@ -78,11 +61,11 @@ public String getInput() {
         return input;
     }
 
-    public long getGas() {
+    public BigInteger getGas() {
         return gas;
     }
 
-    public long getGasUsed() {
+    public BigInteger getGasUsed() {
         return gasUsed;
     }
     //</editor-fold>

src/main/java/io/api/etherscan/model/Log.java

@@ -1,6 +1,10 @@
 package io.api.etherscan.model;
 
+import io.api.etherscan.util.BasicUtils;
+
+import java.math.BigInteger;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.List;
 
 /**
@@ -12,37 +16,28 @@
 public class Log {
 
     private String blockNumber;
+    private long _blockNumber;
     private String address;
     private String transactionHash;
     private String transactionIndex;
+    private long _transactionIndex;
     private String timeStamp;
     private LocalDateTime _timeStamp;
     private String data;
     private String gasPrice;
+    private BigInteger _gasPrice;
     private String gasUsed;
+    private BigInteger _gasUsed;
     private List<String> topics;
     private String logIndex;
-
-    public Log() { }
-
-    public Log(String blockNumber, String address, String transactionHash, String transactionIndex,
-               LocalDateTime _timeStamp, String data, String gasPrice, String gasUsed,
-               List<String> topics, String logIndex) {
-        this.blockNumber = blockNumber;
-        this.address = address;
-        this.transactionHash = transactionHash;
-        this.transactionIndex = transactionIndex;
-        this._timeStamp = _timeStamp;
-        this.data = data;
-        this.gasPrice = gasPrice;
-        this.gasUsed = gasUsed;
-        this.topics = topics;
-        this.logIndex = logIndex;
-    }
+    private long _logIndex;
 
     //<editor-fold desc="Getters">
-    public String getBlockNumber() {
-        return blockNumber;
+    public long getBlockNumber() {
+        if(!BasicUtils.isEmpty(blockNumber)){
+            _blockNumber = BasicUtils.parseHex(blockNumber).longValue();
+        }
+        return _blockNumber;
     }
 
     public String getAddress() {
@@ -53,36 +48,53 @@ public String getTransactionHash() {
         return transactionHash;
     }
 
-    public String getTransactionIndex() {
-        return transactionIndex;
-    }
+    public long getTransactionIndex() {
+        if(!BasicUtils.isEmpty(transactionIndex)){
+            _transactionIndex = BasicUtils.parseHex(transactionIndex).longValue();
+        }
 
-    public String getTimeStamp() {
-        return timeStamp;
+        return _transactionIndex;
     }
 
-    public LocalDateTime get_timeStamp() {
+    public LocalDateTime getTimeStamp() {
+        if(_timeStamp == null && !BasicUtils.isEmpty(timeStamp)) {
+            long formatted = (timeStamp.charAt(0) == '0' && timeStamp.charAt(1) == 'x')
+                    ? BasicUtils.parseHex(timeStamp).longValue()
+                    : Long.valueOf(timeStamp);
+            _timeStamp = LocalDateTime.ofEpochSecond(formatted, 0, ZoneOffset.UTC);
+        }
         return _timeStamp;
     }
 
     public String getData() {
         return data;
     }
 
-    public String getGasPrice() {
-        return gasPrice;
+    public BigInteger getGasPrice() {
+        if(!BasicUtils.isEmpty(gasPrice)){
+            _gasPrice = BasicUtils.parseHex(gasPrice);
+        }
+
+        return _gasPrice;
     }
 
-    public String getGasUsed() {
-        return gasUsed;
+    public BigInteger getGasUsed() {
+        if(!BasicUtils.isEmpty(gasUsed)){
+            _gasUsed = BasicUtils.parseHex(gasUsed);
+        }
+
+        return _gasUsed;
     }
 
     public List<String> getTopics() {
         return topics;
     }
 
-    public String getLogIndex() {
-        return logIndex;
+    public long getLogIndex() {
+        if(!BasicUtils.isEmpty(logIndex)){
+            _logIndex = BasicUtils.parseHex(logIndex).longValue();
+        }
+        return _logIndex;
     }
     //</editor-fold>
 }

src/main/java/io/api/etherscan/model/Tx.java

@@ -2,6 +2,8 @@
 
 import io.api.etherscan.util.BasicUtils;
 
+import java.math.BigInteger;
+
 /**
  * ! NO DESCRIPTION !
  *
@@ -13,8 +15,8 @@ public class Tx extends BaseTx {
     private long nonce;
     private String blockHash;
     private int transactionIndex;
-    private long gasPrice;
-    private long cumulativeGasUsed;
+    private BigInteger gasPrice;
+    private BigInteger cumulativeGasUsed;
     private long confirmations;
     private String isError;
     private String txreceipt_status;
@@ -32,7 +34,7 @@ public int getTransactionIndex() {
         return transactionIndex;
     }
 
-    public long getGasPrice() {
+    public BigInteger getGasPrice() {
         return gasPrice;
     }
 
@@ -44,7 +46,7 @@ public String getTxreceipt_status() {
         return txreceipt_status;
     }
 
-    public long getCumulativeGasUsed() {
+    public BigInteger getCumulativeGasUsed() {
         return cumulativeGasUsed;
     }
 

src/main/java/io/api/etherscan/model/Uncle.java

@@ -14,14 +14,6 @@ public class Uncle {
     private BigInteger blockreward;
     private int unclePosition;
 
-    public Uncle() {}
-
-    public Uncle(String miner, BigInteger blockreward, int unclePosition) {
-        this.miner = miner;
-        this.blockreward = blockreward;
-        this.unclePosition = unclePosition;
-    }
-
     //<editor-fold desc="Getters">
     public String getMiner() {
         return miner;