Merge pull request #3234 from super3/master

Remove Wallet Tools

contrib/README.md

@@ -13,8 +13,8 @@ This is a 'getwork' CPU mining client for Bitcoin. It is pure-python, and theref
 Use the raw transactions API to send coins received on a particular
 address (or addresses).
 
-### [Wallet Tools](/contrib/wallettools) ###
+### WalletTools
-Contains a wallet change password and unlock script. Used to prevent users from having to enter their password as a command-line argument.
+Removed. Please see [/contrib/bitrpc](/contrib/bitrpc).
 
 Repository Tools
 ---------------------

contrib/bitrpc/README.md

@@ -1,2 +1,8 @@
-### BitRPC ###
+### BitRPC
 Allows for sending of all standard Bitcoin commands via RPC rather than as command line args.
+
+### Looking for Wallet Tools?
+BitRPC.py is able to do the exact same thing as `walletchangepass.py` and `walletunlock.py`. Their respective commands in BitRPC.py are:
+
+	bitrpc.py walletpassphrasechange
+	bitrpc.py walletpassphrase

contrib/wallettools/README.md

@@ -1,4 +0,0 @@
-### Wallet Tools ###
-These are two simple python scripts which send the appropriate RPC commands to unlock a wallet and change a wallet password. **They are intended to prevent users from having to enter their password as a command-line argument which could then be stored in the console buffer/history in plaintext.**
-
-Both tools rely on bitcoin/bitcoind running with `server=1` and an `rpcuser` and `rpcpassword` set in `bitcoin.conf`. They can be easily modified for non-standard ports. [walletunlock.py](/contrib/wallettools/walletunlock.py) unlocks the wallet for 60 seconds by default, changeable in code, and both modules rely upon python-json-rpc.

contrib/wallettools/walletchangepass.py

@@ -1,5 +0,0 @@
-from jsonrpc import ServiceProxy
-access = ServiceProxy("http://127.0.0.1:8332")
-pwd = raw_input("Enter old wallet passphrase: ")
-pwd2 = raw_input("Enter new wallet passphrase: ")
-access.walletpassphrasechange(pwd, pwd2)

contrib/wallettools/walletunlock.py

@@ -1,4 +0,0 @@
-from jsonrpc import ServiceProxy
-access = ServiceProxy("http://127.0.0.1:8332")
-pwd = raw_input("Enter wallet passphrase: ")
-access.walletpassphrase(pwd, 60)