Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-03-12 09:27:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Issue where spark spend may not have appeared as confirmed

Browse source
This commit is contained in:
julian 2024-12-17 15:40:13 -06:00 committed by julian-CStack
parent f97ef50978
commit 0e32e8a408
2 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
lib/wallets/wallet/impl/firo_wallet.dart
View file

@ -93,33 +93,13 @@ class FiroWallet<T extends ElectrumXCurrencyInterface> extends Bip39HDWallet<T>
.walletIdEqualToAnyLTagHash(walletId)
.findAll();
final Set<String> sparkTxids = {};
for (final coin in sparkCoins) {
sparkTxids.add(coin.txHash);
// check for duplicates before adding to list
if (allTxHashes.indexWhere((e) => e["tx_hash"] == coin.txHash) == -1) {
final info = {
"tx_hash": coin.txHash,
"height": coin.height,
};
allTxHashes.add(info);
}
}
final missing = await getMissingSparkSpendTransactionIds();
for (final txid in missing.map((e) => e.txid).toSet()) {
allTxHashes.add({
"tx_hash": txid,
});
}
final List<Map<String, dynamic>> allTransactions = [];
// some lelantus transactions aren't fetched via wallet addresses so they
// will never show as confirmed in the gui.
final unconfirmedTransactions = await mainDB
.getTransactions(walletId)
final unconfirmedTransactions = await mainDB.isar.transactionV2s
.where()
.walletIdEqualTo(walletId)
.filter()
.heightIsNull()
.findAll();
@ -137,21 +117,54 @@ class FiroWallet<T extends ElectrumXCurrencyInterface> extends Bip39HDWallet<T>
final info = {
"tx_hash": tx.txid,
"height": height,
"address": tx.address.value?.value,
};
allTxHashes.add(info);
}
}
for (final txHash in allTxHashes) {
// final storedTx = await db
// .getTransactions(walletId)
// .filter()
// .txidEqualTo(txHash["tx_hash"] as String)
// .findFirst();
final Set<String> sparkTxids = {};
for (final coin in sparkCoins) {
sparkTxids.add(coin.txHash);
// check for duplicates before adding to list
if (allTxHashes.indexWhere((e) => e["tx_hash"] == coin.txHash) == -1) {
final info = {
"tx_hash": coin.txHash,
"height": coin.height,
};
allTxHashes.add(info);
}
}
// if (storedTx == null ||
// !storedTx.isConfirmed(currentHeight, MINIMUM_CONFIRMATIONS)) {
final missing = await getSparkSpendTransactionIds();
for (final txid in missing.map((e) => e.txid).toSet()) {
// check for duplicates before adding to list
if (allTxHashes.indexWhere((e) => e["tx_hash"] == txid) == -1) {
final info = {
"tx_hash": txid,
};
allTxHashes.add(info);
}
}
final currentHeight = await chainHeight;
for (final txHash in allTxHashes) {
final storedTx = await mainDB.isar.transactionV2s
.where()
.walletIdEqualTo(walletId)
.filter()
.txidEqualTo(txHash["tx_hash"] as String)
.findFirst();
if (storedTx?.isConfirmed(
currentHeight,
cryptoCurrency.minConfirms,
cryptoCurrency.minCoinbaseConfirms,
) ==
true) {
// tx already confirmed, no need to process it again
continue;
}
// firod/electrumx seem to take forever to process spark txns so we'll
// just ignore null errors and check again on next refresh.
@ -174,7 +187,6 @@ class FiroWallet<T extends ElectrumXCurrencyInterface> extends Bip39HDWallet<T>
tx["height"] ??= txHash["height"];
allTransactions.add(tx);
}
// }
}
final List<TransactionV2> txns = [];
@ -193,7 +205,6 @@ class FiroWallet<T extends ElectrumXCurrencyInterface> extends Bip39HDWallet<T>
bool isMint = false;
bool isJMint = false;
bool isSparkMint = false;
final bool isMasterNodePayment = false;
final bool isSparkSpend = txData["type"] == 9 && txData["version"] == 3;
final bool isMySpark = sparkTxids.contains(txData["txid"] as String);
final bool isMySpentSpark =

12
lib/wallets/wallet/wallet_mixin_interfaces/spark_interface.dart
View file

@ -1103,7 +1103,7 @@ mixin SparkInterface<T extends ElectrumXCurrencyInterface>
}
}
Future<Set<LTagPair>> getMissingSparkSpendTransactionIds() async {
Future<Set<LTagPair>> getSparkSpendTransactionIds() async {
final tags = await mainDB.isar.sparkCoins
.where()
.walletIdEqualToAnyLTagHash(walletId)
@ -1112,21 +1112,11 @@ mixin SparkInterface<T extends ElectrumXCurrencyInterface>
.lTagHashProperty()
.findAll();
final usedCoinTxidsFoundLocally = await mainDB.isar.transactionV2s
.where()
.walletIdEqualTo(walletId)
.filter()
.subTypeEqualTo(TransactionSubType.sparkSpend)
.txidProperty()
.findAll();
final pairs = await FiroCacheCoordinator.getUsedCoinTxidsFor(
tags: tags,
network: cryptoCurrency.network,
);
pairs.removeWhere((e) => usedCoinTxidsFoundLocally.contains(e.txid));
return pairs.toSet();
}