Other provider contracts introduced

GoodforGod · GoodforGod · commit 0b60b4998803 · 2018-10-30T22:34:06.000+03:00
Some models timestamp support improved
diff --git a/src/main/java/io/api/core/IBlockProvider.java b/src/main/java/io/api/core/IBlockProvider.java
@@ -0,0 +1,15 @@
+package io.api.core;
+
+import io.api.model.UncleBlock;
+
+/**
+ * EtherScan - API Descriptions
+ * https://etherscan.io/apis#blocks
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public interface IBlockProvider {
+
+    UncleBlock uncles(long blockNumber);
+}
diff --git a/src/main/java/io/api/core/IContractProvider.java b/src/main/java/io/api/core/IContractProvider.java
@@ -1,7 +1,8 @@
 package io.api.core;
 
 /**
- * ! NO DESCRIPTION !
+ * EtherScan - API Descriptions
+ * https://etherscan.io/apis#contracts
  *
  * @author GoodforGod
  * @since 28.10.2018
diff --git a/src/main/java/io/api/core/ILogsProvider.java b/src/main/java/io/api/core/ILogsProvider.java
@@ -0,0 +1,12 @@
+package io.api.core;
+
+/**
+ * EtherScan - API Descriptions
+ * https://etherscan.io/apis#logs
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public interface ILogsProvider {
+
+}
diff --git a/src/main/java/io/api/core/IParityProvider.java b/src/main/java/io/api/core/IParityProvider.java
@@ -0,0 +1,12 @@
+package io.api.core;
+
+/**
+ * EtherScan - API Descriptions
+ * https://etherscan.io/apis#proxy
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public interface IParityProvider {
+
+}
diff --git a/src/main/java/io/api/core/IStatisticProvider.java b/src/main/java/io/api/core/IStatisticProvider.java
@@ -0,0 +1,12 @@
+package io.api.core;
+
+/**
+ * EtherScan - API Descriptions
+ * https://etherscan.io/apis#stats
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public interface IStatisticProvider {
+
+}
diff --git a/src/main/java/io/api/core/ITokenProvider.java b/src/main/java/io/api/core/ITokenProvider.java
@@ -0,0 +1,12 @@
+package io.api.core;
+
+/**
+ * EtherScan - API Descriptions
+ * https://etherscan.io/apis#tokens
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public interface ITokenProvider {
+
+}
diff --git a/src/main/java/io/api/core/ITransactionProvider.java b/src/main/java/io/api/core/ITransactionProvider.java
@@ -0,0 +1,17 @@
+package io.api.core;
+
+import io.api.model.Status;
+
+/**
+ * EtherScan - API Descriptions
+ * https://etherscan.io/apis#transactions
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public interface ITransactionProvider {
+
+    Status execStatus(String txhash);
+
+    boolean receiptStatus(String txhash);
+}
diff --git a/src/main/java/io/api/model/BaseTx.java b/src/main/java/io/api/model/BaseTx.java
@@ -1,6 +1,10 @@
 package io.api.model;
 
+import io.api.util.BasicUtils;
+
 import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 
 /**
  * ! NO DESCRIPTION !
@@ -12,6 +16,7 @@ abstract class BaseTx {
 
     private long blockNumber;
     private String timeStamp;
+    private LocalDateTime _timeStamp;
     private String hash;
     private String from;
     private String to;
@@ -26,8 +31,10 @@ public long getBlockNumber() {
         return blockNumber;
     }
 
-    public String getTimeStamp() {
-        return timeStamp;
+    public LocalDateTime getTimeStamp() {
+        if(_timeStamp == null && !BasicUtils.isEmpty(timeStamp))
+            _timeStamp = LocalDateTime.ofEpochSecond(Long.valueOf(timeStamp), 0, ZoneOffset.UTC);
+        return _timeStamp;
     }
 
     public String getHash() {
diff --git a/src/main/java/io/api/model/Block.java b/src/main/java/io/api/model/Block.java
@@ -1,5 +1,10 @@
 package io.api.model;
 
+import io.api.util.BasicUtils;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
 /**
  * ! NO DESCRIPTION !
  *
@@ -10,6 +15,7 @@ public class Block {
 
     private String blockNumber;
     private String timeStamp;
+    private LocalDateTime _timeStamp;
     private String blockReward;
 
     public Block(String blockNumber, String timeStamp, String blockReward) {
@@ -23,8 +29,10 @@ public String getBlockNumber() {
         return blockNumber;
     }
 
-    public String getTimeStamp() {
-        return timeStamp;
+    public LocalDateTime getTimeStamp() {
+        if(_timeStamp == null && !BasicUtils.isEmpty(timeStamp))
+            _timeStamp = LocalDateTime.ofEpochSecond(Long.valueOf(timeStamp), 0, ZoneOffset.UTC);
+        return _timeStamp;
     }
 
     public String getBlockReward() {
diff --git a/src/main/java/io/api/model/Status.java b/src/main/java/io/api/model/Status.java
@@ -0,0 +1,21 @@
+package io.api.model;
+
+/**
+ * ! NO DESCRIPTION !
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public class Status {
+
+    private int isError;
+    private String errDescription;
+
+    public int getIsError() {
+        return isError;
+    }
+
+    public String getErrDescription() {
+        return errDescription;
+    }
+}
diff --git a/src/main/java/io/api/model/Uncle.java b/src/main/java/io/api/model/Uncle.java
@@ -0,0 +1,30 @@
+package io.api.model;
+
+import java.math.BigInteger;
+
+/**
+ * ! NO DESCRIPTION !
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public class Uncle {
+
+    private String miner;
+    private BigInteger blockreward;
+    private int unclePosition;
+
+    //<editor-fold desc="Getters">
+    public String getMiner() {
+        return miner;
+    }
+
+    public BigInteger getBlockreward() {
+        return blockreward;
+    }
+
+    public int getUnclePosition() {
+        return unclePosition;
+    }
+    //</editor-fold>
+}
diff --git a/src/main/java/io/api/model/UncleBlock.java b/src/main/java/io/api/model/UncleBlock.java
@@ -0,0 +1,54 @@
+package io.api.model;
+
+import io.api.util.BasicUtils;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
+
+/**
+ * ! NO DESCRIPTION !
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public class UncleBlock {
+
+    private long blockNumber;
+    private BigInteger blockReward;
+    private String blockMiner;
+    private String timeStamp;
+    private LocalDateTime _timeStamp;
+    private List<Uncle> uncles;
+    private String uncleInclusionReward;
+
+    //<editor-fold desc="Getters">
+
+    public LocalDateTime getTimeStamp() {
+        if(_timeStamp == null && !BasicUtils.isEmpty(timeStamp))
+            _timeStamp = LocalDateTime.ofEpochSecond(Long.valueOf(timeStamp), 0, ZoneOffset.UTC);
+        return _timeStamp;
+    }
+
+    public BigInteger getBlockReward() {
+        return blockReward;
+    }
+
+    public String getBlockMiner() {
+        return blockMiner;
+    }
+
+    public List<Uncle> getUncles() {
+        return uncles;
+    }
+
+    public String getUncleInclusionReward() {
+        return uncleInclusionReward;
+    }
+
+    public long getBlockNumber() {
+        return blockNumber;
+    }
+    //</editor-fold>
+}
diff --git a/src/main/java/io/api/model/temporary/StatusResponseTO.java b/src/main/java/io/api/model/temporary/StatusResponseTO.java
@@ -0,0 +1,18 @@
+package io.api.model.temporary;
+
+import io.api.model.Status;
+
+/**
+ * ! NO DESCRIPTION !
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public class StatusResponseTO extends BaseResponseTO {
+
+    private Status result;
+
+    public Status getResult() {
+        return result;
+    }
+}
diff --git a/src/main/java/io/api/model/temporary/UncleBlockResponseTO.java b/src/main/java/io/api/model/temporary/UncleBlockResponseTO.java
@@ -0,0 +1,18 @@
+package io.api.model.temporary;
+
+import io.api.model.UncleBlock;
+
+/**
+ * ! NO DESCRIPTION !
+ *
+ * @author GoodforGod
+ * @since 30.10.2018
+ */
+public class UncleBlockResponseTO extends BaseResponseTO {
+
+    private UncleBlock uncleBlock;
+
+    public UncleBlock getUncleBlock() {
+        return uncleBlock;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`package io.api.core;`
`2`	`2`
`3`	`3`	`/**`
`4`		`- * ! NO DESCRIPTION !`
	`4`	`+ * EtherScan - API Descriptions`
	`5`	`+ * https://etherscan.io/apis#contracts`
`5`	`6`	`*`
`6`	`7`	`* @author GoodforGod`
`7`	`8`	`* @since 28.10.2018`