From 6375959a35748b18e6a12f1410ffeb6527b239f6 Mon Sep 17 00:00:00 2001 From: Robert Brodie Date: Thu, 29 May 2025 15:06:20 -0400 Subject: [PATCH 1/2] #366 Update bitcoinj to 0.17 and use new package namespaces --- pom.xml | 2 +- src/main/java/com/bitpay/sdk/Client.java | 2 +- src/main/java/com/bitpay/sdk/client/BitPayClient.java | 2 +- src/main/java/com/bitpay/sdk/util/KeyUtils.java | 8 ++++---- src/setup/java/BitPaySetup.java | 2 +- .../java/com/bitpay/sdk/client/AbstractClientTest.java | 2 +- src/test/java/com/bitpay/sdk/client/BitPayClientTest.java | 2 +- src/test/java/com/bitpay/sdk/util/KeyUtilsTest.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 76ce4a35..e6edec81 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,7 @@ org.bitcoinj bitcoinj-core - 0.16.5 + 0.17 compile diff --git a/src/main/java/com/bitpay/sdk/Client.java b/src/main/java/com/bitpay/sdk/Client.java index b0ba7120..d5dd251b 100644 --- a/src/main/java/com/bitpay/sdk/Client.java +++ b/src/main/java/com/bitpay/sdk/Client.java @@ -54,7 +54,7 @@ import org.apache.http.client.CredentialsProvider; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.bitcoinj.core.ECKey; +import org.bitcoinj.crypto.ECKey; /** * The type Client. diff --git a/src/main/java/com/bitpay/sdk/client/BitPayClient.java b/src/main/java/com/bitpay/sdk/client/BitPayClient.java index 92a8a5f0..1855b0ed 100644 --- a/src/main/java/com/bitpay/sdk/client/BitPayClient.java +++ b/src/main/java/com/bitpay/sdk/client/BitPayClient.java @@ -25,7 +25,7 @@ import org.apache.http.entity.ByteArrayEntity; import org.apache.http.message.AbstractHttpMessage; import org.apache.http.message.BasicNameValuePair; -import org.bitcoinj.core.ECKey; +import org.bitcoinj.crypto.ECKey; /** * The type Bit pay client. diff --git a/src/main/java/com/bitpay/sdk/util/KeyUtils.java b/src/main/java/com/bitpay/sdk/util/KeyUtils.java index b6ec4a2c..3ad504e3 100644 --- a/src/main/java/com/bitpay/sdk/util/KeyUtils.java +++ b/src/main/java/com/bitpay/sdk/util/KeyUtils.java @@ -18,10 +18,10 @@ import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import org.bitcoinj.core.Base58; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.ECKey.ECDSASignature; -import org.bitcoinj.core.Sha256Hash; +import org.bitcoinj.base.Base58; +import org.bitcoinj.base.Sha256Hash; +import org.bitcoinj.crypto.ECKey; +import org.bitcoinj.crypto.ECKey.ECDSASignature; import org.bitcoinj.crypto.KeyCrypterException; /** diff --git a/src/setup/java/BitPaySetup.java b/src/setup/java/BitPaySetup.java index 9f7a2e72..a224dc69 100644 --- a/src/setup/java/BitPaySetup.java +++ b/src/setup/java/BitPaySetup.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Scanner; import java.util.concurrent.atomic.AtomicReference; -import org.bitcoinj.core.ECKey; +import org.bitcoinj.crypto.ECKey; public class BitPaySetup { public static void main(final String[] args) { diff --git a/src/test/java/com/bitpay/sdk/client/AbstractClientTest.java b/src/test/java/com/bitpay/sdk/client/AbstractClientTest.java index 3654806e..848e4ece 100644 --- a/src/test/java/com/bitpay/sdk/client/AbstractClientTest.java +++ b/src/test/java/com/bitpay/sdk/client/AbstractClientTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.ThreadLocalRandom; import org.apache.commons.io.FileUtils; import org.apache.http.impl.client.HttpClientBuilder; -import org.bitcoinj.core.ECKey; +import org.bitcoinj.crypto.ECKey; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/bitpay/sdk/client/BitPayClientTest.java b/src/test/java/com/bitpay/sdk/client/BitPayClientTest.java index 110286e6..f885f4a0 100644 --- a/src/test/java/com/bitpay/sdk/client/BitPayClientTest.java +++ b/src/test/java/com/bitpay/sdk/client/BitPayClientTest.java @@ -20,7 +20,7 @@ import org.apache.http.client.methods.HttpPut; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.message.BasicNameValuePair; -import org.bitcoinj.core.ECKey; +import org.bitcoinj.crypto.ECKey; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/bitpay/sdk/util/KeyUtilsTest.java b/src/test/java/com/bitpay/sdk/util/KeyUtilsTest.java index ce370f1b..563ff4d1 100644 --- a/src/test/java/com/bitpay/sdk/util/KeyUtilsTest.java +++ b/src/test/java/com/bitpay/sdk/util/KeyUtilsTest.java @@ -9,7 +9,7 @@ import com.bitpay.sdk.exceptions.BitPayGenericException; -import org.bitcoinj.core.ECKey; +import org.bitcoinj.crypto.ECKey; import org.junit.jupiter.api.Test; public class KeyUtilsTest { From deca515cd83a79ea612b907ece9e7efe106a54d1 Mon Sep 17 00:00:00 2001 From: GitHub Actions <> Date: Thu, 29 May 2025 19:06:51 +0000 Subject: [PATCH 2/2] Update javadoc --- docs/com/bitpay/sdk/Client.html | 18 ++--- docs/com/bitpay/sdk/class-use/Config.html | 2 +- docs/com/bitpay/sdk/class-use/PrivateKey.html | 2 +- docs/com/bitpay/sdk/client/BitPayClient.html | 16 ++--- .../client/class-use/HttpRequestFactory.html | 8 +-- .../class-use/BitPayGenericException.html | 14 ++-- docs/com/bitpay/sdk/util/KeyUtils.html | 68 +++++++++---------- docs/index-all.html | 18 ++--- 8 files changed, 73 insertions(+), 73 deletions(-) diff --git a/docs/com/bitpay/sdk/Client.html b/docs/com/bitpay/sdk/Client.html index 8d75e28a..0c831706 100644 --- a/docs/com/bitpay/sdk/Client.html +++ b/docs/com/bitpay/sdk/Client.html @@ -456,7 +456,7 @@

Method Summary

protected void -deriveIdentity(org.bitcoinj.core.ECKey ecKey) +deriveIdentity(org.bitcoinj.crypto.ECKey ecKey)
Derive identity.
@@ -517,13 +517,13 @@

Method Summary

-protected org.bitcoinj.core.ECKey +protected org.bitcoinj.crypto.ECKey getEcKey(Config config)
Initialize the public/private key pair by either loading the existing one or by creating a new one.
-protected org.bitcoinj.core.ECKey +protected org.bitcoinj.crypto.ECKey getEcKey(PrivateKey privateKey)
Gets ECKey.
@@ -2891,8 +2891,8 @@

getHttpClient