From a60eb1b802170abae6614f0284ba2b765ccf0d31 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 28 Jan 2019 16:03:22 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/data/Blockchain.java | 2 +- .../com/tangem/domain/wallet/eth/EthEngine.java | 4 ++-- .../com/tangem/domain/wallet/rsk/RskEngine.java | 10 +--------- .../tangem/domain/wallet/rsk/RskTokenEngine.java | 14 +++----------- .../tangem/domain/wallet/token/TokenEngine.java | 8 ++++---- 5 files changed, 11 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/tangem/data/Blockchain.java b/app/src/main/java/com/tangem/data/Blockchain.java index 2131113e17..11cb8eecf2 100644 --- a/app/src/main/java/com/tangem/data/Blockchain.java +++ b/app/src/main/java/com/tangem/data/Blockchain.java @@ -15,7 +15,7 @@ public enum Blockchain { BitcoinCash("BCH", "BCH", 100000000.0, R.drawable.ic_logo_bitcoin_cash, "Bitcoin Cash"), Litecoin("LTC", "LTC", 100000000.0, R.drawable.ic_logo_bitcoin, "Litecoin"), Rootstock("RSK", "RBTC", 1.0, R.drawable.ic_logo_bitcoin, "Rootstock"), - RootstockToken("Token", "RSK", 1.0, R.drawable.ic_logo_bat_token, "Rootstock"); + RootstockToken("Token", "RBTC", 1.0, R.drawable.ic_logo_bat_token, "Rootstock"); Blockchain(String ID, String currency, double multiplier, int imageResource, String officialName) { mID = ID; diff --git a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java index 5121fe4e75..f347e75893 100644 --- a/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/eth/EthEngine.java @@ -453,7 +453,7 @@ public class EthEngine extends CoinEngine { throw new Exception("Error in " + this.getClass().getSimpleName() + " - invalid v"); } tx.signature.v = (byte) v; - Log.e(this.getClass().getSimpleName(), " V: " +String.valueOf(v)); + Log.e(this.getClass().getSimpleName(), " V: " + String.valueOf(v)); byte[] txForSend = tx.getEncoded(); notifyOnNeedSendTransaction(txForSend); @@ -588,7 +588,7 @@ public class EthEngine extends CoinEngine { blockchainRequestsCallbacks.onComplete(false); } else { BigInteger nonce = coinData.getConfirmedTXCount(); - nonce=nonce.add(BigInteger.valueOf(1)); + nonce = nonce.add(BigInteger.valueOf(1)); coinData.setConfirmedTXCount(nonce); ctx.setError(null); blockchainRequestsCallbacks.onComplete(true); diff --git a/app/src/main/java/com/tangem/domain/wallet/rsk/RskEngine.java b/app/src/main/java/com/tangem/domain/wallet/rsk/RskEngine.java index 7220486514..633aee5fc2 100644 --- a/app/src/main/java/com/tangem/domain/wallet/rsk/RskEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/rsk/RskEngine.java @@ -8,20 +8,12 @@ import com.tangem.data.network.ServerApiRootstock; import com.tangem.data.network.model.InfuraResponse; import com.tangem.domain.wallet.BTCUtils; import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.ECDSASignatureETH; import com.tangem.domain.wallet.EthTransaction; import com.tangem.domain.wallet.TangemContext; -import com.tangem.domain.wallet.eth.EthData; import com.tangem.domain.wallet.eth.EthEngine; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.tasks.SignTask; -import com.tangem.util.CryptoUtil; import com.tangem.wallet.R; -import org.bitcoinj.core.ECKey; - import java.math.BigInteger; -import java.util.Arrays; public class RskEngine extends EthEngine { @@ -60,7 +52,7 @@ public class RskEngine extends EthEngine { } @Override - public Uri getWalletExplorerUri()) { + public Uri getWalletExplorerUri() { return Uri.parse("https://explorer.rsk.co/address/" + ctx.getCoinData().getWallet()); } diff --git a/app/src/main/java/com/tangem/domain/wallet/rsk/RskTokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/rsk/RskTokenEngine.java index 51604f2302..d2ac844bba 100644 --- a/app/src/main/java/com/tangem/domain/wallet/rsk/RskTokenEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/rsk/RskTokenEngine.java @@ -3,27 +3,17 @@ package com.tangem.domain.wallet.rsk; import android.net.Uri; import android.util.Log; -import com.google.common.base.Strings; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiRootstock; import com.tangem.data.network.model.InfuraResponse; import com.tangem.domain.wallet.BTCUtils; import com.tangem.domain.wallet.CoinEngine; -import com.tangem.domain.wallet.ECDSASignatureETH; import com.tangem.domain.wallet.EthTransaction; import com.tangem.domain.wallet.TangemContext; import com.tangem.domain.wallet.token.TokenEngine; -import com.tangem.tangemcard.data.TangemCard; -import com.tangem.tangemcard.tasks.SignTask; -import com.tangem.util.CryptoUtil; import com.tangem.wallet.R; -import org.bitcoinj.core.ECKey; - -import java.math.BigDecimal; import java.math.BigInteger; -import java.math.RoundingMode; -import java.util.Arrays; public class RskTokenEngine extends TokenEngine { @@ -48,7 +38,9 @@ public class RskTokenEngine extends TokenEngine { } @Override - public Uri getWalletExplorerUri() { return Uri.parse("https://explorer.rsk.co/address/" + ctx.getCoinData().getWallet()); } // Only RSK explorer for now + public Uri getWalletExplorerUri() { + return Uri.parse("https://explorer.rsk.co/address/" + ctx.getCoinData().getWallet()); + } // Only RSK explorer for now @Override public Uri getShareWalletUri() { diff --git a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java index 1594d609f9..9e515f0c1a 100644 --- a/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/token/TokenEngine.java @@ -437,7 +437,7 @@ public class TokenEngine extends CoinEngine { } @Override - public SignTask.TransactionToSign constructPayment(Amount amountValue, Amount feeValue, boolean IncFee, String targetAddress) throws Exception { + public SignTask.TransactionToSign constructTransaction(Amount amountValue, Amount feeValue, boolean IncFee, String targetAddress) throws Exception { if (amountValue.getCurrency().equals(this.getBlockchain().getCurrency())) { return constructTransactionCoin(feeValue, amountValue, IncFee, targetAddress); } else { @@ -528,7 +528,7 @@ public class TokenEngine extends CoinEngine { } private SignTask.TransactionToSign constructTransactionToken(Amount feeValue, Amount amountValue, boolean IncFee, String targetAddress) throws Exception { - Log.e(TAG, "Construct TOKEN transaction "+amountValue.toString()+" with fee "+feeValue.toString()+(IncFee?" including":" excluding")); + Log.e(TAG, "Construct TOKEN transaction " + amountValue.toString() + " with fee " + feeValue.toString() + (IncFee ? " including" : " excluding")); BigInteger nonceValue = coinData.getConfirmedTXCount(); byte[] pbKey = ctx.getCard().getWalletPublicKey(); @@ -593,12 +593,12 @@ public class TokenEngine extends CoinEngine { @Override public byte[] getRawDataToSign() throws Exception { - throw new Exception("Signing of raw transaction not supported for ETH"); + throw new Exception("Signing of raw transaction not supported for " + this.getClass().getSimpleName()); } @Override public String getHashAlgToSign() throws Exception { - throw new Exception("Signing of raw transaction not supported for ETH"); + throw new Exception("Signing of raw transaction not supported for " + this.getClass().getSimpleName()); } @Override