AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: don't create new QEAmount instances on query, re-use same instance

Browse Source
This commit is contained in:
Sander van Grieken
2023-01-09 12:31:07 +01:00
parent becd46fbf6
commit 281b9ddafb
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
electrum/gui/qml/qewallet.py
View File

@@ -78,6 +78,14 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
_synchronizing = False _synchronizing = False
_synchronizing_progress = '' _synchronizing_progress = ''
_lightningbalance = QEAmount()
_confirmedbalance = QEAmount()
_unconfirmedbalance = QEAmount()
_frozenbalance = QEAmount()
_totalbalance = QEAmount()
_lightningcanreceive = QEAmount()
_lightningcansend = QEAmount()
def __init__(self, wallet: 'Abstract_Wallet', parent=None): def __init__(self, wallet: 'Abstract_Wallet', parent=None):
super().__init__(parent) super().__init__(parent)
self.wallet = wallet self.wallet = wallet
@@ -394,48 +402,42 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
@pyqtProperty(QEAmount, notify=balanceChanged) @pyqtProperty(QEAmount, notify=balanceChanged)
def frozenBalance(self): def frozenBalance(self):
c, u, x = self.wallet.get_frozen_balance() c, u, x = self.wallet.get_frozen_balance()
self._frozenbalance = QEAmount(amount_sat=c+x) self._frozenbalance.satsInt = c+x
return self._frozenbalance return self._frozenbalance
@pyqtProperty(QEAmount, notify=balanceChanged) @pyqtProperty(QEAmount, notify=balanceChanged)
def unconfirmedBalance(self): def unconfirmedBalance(self):
self._unconfirmedbalance = QEAmount(amount_sat=self.wallet.get_balance()[1]) self._unconfirmedbalance.satsInt = self.wallet.get_balance()[1]
return self._unconfirmedbalance return self._unconfirmedbalance
@pyqtProperty(QEAmount, notify=balanceChanged) @pyqtProperty(QEAmount, notify=balanceChanged)
def confirmedBalance(self): def confirmedBalance(self):
c, u, x = self.wallet.get_balance() c, u, x = self.wallet.get_balance()
self._confirmedbalance = QEAmount(amount_sat=c+x) self._confirmedbalance.satsInt = c+x
return self._confirmedbalance return self._confirmedbalance
@pyqtProperty(QEAmount, notify=balanceChanged) @pyqtProperty(QEAmount, notify=balanceChanged)
def lightningBalance(self): def lightningBalance(self):
if not self.isLightning: if self.isLightning:
self._lightningbalance = QEAmount() self._lightningbalance.satsInt = int(self.wallet.lnworker.get_balance())
else:
self._lightningbalance = QEAmount(amount_sat=int(self.wallet.lnworker.get_balance()))
return self._lightningbalance return self._lightningbalance
@pyqtProperty(QEAmount, notify=balanceChanged) @pyqtProperty(QEAmount, notify=balanceChanged)
def totalBalance(self): def totalBalance(self):
total = self.confirmedBalance.satsInt + self.lightningBalance.satsInt total = self.confirmedBalance.satsInt + self.lightningBalance.satsInt
self._totalBalance = QEAmount(amount_sat=total) self._totalbalance.satsInt = total
return self._totalBalance return self._totalbalance
@pyqtProperty(QEAmount, notify=balanceChanged) @pyqtProperty(QEAmount, notify=balanceChanged)
def lightningCanSend(self): def lightningCanSend(self):
if not self.isLightning: if self.isLightning:
self._lightningcansend = QEAmount() self._lightningcansend.satsInt = int(self.wallet.lnworker.num_sats_can_send())
else:
self._lightningcansend = QEAmount(amount_sat=int(self.wallet.lnworker.num_sats_can_send()))
return self._lightningcansend return self._lightningcansend
@pyqtProperty(QEAmount, notify=balanceChanged) @pyqtProperty(QEAmount, notify=balanceChanged)
def lightningCanReceive(self): def lightningCanReceive(self):
if not self.isLightning: if self.isLightning:
self._lightningcanreceive = QEAmount() self._lightningcanreceive.satsInt = int(self.wallet.lnworker.num_sats_can_receive())
else:
self._lightningcanreceive = QEAmount(amount_sat=int(self.wallet.lnworker.num_sats_can_receive()))
return self._lightningcanreceive return self._lightningcanreceive
@pyqtSlot() @pyqtSlot()