[3.0.0-SNAPSHOT]

GoodforGod · GoodforGod · commit 7ea05262d05a · 2025-09-08T01:08:49.000+03:00
Added JdkEthHttpClient gzip/deflate protocol support
Added EthScanAPIBuilder key required
Fixed JdkEthHttpClient fallback to UrlEthHttpClient cause content-length works incorrectly
Updated test and fixed
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -0,0 +1,37 @@
+name: CI Master
+
+on:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: 0 0 * * 0
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '11', '17' ]
+    name: Master Java ${{ matrix.java }} action
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'adopt'
+
+      - name: Build
+        run: './gradlew classes'
+
+      - name: Test
+        run: './gradlew test jacocoTestReport'
+
+      - name: SonarQube
+        if: matrix.java == '17'
+        run: './gradlew sonar --info'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -1,4 +1,4 @@
-name: CI Master
+name: Release
 
 on:
   release:
@@ -22,8 +22,6 @@ jobs:
 
       - name: Test
         run: './gradlew test jacocoTestReport'
-        env:
-          ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY_2 }}
 
       - name: SonarQube
         run: './gradlew sonar --info'
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -1,4 +1,4 @@
-name: CI Dev
+name: Snapshot
 
 on:
   push:
@@ -32,8 +32,6 @@ jobs:
 
       - name: Test
         run: './gradlew test jacocoTestReport'
-        env:
-          ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY_2 }}
 
       - name: Publish Snapshot
         run: './gradlew publish'
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [ '11', '17' ]
-    name: Java ${{ matrix.java }} Pull Request setup
+    name: Pull Request Java ${{ matrix.java }} action
 
     steps:
       - uses: actions/checkout@v3
@@ -29,23 +29,7 @@ jobs:
         run: './gradlew classes'
 
       - name: Test
-        if: matrix.java == '11'
         run: './gradlew test jacocoTestReport'
-        env:
-          ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY_1 }}
-
-      - name: Test
-        if: matrix.java == '17'
-        run: './gradlew test jacocoTestReport'
-        env:
-          ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY_2 }}
-
-      - name: Test Report
-        if: matrix.java == '17'
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          files: |
-            **/test-results/**/*.xml
 
       - name: SonarQube
         if: matrix.java == '17'
diff --git a/build.gradle b/build.gradle
@@ -35,7 +35,7 @@ test {
     testLogging {
         events("passed", "skipped", "failed")
         exceptionFormat("full")
-        showStandardStreams(false)
+        showStandardStreams(true)
     }
 
     reports {
@@ -71,8 +71,8 @@ nexusPublishing {
         sonatype {
             username = System.getenv("OSS_USERNAME")
             password = System.getenv("OSS_PASSWORD")
-            nexusUrl.set(uri("https://oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/"))
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
         }
     }
 }
@@ -110,8 +110,8 @@ publishing {
     }
     repositories {
         maven {
-            def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
-            def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            def releasesRepoUrl = "https://ossrh-staging-api.central.sonatype.com/service/local/"
+            def snapshotsRepoUrl = "https://central.sonatype.com/repository/maven-snapshots/"
             url = version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl
             credentials {
                 username System.getenv("OSS_USERNAME")
diff --git a/src/main/java/io/goodforgod/api/etherscan/http/impl/JdkEthHttpClient.java b/src/main/java/io/goodforgod/api/etherscan/http/impl/JdkEthHttpClient.java
@@ -42,6 +42,7 @@ public class JdkEthHttpClient implements EthHttpClient {
     private final HttpClient httpClient;
     private final Duration requestTimeout;
     private final Map<String, String> headers;
+    private final UrlEthHttpClient urlEthHttpClient;
 
     public JdkEthHttpClient() {
         this(HttpClient.newBuilder()
@@ -65,6 +66,7 @@ public JdkEthHttpClient(HttpClient httpClient, Duration requestTimeout, Map<Stri
         this.httpClient = httpClient;
         this.requestTimeout = requestTimeout;
         this.headers = headers;
+        this.urlEthHttpClient = new UrlEthHttpClient(DEFAULT_CONNECT_TIMEOUT, requestTimeout, headers);
     }
 
     @Override
@@ -111,12 +113,19 @@ public byte[] body() {
 
     @Override
     public EthResponse post(@NotNull URI uri, byte[] body) {
+        return urlEthHttpClient.post(uri, body);
+    }
+
+    // content-length somehow is not working properly and can't force user to override
+    // "jdk.httpclient.allowRestrictedHeaders" prop, so will force use UrlEthHttpClient
+    private EthResponse postJdk(@NotNull URI uri, byte[] body) {
         HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
                 .POST(HttpRequest.BodyPublishers.ofByteArray(body))
                 .uri(uri)
                 .timeout(requestTimeout);
 
         headers.forEach(requestBuilder::header);
+        requestBuilder.header("Content-Type", "application/json; charset=UTF-8");
 
         try {
             HttpResponse<InputStream> response = httpClient.send(requestBuilder.build(),
diff --git a/src/main/java/io/goodforgod/api/etherscan/model/GasOracle.java b/src/main/java/io/goodforgod/api/etherscan/model/GasOracle.java
@@ -1,7 +1,6 @@
 package io.goodforgod.api.etherscan.model;
 
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -14,9 +13,9 @@
 public class GasOracle {
 
     private Long LastBlock;
-    private BigInteger SafeGasPrice;
-    private BigInteger ProposeGasPrice;
-    private BigInteger FastGasPrice;
+    private BigDecimal SafeGasPrice;
+    private BigDecimal ProposeGasPrice;
+    private BigDecimal FastGasPrice;
     private BigDecimal suggestBaseFee;
     private String gasUsedRatio;
 
@@ -129,13 +128,13 @@ public GasOracle build() {
             gasOracle.LastBlock = this.lastBlock;
             gasOracle.suggestBaseFee = this.suggestBaseFee;
             if (this.proposeGasPrice != null) {
-                gasOracle.ProposeGasPrice = this.proposeGasPrice.asGwei().toBigInteger();
+                gasOracle.ProposeGasPrice = this.proposeGasPrice.asGwei();
             }
             if (this.safeGasPrice != null) {
-                gasOracle.SafeGasPrice = this.safeGasPrice.asGwei().toBigInteger();
+                gasOracle.SafeGasPrice = this.safeGasPrice.asGwei();
             }
             if (this.fastGasPrice != null) {
-                gasOracle.FastGasPrice = this.fastGasPrice.asGwei().toBigInteger();
+                gasOracle.FastGasPrice = this.fastGasPrice.asGwei();
             }
             if (this.gasUsedRatio != null) {
                 gasOracle.gasUsedRatio = this.gasUsedRatio.stream()
diff --git a/src/test/java/io/goodforgod/api/etherscan/EtherScanAPITests.java b/src/test/java/io/goodforgod/api/etherscan/EtherScanAPITests.java
@@ -4,7 +4,6 @@
 import io.goodforgod.api.etherscan.error.EtherScanKeyException;
 import io.goodforgod.api.etherscan.http.EthHttpClient;
 import io.goodforgod.api.etherscan.http.impl.UrlEthHttpClient;
-import io.goodforgod.api.etherscan.model.Balance;
 import java.net.URI;
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
@@ -37,33 +36,6 @@ void blankKey() {
                 () -> EtherScanAPI.builder("someKey").withApiKey("         ").withNetwork(network).build());
     }
 
-    @Test
-    void noTimeoutOnRead() {
-        Supplier<EthHttpClient> supplier = () -> new UrlEthHttpClient(Duration.ofMillis(300));
-        EtherScanAPI api = EtherScanAPI.builder(ApiRunner.getKey()).withNetwork(EthNetworks.MAINNET).withHttpClient(supplier)
-                .build();
-        Balance balance = api.account().balance("0xF318ABc9A5a92357c4Fea8d082dade4D43e780B7");
-        assertNotNull(balance);
-    }
-
-    @Test
-    void noTimeoutOnReadGroli() {
-        Balance balance = getApi().account().balance("0xF318ABc9A5a92357c4Fea8d082dade4D43e780B7");
-        assertNotNull(balance);
-    }
-
-    @Test
-    void noTimeoutOnReadTobalala() {
-        Balance balance = getApi().account().balance("0xF318ABc9A5a92357c4Fea8d082dade4D43e780B7");
-        assertNotNull(balance);
-    }
-
-    @Test
-    void noTimeoutUnlimitedAwait() {
-        Balance balance = getApi().account().balance("0xF318ABc9A5a92357c4Fea8d082dade4D43e780B7");
-        assertNotNull(balance);
-    }
-
     @Test
     void timeout() throws InterruptedException {
         TimeUnit.SECONDS.sleep(5);
diff --git a/src/test/java/io/goodforgod/api/etherscan/account/AccountTxsTests.java b/src/test/java/io/goodforgod/api/etherscan/account/AccountTxsTests.java
@@ -16,7 +16,7 @@ class AccountTxsTests extends ApiRunner {
     void correct() {
         List<Tx> txs = getApi().account().txs("0x9327cb34984c3992ec1EA0eAE98Ccf80A74f95B9");
         assertNotNull(txs);
-        assertEquals(5, txs.size());
+        assertEquals(6, txs.size());
         assertTxs(txs);
         assertNotNull(txs.get(0).getTimeStamp());
         assertNotNull(txs.get(0).getHash());
@@ -39,7 +39,7 @@ void correct() {
     void correctStartBlock() {
         List<Tx> txs = getApi().account().txs("0x9327cb34984c3992ec1EA0eAE98Ccf80A74f95B9", 3892842);
         assertNotNull(txs);
-        assertEquals(4, txs.size());
+        assertEquals(5, txs.size());
         assertTxs(txs);
     }
 
diff --git a/src/test/java/io/goodforgod/api/etherscan/proxy/ProxyBlockApiTests.java b/src/test/java/io/goodforgod/api/etherscan/proxy/ProxyBlockApiTests.java
@@ -22,7 +22,6 @@ void correct() {
         assertNotNull(proxy.getStateRoot());
         assertNotNull(proxy.getSize());
         assertNotNull(proxy.getDifficulty());
-        assertNotNull(proxy.getTotalDifficulty());
         assertNotNull(proxy.getTimeStamp());
         assertNotNull(proxy.getMiner());
         assertNotNull(proxy.getNonce());

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ test {`
`35`	`35`	`testLogging {`
`36`	`36`	`events("passed", "skipped", "failed")`
`37`	`37`	`exceptionFormat("full")`
`38`		`- showStandardStreams(false)`
	`38`	`+ showStandardStreams(true)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`reports {`
`@@ -71,8 +71,8 @@ nexusPublishing {`
`71`	`71`	`sonatype {`
`72`	`72`	`username = System.getenv("OSS_USERNAME")`
`73`	`73`	`password = System.getenv("OSS_PASSWORD")`
`74`		`- nexusUrl.set(uri("https://oss.sonatype.org/service/local/"))`
`75`		`- snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/"))`
	`74`	`+ nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))`
	`75`	`+ snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
`@@ -110,8 +110,8 @@ publishing {`
`110`	`110`	`}`
`111`	`111`	`repositories {`
`112`	`112`	`maven {`
`113`		`- def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2"`
`114`		`- def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"`
	`113`	`+ def releasesRepoUrl = "https://ossrh-staging-api.central.sonatype.com/service/local/"`
	`114`	`+ def snapshotsRepoUrl = "https://central.sonatype.com/repository/maven-snapshots/"`
`115`	`115`	`url = version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl`
`116`	`116`	`credentials {`
`117`	`117`	`username System.getenv("OSS_USERNAME")`