LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 16:01:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

disallow adding receive requests without valid is_mine addresses

Browse source
This commit is contained in:
SomberNight 2018-03-12 21:50:56 +01:00
parent 87aee10047
commit 8e79d09511
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gui/kivy/uix/screens.py
View file

@ -371,13 +371,20 @@ class ReceiveScreen(CScreen):
def save_request(self): def save_request(self):
addr = self.screen.address addr = self.screen.address
if not addr: if not addr:
return return False
amount = self.screen.amount amount = self.screen.amount
message = self.screen.message message = self.screen.message
amount = self.app.get_amount(amount) if amount else 0 amount = self.app.get_amount(amount) if amount else 0
req = self.app.wallet.make_payment_request(addr, amount, message, None) req = self.app.wallet.make_payment_request(addr, amount, message, None)
self.app.wallet.add_payment_request(req, self.app.electrum_config) try:
self.app.update_tab('requests') self.app.wallet.add_payment_request(req, self.app.electrum_config)
added_request = True
except Exception as e:
self.app.show_error(_('Error adding payment request') + ':\n' + str(e))
added_request = False
finally:
self.app.update_tab('requests')
return added_request
def on_amount_or_message(self): def on_amount_or_message(self):
self.save_request() self.save_request()
@ -389,8 +396,8 @@ class ReceiveScreen(CScreen):
self.app.show_info(_('Please use the existing requests first.')) self.app.show_info(_('Please use the existing requests first.'))
def do_save(self): def do_save(self):
self.save_request() if self.save_request():
self.app.show_info(_('Request was saved.')) self.app.show_info(_('Request was saved.'))
class TabbedCarousel(Factory.TabbedPanel): class TabbedCarousel(Factory.TabbedPanel):

5
lib/wallet.py
View file

@ -1588,6 +1588,11 @@ class Abstract_Wallet(PrintError):
def add_payment_request(self, req, config): def add_payment_request(self, req, config):
addr = req['address'] addr = req['address']
if not bitcoin.is_address(addr):
raise Exception(_('Invalid Bitcoin address.'))
if not self.is_mine(addr):
raise Exception(_('Address not in wallet.'))
amount = req.get('amount') amount = req.get('amount')
message = req.get('memo') message = req.get('memo')
self.receive_requests[addr] = req self.receive_requests[addr] = req