AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #152 from nelisky/master

Browse Source 
self missing in a few commands
This commit is contained in:
ThomasV
2013-03-07 01:39:07 -08:00
parent e06e511e39 c504ccd61a
commit 29a8c0f0e6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/commands.py
View File

@@ -124,7 +124,7 @@ class Commands:
def sendrawtransaction(self, raw): def sendrawtransaction(self, raw):
tx = Transaction(raw) tx = Transaction(raw)
r, h = wallet.sendtx( tx ) r, h = self.wallet.sendtx( tx )
return h return h
def createmultisig(self, num, pubkeys): def createmultisig(self, num, pubkeys):
@@ -170,7 +170,7 @@ class Commands:
else: else:
c = u = 0 c = u = 0
for addr in addresses: for addr in addresses:
cc, uu = wallet.get_addr_balance(addr) cc, uu = self.wallet.get_addr_balance(addr)
c += cc c += cc
u += uu u += uu
@@ -186,8 +186,8 @@ class Commands:
def importprivkey(self, sec): def importprivkey(self, sec):
try: try:
addr = wallet.import_key(sec,self.password) addr = self.wallet.import_key(sec,self.password)
wallet.save() self.wallet.save()
out = "Keypair imported: ", addr out = "Keypair imported: ", addr
except BaseException as e: except BaseException as e:
out = "Error: Keypair import failed: " + str(e) out = "Error: Keypair import failed: " + str(e)
@@ -243,7 +243,7 @@ class Commands:
def payto(self, to_address, amount, fee = None, change_addr = None, from_addr = None): 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) tx = self._mktx(to_address, amount, fee, change_addr, from_addr)
r, h = wallet.sendtx( tx ) r, h = self.wallet.sendtx( tx )
return h return h