GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2019-02-28 12:57:03 +03:00
parent 52f7ae6f1b
commit 1ccd51f403
2 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/tangem/data/network/model/AdaliteResponse.kt
View file

@ -17,7 +17,10 @@ data class AddressData(
var caAddress: String? = null,
@SerializedName("caBalance")
var caBalance: AdaliteCoins? = null
var caBalance: AdaliteCoins? = null,
@SerializedName("caTxList")
var caTxList: List<TxData>
)
data class AdaliteCoins(
@ -34,4 +37,9 @@ data class UtxoData(
@SerializedName("cuCoins")
var cuCoins: AdaliteCoins? = null
)
data class TxData(
@SerializedName("ctbId")
var ctbId: String? = null
)

32
app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java
View file

@ -5,9 +5,12 @@ import android.text.InputFilter;
import android.util.Base64;
import android.util.Log;
import com.tangem.App;
import com.tangem.data.local.PendingTransactionsStorage;
import com.tangem.data.network.ServerApiAdalite;
import com.tangem.data.network.model.AdaliteResponse;
import com.tangem.data.network.model.AdaliteResponseUtxo;
import com.tangem.data.network.model.TxData;
import com.tangem.data.network.model.UtxoData;
import com.tangem.domain.wallet.BTCUtils;
import com.tangem.domain.wallet.BalanceValidator;
@ -617,6 +620,20 @@ public class CardanoEngine extends CoinEngine {
coinData.setBalanceReceived(true);
coinData.setBalance(adaliteResponse.getRight().getCaBalance().getGetCoin());
coinData.setValidationNodeDescription(ServerApiAdalite.lastNode);
//check pending
if (App.pendingTransactionsStorage.hasTransactions(ctx.getCard())) {
for (PendingTransactionsStorage.TransactionInfo pendingTx : App.pendingTransactionsStorage.getTransactions(ctx.getCard()).getTransactions()) {
String pendingId = CalculateTxHash(pendingTx.getTx());
int x = 0;
for (TxData walletTx : adaliteResponse.getRight().getCaTxList()) {
if (walletTx.getCtbId().equals(pendingId)) {
App.pendingTransactionsStorage.removeTransaction(ctx.getCard(), pendingTx.getTx());
}
}
}
}
} catch (Exception e) {
e.printStackTrace();
Log.e(TAG, "FAIL ADALITE_ADDRESS Exception");
@ -756,4 +773,19 @@ public class CardanoEngine extends CoinEngine {
public boolean allowSelectFeeLevel() {
return false;
}
@Override
public int pendingTransactionTimeoutInSeconds() { return 60; }
private String CalculateTxHash(String tx) throws CborException {
Array txArray = (Array) CborDecoder.decode(BTCUtils.fromHex(tx)).get(0);
DataItem txBodyItem = txArray.getDataItems().get(0);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
new CborEncoder(baos).encode(txBodyItem);
byte[] txBody = baos.toByteArray();
final Blake2b blake2b = Blake2b.Digest.newInstance(32);
return BTCUtils.toHex(blake2b.digest(txBody));
}
}