laantungir/minibits_wallet
1
0
Fork 0
mirror of https://github.com/minibits-cash/minibits_wallet.git synced 2026-10-06 03:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Ecash SEND transaction remains pending even it was received by receiver

Browse Source
This commit is contained in:
minibits-cash
2024-12-07 18:33:16 +01:00
parent c855f8604c
commit d5422afad9
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "minibits_wallet",
"version": "0.1.10-beta.3",
"version": "0.1.10-beta.4",
"private": true,
"scripts": {
"android:clean": "cd android && ./gradlew clean",
src/services/walletService.ts
+32 -7
View File
@@ -612,12 +612,12 @@ const _syncStateWithMintTask = async function (
})
// If some of the pending by wallet proofs are neither pending nor spent by mint
if (unspentByMintProofs.length > 0 && isPending) {
/*if (unspentByMintProofs.length > 0 && isPending) {
// remove it from pending proofs in the wallet
proofsStore.removeProofs(unspentByMintProofs as Proof[], true, true)
// add proofs back to the spendable wallet
proofsStore.addProofs(unspentByMintProofs as Proof[])
}
}*/
// 1. Complete transactions with their proofs becoming spent by mint
if (spentByMintProofs.length > 0) {
@@ -659,11 +659,36 @@ const _syncStateWithMintTask = async function (
const tx = transactionsStore.findById(Number(tId))
if (tx) {
// if spent amount does not cover matched tx amount
// we do nothing because our proofsToSync might not be all pending proofs, only those selected for the tx that failed and we sync
// from exception handler.
// We move all unspent to spendable already above.
if(spentByMintTxAmount === tx.amount) {
// spent amount does not cover matched tx amount
// means that some spent proofs were used as inputs into the swap / melt
if(spentByMintTxAmount < tx.amount) {
errorTransactionIds.push(Number(tId))
// return unspent proofs from pending back to spendable
if(isPending) {
const unspentProofs = proofsToSync.filter(proof =>
spentByMintProofs.find(spent => spent.secret !== proof.secret)
)
if(unspentProofs.length > 0) {
log.trace('[_syncStateWithMintTask]', `Moving ${unspentProofs.length} unspent proofs from pending back to spendable.`)
// remove it from pending proofs in the wallet
proofsStore.removeProofs(unspentProofs, true, true)
// add proofs back to the spendable wallet
proofsStore.addProofs(unspentProofs)
}
}
return {
tId: Number(tId),
amount: tx.amount,
spentByMintAmount: spentByMintTxAmount as number,
message: 'Some spent ecash has been used as an input for this transaction.',
updatedStatus: TransactionStatus.ERROR
} as TransactionStateUpdate
} else {
completedTransactionIds.push(Number(tId))