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 @@
protected voidderiveIdentity(org.bitcoinj.core.ECKey ecKey)
+deriveIdentity(org.bitcoinj.crypto.ECKey ecKey)
protected org.bitcoinj.core.ECKeyprotected org.bitcoinj.crypto.ECKeygetEcKey(Config config)
protected org.bitcoinj.core.ECKeyprotected org.bitcoinj.crypto.ECKeygetEcKey(PrivateKey privateKey)
protected org.bitcoinj.core.ECKey getEcKey(PrivateKey privateKey) - throws BitPayGenericException+
protected org.bitcoinj.crypto.ECKey getEcKey(PrivateKey privateKey) + throws BitPayGenericException
protected org.bitcoinj.core.ECKey getEcKey(Config config) - throws BitPayGenericException+
protected org.bitcoinj.crypto.ECKey getEcKey(Config config) + throws BitPayGenericException
protected void deriveIdentity(org.bitcoinj.core.ECKey ecKey) +protected void deriveIdentity(org.bitcoinj.crypto.ECKey ecKey) throws BitPayGenericExceptionDerive identity.
protected org.bitcoinj.core.ECKeyprotected org.bitcoinj.crypto.ECKeygetEcKey(Config config)
protected org.bitcoinj.core.ECKeyprotected org.bitcoinj.crypto.ECKeygetEcKey(PrivateKey privateKey)
BitPayClient(org.apache.http.client.HttpClient httpClient,
+BitPayClient(org.apache.http.client.HttpClient httpClient,
HttpRequestFactory httpRequestFactory,
String baseUrl,
- org.bitcoinj.core.ECKey ecKey)
+ org.bitcoinj.crypto.ECKey ecKey)
Instantiates a new Bit pay client.
BitPayClient(org.apache.http.client.HttpClient httpClient,
+BitPayClient(org.apache.http.client.HttpClient httpClient,
HttpRequestFactory httpRequestFactory,
String baseUrl,
- org.bitcoinj.core.ECKey ecKey,
+ org.bitcoinj.crypto.ECKey ecKey,
String platformInfo)
Instantiates a new Bit pay client.
@@ -233,7 +233,7 @@ Methods inherited from class java.lang.
+
@@ -242,7 +242,7 @@ BitPayClient
public BitPayClient(org.apache.http.client.HttpClient httpClient,
HttpRequestFactory httpRequestFactory,
String baseUrl,
- org.bitcoinj.core.ECKey ecKey)
+ org.bitcoinj.crypto.ECKey ecKey)
Instantiates a new Bit pay client.
- Parameters:
@@ -253,7 +253,7 @@ BitPayClient
-
+
@@ -262,7 +262,7 @@ BitPayClient
public BitPayClient(org.apache.http.client.HttpClient httpClient,
HttpRequestFactory httpRequestFactory,
String baseUrl,
- org.bitcoinj.core.ECKey ecKey,
+ org.bitcoinj.crypto.ECKey ecKey,
String platformInfo)
Instantiates a new Bit pay client.
diff --git a/docs/com/bitpay/sdk/client/class-use/HttpRequestFactory.html b/docs/com/bitpay/sdk/client/class-use/HttpRequestFactory.html
index fa8c5642..dfe8dd87 100644
--- a/docs/com/bitpay/sdk/client/class-use/HttpRequestFactory.html
+++ b/docs/com/bitpay/sdk/client/class-use/HttpRequestFactory.html
@@ -102,18 +102,18 @@ Uses of
-BitPayClient(org.apache.http.client.HttpClient httpClient,
+BitPayClient(org.apache.http.client.HttpClient httpClient,
HttpRequestFactory httpRequestFactory,
String baseUrl,
- org.bitcoinj.core.ECKey ecKey)
+ org.bitcoinj.crypto.ECKey ecKey)
Instantiates a new Bit pay client.
BitPayClient(org.apache.http.client.HttpClient httpClient,
+BitPayClient(org.apache.http.client.HttpClient httpClient,
HttpRequestFactory httpRequestFactory,
String baseUrl,
- org.bitcoinj.core.ECKey ecKey,
+ org.bitcoinj.crypto.ECKey ecKey,
String platformInfo)
Instantiates a new Bit pay client.
diff --git a/docs/com/bitpay/sdk/exceptions/class-use/BitPayGenericException.html b/docs/com/bitpay/sdk/exceptions/class-use/BitPayGenericException.html
index debca9a7..f7378114 100644
--- a/docs/com/bitpay/sdk/exceptions/class-use/BitPayGenericException.html
+++ b/docs/com/bitpay/sdk/exceptions/class-use/BitPayGenericException.html
@@ -353,7 +353,7 @@ Uses of
protected void
-Client.deriveIdentity(org.bitcoinj.core.ECKey ecKey)
+ Client.deriveIdentity(org.bitcoinj.crypto.ECKey ecKey)
Derive identity.
protected org.bitcoinj.core.ECKeyprotected org.bitcoinj.crypto.ECKeygetEcKey(Config config)
protected org.bitcoinj.core.ECKeyprotected org.bitcoinj.crypto.ECKeygetEcKey(PrivateKey privateKey)
static org.bitcoinj.core.ECKeystatic org.bitcoinj.crypto.ECKeycreateEcKeyFromHexString(String privateKey)
static org.bitcoinj.core.ECKeystatic org.bitcoinj.crypto.ECKeycreateEcKeyFromHexStringFile(String privKeyFile)
static StringderiveSin(org.bitcoinj.core.ECKey ecKey)
+deriveSin(org.bitcoinj.crypto.ECKey ecKey)
static Stringsign(org.bitcoinj.core.ECKey key,
+KeyUtils.sign(org.bitcoinj.crypto.ECKey key,
String input)
Sign EC Key.
diff --git a/docs/com/bitpay/sdk/util/KeyUtils.html b/docs/com/bitpay/sdk/util/KeyUtils.html
index ff776aac..7b3b14a5 100644
--- a/docs/com/bitpay/sdk/util/KeyUtils.html
+++ b/docs/com/bitpay/sdk/util/KeyUtils.html
@@ -156,26 +156,26 @@ Method Summary
static org.bitcoinj.core.ECKeystatic org.bitcoinj.crypto.ECKeycreateEcKey()
static org.bitcoinj.core.ECKeystatic org.bitcoinj.crypto.ECKeycreateEcKeyFromHexString(String privateKey)
static org.bitcoinj.core.ECKeystatic org.bitcoinj.crypto.ECKeycreateEcKeyFromHexStringFile(String privKeyFile)
static StringderiveSin(org.bitcoinj.core.ECKey ecKey)
+deriveSin(org.bitcoinj.crypto.ECKey ecKey)
static org.bitcoinj.core.ECKeystatic org.bitcoinj.crypto.ECKeyloadEcKey()
static org.bitcoinj.core.ECKeystatic org.bitcoinj.crypto.ECKeyloadEcKey(URI privateKey)
static StringloadEcKeyAsHex(org.bitcoinj.core.ECKey ecKey)
+loadEcKeyAsHex(org.bitcoinj.crypto.ECKey ecKey)
static voidsaveEcKey(org.bitcoinj.core.ECKey ecKey)
+saveEcKey(org.bitcoinj.crypto.ECKey ecKey)
static voidsaveEcKey(org.bitcoinj.core.ECKey ecKey,
+saveEcKey(org.bitcoinj.crypto.ECKey ecKey,
URI privateKey)
Save EC key.
static voidsaveEcKeyAsHex(org.bitcoinj.core.ECKey ecKey)
+saveEcKeyAsHex(org.bitcoinj.crypto.ECKey ecKey)
static Stringsign(org.bitcoinj.core.ECKey key,
+sign(org.bitcoinj.crypto.ECKey key,
String input)
Sign EC Key.
@@ -303,7 +303,7 @@ privateKeyExists
-
createEcKey
-public static org.bitcoinj.core.ECKey createEcKey()
+public static org.bitcoinj.crypto.ECKey createEcKey()
Create EC key.
- Returns:
@@ -317,8 +317,8 @@ createEcKey
-
createEcKeyFromHexString
-public static org.bitcoinj.core.ECKey createEcKeyFromHexString(String privateKey)
- throws BitPayGenericException
+public static org.bitcoinj.crypto.ECKey createEcKeyFromHexString(String privateKey)
+ throws BitPayGenericException
Create EC key from hex string.
- Parameters:
@@ -336,9 +336,9 @@ createEcKeyFromHexString
-
createEcKeyFromHexStringFile
-public static org.bitcoinj.core.ECKey createEcKeyFromHexStringFile(String privKeyFile)
- throws IOException,
- BitPayGenericException
+public static org.bitcoinj.crypto.ECKey createEcKeyFromHexStringFile(String privKeyFile)
+ throws IOException,
+ BitPayGenericException
Create EC key from hex string private key file.
- Parameters:
@@ -357,8 +357,8 @@ createEcKeyFromHexStringFile
-
loadEcKey
-public static org.bitcoinj.core.ECKey loadEcKey()
- throws IOException
+public static org.bitcoinj.crypto.ECKey loadEcKey()
+ throws IOException
Load EC key.
- Returns:
@@ -374,9 +374,9 @@ loadEcKey
-
loadEcKey
-public static org.bitcoinj.core.ECKey loadEcKey(URI privateKey)
- throws IOException,
- URISyntaxException
+public static org.bitcoinj.crypto.ECKey loadEcKey(URI privateKey)
+ throws IOException,
+ URISyntaxException
Load EC key.
- Parameters:
@@ -408,13 +408,13 @@ getKeyStringFromFile
-
+
-
saveEcKey
-public static void saveEcKey(org.bitcoinj.core.ECKey ecKey)
+public static void saveEcKey(org.bitcoinj.crypto.ECKey ecKey)
throws IOException
Save EC key.
@@ -425,13 +425,13 @@ saveEcKey
-
+
-
saveEcKey
-public static void saveEcKey(org.bitcoinj.core.ECKey ecKey,
+public static void saveEcKey(org.bitcoinj.crypto.ECKey ecKey,
URI privateKey)
throws IOException,
URISyntaxException
@@ -446,13 +446,13 @@ saveEcKey
-
+
-
saveEcKeyAsHex
-public static void saveEcKeyAsHex(org.bitcoinj.core.ECKey ecKey)
+public static void saveEcKeyAsHex(org.bitcoinj.crypto.ECKey ecKey)
throws IOException
Save EC key as hex.
@@ -463,13 +463,13 @@ saveEcKeyAsHex
-
+
-
loadEcKeyAsHex
-public static String loadEcKeyAsHex(org.bitcoinj.core.ECKey ecKey)
+public static String loadEcKeyAsHex(org.bitcoinj.crypto.ECKey ecKey)
throws IOException
Load EC key as hex string.
@@ -482,13 +482,13 @@ loadEcKeyAsHex
-
+
-
deriveSin
-public static String deriveSin(org.bitcoinj.core.ECKey ecKey)
+public static String deriveSin(org.bitcoinj.crypto.ECKey ecKey)
throws BitPayGenericException
Derive sin string.
@@ -501,13 +501,13 @@ deriveSin
-
+
-
sign
-public static String sign(org.bitcoinj.core.ECKey key,
+public static String sign(org.bitcoinj.crypto.ECKey key,
String input)
throws BitPayGenericException
Sign EC Key.
diff --git a/docs/index-all.html b/docs/index-all.html
index 1ce5ad2b..fd4b9aed 100644
--- a/docs/index-all.html
+++ b/docs/index-all.html
@@ -322,11 +322,11 @@ B
- bitPayClient - Variable in class com.bitpay.sdk.Client
-
-- BitPayClient(HttpClient, HttpRequestFactory, String, ECKey) - Constructor for class com.bitpay.sdk.client.BitPayClient
+- BitPayClient(HttpClient, HttpRequestFactory, String, ECKey) - Constructor for class com.bitpay.sdk.client.BitPayClient
-
Instantiates a new Bit pay client.
-- BitPayClient(HttpClient, HttpRequestFactory, String, ECKey, String) - Constructor for class com.bitpay.sdk.client.BitPayClient
+- BitPayClient(HttpClient, HttpRequestFactory, String, ECKey, String) - Constructor for class com.bitpay.sdk.client.BitPayClient
-
Instantiates a new Bit pay client.
@@ -997,11 +997,11 @@ D
-
Deliver a BitPay Bill.
-- deriveIdentity(ECKey) - Method in class com.bitpay.sdk.Client
+- deriveIdentity(ECKey) - Method in class com.bitpay.sdk.Client
-
Derive identity.
-- deriveSin(ECKey) - Static method in class com.bitpay.sdk.util.KeyUtils
+- deriveSin(ECKey) - Static method in class com.bitpay.sdk.util.KeyUtils
-
Derive sin string.
@@ -3528,7 +3528,7 @@ L
-
Load EC key.
-- loadEcKeyAsHex(ECKey) - Static method in class com.bitpay.sdk.util.KeyUtils
+- loadEcKeyAsHex(ECKey) - Static method in class com.bitpay.sdk.util.KeyUtils
-
Load EC key as hex string.
@@ -4261,15 +4261,15 @@ S
- satoshisPerByte - Variable in class com.bitpay.sdk.model.invoice.MinerFeesItem
-
-- saveEcKey(ECKey) - Static method in class com.bitpay.sdk.util.KeyUtils
+- saveEcKey(ECKey) - Static method in class com.bitpay.sdk.util.KeyUtils
-
Save EC key.
-- saveEcKey(ECKey, URI) - Static method in class com.bitpay.sdk.util.KeyUtils
+- saveEcKey(ECKey, URI) - Static method in class com.bitpay.sdk.util.KeyUtils
-
Save EC key.
-- saveEcKeyAsHex(ECKey) - Static method in class com.bitpay.sdk.util.KeyUtils
+- saveEcKeyAsHex(ECKey) - Static method in class com.bitpay.sdk.util.KeyUtils
-
Save EC key as hex.
@@ -5832,7 +5832,7 @@ S
-
The constant SHP.
-- sign(ECKey, String) - Static method in class com.bitpay.sdk.util.KeyUtils
+- sign(ECKey, String) - Static method in class com.bitpay.sdk.util.KeyUtils
-
Sign EC Key.
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 {