tMerge pull request #152 from nelisky/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 29a8c0f0e6e2af55c4913bfddea755637775b154
DIR parent e06e511e3948691f7aa85a3c34187ac277d1d34a
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Thu, 7 Mar 2013 01:39:07 -0800
Merge pull request #152 from nelisky/master
self missing in a few commands
Diffstat:
M lib/commands.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -124,7 +124,7 @@ class Commands:
def sendrawtransaction(self, raw):
tx = Transaction(raw)
- r, h = wallet.sendtx( tx )
+ r, h = self.wallet.sendtx( tx )
return h
def createmultisig(self, num, pubkeys):
t@@ -170,7 +170,7 @@ class Commands:
else:
c = u = 0
for addr in addresses:
- cc, uu = wallet.get_addr_balance(addr)
+ cc, uu = self.wallet.get_addr_balance(addr)
c += cc
u += uu
t@@ -186,8 +186,8 @@ class Commands:
def importprivkey(self, sec):
try:
- addr = wallet.import_key(sec,self.password)
- wallet.save()
+ addr = self.wallet.import_key(sec,self.password)
+ self.wallet.save()
out = "Keypair imported: ", addr
except BaseException as e:
out = "Error: Keypair import failed: " + str(e)
t@@ -243,7 +243,7 @@ class Commands:
def payto(self, to_address, amount, fee = None, change_addr = None, from_addr = None):
tx = self._mktx(to_address, amount, fee, change_addr, from_addr)
- r, h = wallet.sendtx( tx )
+ r, h = self.wallet.sendtx( tx )
return h