aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/README.md44
-rw-r--r--contrib/bitrpc/bitrpc.py7
2 files changed, 27 insertions, 24 deletions
diff --git a/contrib/README.md b/contrib/README.md
index cd0dd3b023..92d0a343db 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -1,22 +1,36 @@
-Python Tools
+Wallet Tools
---------------------
### [BitRPC](/contrib/bitrpc) ###
Allows for sending of all standard Bitcoin commands via RPC rather than as command line args.
+### [SpendFrom](/contrib/spendfrom) ###
+
+Use the raw transactions API to send coins received on a particular
+address (or addresses).
+
+Repository Tools
+---------------------
+
+### [Developer tools](/contrib/devtools) ###
+Specific tools for developers working on this repository.
+Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG.
+
+### [Linearize](/contrib/linearize) ###
+Construct a linear, no-fork, best version of the blockchain.
+
### [PyMiner](/contrib/pyminer) ###
This is a 'getwork' CPU mining client for Bitcoin. It is pure-python, and therefore very, very slow. The purpose is to provide a reference implementation of a miner, for study.
-### [SpendFrom](/contrib/spendfrom) ###
+### [Qos](/contrib/qos) ###
-Use the raw transactions API to send coins received on a particular
-address (or addresses).
+A Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
-### WalletTools
-Removed. Please see [/contrib/bitrpc](/contrib/bitrpc).
+### [Seeds](/contrib/seeds) ###
+Utility to generate the pnSeed[] array that is compiled into the client.
-Repository Tools
+Build Tools and Keys
---------------------
### [Debian](/contrib/debian) ###
@@ -29,18 +43,11 @@ Gavin's notes on getting gitian builds up and running using KVM.
### [Gitian-downloader](/contrib/gitian-downloader)
Various PGP files of core developers.
-### [Linearize](/contrib/linearize) ###
-Construct a linear, no-fork, best version of the blockchain.
-
### [MacDeploy](/contrib/macdeploy) ###
Scripts and notes for Mac builds.
-### [Qos](/contrib/qos) ###
-
-A Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
-
-### [Seeds](/contrib/seeds) ###
-Utility to generate the pnSeed[] array that is compiled into the client.
+Test and Verify Tools
+---------------------
### [TestGen](/contrib/testgen) ###
Utilities to generate test vectors for the data-driven Bitcoin tests.
@@ -51,8 +58,3 @@ tests each pull and when master is tested using jenkins.
### [Verify SF Binaries](/contrib/verifysfbinaries) ###
This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge.
-
-### [Developer tools](/contrib/devtools) ###
-Specific tools for developers working on this repository.
-Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG.
-
diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py
index a840bc2020..a84d7e34dd 100644
--- a/contrib/bitrpc/bitrpc.py
+++ b/contrib/bitrpc/bitrpc.py
@@ -1,6 +1,7 @@
from jsonrpc import ServiceProxy
import sys
import string
+import getpass
# ===== BEGIN USER SETTINGS =====
# if you do not set these you will be prompted for a password for every command
@@ -302,7 +303,7 @@ elif cmd == "validateaddress":
elif cmd == "walletpassphrase":
try:
- pwd = raw_input("Enter wallet passphrase: ")
+ pwd = getpass.getpass(prompt="Enter wallet passphrase: ")
access.walletpassphrase(pwd, 60)
print "\n---Wallet unlocked---\n"
except:
@@ -310,8 +311,8 @@ elif cmd == "walletpassphrase":
elif cmd == "walletpassphrasechange":
try:
- pwd = raw_input("Enter old wallet passphrase: ")
- pwd2 = raw_input("Enter new wallet passphrase: ")
+ pwd = getpass.getpass(prompt="Enter old wallet passphrase: ")
+ pwd2 = getpass.getpass(prompt="Enter new wallet passphrase: ")
access.walletpassphrasechange(pwd, pwd2)
print
print "\n---Passphrase changed---\n"