tadd command for offline tx - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ecd144b625a443caf1f43bc1ed9d5f7c56d67261
DIR parent 85d1d5923f7bb8491cea51e1780b9e9b17d06c9e
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 8 Nov 2011 16:48:44 +0100
add command for offline tx
Diffstat:
M client/electrum.py | 28 ++++++++++++++++------------
M client/gui.py | 2 +-
2 files changed, 17 insertions(+), 13 deletions(-)
---
DIR diff --git a/client/electrum.py b/client/electrum.py
t@@ -567,7 +567,7 @@ class Wallet:
- def send(self, to_address, amount, label, password):
+ def send(self, to_address, amount, label, password, do_send):
try:
inputs, outputs = wallet.choose_inputs_outputs( to_address, amount, self.fee, password )
except InvalidPassword: return False, "Wrong password"
t@@ -579,15 +579,18 @@ class Wallet:
tx = raw_tx( s_inputs, outputs )
tx = filter( tx )
tx_hash = Hash(tx.decode('hex') )[::-1].encode('hex')
- out = self.send_tx(tx)
- if out != tx_hash:
- return False, "error: hash mismatch"
+ if do_send:
+ out = self.send_tx(tx)
+ if out != tx_hash:
+ return False, "error: hash mismatch"
+ else:
+ out = tx
if to_address not in self.addressbook:
self.addressbook.append(to_address)
if label:
wallet.labels[tx_hash] = label
wallet.save()
- return True, tx_hash
+ return True, out
t@@ -600,7 +603,7 @@ if __name__ == '__main__':
except:
cmd = "gui"
- known_commands = ['balance', 'sendtoaddress', 'password', 'getnewaddress', 'addresses', 'history', 'label', 'gui', 'all_addresses']
+ known_commands = ['balance', 'sendtoaddress', 'password', 'getnewaddress', 'addresses', 'history', 'label', 'gui', 'all_addresses', 'gentx']
if cmd not in known_commands:
print "Known commands:", ', '.join(known_commands)
exit(0)
t@@ -651,11 +654,12 @@ if __name__ == '__main__':
# generate first key
wallet.create_new_address(False, None)
- wallet.new_session()
- wallet.update()
- wallet.save()
+ if cmd not in ['password', 'gentx', 'history', 'label']:
+ wallet.new_session()
+ wallet.update()
+ wallet.save()
- if cmd in ['sendtoaddress', 'password', 'getnewaddress']:
+ if cmd in ['sendtoaddress', 'password', 'getnewaddress','gentx']:
password = getpass.getpass('Password:') if wallet.use_encryption else None
if cmd == 'balance':
t@@ -707,7 +711,7 @@ if __name__ == '__main__':
wallet.labels[tx] = label
wallet.save()
- elif cmd == 'sendtoaddress':
+ elif cmd in ['sendtoaddress', 'gentx']:
try:
to_address = sys.argv[2]
amount = float(sys.argv[3])
t@@ -715,7 +719,7 @@ if __name__ == '__main__':
except:
print "syntax: send <recipient> <amount> [label]"
exit(1)
- r, h = wallet.send( to_address, amount, label, password )
+ r, h = wallet.send( to_address, amount, label, password, cmd=='sendtoaddress' )
print h
elif cmd == 'getnewaddress':
DIR diff --git a/client/gui.py b/client/gui.py
t@@ -542,7 +542,7 @@ class BitcoinGUI:
password = password_dialog() if self.wallet.use_encryption else None
- status, msg = self.wallet.send( to_address, amount, label, password )
+ status, msg = self.wallet.send( to_address, amount, label, password, True )
if status:
show_message( "payment sent.\n" + msg )
payto_entry.set_text("")