RanchiMall/pywallet-tools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --label and --reserve options

Browse Source
This commit is contained in:
jackjack 2011-07-25 00:13:15 +02:00
parent ebcac3c888
commit 70d506ff00
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@ -6,5 +6,9 @@ Options:
--dumpwallet dump wallet in json format --dumpwallet dump wallet in json format
--importprivkey=KEY import private key from vanitygen --importprivkey=KEY import private key from vanitygen
--datadir=DATADIR wallet directory (defaults to bitcoin default) --datadir=DATADIR wallet directory (defaults to bitcoin default)
--wallet=WALLETFILE wallet filename (defaults to wallet.dat)
--label=LABEL label shown in the adress book (defaults to '')
--testnet use testnet subdirectory and address type --testnet use testnet subdirectory and address type
--wallet wallet filename (defaults to wallet.dat) --reserve import as a reserve key, i.e. it won't show in the
adress book

23
pywallet.py
View File

@ -3,15 +3,6 @@
# pywallet.py 1.1 # pywallet.py 1.1
# based on http://github.com/gavinandresen/bitcointools # based on http://github.com/gavinandresen/bitcointools
# #
# Usage: pywallet.py [options]
#
# Options:
# --version show program's version number and exit
# -h, --help show this help message and exit
# --dumpwallet dump wallet in json format
# --importprivkey=KEY import private key from vanitygen
# --datadir=DATADIR wallet directory (defaults to bitcoin default)
# --testnet use testnet subdirectory and address type
from bsddb.db import * from bsddb.db import *
import os, sys, time import os, sys, time
@ -782,7 +773,7 @@ def read_wallet(json_db, db_env, walletfile, print_wallet, print_wallet_transact
del(json_db['pool']) del(json_db['pool'])
del(json_db['names']) del(json_db['names'])
def importprivkey(db, sec): def importprivkey(db, sec, label, reserve):
pkey = regenerate_key(sec) pkey = regenerate_key(sec)
if not pkey: if not pkey:
return False return False
@ -796,7 +787,8 @@ def importprivkey(db, sec):
print "Privkey: %s" % SecretToASecret(secret) print "Privkey: %s" % SecretToASecret(secret)
update_wallet(db, 'key', { 'public_key' : public_key, 'private_key' : private_key }) update_wallet(db, 'key', { 'public_key' : public_key, 'private_key' : private_key })
update_wallet(db, 'name', { 'hash' : addr, 'name' : '' }) if not reserve:
update_wallet(db, 'name', { 'hash' : addr, 'name' : label })
return True return True
@ -821,9 +813,16 @@ def main():
help="wallet filename (defaults to wallet.dat)", help="wallet filename (defaults to wallet.dat)",
default="wallet.dat") default="wallet.dat")
parser.add_option("--label", dest="label",
help="label shown in the adress book (defaults to '')",
default="")
parser.add_option("--testnet", dest="testnet", action="store_true", parser.add_option("--testnet", dest="testnet", action="store_true",
help="use testnet subdirectory and address type") help="use testnet subdirectory and address type")
parser.add_option("--reserve", dest="reserve", action="store_true",
help="import as a reserve key, i.e. it won't show in the adress book")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if options.dump is None and options.key is None: if options.dump is None and options.key is None:
@ -854,7 +853,7 @@ def main():
else: else:
db = open_wallet(db_env, options.walletfile, writable=True) db = open_wallet(db_env, options.walletfile, writable=True)
if importprivkey(db, options.key): if importprivkey(db, options.key, options.label, options.reserve):
print "Imported successfully" print "Imported successfully"
else: else:
print "Bad private key" print "Bad private key"