Skip to content
Snippets Groups Projects
Commit c32e5ba6 authored by inso's avatar inso
Browse files

Multiples fixes with transfers

parent d8691b91
No related branches found
No related tags found
No related merge requests found
...@@ -114,20 +114,23 @@ class Transfer(QObject): ...@@ -114,20 +114,23 @@ class Transfer(QObject):
self.state = Transfer.AWAITING self.state = Transfer.AWAITING
self.hash = hashlib.sha1(txdoc.signed_raw().encode("ascii")).hexdigest().upper() self.hash = hashlib.sha1(txdoc.signed_raw().encode("ascii")).hexdigest().upper()
blockid = yield from community.blockid() blockid = yield from community.blockid()
block = yield from community.bma_access.future_request(qtbma.blockchain.Block,
req_args={'number': blockid['number']})
if block != qtbma.Blockchain.Block.null_value:
self._metadata['block'] = blockid['number'] self._metadata['block'] = blockid['number']
self._metadata['time'] = community.get_block()['medianTime'] self._metadata['time'] = block['medianTime']
def __handle_transfers_reply(self, replies, reply): def __handle_transfers_reply(self, replies, reply):
strdata = bytes(reply.readAll()).decode('utf-8') strdata = bytes(reply.readAll()).decode('utf-8')
logging.debug("Received reply : {0} : {1}".format(reply.error(), strdata)) logging.debug("Received reply : {0} : {1}".format(reply.error(), strdata))
if reply.error() == QNetworkReply.NoError: if reply.error() == QNetworkReply.NoError:
self.transfer_broadcasted.emit(self.metadata['receiver_uid'])
for r in replies: for r in replies:
try: try:
r.disconnect() r.disconnect()
except TypeError as e: except TypeError as e:
if "disconnect()" in str(e): if "disconnect()" in str(e):
logging.debug("Could not disconnect a reply") logging.debug("Could not disconnect a reply")
self.transfer_broadcasted.emit(self.metadata['receiver_uid'])
else: else:
for r in replies: for r in replies:
if not r.isFinished() or r.error() == QNetworkReply.NoError: if not r.isFinished() or r.error() == QNetworkReply.NoError:
......
...@@ -274,7 +274,7 @@ class Wallet(QObject): ...@@ -274,7 +274,7 @@ class Wallet(QObject):
result = self.tx_inputs(int(amount), community) result = self.tx_inputs(int(amount), community)
inputs = result[0] inputs = result[0]
self.caches[community.currency].available_sources = result[1:] self.caches[community.currency].available_sources = result[1][1:]
logging.debug("Inputs : {0}".format(inputs)) logging.debug("Inputs : {0}".format(inputs))
outputs = self.tx_outputs(recipient, amount, inputs) outputs = self.tx_outputs(recipient, amount, inputs)
......
...@@ -162,11 +162,11 @@ class CurrencyTabWidget(QWidget, Ui_CurrencyTabWidget): ...@@ -162,11 +162,11 @@ class CurrencyTabWidget(QWidget, Ui_CurrencyTabWidget):
logging.debug("Refresh status") logging.debug("Refresh status")
text = self.tr(" Block {0}").format(self.community.network.latest_block) text = self.tr(" Block {0}").format(self.community.network.latest_block)
blockchain_time = self.community.get_block(self.community.network.latest_block)['medianTime'] block = self.community.get_block(self.community.network.latest_block)
if blockchain_time != qtbma.blockchain.Block.null_value: if block != qtbma.blockchain.Block.null_value:
text += " ( {0} )".format(QLocale.toString( text += " ( {0} )".format(QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(blockchain_time), QDateTime.fromTime_t(block['medianTime']),
QLocale.dateTimeFormat(QLocale(), QLocale.NarrowFormat) QLocale.dateTimeFormat(QLocale(), QLocale.NarrowFormat)
)) ))
......
...@@ -143,7 +143,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -143,7 +143,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
QApplication.processEvents() QApplication.processEvents()
def open_transfer_money_dialog(self): def open_transfer_money_dialog(self):
dialog = TransferMoneyDialog(self.app.current_account, dialog = TransferMoneyDialog(self.app, self.app.current_account,
self.password_asker) self.password_asker)
dialog.accepted.connect(self.refresh_wallets) dialog.accepted.connect(self.refresh_wallets)
if dialog.exec_() == QDialog.Accepted: if dialog.exec_() == QDialog.Accepted:
......
...@@ -28,6 +28,7 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog): ...@@ -28,6 +28,7 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog):
""" """
super().__init__() super().__init__()
self.setupUi(self) self.setupUi(self)
self.app = app
self.account = sender self.account = sender
self.password_asker = password_asker self.password_asker = password_asker
self.recipient_trusts = [] self.recipient_trusts = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment