AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: fix crashes on tx finalizing

Browse Source
This commit is contained in:
Sander van Grieken
2022-10-04 21:47:28 +02:00
parent 2118eb57bd
commit 090706bfd6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/qml/qechannelopener.py
View File

@@ -35,7 +35,7 @@ class QEChannelOpener(QObject, AuthMixin):
conflictingBackup = pyqtSignal([str], arguments=['message']) conflictingBackup = pyqtSignal([str], arguments=['message'])
channelOpening = pyqtSignal([str], arguments=['peer']) channelOpening = pyqtSignal([str], arguments=['peer'])
channelOpenError = pyqtSignal([str], arguments=['message']) channelOpenError = pyqtSignal([str], arguments=['message'])
channelOpenSuccess = pyqtSignal([str,bool,int], arguments=['cid','has_onchain_backup','min_depth','tx_complete']) channelOpenSuccess = pyqtSignal([str,bool,int,bool], arguments=['cid','has_onchain_backup','min_depth','tx_complete'])
dataChanged = pyqtSignal() # generic notify signal dataChanged = pyqtSignal() # generic notify signal
@@ -163,7 +163,7 @@ class QEChannelOpener(QObject, AuthMixin):
node_id=self._peer.pubkey, node_id=self._peer.pubkey,
fee_est=None) fee_est=None)
acpt = lambda tx: self.do_open_channel(tx, str(self._peer), None) acpt = lambda tx: self.do_open_channel(tx, str(self._peer), self._wallet.password)
self._finalizer = QETxFinalizer(self, make_tx=mktx, accept=acpt) self._finalizer = QETxFinalizer(self, make_tx=mktx, accept=acpt)
self._finalizer.canRbf = False self._finalizer.canRbf = False

2
electrum/gui/qml/qetxfinalizer.py
View File

@@ -280,7 +280,7 @@ class QETxFinalizer(QObject):
fee = tx.get_fee() fee = tx.get_fee()
feerate = Decimal(fee) / tx_size # sat/byte feerate = Decimal(fee) / tx_size # sat/byte
self.fee.satsInt = fee self._fee.satsInt = int(fee)
self.feeRate = f'{feerate:.1f}' self.feeRate = f'{feerate:.1f}'
#TODO #TODO

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

@@ -407,7 +407,7 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
@auth_protect @auth_protect
def sign(self, tx, *, broadcast: bool = False): def sign(self, tx, *, broadcast: bool = False):
tx = self.wallet.sign_transaction(tx, None) tx = self.wallet.sign_transaction(tx, self.password)
if tx is None: if tx is None:
self._logger.info('did not sign') self._logger.info('did not sign')