GlcoinCore/specter-desktop
1
0
Fork 0
mirror of https://github.com/cryptoadvance/specter-desktop.git synced 2026-08-13 12:33:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Chore: Thread safety for TxList and Cypress test fix (#2148)

Browse source 
* fixes psbt key error
* use lock to avoid concurrent access
This commit is contained in:
k9ert 2023-02-02 19:17:15 +01:00 • committed by GitHub
parent 19d8a82424
commit b2141aee8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cypress/integration/spec_balances_amounts.js
View file

@ -27,7 +27,7 @@ describe('Test the rendering of balances and amounts', () => {
cy.get('#satoshis_hot_keys_hot_sign_btn').click()
cy.get('#hot_enter_passphrase__submit').click()
cy.get('#broadcast_local_btn').click()
cy.reload()
cy.visit("/")
cy.selectWallet('Ghost wallet')
cy.get('#unconfirmed_amount').then(($amount) => {
expect(parseFloat($amount.text())).to.be.gt(0).and.to.be.lt(1);

82
src/cryptoadvance/specter/txlist.py
View file

@ -25,6 +25,7 @@ from .util.psbt import (
SpecterTx,
)
from .util.tx import decoderawtransaction
from threading import RLock
logger = logging.getLogger(__name__)
@ -448,6 +449,8 @@ class TxList(dict, AbstractTxListContext):
ItemCls = WalletAwareTxItem # for inheritance
PSBTCls = SpecterPSBT
lock = RLock()
def __init__(self, path, parent, addresses):
self.parent = parent
self.path = path
@ -522,7 +525,11 @@ class TxList(dict, AbstractTxListContext):
# Make a copy of all txs if the tx.ismine (which should be all of them)
# As TxItem is derived from Dict, the __Dict__ will return a TxItem
transactions: List(TxItem) = [tx.copy() for tx in self.values() if tx.ismine]
with self.lock:
tx_values = self.values()
transactions: List(TxItem) = [
tx.copy() for tx in self.values() if tx.ismine
]
# 1. sorted
transactions = sorted(transactions, key=lambda tx: tx["time"], reverse=True)
@ -606,42 +613,43 @@ class TxList(dict, AbstractTxListContext):
}
(format of listtransactions)
"""
# here we store all addresses in transactions
# to set them used later
addresses = []
# first we add all transactions to cache
for txid in txs:
tx = txs[txid]
# find minimal from 3 times:
maxtime = 10445238000 # TODO: change after 31 dec 2300 lol
time = min(
tx.get("blocktime", maxtime),
tx.get("timereceived", maxtime),
tx.get("time", maxtime),
)
obj = {
"txid": txid,
"fee": tx.get("fee", None),
"blockheight": tx.get("blockheight", None),
"blockhash": tx.get("blockhash", None),
"time": time,
"blocktime": tx.get("blocktime", None),
"conflicts": tx.get("walletconflicts", []),
"bip125-replaceable": tx.get("bip125-replaceable", "no"),
"hex": tx.get("hex", None),
}
txitem = self.ItemCls(self, self._addresses, self.rawdir, **obj)
self[txid] = txitem
if txitem.tx:
for vout in txitem.tx.vout:
try:
addr = vout.script_pubkey.address(get_network(self.chain))
if addr not in addresses:
addresses.append(addr)
except:
pass # maybe not an address, but a raw script?
self._addresses.set_used(addresses)
self._save()
with self.lock:
# here we store all addresses in transactions
# to set them used later
addresses = []
# first we add all transactions to cache
for txid in txs:
tx = txs[txid]
# find minimal from 3 times:
maxtime = 10445238000 # TODO: change after 31 dec 2300 lol
time = min(
tx.get("blocktime", maxtime),
tx.get("timereceived", maxtime),
tx.get("time", maxtime),
)
obj = {
"txid": txid,
"fee": tx.get("fee", None),
"blockheight": tx.get("blockheight", None),
"blockhash": tx.get("blockhash", None),
"time": time,
"blocktime": tx.get("blocktime", None),
"conflicts": tx.get("walletconflicts", []),
"bip125-replaceable": tx.get("bip125-replaceable", "no"),
"hex": tx.get("hex", None),
}
txitem = self.ItemCls(self, self._addresses, self.rawdir, **obj)
self[txid] = txitem
if txitem.tx:
for vout in txitem.tx.vout:
try:
addr = vout.script_pubkey.address(get_network(self.chain))
if addr not in addresses:
addresses.append(addr)
except:
pass # maybe not an address, but a raw script?
self._addresses.set_used(addresses)
self._save()
def load(self, arr):
"""