From de5d9df8cee94ef237147a272bd663550571bd2f Mon Sep 17 00:00:00 2001 From: kkyovsky Date: Fri, 29 May 2020 14:15:53 +0200 Subject: [PATCH] moved packages around again and introduced bitrafael-client-dummy --- .../{server/api => client}/api/IClient.java | 2 +- bitrafael-client-dummy/build.gradle | 35 ++++++ .../generalbytes/bitrafael/client/Client.java | 105 ++++++++++++++++++ .../bitrafael/tools/wallet/WalletTools.java | 81 ++++++++++++++ .../{server/api => client}/Client.java | 8 +- .../examples/ClassificationExample.java | 2 +- .../examples/bitcoin/ClientExample.java | 4 +- .../bitrafael/examples/bitcoin/Forwarder.java | 4 +- .../examples/bitcoin/PaymentExample.java | 2 +- .../examples/bitcoin/SendAllCoinsExample.java | 4 +- .../bitcoin/TransactionWatcherExample.java | 2 +- .../examples/bitcoin/WalletToolsExample.java | 2 +- .../bitcoin/WalletWatcherExample.java | 2 +- .../examples/dash/ClientExample.java | 2 +- .../examples/ethereum/EthereumExample.java | 2 +- .../examples/litecoin/ClientExample.java | 4 +- .../bitrafael/tools/payment/PaymentMgr.java | 4 +- .../bitrafael/tools/wallet/WalletTools.java | 2 +- .../bitrafael/tools/wallet/XPUBMgr.java | 2 +- .../tools/wallet/bch/MasterPrivateKeyBCH.java | 2 +- .../tools/wallet/bch/WalletToolsBCH.java | 2 +- .../tools/wallet/btc/MasterPrivateKeyBTC.java | 2 +- .../tools/wallet/btc/WalletToolsBTC.java | 2 +- .../tools/wallet/dash/WalletToolsDASH.java | 2 +- .../tools/wallet/eth/MasterPrivateKeyETH.java | 2 +- .../tools/wallet/eth/WalletToolsETH.java | 2 +- .../tools/wallet/ltc/MasterPrivateKeyLTC.java | 2 +- .../tools/wallet/ltc/WalletToolsLTC.java | 2 +- .../tools/wallet/xmr/WalletToolsXMR.java | 2 +- .../tools/watch/BlockchainWatcher.java | 4 +- settings.gradle | 1 + 31 files changed, 260 insertions(+), 34 deletions(-) rename bitrafael-client-api/src/main/java/com/generalbytes/bitrafael/{server/api => client}/api/IClient.java (98%) create mode 100644 bitrafael-client-dummy/build.gradle create mode 100644 bitrafael-client-dummy/src/main/java/com/generalbytes/bitrafael/client/Client.java create mode 100644 bitrafael-client-dummy/src/main/java/com/generalbytes/bitrafael/tools/wallet/WalletTools.java rename bitrafael-client/src/main/java/com/generalbytes/bitrafael/{server/api => client}/Client.java (97%) diff --git a/bitrafael-client-api/src/main/java/com/generalbytes/bitrafael/server/api/api/IClient.java b/bitrafael-client-api/src/main/java/com/generalbytes/bitrafael/client/api/IClient.java similarity index 98% rename from bitrafael-client-api/src/main/java/com/generalbytes/bitrafael/server/api/api/IClient.java rename to bitrafael-client-api/src/main/java/com/generalbytes/bitrafael/client/api/IClient.java index cee59a7..ce0a3ad 100644 --- a/bitrafael-client-api/src/main/java/com/generalbytes/bitrafael/server/api/api/IClient.java +++ b/bitrafael-client-api/src/main/java/com/generalbytes/bitrafael/client/api/IClient.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.bitrafael.server.api.api; +package com.generalbytes.bitrafael.client.api; import com.generalbytes.bitrafael.server.api.dto.*; diff --git a/bitrafael-client-dummy/build.gradle b/bitrafael-client-dummy/build.gradle new file mode 100644 index 0000000..1339b2a --- /dev/null +++ b/bitrafael-client-dummy/build.gradle @@ -0,0 +1,35 @@ +plugins { + id 'java' + id 'maven-publish' + id 'com.generalbytes.gradle.main' +} + +dependencies { + compile project(':bitrafael-server-api') + compile project(':bitrafael-client-api') +} + +dependencyVerifications { + checksums batmDependencyChecksumsConfig + printUnusedAssertions false +} + +publishing { + if (hasGbUploadArtifactory) { + repositories { + maven { + credentials { + username gbArtifactoryUser + password gbArtifactoryPassword + } + url gbArtifactoryUploadUrl + } + } + } + + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} \ No newline at end of file diff --git a/bitrafael-client-dummy/src/main/java/com/generalbytes/bitrafael/client/Client.java b/bitrafael-client-dummy/src/main/java/com/generalbytes/bitrafael/client/Client.java new file mode 100644 index 0000000..110883e --- /dev/null +++ b/bitrafael-client-dummy/src/main/java/com/generalbytes/bitrafael/client/Client.java @@ -0,0 +1,105 @@ +package com.generalbytes.bitrafael.client; + +import com.generalbytes.bitrafael.client.api.IClient; +import com.generalbytes.bitrafael.server.api.dto.*; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +public class Client implements IClient { + @Override + public long getCurrentBlockchainHeight() { + return 0; + } + + @Override + public BigDecimal getAddressBalance(String address) { + return BigDecimal.ONE; + } + + @Override + public BigDecimal getAddressBalanceConfirmed(String address) { + return BigDecimal.ONE; + } + + @Override + public AccountBalance getAccountBalance(String xpub) { + return new AccountBalance(xpub,"nextAddr",0,"nextAddrChange",0,100000000,100000000); + } + + @Override + public TxInfo getAddressLastTransactionInfo(String address) { + return null; + } + + @Override + public AddressInfo getAddressInfo(String address, int limit) { + return null; + } + + @Override + public Map getAddressesLastTransactionInfos(List addresses) { + return null; + } + + @Override + public Map getAddressesInfo(List addresses, int limit) { + return null; + } + + @Override + public Map getAddressesAudits(List addresses) { + return null; + } + + @Override + public long getTransactionHeight(String txHash) { + return 0; + } + + @Override + public long getTransactionConfirmations(String txHash) { + return 0; + } + + @Override + public String send(String fromPrivateKey, BigDecimal amount, String toAddress) { + return null; + } + + @Override + public String send(String fromPrivateKey, BigDecimal amount, String toAddress, BigDecimal fee) { + return null; + } + + @Override + public String send(String[] fromPrivateKeys, BigDecimal[] fromAmounts, String[] toAddresses, BigDecimal[] toAmounts, BigDecimal fee) { + return null; + } + + @Override + public BigDecimal convertAmount(BigDecimal fromAmount, String fromCurrency, String toCurrency) { + return null; + } + + @Override + public List convertAmounts(List amountsPairs) { + return null; + } + + @Override + public TxFeesInfo getRecommendedTransactionFeesPerByte() { + return null; + } + + @Override + public TxFees getTransactionFees(List txHashes) { + return null; + } + + @Override + public RiskLevel getTransactionRiskLevel(String txHash) { + return null; + } +} diff --git a/bitrafael-client-dummy/src/main/java/com/generalbytes/bitrafael/tools/wallet/WalletTools.java b/bitrafael-client-dummy/src/main/java/com/generalbytes/bitrafael/tools/wallet/WalletTools.java new file mode 100644 index 0000000..1fa0ae3 --- /dev/null +++ b/bitrafael-client-dummy/src/main/java/com/generalbytes/bitrafael/tools/wallet/WalletTools.java @@ -0,0 +1,81 @@ +package com.generalbytes.bitrafael.tools.wallet; + +import com.generalbytes.bitrafael.client.api.IClient; +import com.generalbytes.bitrafael.tools.api.wallet.Classification; +import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; +import com.generalbytes.bitrafael.tools.api.wallet.ISignature; +import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; + +import java.util.Set; + +public class WalletTools implements IWalletTools { + @Override + public String generateSeedMnemonicSeparatedBySpaces() { + return "a h o j"; + } + + @Override + public IMasterPrivateKey getMasterPrivateKey(String seedMnemonicSeparatedBySpaces, String password, String cryptoCurrency, int standard) { + return null; + } + + @Override + public IMasterPrivateKey getMasterPrivateKey(String prv, String cryptoCurrency, int standard) { + return null; + } + + @Override + public String getAccountPUB(IMasterPrivateKey master, String cryptoCurrency, int accountIndex) { + return null; + } + + @Override + public String getWalletAddress(IMasterPrivateKey master, String cryptoCurrency, int accountIndex, int chainIndex, int index) { + return null; + } + + @Override + public String getWalletPrivateKey(IMasterPrivateKey master, String cryptoCurrency, int accountIndex, int chainIndex, int index) { + return null; + } + + @Override + public String getWalletAddressFromAccountPUB(String accountPUB, String cryptoCurrency, int chainIndex, int index) { + return null; + } + + @Override + public String generateWalletPrivateKeyWithPrefix(String prefix, String cryptoCurrency) { + return null; + } + + @Override + public String getWalletAddressFromPrivateKey(String privateKey, String cryptoCurrency) { + return null; + } + + @Override + public ISignature sign(String privateKey, byte[] hashToSign, String cryptoCurrency) { + return null; + } + + @Override + public boolean isAddressValid(String address, String cryptoCurrency) { + return false; + } + + @Override + public Set supportedCryptoCurrencies() { + return null; + } + + @Override + public Classification classify(String input) { + return new Classification(Classification.TYPE_ADDRESS, IClient.BTC,"1111111111111111111114oLvT2"); + } + + @Override + public Classification classify(String input, String cryptoCurrencyHint) { + return classify(input); + } +} diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/server/api/Client.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/client/Client.java similarity index 97% rename from bitrafael-client/src/main/java/com/generalbytes/bitrafael/server/api/Client.java rename to bitrafael-client/src/main/java/com/generalbytes/bitrafael/client/Client.java index be700c0..03076bd 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/server/api/Client.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/client/Client.java @@ -17,9 +17,13 @@ ************************************************************************************/ -package com.generalbytes.bitrafael.server.api; +package com.generalbytes.bitrafael.client; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.server.api.IBitrafaelAPI; +import com.generalbytes.bitrafael.server.api.IBitrafaelBitcoinAPI; +import com.generalbytes.bitrafael.server.api.IBitrafaelDashAPI; +import com.generalbytes.bitrafael.server.api.IBitrafaelLitecoinAPI; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.server.api.dto.*; import com.generalbytes.bitrafael.server.api.dto.rest.*; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/ClassificationExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/ClassificationExample.java index b899246..06b6b18 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/ClassificationExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/ClassificationExample.java @@ -17,7 +17,7 @@ ************************************************************************************/ package com.generalbytes.bitrafael.examples; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.Classification; import com.generalbytes.bitrafael.tools.wallet.WalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/ClientExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/ClientExample.java index be4b045..2dcb58e 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/ClientExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/ClientExample.java @@ -18,8 +18,8 @@ package com.generalbytes.bitrafael.examples.bitcoin; -import com.generalbytes.bitrafael.server.api.Client; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.Client; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.server.api.dto.AccountBalance; import com.generalbytes.bitrafael.server.api.dto.AddressInfo; import com.generalbytes.bitrafael.server.api.dto.TxFeesInfo; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/Forwarder.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/Forwarder.java index dbb9326..4d854a6 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/Forwarder.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/Forwarder.java @@ -18,8 +18,8 @@ package com.generalbytes.bitrafael.examples.bitcoin; -import com.generalbytes.bitrafael.server.api.Client; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.Client; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.server.api.dto.TxInfo; import com.generalbytes.bitrafael.tools.wallet.WalletTools; import com.generalbytes.bitrafael.tools.watch.AbstractBlockchainWatcherWalletListener; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/PaymentExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/PaymentExample.java index c38fe4c..5f70235 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/PaymentExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/PaymentExample.java @@ -17,7 +17,7 @@ ************************************************************************************/ package com.generalbytes.bitrafael.examples.bitcoin; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.payment.IPaymentListener; import com.generalbytes.bitrafael.tools.api.payment.Payment; import com.generalbytes.bitrafael.tools.api.payment.PaymentRequest; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/SendAllCoinsExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/SendAllCoinsExample.java index fa9645b..5b8540b 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/SendAllCoinsExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/SendAllCoinsExample.java @@ -17,8 +17,8 @@ ************************************************************************************/ package com.generalbytes.bitrafael.examples.bitcoin; -import com.generalbytes.bitrafael.server.api.Client; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.Client; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.wallet.WalletTools; import java.math.BigDecimal; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/TransactionWatcherExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/TransactionWatcherExample.java index 8116021..410613a 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/TransactionWatcherExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/TransactionWatcherExample.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.examples.bitcoin; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.watch.AbstractBlockchainWatcherTransactionListener; import com.generalbytes.bitrafael.tools.watch.BlockchainWatcher; import com.generalbytes.bitrafael.tools.api.watch.IBlockchainWatcherListener; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/WalletToolsExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/WalletToolsExample.java index 6bc1966..69fb9cd 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/WalletToolsExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/WalletToolsExample.java @@ -17,7 +17,7 @@ ************************************************************************************/ package com.generalbytes.bitrafael.examples.bitcoin; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.wallet.WalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/WalletWatcherExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/WalletWatcherExample.java index 0b9c14e..43aba93 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/WalletWatcherExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/bitcoin/WalletWatcherExample.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.examples.bitcoin; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.server.api.dto.TxInfo; import com.generalbytes.bitrafael.tools.watch.AbstractBlockchainWatcherWalletListener; import com.generalbytes.bitrafael.tools.watch.BlockchainWatcher; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/dash/ClientExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/dash/ClientExample.java index ac95298..ffe2320 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/dash/ClientExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/dash/ClientExample.java @@ -17,7 +17,7 @@ ************************************************************************************/ package com.generalbytes.bitrafael.examples.dash; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.wallet.WalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/ethereum/EthereumExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/ethereum/EthereumExample.java index c678040..8cf1b67 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/ethereum/EthereumExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/ethereum/EthereumExample.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.examples.ethereum; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.wallet.eth.MasterPrivateKeyETH; import com.generalbytes.bitrafael.tools.wallet.eth.WalletToolsETH; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/litecoin/ClientExample.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/litecoin/ClientExample.java index 1985819..9c1452d 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/litecoin/ClientExample.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/examples/litecoin/ClientExample.java @@ -17,8 +17,8 @@ ************************************************************************************/ package com.generalbytes.bitrafael.examples.litecoin; -import com.generalbytes.bitrafael.server.api.Client; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.Client; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.server.api.dto.AccountBalance; public class ClientExample { diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/payment/PaymentMgr.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/payment/PaymentMgr.java index 1eac4d0..6ec1b93 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/payment/PaymentMgr.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/payment/PaymentMgr.java @@ -18,8 +18,8 @@ package com.generalbytes.bitrafael.tools.payment; -import com.generalbytes.bitrafael.server.api.Client; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.Client; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.payment.*; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.wallet.WalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/WalletTools.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/WalletTools.java index 076adfe..13c9082 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/WalletTools.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/WalletTools.java @@ -19,7 +19,7 @@ package com.generalbytes.bitrafael.tools.wallet; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.*; import com.generalbytes.bitrafael.tools.wallet.bch.WalletToolsBCH; import com.generalbytes.bitrafael.tools.wallet.btc.WalletToolsBTC; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/XPUBMgr.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/XPUBMgr.java index 897d180..f2c2285 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/XPUBMgr.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/XPUBMgr.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.tools.wallet; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.server.api.dto.AccountBalance; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.api.wallet.IXPUBMgr; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/bch/MasterPrivateKeyBCH.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/bch/MasterPrivateKeyBCH.java index 9fef5db..bba380a 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/bch/MasterPrivateKeyBCH.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/bch/MasterPrivateKeyBCH.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.tools.wallet.bch; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.wallet.WalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/bch/WalletToolsBCH.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/bch/WalletToolsBCH.java index 9f2410d..709095f 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/bch/WalletToolsBCH.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/bch/WalletToolsBCH.java @@ -19,7 +19,7 @@ package com.generalbytes.bitrafael.tools.wallet.bch; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.Classification; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.ISignature; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/btc/MasterPrivateKeyBTC.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/btc/MasterPrivateKeyBTC.java index 99119c2..ea5ac27 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/btc/MasterPrivateKeyBTC.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/btc/MasterPrivateKeyBTC.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.tools.wallet.btc; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.wallet.WalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/btc/WalletToolsBTC.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/btc/WalletToolsBTC.java index 994595c..334fc25 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/btc/WalletToolsBTC.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/btc/WalletToolsBTC.java @@ -19,7 +19,7 @@ package com.generalbytes.bitrafael.tools.wallet.btc; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.Classification; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.ISignature; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/dash/WalletToolsDASH.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/dash/WalletToolsDASH.java index ad63d9a..aa0737b 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/dash/WalletToolsDASH.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/dash/WalletToolsDASH.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.tools.wallet.dash; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.Classification; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.ISignature; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/eth/MasterPrivateKeyETH.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/eth/MasterPrivateKeyETH.java index 397f1f0..97c75bb 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/eth/MasterPrivateKeyETH.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/eth/MasterPrivateKeyETH.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.tools.wallet.eth; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.wallet.WalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/eth/WalletToolsETH.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/eth/WalletToolsETH.java index 3be2489..d1d8092 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/eth/WalletToolsETH.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/eth/WalletToolsETH.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.tools.wallet.eth; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.Classification; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.ISignature; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/ltc/MasterPrivateKeyLTC.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/ltc/MasterPrivateKeyLTC.java index 7d2e4d7..bd52630 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/ltc/MasterPrivateKeyLTC.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/ltc/MasterPrivateKeyLTC.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.tools.wallet.ltc; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.IWalletTools; import com.generalbytes.bitrafael.tools.wallet.WalletTools; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/ltc/WalletToolsLTC.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/ltc/WalletToolsLTC.java index 7d07764..f0f54a1 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/ltc/WalletToolsLTC.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/ltc/WalletToolsLTC.java @@ -18,7 +18,7 @@ package com.generalbytes.bitrafael.tools.wallet.ltc; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.Classification; import com.generalbytes.bitrafael.tools.api.wallet.IMasterPrivateKey; import com.generalbytes.bitrafael.tools.api.wallet.ISignature; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/xmr/WalletToolsXMR.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/xmr/WalletToolsXMR.java index 2cf554a..8b55b5e 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/xmr/WalletToolsXMR.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/wallet/xmr/WalletToolsXMR.java @@ -17,7 +17,7 @@ ************************************************************************************/ package com.generalbytes.bitrafael.tools.wallet.xmr; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.tools.api.wallet.Classification; import com.generalbytes.bitrafael.tools.api.wallet.IClassificator; import com.generalbytes.bitrafael.tools.wallet.xmr.core.Utils; diff --git a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/watch/BlockchainWatcher.java b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/watch/BlockchainWatcher.java index 8bb520e..408e567 100644 --- a/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/watch/BlockchainWatcher.java +++ b/bitrafael-client/src/main/java/com/generalbytes/bitrafael/tools/watch/BlockchainWatcher.java @@ -19,8 +19,8 @@ package com.generalbytes.bitrafael.tools.watch; -import com.generalbytes.bitrafael.server.api.Client; -import com.generalbytes.bitrafael.server.api.api.IClient; +import com.generalbytes.bitrafael.client.Client; +import com.generalbytes.bitrafael.client.api.IClient; import com.generalbytes.bitrafael.server.api.dto.TxInfo; import com.generalbytes.bitrafael.tools.api.watch.IBlockchainWatcher; import com.generalbytes.bitrafael.tools.api.watch.IBlockchainWatcherListener; diff --git a/settings.gradle b/settings.gradle index 67c6ab0..2781ef8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ include 'bitrafael-client' +include 'bitrafael-client-dummy' include 'bitrafael-client-api' include 'bitrafael-server-api'