aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-11-19 10:25:42 -0800
committerWladimir J. van der Laan <laanwj@gmail.com>2013-11-19 10:25:42 -0800
commit96aaf006a5dcb67f1b4f26a60b214a18572e3d87 (patch)
tree0c5823f4cc7a5eb6cf02232d7357282ddc73786c
parent993a50b68311c6675ddc58fe57324a3bce61f82a (diff)
parent43bba5d012eb770eb32699fa1cbbab3498d6db40 (diff)
Merge pull request #3234 from super3/master
Remove Wallet Tools
-rw-r--r--contrib/README.md4
-rw-r--r--contrib/bitrpc/README.md10
-rw-r--r--contrib/wallettools/README.md4
-rw-r--r--contrib/wallettools/walletchangepass.py5
-rw-r--r--contrib/wallettools/walletunlock.py4
5 files changed, 10 insertions, 17 deletions
diff --git a/contrib/README.md b/contrib/README.md
index eb0d3ee2c9..d1cdd7eb38 100644
--- a/contrib/README.md
+++ b/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) ###
-Contains a wallet change password and unlock script. Used to prevent users from having to enter their password as a command-line argument.
+### WalletTools
+Removed. Please see [/contrib/bitrpc](/contrib/bitrpc).
Repository Tools
---------------------
diff --git a/contrib/bitrpc/README.md b/contrib/bitrpc/README.md
index 2dde60a08e..f5ef2f0405 100644
--- a/contrib/bitrpc/README.md
+++ b/contrib/bitrpc/README.md
@@ -1,2 +1,8 @@
-### BitRPC ###
-Allows for sending of all standard Bitcoin commands via RPC rather than as command line args. \ No newline at end of file
+### 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 \ No newline at end of file
diff --git a/contrib/wallettools/README.md b/contrib/wallettools/README.md
deleted file mode 100644
index 3a71ba1436..0000000000
--- a/contrib/wallettools/README.md
+++ /dev/null
@@ -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.
diff --git a/contrib/wallettools/walletchangepass.py b/contrib/wallettools/walletchangepass.py
deleted file mode 100644
index 30f3f5b26a..0000000000
--- a/contrib/wallettools/walletchangepass.py
+++ /dev/null
@@ -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) \ No newline at end of file
diff --git a/contrib/wallettools/walletunlock.py b/contrib/wallettools/walletunlock.py
deleted file mode 100644
index f847c6fe61..0000000000
--- a/contrib/wallettools/walletunlock.py
+++ /dev/null
@@ -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) \ No newline at end of file