[2.0.0-SNAPSHOT]

GoodforGod · GoodforGod · commit 1beaafdd691f · 2023-05-14T13:13:59.000+03:00
Balance contract improved
Wei contract improved
Supply constructor added
ProxyAPI contract refactored to Wei
diff --git a/src/main/java/io/goodforgod/api/etherscan/GasTrackerAPIProvider.java b/src/main/java/io/goodforgod/api/etherscan/GasTrackerAPIProvider.java
@@ -34,7 +34,7 @@ final class GasTrackerAPIProvider extends BasicProvider implements GasTrackerAPI
 
     @Override
     public @NotNull GasEstimate estimate(@NotNull Wei wei) throws EtherScanException {
-        final String urlParams = ACT_GAS_ESTIMATE_PARAM + GASPRICE_PARAM + wei.getValue().toString();
+        final String urlParams = ACT_GAS_ESTIMATE_PARAM + GASPRICE_PARAM + wei.asWei().toString();
         final GasEstimateResponseTO response = getRequest(urlParams, GasEstimateResponseTO.class);
         if (response.getStatus() != 1)
             throw new EtherScanResponseException(response);
diff --git a/src/main/java/io/goodforgod/api/etherscan/ProxyAPI.java b/src/main/java/io/goodforgod/api/etherscan/ProxyAPI.java
@@ -1,10 +1,10 @@
 package io.goodforgod.api.etherscan;
 
 import io.goodforgod.api.etherscan.error.EtherScanException;
+import io.goodforgod.api.etherscan.model.Wei;
 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.BigInteger;
 import java.util.Optional;
 import org.jetbrains.annotations.ApiStatus.Experimental;
 import org.jetbrains.annotations.NotNull;
@@ -150,7 +150,7 @@ public interface ProxyAPI {
      * @throws EtherScanException parent exception class
      */
     @NotNull
-    BigInteger gasPrice() throws EtherScanException;
+    Wei gasPrice() throws EtherScanException;
 
     /**
      * Makes a call or transaction, which won't be added to the blockchain and returns the used gas,
@@ -161,8 +161,8 @@ public interface ProxyAPI {
      * @throws EtherScanException parent exception class
      */
     @NotNull
-    BigInteger gasEstimated(String hexData) throws EtherScanException;
+    Wei gasEstimated(String hexData) throws EtherScanException;
 
     @NotNull
-    BigInteger gasEstimated() throws EtherScanException;
+    Wei gasEstimated() throws EtherScanException;
 }
diff --git a/src/main/java/io/goodforgod/api/etherscan/ProxyAPIProvider.java b/src/main/java/io/goodforgod/api/etherscan/ProxyAPIProvider.java
@@ -5,6 +5,7 @@
 import io.goodforgod.api.etherscan.error.EtherScanResponseException;
 import io.goodforgod.api.etherscan.http.EthHttpClient;
 import io.goodforgod.api.etherscan.manager.RequestQueueManager;
+import io.goodforgod.api.etherscan.model.Wei;
 import io.goodforgod.api.etherscan.model.proxy.BlockProxy;
 import io.goodforgod.api.etherscan.model.proxy.ReceiptProxy;
 import io.goodforgod.api.etherscan.model.proxy.TxProxy;
@@ -13,7 +14,6 @@
 import io.goodforgod.api.etherscan.model.proxy.utility.TxInfoProxyTO;
 import io.goodforgod.api.etherscan.model.proxy.utility.TxProxyTO;
 import io.goodforgod.api.etherscan.util.BasicUtils;
-import java.math.BigInteger;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import org.jetbrains.annotations.NotNull;
@@ -197,29 +197,29 @@ public Optional<String> storageAt(String address, long position) throws EtherSca
 
     @NotNull
     @Override
-    public BigInteger gasPrice() throws EtherScanException {
+    public Wei gasPrice() throws EtherScanException {
         final StringProxyTO response = getRequest(ACT_GASPRICE_PARAM, StringProxyTO.class);
         return (BasicUtils.isEmpty(response.getResult()))
-                ? BigInteger.valueOf(-1)
-                : BasicUtils.parseHex(response.getResult());
+                ? new Wei(0)
+                : new Wei(BasicUtils.parseHex(response.getResult()));
     }
 
     @NotNull
     @Override
-    public BigInteger gasEstimated() throws EtherScanException {
+    public Wei gasEstimated() throws EtherScanException {
         return gasEstimated("606060405260728060106000396000f360606040526000");
     }
 
     @NotNull
     @Override
-    public BigInteger gasEstimated(String hexData) throws EtherScanException {
+    public Wei gasEstimated(String hexData) throws EtherScanException {
         if (!BasicUtils.isEmpty(hexData) && BasicUtils.isNotHex(hexData))
             throw new EtherScanInvalidDataHexException("Data is not in hex format.");
 
         final String urlParams = ACT_ESTIMATEGAS_PARAM + DATA_PARAM + hexData + GAS_PARAM + "2000000000000000";
         final StringProxyTO response = getRequest(urlParams, StringProxyTO.class);
         return (BasicUtils.isEmpty(response.getResult()))
-                ? BigInteger.valueOf(-1)
-                : BasicUtils.parseHex(response.getResult());
+                ? new Wei(0)
+                : new Wei(BasicUtils.parseHex(response.getResult()));
     }
 }
diff --git a/src/main/java/io/goodforgod/api/etherscan/manager/RequestQueueManager.java b/src/main/java/io/goodforgod/api/etherscan/manager/RequestQueueManager.java
@@ -16,13 +16,13 @@ public interface RequestQueueManager extends AutoCloseable {
     /**
      * Is used by default when no API KEY is provided
      */
-    RequestQueueManager ANONYMOUS = new SemaphoreRequestQueueManager(1, Duration.ofMillis(5005L));
+    RequestQueueManager ANONYMOUS = new SemaphoreRequestQueueManager(1, Duration.ofMillis(5010L));
 
     /**
      * Is available for all registered free API KEYs
      * <a href="https://docs.etherscan.io/getting-started/viewing-api-usage-statistics">Free API KEY</a>
      */
-    RequestQueueManager FREE_PLAN = new SemaphoreRequestQueueManager(5, Duration.ofMillis(1005L));
+    RequestQueueManager FREE_PLAN = new SemaphoreRequestQueueManager(5, Duration.ofMillis(1010L));
 
     RequestQueueManager UNLIMITED = new FakeRequestQueueManager();
 
diff --git a/src/main/java/io/goodforgod/api/etherscan/model/Balance.java b/src/main/java/io/goodforgod/api/etherscan/model/Balance.java
@@ -23,24 +23,8 @@ public String getAddress() {
         return address;
     }
 
-    public BigInteger getWei() {
-        return balance.getValue();
-    }
-
-    public BigInteger getKwei() {
-        return balance.asKwei();
-    }
-
-    public BigInteger getMwei() {
-        return balance.asMwei();
-    }
-
-    public BigInteger getGwei() {
-        return balance.asGwei();
-    }
-
-    public BigInteger getEther() {
-        return balance.asEther();
+    public Wei getBalanceInWei() {
+        return balance;
     }
     // </editor-fold>
 
diff --git a/src/main/java/io/goodforgod/api/etherscan/model/Supply.java b/src/main/java/io/goodforgod/api/etherscan/model/Supply.java
@@ -8,6 +8,10 @@
  */
 public class Supply extends Wei {
 
+    public Supply(long value) {
+        super(value);
+    }
+
     public Supply(BigInteger value) {
         super(value);
     }
diff --git a/src/main/java/io/goodforgod/api/etherscan/model/Wei.java b/src/main/java/io/goodforgod/api/etherscan/model/Wei.java
@@ -20,7 +20,7 @@ public Wei(BigInteger value) {
     }
 
     // <editor-fold desc="Getters">
-    public BigInteger getValue() {
+    public BigInteger asWei() {
         return result;
     }
 
diff --git a/src/test/java/io/goodforgod/api/etherscan/account/AccountBalanceListTests.java b/src/test/java/io/goodforgod/api/etherscan/account/AccountBalanceListTests.java
@@ -29,13 +29,9 @@ void correct() {
         assertNotEquals(balances.get(0).hashCode(), balances.get(1).hashCode());
         for (Balance balance : balances) {
             assertNotNull(balance.getAddress());
-            assertNotNull(balance.getGwei());
-            assertNotNull(balance.getKwei());
-            assertNotNull(balance.getMwei());
-            assertNotNull(balance.getEther());
-            assertNotNull(balance.getGwei());
+            assertNotNull(balance.getBalanceInWei());
             assertNotNull(balance.getAddress());
-            assertNotEquals(BigInteger.ZERO, balance.getWei());
+            assertNotEquals(BigInteger.ZERO, balance.getBalanceInWei().asWei());
             assertNotNull(balance.toString());
         }
     }
@@ -84,7 +80,7 @@ void correctParamWithEmptyExpectedResult() {
         assertEquals(2, balances.size());
         for (Balance balance : balances) {
             assertNotNull(balance.getAddress());
-            assertEquals(0, balance.getWei().intValue());
+            assertEquals(0, balance.getBalanceInWei().asWei().intValue());
         }
     }
 }
diff --git a/src/test/java/io/goodforgod/api/etherscan/proxy/ProxyGasApiTests.java b/src/test/java/io/goodforgod/api/etherscan/proxy/ProxyGasApiTests.java
@@ -2,7 +2,7 @@
 
 import io.goodforgod.api.etherscan.ApiRunner;
 import io.goodforgod.api.etherscan.error.EtherScanInvalidDataHexException;
-import java.math.BigInteger;
+import io.goodforgod.api.etherscan.model.Wei;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -13,23 +13,23 @@ class ProxyGasApiTests extends ApiRunner {
 
     @Test
     void correctPrice() {
-        BigInteger price = getApi().proxy().gasPrice();
+        Wei price = getApi().proxy().gasPrice();
         assertNotNull(price);
-        assertNotEquals(0, price.intValue());
+        assertNotEquals(0, price.asWei().intValue());
     }
 
     @Test
     void correctEstimated() {
-        BigInteger price = getApi().proxy().gasEstimated();
+        Wei price = getApi().proxy().gasEstimated();
         assertNotNull(price);
-        assertNotEquals(0, price.intValue());
+        assertNotEquals(0, price.asWei().intValue());
     }
 
     @Test
     void correctEstimatedWithData() {
         String dataCustom = "606060405260728060106000396000f360606040526000606060405260728060106000396000f360606040526000";
-        BigInteger price = getApi().proxy().gasEstimated();
-        BigInteger priceCustom = getApi().proxy().gasEstimated(dataCustom);
+        Wei price = getApi().proxy().gasEstimated();
+        Wei priceCustom = getApi().proxy().gasEstimated(dataCustom);
         assertNotNull(price);
         assertNotNull(priceCustom);
         assertNotEquals(price, priceCustom);
diff --git a/src/test/java/io/goodforgod/api/etherscan/statistic/StatisticSupplyApiTests.java b/src/test/java/io/goodforgod/api/etherscan/statistic/StatisticSupplyApiTests.java
@@ -15,7 +15,7 @@ class StatisticSupplyApiTests extends ApiRunner {
     void correct() {
         Supply supply = getApi().stats().supply();
         assertNotNull(supply);
-        assertNotNull(supply.getValue());
+        assertNotNull(supply.asWei());
         assertNotNull(supply.asGwei());
         assertNotNull(supply.asKwei());
         assertNotNull(supply.asMwei());

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public Wei(BigInteger value) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// <editor-fold desc="Getters">`
`23`		`- public BigInteger getValue() {`
	`23`	`+ public BigInteger asWei() {`
`24`	`24`	`return result;`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,9 @@ void correct() {`
`29`	`29`	`assertNotEquals(balances.get(0).hashCode(), balances.get(1).hashCode());`
`30`	`30`	`for (Balance balance : balances) {`
`31`	`31`	`assertNotNull(balance.getAddress());`
`32`		`- assertNotNull(balance.getGwei());`
`33`		`- assertNotNull(balance.getKwei());`
`34`		`- assertNotNull(balance.getMwei());`
`35`		`- assertNotNull(balance.getEther());`
`36`		`- assertNotNull(balance.getGwei());`
	`32`	`+ assertNotNull(balance.getBalanceInWei());`
`37`	`33`	`assertNotNull(balance.getAddress());`
`38`		`- assertNotEquals(BigInteger.ZERO, balance.getWei());`
	`34`	`+ assertNotEquals(BigInteger.ZERO, balance.getBalanceInWei().asWei());`
`39`	`35`	`assertNotNull(balance.toString());`
`40`	`36`	`}`
`41`	`37`	`}`
`@@ -84,7 +80,7 @@ void correctParamWithEmptyExpectedResult() {`
`84`	`80`	`assertEquals(2, balances.size());`
`85`	`81`	`for (Balance balance : balances) {`
`86`	`82`	`assertNotNull(balance.getAddress());`
`87`		`- assertEquals(0, balance.getWei().intValue());`
	`83`	`+ assertEquals(0, balance.getBalanceInWei().asWei().intValue());`
`88`	`84`	`}`
`89`	`85`	`}`
`90`	`86`	`}`