# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
from util import *
from bitcoin import *
from decimal import Decimal
import bitcoin
+from transaction import Transaction
+
+class Command:
+ def __init__(self, name, min_args, max_args, requires_network, requires_wallet, requires_password, description, syntax = '', options_syntax = ''):
+ self.name = name
+ self.min_args=min_args
+ self.max_args = max_args
+ self.requires_network = requires_network
+ self.requires_wallet = requires_wallet
+ self.requires_password = requires_password
+ self.description = description
+ self.syntax = syntax
+ self.options = options_syntax
known_commands = {}
-offline_commands = []
-protected_commands = []
-
-def register_command(name, min_args, max_args, is_protected, is_offline, description, syntax = '', options_syntax = ''):
- global known_commands, protected_commands, offline_commands
- known_commands[name] = (min_args, max_args, description, syntax, options_syntax)
- if is_protected:
- protected_commands.append(name)
- if is_offline:
- offline_commands.append(name)
-
-
-payto_options = ' --fee, -f: set transaction fee\n --fromaddr, -s: send from address -\n --changeaddr, -c: send change to address'
-listaddr_options = " -a: show all addresses, including change addresses\n -b: include balance in results\n -l: include labels in results"
-
-
-register_command('contacts', 0, 0, False, True, 'Show your list of contacts')
-register_command('create', 0, 0, False, True, 'Create a new wallet')
-register_command('createmultisig', 2, 2, False, True, 'similar to bitcoind\'s command')
-register_command('createrawtransaction', 2, 2, False, True, 'similar to bitcoind\'s command')
-register_command('deseed', 0, 0, False, True, 'Create a seedless, watching-only wallet.')
-register_command('decoderawtransaction', 1, 1, False, True, 'similar to bitcoind\'s command')
-register_command('dumpprivkey', 1, 1, True, True, 'similar to bitcoind\'s command')
-register_command('dumpprivkeys', 0, 0, True, True, 'dump all private keys')
-register_command('eval', 1, 1, False, True, 'Run python eval() on an object', 'eval <expression>\nExample: eval \"wallet.aliases\"')
-register_command('freeze', 1, 1, False, True, 'Freeze the funds at one of your wallet\'s addresses')
-register_command('getbalance', 0, 1, False, False, 'Display the balance of your wallet or of an address', 'getbalance [<address>]')
-register_command('getaddresshistory', 1, 1, False, False, 'get history for an address')
-register_command('getconfig', 1, 1, False, True, 'Return a configuration variable', 'getconfig <name>')
-register_command('getseed', 0, 0, True, True, 'Print the generation seed of your wallet.')
-register_command('help', 0, 1, False, True, 'Prints this help')
-register_command('history', 0, 0, False, False, 'Returns the transaction history of your wallet')
-register_command('importprivkey', 1, 1, True, True, 'Import a private key', 'importprivkey <privatekey>')
-register_command('listaddresses', 3, 3, False, True, 'Returns your list of addresses.', '', listaddr_options)
-register_command('listunspent', 0, 0, False, True, 'Returns a list of unspent inputs in your wallet.')
-register_command('mktx', 5, 5, True, True, 'Create a signed transaction', 'mktx <recipient> <amount> [label]', payto_options)
-register_command('mksendmanytx', 4, 4, True, True, 'Create a signed transaction', 'mksendmanytx <recipient> <amount> [<recipient> <amount> ...]', payto_options)
-register_command('payto', 5, 5, True, False, 'Create and broadcast a transaction.', "payto <recipient> <amount> [label]\n<recipient> can be a bitcoin address or a label", payto_options)
-register_command('paytomany', 4, 4, True, False, 'Create and broadcast a transaction.', "paytomany <recipient> <amount> [<recipient> <amount> ...]\n<recipient> can be a bitcoin address or a label", payto_options)
-register_command('password', 0, 0, True, True, 'Change your password')
-register_command('prioritize', 1, 1, False, True, 'Coins at prioritized addresses are spent first.', 'prioritize <address>')
-register_command('restore', 0, 0, False, False, 'Restore a wallet')
-register_command('setconfig', 2, 2, False, True, 'Set a configuration variable', 'setconfig <name> <value>')
-register_command('setlabel', 2,-1, False, True, 'Assign a label to an item', 'setlabel <tx_hash> <label>')
-register_command('sendrawtransaction', 1, 1, False, False, 'Broadcasts a transaction to the network.', 'sendrawtransaction <tx in hexadecimal>')
-register_command('signrawtransaction', 1, 3, True, True, 'similar to bitcoind\'s command')
-register_command('signmessage', 2,-1, True, True, 'Sign a message with a key', 'signmessage <address> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello This is a weird String "')
-register_command('unfreeze', 1, 1, False, True, '')
-register_command('unprioritize', 1, 1, False, True, '')
-register_command('validateaddress', 1, 1, False, True, 'Check that the address is valid')
-register_command('verifymessage', 3,-1, False, True, 'Verifies a signature', 'verifymessage <address> <signature> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello This is a weird String "')
-
+def register_command(*args):
+ global known_commands
+ name = args[0]
+ known_commands[name] = Command(*args)
+
+
+
+payto_options = ' --fee, -f: set transaction fee\n --fromaddr, -F: send from address -\n --changeaddr, -c: send change to address'
+listaddr_options = " -a: show all addresses, including change addresses\n -l: include labels in results"
+restore_options = " accepts a seed or master public key."
+config_options = " accounts, addr_history, auto_cycle, column_widths, console-history, contacts,\n fee_per_kb, frozen_addresses, gap_limit, imported_keys, labels,\n master_public_key, num_zeros, prioritized_addresses, proxy, seed,\n seed_version, server, transactions, use_change, use_encryption, winpos-qt"
+mksendmany_syntax = 'mksendmanytx <recipient> <amount> [<recipient> <amount> ...]'
+payto_syntax = "payto <recipient> <amount> [label]\n<recipient> can be a bitcoin address or a label"
+paytomany_syntax = "paytomany <recipient> <amount> [<recipient> <amount> ...]\n<recipient> can be a bitcoin address or a label"
+signmessage_syntax = 'signmessage <address> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello This is a weird String "'
+verifymessage_syntax = 'verifymessage <address> <signature> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello This is a weird String "'
+
+
+# command
+# requires_network
+# requires_wallet
+# requires_password
+register_command('contacts', 0, 0, False, True, False, 'Show your list of contacts')
+register_command('create', 0, 0, False, True, False, 'Create a new wallet')
+register_command('createmultisig', 2, 2, False, True, False, 'similar to bitcoind\'s command')
+register_command('createrawtransaction', 2, 2, False, True, False, 'similar to bitcoind\'s command')
+register_command('deseed', 0, 0, False, True, False, 'Remove seed from wallet, creating a seedless, watching-only wallet.')
+register_command('decoderawtransaction', 1, 1, False, False, False, 'similar to bitcoind\'s command')
+register_command('dumpprivkey', 1, 1, False, True, True, 'Dumps a specified private key for a given address', 'dumpprivkey <bitcoin address>')
+register_command('dumpprivkeys', 0, 0, False, True, True, 'dump all private keys')
+register_command('freeze', 1, 1, False, True, True, 'Freeze the funds at one of your wallet\'s addresses', 'freeze <address>')
+register_command('getbalance', 0, 1, True, True, False, 'Return the balance of your wallet, or of one account in your wallet', 'getbalance [<account>]')
+register_command('getservers', 0, 0, True, False, False, 'Return the list of available servers')
+register_command('getaddressbalance', 1, 1, True, True, False, 'Return the balance of an address', 'getbalance <address>')
+register_command('getaddresshistory', 1, 1, True, True, False, 'Return the transaction history of a wallet address', 'getaddresshistory <address>')
+register_command('getconfig', 1, 1, False, False, False, 'Return a configuration variable', 'getconfig <name>', config_options)
+register_command('getpubkeys', 1, 1, False, True, False, 'Return the public keys for a wallet address', 'getpubkeys <bitcoin address>')
+register_command('getrawtransaction', 1, 2, True, False, False, 'Retrieve a transaction', 'getrawtransaction <txhash> <height>')
+register_command('getseed', 0, 0, False, True, True, 'Print the generation seed of your wallet.')
+register_command('getmpk', 0, 0, False, True, False, 'Return your wallet\'s master public key', 'getmpk')
+register_command('help', 0, 1, False, False, False, 'Prints this help')
+register_command('history', 0, 0, True, True, False, 'Returns the transaction history of your wallet')
+register_command('importprivkey', 1, 1, False, True, True, 'Import a private key', 'importprivkey <privatekey>')
+register_command('listaddresses', 2, 2, False, True, False, 'Returns your list of addresses.', '', listaddr_options)
+register_command('listunspent', 0, 0, True, True, False, 'Returns the list of unspent inputs in your wallet.')
+register_command('mktx', 5, 5, False, True, True, 'Create a signed transaction', 'mktx <recipient> <amount> [label]', payto_options)
+register_command('mksendmanytx', 4, 4, False, True, True, 'Create a signed transaction', mksendmany_syntax, payto_options)
+register_command('payto', 5, 5, True, True, True, 'Create and broadcast a transaction.', payto_syntax, payto_options)
+register_command('paytomany', 4, 4, True, True, True, 'Create and broadcast a transaction.', paytomany_syntax, payto_options)
+register_command('password', 0, 0, False, True, True, 'Change your password')
+register_command('prioritize', 1, 1, False, True, False, 'Coins at prioritized addresses are spent first.', 'prioritize <address>')
+register_command('restore', 0, 0, True, True, False, 'Restore a wallet', '', restore_options)
+register_command('setconfig', 2, 2, False, False, False, 'Set a configuration variable', 'setconfig <name> <value>', config_options)
+register_command('setlabel', 2,-1, False, True, False, 'Assign a label to an item', 'setlabel <tx_hash> <label>')
+register_command('sendrawtransaction', 1, 1, True, False, False, 'Broadcasts a transaction to the network.', 'sendrawtransaction <tx in hexadecimal>')
+register_command('signrawtransaction', 1, 3, False, True, True, 'similar to bitcoind\'s command')
+register_command('signmessage', 2,-1, False, True, True, 'Sign a message with a key', signmessage_syntax)
+register_command('unfreeze', 1, 1, False, True, False, 'Unfreeze the funds at one of your wallet\'s address', 'unfreeze <address>')
+register_command('unprioritize', 1, 1, False, True, False, 'Unprioritize an address', 'unprioritize <address>')
+register_command('validateaddress', 1, 1, False, False, False, 'Check that the address is valid', 'validateaddress <address>')
+register_command('verifymessage', 3,-1, False, False, False, 'Verifies a signature', verifymessage_syntax)
+
class Commands:
- def __init__(self, wallet, interface, callback = None):
+ def __init__(self, wallet, network, callback = None):
self.wallet = wallet
- self.interface = interface
+ self.network = network
self._callback = callback
self.password = None
def _run(self, method, args, password_getter):
- if method in protected_commands and self.wallet.use_encryption:
+ cmd = known_commands[method]
+ if cmd.requires_password and self.wallet.use_encryption:
self.password = apply(password_getter,())
f = eval('self.'+method)
result = apply(f,args)
return result
def getaddresshistory(self, addr):
+ assert self.wallet.is_mine(addr)
h = self.wallet.get_history(addr)
- if h is None: h = self.wallet.interface.synchronous_get([ ('blockchain.address.get_history',[addr]) ])[0]
+ if h is None: h = self.network.synchronous_get([ ('blockchain.address.get_history',[addr]) ])[0]
return h
def listunspent(self):
i['index'] = i['vout']
outputs = map(lambda x: (x[0],int(1e8*x[1])), outputs.items())
tx = Transaction.from_io(inputs, outputs)
- return tx.as_dict()
+ return tx
def signrawtransaction(self, raw_tx, input_info, private_keys):
tx = Transaction(raw_tx)
self.wallet.signrawtransaction(tx, input_info, private_keys, self.password)
- return tx.as_dict()
+ return tx
def decoderawtransaction(self, raw):
tx = Transaction(raw)
def createmultisig(self, num, pubkeys):
assert isinstance(pubkeys, list)
- return Transaction.multisig_script(pubkeys, num)
+ redeem_script = Transaction.multisig_script(pubkeys, num)
+ address = hash_160_to_bc_address(hash_160(redeem_script.decode('hex')), 5)
+ return {'address':address, 'redeemScript':redeem_script}
def freeze(self,addr):
return self.wallet.freeze(addr)
def dumpprivkeys(self, addresses = None):
if addresses is None:
addresses = self.wallet.addresses(True)
- return self.wallet.get_private_keys(addresses, self.password)
+ return [self.wallet.get_private_key(address, self.password) for address in addresses]
- def validateaddress(self,addr):
+ def validateaddress(self, addr):
isvalid = is_valid(addr)
out = { 'isvalid':isvalid }
if isvalid:
- is_mine = self.wallet.is_mine(addr)
out['address'] = addr
- out['ismine'] = is_mine
- if is_mine:
- out['pubkey'] = self.wallet.get_public_key(addr)
-
+
+ def getpubkeys(self, addr):
+ assert is_valid(addr) and self.wallet.is_mine(addr)
+ out = { 'address':addr }
+ account, sequence = self.wallet.get_address_index(addr)
+ if account != -1:
+ a = self.wallet.accounts[account]
+ out['pubkeys'] = a.get_pubkeys( sequence )
+
return out
-
- def getbalance(self, addresses = []):
- if addresses == []:
+ def getbalance(self, account= None):
+ if account is None:
c, u = self.wallet.get_balance()
else:
- c = u = 0
- for addr in addresses:
- cc, uu = self.wallet.get_addr_balance(addr)
- c += cc
- u += uu
+ c, u = self.wallet.get_account_balance(account)
+
+ out = { "confirmed": str(Decimal(c)/100000000) }
+ if u: out["unconfirmed"] = str(Decimal(u)/100000000)
+ return out
+ def getaddressbalance(self, addr):
+ c, u = self.wallet.get_addr_balance(addr)
out = { "confirmed": str(Decimal(c)/100000000) }
if u: out["unconfirmed"] = str(Decimal(u)/100000000)
return out
+ def getservers(self):
+ return self.network.get_servers()
+
+ def getmpk(self):
+ return self.wallet.get_master_public_key()
def getseed(self):
- import mnemonic
- seed = self.wallet.decode_seed(self.password)
- return { "hex":seed, "mnemonic": ' '.join(mnemonic.mn_encode(seed)) }
+ mnemonic = self.wallet.get_mnemonic(self.password)
+ seed = self.wallet.get_seed(self.password)
+ return { 'mnemonic':mnemonic, 'seed':seed, 'version':self.wallet.seed_version }
def importprivkey(self, sec):
try:
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)
def verifymessage(self, address, signature, message):
- try:
- EC_KEY.verify_message(address, signature, message)
- return True
- except BaseException as e:
- print_error("Verification error: {0}".format(e))
- return False
+ return bitcoin.verify_message(address, signature, message)
def _mktx(self, outputs, fee = None, change_addr = None, domain = None):
def mktx(self, to_address, amount, fee = None, change_addr = None, domain = None):
tx = self._mktx([(to_address, amount)], fee, change_addr, domain)
- return tx.as_dict()
+ return tx
def mksendmanytx(self, outputs, fee = None, change_addr = None, domain = None):
tx = self._mktx(outputs, fee, change_addr, domain)
- return tx.as_dict()
+ return tx
def payto(self, to_address, amount, fee = None, change_addr = None, domain = None):
- def setlabel(self, tx, label):
- self.wallet.labels[tx] = label
- self.wallet.save()
+ def setlabel(self, key, label):
+ self.wallet.set_label(key, label)
+
def contacts(self):
return c
- def listaddresses(self, show_all = False, show_balance = False, show_label = False):
+ def listaddresses(self, show_all = False, show_label = False):
out = []
for addr in self.wallet.addresses(True):
if show_all or not self.wallet.is_change(addr):
- if show_balance or show_label:
+ if show_label:
item = { 'address': addr }
- if show_balance:
- item['balance'] = str(Decimal(self.wallet.get_addr_balance(addr)[0])/100000000)
if show_label:
label = self.wallet.labels.get(addr,'')
if label:
out.append( item )
return out
- def help(self, cmd2=None):
- if cmd2 not in known_commands:
- print_msg("List of commands:", ', '.join(known_commands))
+ def help(self, cmd=None):
+ if cmd not in known_commands:
+ print_msg("\nList of commands:", ', '.join(sorted(known_commands)))
else:
- _, _, description, syntax, options_syntax = known_commands[cmd2]
- print_msg(description)
- if syntax: print_msg("Syntax: " + syntax)
- if options_syntax: print_msg("options:\n" + options_syntax)
+ cmd = known_commands[cmd]
+ print_msg(cmd.description)
+ if cmd.syntax: print_msg("Syntax: " + cmd.syntax)
+ if cmd.options: print_msg("options:\n" + cmd.options)
return None
+ def getrawtransaction(self, tx_hash, height = 0):
+ tx = self.wallet.transactions.get(tx_hash)
+ if tx:
+ return tx
+ height = int(height)
+ return self.network.retrieve_transaction(tx_hash, height)
+
git://git.novaco.in / electrum-nvc.git / blobdiff