Skip to content

Commit 090706b

Browse files
committed
qml: fix crashes on tx finalizing
1 parent 2118eb5 commit 090706b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

electrum/gui/qml/qechannelopener.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __init__(self, parent=None):
3535
conflictingBackup = pyqtSignal([str], arguments=['message'])
3636
channelOpening = pyqtSignal([str], arguments=['peer'])
3737
channelOpenError = pyqtSignal([str], arguments=['message'])
38-
channelOpenSuccess = pyqtSignal([str,bool,int], arguments=['cid','has_onchain_backup','min_depth','tx_complete'])
38+
channelOpenSuccess = pyqtSignal([str,bool,int,bool], arguments=['cid','has_onchain_backup','min_depth','tx_complete'])
3939

4040
dataChanged = pyqtSignal() # generic notify signal
4141

@@ -163,7 +163,7 @@ def open_channel(self, confirm_backup_conflict=False):
163163
node_id=self._peer.pubkey,
164164
fee_est=None)
165165

166-
acpt = lambda tx: self.do_open_channel(tx, str(self._peer), None)
166+
acpt = lambda tx: self.do_open_channel(tx, str(self._peer), self._wallet.password)
167167

168168
self._finalizer = QETxFinalizer(self, make_tx=mktx, accept=acpt)
169169
self._finalizer.canRbf = False

electrum/gui/qml/qetxfinalizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def update(self):
280280
fee = tx.get_fee()
281281
feerate = Decimal(fee) / tx_size # sat/byte
282282

283-
self.fee.satsInt = fee
283+
self._fee.satsInt = int(fee)
284284
self.feeRate = f'{feerate:.1f}'
285285

286286
#TODO

electrum/gui/qml/qewallet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ def send_onchain(self, address, amount, fee=None, rbf=False):
407407

408408
@auth_protect
409409
def sign(self, tx, *, broadcast: bool = False):
410-
tx = self.wallet.sign_transaction(tx, None)
410+
tx = self.wallet.sign_transaction(tx, self.password)
411411

412412
if tx is None:
413413
self._logger.info('did not sign')

0 commit comments

Comments
 (0)