status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-01-24 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

fix(Wallet) move deletion of pending transactions in nim

Browse Source 
Bump status-go HEAD that removes deletion of pending multi-transactions
in status-go

Previous implementation was relying on the fact that all pending
transactions are also multi-transactions, which it seems not to be
the case (e.g. ens, airdrop collectible)

Also tried to extend the deletion of multi-transactions to status go
but it was causing crashes for minted/dropped tokens.

Updates #10474
This commit is contained in:
Stefan 2023-04-28 13:03:12 +03:00 committed by Stefan Dunca
parent 110e5af0c3
commit 528bb53b77
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app_service/service/transaction/service.nim
View File

@ -173,7 +173,7 @@ QtObject:
return @[] return @[]
return toSeq(self.allTransactions[address].values) return toSeq(self.allTransactions[address].values)
proc watchTransactionResult*(self: Service, watchTxResult: string) {.slot.} = proc watchTransactionResult*(self: Service, watchTxResult: string) {.slot.} =
let watchTxResult = parseJson(watchTxResult) let watchTxResult = parseJson(watchTxResult)
let success = watchTxResult["isSuccessfull"].getBool let success = watchTxResult["isSuccessfull"].getBool
@ -183,7 +183,10 @@ QtObject:
let address = watchTxResult["address"].getStr let address = watchTxResult["address"].getStr
let transactionReceipt = transactions.getTransactionReceipt(chainId, hash).result let transactionReceipt = transactions.getTransactionReceipt(chainId, hash).result
if transactionReceipt != nil and transactionReceipt.kind != JNull: if transactionReceipt != nil and transactionReceipt.kind != JNull:
# Pending transaction will be deleted by backend after transfering multi-transaction info to history # Delete pending transaction. Deleting it in status-go didn't work for all the cases
# TODO: make delete pending and save transaction atomc in status-go after fixing the crash
discard transactions.deletePendingTransaction(chainId, hash)
echo watchTxResult["data"].getStr echo watchTxResult["data"].getStr
let ev = TransactionMinedArgs( let ev = TransactionMinedArgs(
data: watchTxResult["data"].getStr, data: watchTxResult["data"].getStr,

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit edf8869ff27b5dd16a61067842a38c1c5fa6273b Subproject commit c5a8b40d9c8b7a0104ea9894b07eb3ca42b530af