[2.0.0-SNAPSHOT]

GoodforGod · GoodforGod · commit 14ccb53db6d1 · 2023-05-15T00:19:41.000+03:00
Test asserts fixed
Log contract improved
Tests reinforced
diff --git a/src/main/java/io/goodforgod/api/etherscan/model/EthSupply.java b/src/main/java/io/goodforgod/api/etherscan/model/EthSupply.java
@@ -4,8 +4,6 @@
 import java.util.Objects;
 
 /**
- * Please Add Description Here.
- *
  * @author Anton Kurako (GoodforGod)
  * @since 14.05.2023
  */
@@ -100,10 +98,26 @@ public EthSupplyBuilder withWithdrawnTotal(Wei withdrawnTotal) {
 
         public EthSupply build() {
             EthSupply ethSupply = new EthSupply();
-            ethSupply.BurntFees = this.burntFees.toString();
-            ethSupply.Eth2Staking = this.eth2Staking.toString();
-            ethSupply.EthSupply = this.ethSupply.toString();
-            ethSupply.WithdrawnTotal = this.withdrawnTotal.toString();
+            if (this.burntFees != null) {
+                ethSupply.BurntFees = this.burntFees.toString();
+            } else {
+                ethSupply.BurntFees = BigInteger.ZERO.toString();
+            }
+            if (this.eth2Staking != null) {
+                ethSupply.Eth2Staking = this.eth2Staking.toString();
+            } else {
+                ethSupply.Eth2Staking = BigInteger.ZERO.toString();
+            }
+            if (this.ethSupply != null) {
+                ethSupply.EthSupply = this.ethSupply.toString();
+            } else {
+                ethSupply.EthSupply = BigInteger.ZERO.toString();
+            }
+            if (this.withdrawnTotal != null) {
+                ethSupply.WithdrawnTotal = this.withdrawnTotal.toString();
+            } else {
+                ethSupply.WithdrawnTotal = BigInteger.ZERO.toString();
+            }
             return ethSupply;
         }
     }
diff --git a/src/main/java/io/goodforgod/api/etherscan/model/Log.java b/src/main/java/io/goodforgod/api/etherscan/model/Log.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.annotations.Expose;
 import io.goodforgod.api.etherscan.util.BasicUtils;
-import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
@@ -28,10 +27,10 @@ public class Log {
     private String data;
     private String gasPrice;
     @Expose(deserialize = false, serialize = false)
-    private BigInteger _gasPrice;
+    private Wei _gasPrice;
     private String gasUsed;
     @Expose(deserialize = false, serialize = false)
-    private BigInteger _gasUsed;
+    private Wei _gasUsed;
     private List<String> topics;
     private String logIndex;
     @Expose(deserialize = false, serialize = false)
@@ -93,17 +92,17 @@ public String getData() {
         return data;
     }
 
-    public BigInteger getGasPrice() {
+    public Wei getGasPrice() {
         if (!BasicUtils.isEmpty(gasPrice)) {
-            _gasPrice = BasicUtils.parseHex(gasPrice);
+            _gasPrice = Wei.ofWei(BasicUtils.parseHex(gasPrice));
         }
 
         return _gasPrice;
     }
 
-    public BigInteger getGasUsed() {
+    public Wei getGasUsed() {
         if (!BasicUtils.isEmpty(gasUsed)) {
-            _gasUsed = BasicUtils.parseHex(gasUsed);
+            _gasUsed = Wei.ofWei(BasicUtils.parseHex(gasUsed));
         }
 
         return _gasUsed;
@@ -172,8 +171,8 @@ public static final class LogBuilder {
         private Long transactionIndex;
         private LocalDateTime timeStamp;
         private String data;
-        private BigInteger gasPrice;
-        private BigInteger gasUsed;
+        private Wei gasPrice;
+        private Wei gasUsed;
         private List<String> topics;
         private Long logIndex;
 
@@ -209,12 +208,12 @@ public LogBuilder withData(String data) {
             return this;
         }
 
-        public LogBuilder withGasPrice(BigInteger gasPrice) {
+        public LogBuilder withGasPrice(Wei gasPrice) {
             this.gasPrice = gasPrice;
             return this;
         }
 
-        public LogBuilder withGasUsed(BigInteger gasUsed) {
+        public LogBuilder withGasUsed(Wei gasUsed) {
             this.gasUsed = gasUsed;
             return this;
         }
@@ -233,7 +232,6 @@ public Log build() {
             Log log = new Log();
             log.address = this.address;
             if (this.gasPrice != null) {
-                log.gasPrice = String.valueOf(this.gasPrice);
                 log._gasPrice = this.gasPrice;
             }
             log._logIndex = this.logIndex;
@@ -246,7 +244,6 @@ public Log build() {
             }
             log.data = this.data;
             if (this.gasUsed != null) {
-                log.gasUsed = String.valueOf(this.gasUsed);
                 log._gasUsed = this.gasUsed;
             }
             log.logIndex = String.valueOf(this.logIndex);
diff --git a/src/test/java/io/goodforgod/api/etherscan/account/AccountTxErc20Tests.java b/src/test/java/io/goodforgod/api/etherscan/account/AccountTxErc20Tests.java
@@ -71,7 +71,7 @@ private void assertTxs(List<TxErc20> txs) {
             assertNotNull(tx.getTokenDecimal());
             assertNotEquals(-1, (tx.getConfirmations()));
             assertNotNull(tx.getGasUsed());
-            assertNotEquals(-1, tx.getGasUsedCumulative());
+            assertNotEquals(-1, tx.getGasUsedCumulative().asWei().intValue());
             assertNotEquals(-1, tx.getTransactionIndex());
         }
     }
diff --git a/src/test/java/io/goodforgod/api/etherscan/account/AccountTxRc1155TokenTests.java b/src/test/java/io/goodforgod/api/etherscan/account/AccountTxRc1155TokenTests.java
@@ -18,7 +18,7 @@ void correct() {
         assertNotNull(txs);
         assertFalse(txs.isEmpty());
         assertTxs(txs);
-        assertNotEquals(0, txs.get(0).getGasPrice());
+        assertNotEquals(0, txs.get(0).getGasPrice().asWei().intValue());
         assertNotEquals(-1, txs.get(0).getNonce());
 
         assertNotNull(txs.get(0).toString());
@@ -75,7 +75,7 @@ private void asserTx(TxErc1155 tx) {
         assertNotNull(tx.getTokenValue());
         assertNotEquals(-1, (tx.getConfirmations()));
         assertNotNull(tx.getGasUsed());
-        assertNotEquals(-1, tx.getGasUsedCumulative());
+        assertNotEquals(-1, tx.getGasUsedCumulative().asWei().intValue());
         assertNotEquals(-1, tx.getTransactionIndex());
     }
 }
diff --git a/src/test/java/io/goodforgod/api/etherscan/account/AccountTxRc721TokenTests.java b/src/test/java/io/goodforgod/api/etherscan/account/AccountTxRc721TokenTests.java
@@ -18,7 +18,7 @@ void correct() {
         assertNotNull(txs);
         assertEquals(16, txs.size());
         assertTxs(txs);
-        assertNotEquals(0, txs.get(0).getGasPrice());
+        assertNotEquals(0, txs.get(0).getGasPrice().asWei().intValue());
         assertNotEquals(-1, txs.get(0).getNonce());
 
         assertNotNull(txs.get(0).toString());
@@ -73,7 +73,7 @@ private void assertTxs(List<TxErc721> txs) {
             assertNotNull(tx.getTokenDecimal());
             assertNotEquals(-1, (tx.getConfirmations()));
             assertNotNull(tx.getGasUsed());
-            assertNotEquals(-1, tx.getGasUsedCumulative());
+            assertNotEquals(-1, tx.getGasUsedCumulative().asWei().intValue());
             assertNotEquals(-1, tx.getTransactionIndex());
         }
     }
diff --git a/src/test/java/io/goodforgod/api/etherscan/model/ModelBuilderTests.java b/src/test/java/io/goodforgod/api/etherscan/model/ModelBuilderTests.java
@@ -1,8 +1,12 @@
 package io.goodforgod.api.etherscan.model;
 
+import io.goodforgod.api.etherscan.model.proxy.BlockProxy;
+import io.goodforgod.api.etherscan.model.proxy.ReceiptProxy;
+import io.goodforgod.api.etherscan.model.proxy.TxProxy;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.Collections;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -84,8 +88,8 @@ void logBuilder() {
                 .withAddress("1")
                 .withBlockNumber(1L)
                 .withData("1")
-                .withGasPrice(BigInteger.ONE)
-                .withGasUsed(BigInteger.ONE)
+                .withGasPrice(Wei.ofWei(1))
+                .withGasUsed(Wei.ofWei(1))
                 .withLogIndex(1L)
                 .withTimeStamp(timestamp)
                 .withTransactionHash("1")
@@ -268,4 +272,100 @@ void txInternalBuilder() {
         assertEquals("1", value.getTo());
         assertEquals("1", value.getFrom());
     }
+
+    @Test
+    void ethSupplyBuilder() {
+        EthSupply value = EthSupply.builder()
+                .withBurntFees(Wei.ofWei(1))
+                .withEth2Staking(Wei.ofWei(1))
+                .withEthSupply(Wei.ofWei(1))
+                .withWithdrawnTotal(Wei.ofWei(1))
+                .build();
+
+        assertNotNull(value);
+        assertEquals(BigInteger.valueOf(1), value.getTotal().asWei());
+
+        EthSupply valueEmpty = EthSupply.builder()
+                .build();
+        assertNotNull(valueEmpty);
+        assertEquals(BigInteger.ZERO, valueEmpty.getTotal().asWei());
+    }
+
+    @Test
+    void receiptProxyBuilder() {
+        LocalDateTime timestamp = LocalDateTime.now();
+        ReceiptProxy value = ReceiptProxy.builder()
+                .withBlockHash("1")
+                .withBlockNumber(1L)
+                .withContractAddress("1")
+                .withCumulativeGasUsed(Wei.ofWei(1))
+                .withFrom("1")
+                .withTo("1")
+                .withGasUsed(Wei.ofWei(1))
+                .withRoot("1")
+                .withLogsBloom("1")
+                .withTransactionHash("1")
+                .withTransactionIndex(1L)
+                .withLogs(Arrays.asList(Log.builder()
+                        .withTopics(Arrays.asList("1"))
+                        .withTransactionIndex(1L)
+                        .withTransactionHash("1")
+                        .withTimeStamp(timestamp)
+                        .withLogIndex(1L)
+                        .withGasUsed(Wei.ofWei(1))
+                        .withGasPrice(Wei.ofWei(1))
+                        .withData("1")
+                        .withAddress("1")
+                        .build()))
+                .build();
+
+        assertNotNull(value);
+        assertEquals(BigInteger.valueOf(1), value.getGasUsed().asWei());
+    }
+
+    @Test
+    void blockProxyBuilder() {
+        LocalDateTime timestamp = LocalDateTime.now();
+        BlockProxy value = BlockProxy.builder()
+                .withGasUsed(Wei.ofWei(1))
+                .withLogsBloom("1")
+                .withDifficulty("1")
+                .withExtraData("1")
+                .withGasLimit(Wei.ofWei(1))
+                .withHash("1")
+                .withMiner("1")
+                .withMixHash("1")
+                .withNonce("1")
+                .withNumber(1L)
+                .withParentHash("1")
+                .withReceiptsRoot("1")
+                .withSha3Uncles("1")
+                .withSize(1L)
+                .withStateRoot("1")
+                .withTimestamp(timestamp)
+                .withTotalDifficulty("1")
+                .withTransactionsRoot("1")
+                .withUncles(Arrays.asList("1"))
+                .withTransactions(Arrays.asList(TxProxy.builder()
+                        .withBlockHash("1")
+                        .withBlockNumber(1L)
+                        .withFrom("1")
+                        .withGas(Wei.ofWei(1))
+                        .withGasPrice(Wei.ofWei(1))
+                        .withHash("1")
+                        .withInput("1")
+                        .withNonce(1L)
+                        .withR("1")
+                        .withS("1")
+                        .withTo("1")
+                        .withTransactionIndex(1L)
+                        .withV("1")
+                        .withValue("1")
+                        .withV("1")
+                        .build()))
+                .build();
+
+        assertNotNull(value);
+        assertEquals(BigInteger.valueOf(1), value.getGasUsed().asWei());
+    }
 }
diff --git a/src/test/java/io/goodforgod/api/etherscan/statistic/StatisticTokenSupplyApiTests.java b/src/test/java/io/goodforgod/api/etherscan/statistic/StatisticTokenSupplyApiTests.java
@@ -16,7 +16,7 @@ class StatisticTokenSupplyApiTests extends ApiRunner {
     void correct() {
         Wei supply = getApi().stats().supply("0x57d90b64a1a57749b0f932f1a3395792e12e7055");
         assertNotNull(supply);
-        assertNotEquals(BigInteger.ZERO, supply);
+        assertNotEquals(BigInteger.ZERO, supply.asWei());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private void assertTxs(List<TxErc20> txs) {`
`71`	`71`	`assertNotNull(tx.getTokenDecimal());`
`72`	`72`	`assertNotEquals(-1, (tx.getConfirmations()));`
`73`	`73`	`assertNotNull(tx.getGasUsed());`
`74`		`- assertNotEquals(-1, tx.getGasUsedCumulative());`
	`74`	`+ assertNotEquals(-1, tx.getGasUsedCumulative().asWei().intValue());`
`75`	`75`	`assertNotEquals(-1, tx.getTransactionIndex());`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class StatisticTokenSupplyApiTests extends ApiRunner {`
`16`	`16`	`void correct() {`
`17`	`17`	`Wei supply = getApi().stats().supply("0x57d90b64a1a57749b0f932f1a3395792e12e7055");`
`18`	`18`	`assertNotNull(supply);`
`19`		`- assertNotEquals(BigInteger.ZERO, supply);`
	`19`	`+ assertNotEquals(BigInteger.ZERO, supply.asWei());`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Test`