diff --git a/app/src/main/java/com/tangem/data/network/BlockcypherApi.java b/app/src/main/java/com/tangem/data/network/BlockcypherApi.java index d952daf43c..2ef6251651 100644 --- a/app/src/main/java/com/tangem/data/network/BlockcypherApi.java +++ b/app/src/main/java/com/tangem/data/network/BlockcypherApi.java @@ -14,12 +14,12 @@ import retrofit2.http.Query; public interface BlockcypherApi { @GET(Server.ApiBlockcypher.Method.MAIN) - Call blockcypherMain(@Path("blockchain") String blockchain); + Call blockcypherMain(@Path("blockchain") String blockchain, @Path("network") String network); @GET(Server.ApiBlockcypher.Method.ADDRESS) - Call blockcypherAddress(@Path("blockchain") String blockchain, @Path("address") String address); + Call blockcypherAddress(@Path("blockchain") String blockchain, @Path("network") String network, @Path("address") String address); @Headers("Content-Type: application/json") @POST(Server.ApiBlockcypher.Method.PUSH) - Call blockcypherPush(@Path("blockchain") String blockchain, @Body BlockcypherBody blockcypherBody, @Query("token") String token); + Call blockcypherPush(@Path("blockchain") String blockchain, @Path("network") String network, @Body BlockcypherBody blockcypherBody, @Query("token") String token); } diff --git a/app/src/main/java/com/tangem/data/network/Server.java b/app/src/main/java/com/tangem/data/network/Server.java index 3365ca5590..bdc351369b 100644 --- a/app/src/main/java/com/tangem/data/network/Server.java +++ b/app/src/main/java/com/tangem/data/network/Server.java @@ -97,7 +97,7 @@ public class Server { public static class ApiBlockcypher { public static final String URL_BLOCKCYPHER = ServerURL.API_BLOCKCYPHER; - static final String V1_MAIN = "v1/{blockchain}/main"; + static final String V1_MAIN = "v1/{blockchain}/{network}"; public static class Method { static final String MAIN = URL_BLOCKCYPHER + V1_MAIN; diff --git a/app/src/main/java/com/tangem/data/network/ServerApiBlockcypher.java b/app/src/main/java/com/tangem/data/network/ServerApiBlockcypher.java index 5b07c97b71..33add147b9 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiBlockcypher.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiBlockcypher.java @@ -3,6 +3,7 @@ package com.tangem.data.network; import android.util.Log; import com.tangem.App; +import com.tangem.data.Blockchain; import com.tangem.data.network.model.BlockcypherBody; import com.tangem.data.network.model.BlockcypherFee; import com.tangem.data.network.model.BlockcypherResponse; @@ -47,9 +48,15 @@ public class ServerApiBlockcypher { String blockchain = blockchainID.toLowerCase(); BlockcypherApi blockcypherApi = App.Companion.getNetworkComponent().getRetrofitBlockcypher().create(BlockcypherApi.class); + String network = "main"; + if (blockchainID.equals(Blockchain.BitcoinTestNet.getID())) { + blockchain = "btc"; + network = "test3"; + } + switch (method) { case BLOCKCYPHER_ADDRESS: - Call addressCall = blockcypherApi.blockcypherAddress(blockchain, wallet); + Call addressCall = blockcypherApi.blockcypherAddress(blockchain, network, wallet); addressCall.enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { @@ -72,7 +79,7 @@ public class ServerApiBlockcypher { break; case BLOCKCYPHER_FEE: - Call feeCall = blockcypherApi.blockcypherMain(blockchain); + Call feeCall = blockcypherApi.blockcypherMain(blockchain, network); feeCall.enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { @@ -97,7 +104,7 @@ public class ServerApiBlockcypher { case BLOCKCYPHER_SEND: BlockcypherToken blockcypherToken = BlockcypherToken.values()[new Random().nextInt(BlockcypherToken.values().length)]; - Call sendCall = blockcypherApi.blockcypherPush(blockchain, new BlockcypherBody(tx), blockcypherToken.getToken()); + Call sendCall = blockcypherApi.blockcypherPush(blockchain, network, new BlockcypherBody(tx), blockcypherToken.getToken()); sendCall.enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { diff --git a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java index 3427fa0bbe..6bc9b6a17f 100644 --- a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java @@ -186,7 +186,7 @@ public class BtcEngine extends CoinEngine { @Override public Uri getWalletExplorerUri() { - return Uri.parse((ctx.getBlockchain() == Blockchain.Bitcoin ? "https://blockchain.info/address/" : "https://testnet.blockchain.info/address/") + ctx.getCoinData().getWallet()); + return Uri.parse((ctx.getBlockchain() == Blockchain.Bitcoin ? "https://blockchain.info/address/" : "https://www.blockchain.com/btctest/address/") + ctx.getCoinData().getWallet()); } @Override