suggestion:
fork the client, and rename wallet to keyring.
please fork the client, if you want it to change!
i will keep my "wallet.dat" client.
Maybe you'll keep your wallet.dat, but after asking for it twice, I must indulge:
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index b690fae..fb267de 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -131,3 +131,3 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/bitcoinamountfield.h \
- src/wallet.h \
+ src/keyring.h \
src/keystore.h \
@@ -135,3 +135,3 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/transactionview.h \
- src/qt/walletmodel.h \
+ src/qt/keyringmodel.h \
src/bitcoinrpc.h \
@@ -178,3 +178,3 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/bitcoinamountfield.cpp \
- src/wallet.cpp \
+ src/keyring.cpp \
src/keystore.cpp \
@@ -182,3 +182,3 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactionview.cpp \
- src/qt/walletmodel.cpp \
+ src/qt/keyringmodel.cpp \
src/bitcoinrpc.cpp \
diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py
index b02b299..ae109f3 100644
--- a/contrib/bitrpc/bitrpc.py
+++ b/contrib/bitrpc/bitrpc.py
@@ -17,6 +17,6 @@ cmd = sys.argv[1].lower()
-if cmd == "backupwallet":
+if cmd == "backupkeyring":
try:
path = raw_input("Enter destination path/filename: ")
- print access.backupwallet(path)
+ print access.backupkeyring(path)
except:
@@ -302,6 +302,6 @@ elif cmd == "validateaddress":
-elif cmd == "walletpassphrase":
+elif cmd == "keyringpassphrase":
try:
- pwd = raw_input("Enter wallet passphrase: ")
- access.walletpassphrase(pwd, 60)
+ pwd = raw_input("Enter keyring passphrase: ")
+ access.keyringpassphrase(pwd, 60)
print "\n---Wallet unlocked---\n"
@@ -310,7 +310,7 @@ elif cmd == "walletpassphrase":
-elif cmd == "walletpassphrasechange":
+elif cmd == "keyringpassphrasechange":
try:
- pwd = raw_input("Enter old wallet passphrase: ")
- pwd2 = raw_input("Enter new wallet passphrase: ")
- access.walletpassphrasechange(pwd, pwd2)
+ pwd = raw_input("Enter old keyring passphrase: ")
+ pwd2 = raw_input("Enter new keyring passphrase: ")
+ access.keyringpassphrasechange(pwd, pwd2)
print
@@ -323,2 +323,2 @@ elif cmd == "walletpassphrasechange":
else:
- print "Command not found or not supported"
\ No newline at end of file
+ print "Command not found or not supported"
diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf
index e56c43c..8762a05 100644
--- a/contrib/debian/examples/bitcoin.conf
+++ b/contrib/debian/examples/bitcoin.conf
@@ -68,3 +68,3 @@ gen=0
-# Pre-generate this many public/private key pairs, so wallet backups will be valid for
+# Pre-generate this many public/private key pairs, so keyring backups will be valid for
# both prior transactions and several dozen future transactions.
diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/bitcoin.conf.5
index 1243253..5802f8b 100644
--- a/contrib/debian/manpages/bitcoin.conf.5
+++ b/contrib/debian/manpages/bitcoin.conf.5
@@ -72,3 +72,3 @@ Enable or disable use SSE instructions to try to generate bitcoins faster.
\fBkeypool=\fR\fI'100'\fR
-Pre-generate this many public/private key pairs, so wallet backups will be valid for both prior transactions and several dozen future transactions.
+Pre-generate this many public/private key pairs, so keyring backups will be valid for both prior transactions and several dozen future transactions.
.TP
diff --git a/contrib/debian/manpages/bitcoind.1 b/contrib/debian/manpages/bitcoind.1
index 0179406..4f99899 100644
--- a/contrib/debian/manpages/bitcoind.1
+++ b/contrib/debian/manpages/bitcoind.1
@@ -83,4 +83,4 @@ This help message
.TP
-\fBbackupwallet 'destination'\fR
-Safely copies *wallet.dat* to 'destination', which can be a directory or a path with filename.
+\fBbackupkeyring 'destination'\fR
+Safely copies *keyring.dat* to 'destination', which can be a directory or a path with filename.
.TP
@@ -197,3 +197,3 @@ Checks that 'bitcoinaddress' looks like a proper bitcoin address. Returns an obj
"isvalid" : true or false.
- "ismine" : true if the address is in the server's wallet.
+ "ismine" : true if the address is in the server's keyring.
"address" : bitcoinaddress.
diff --git a/contrib/wallettools/walletchangepass.py b/contrib/wallettools/walletchangepass.py
index 30f3f5b..3f2867a 100644
--- a/contrib/wallettools/walletchangepass.py
+++ b/contrib/wallettools/walletchangepass.py
@@ -2,4 +2,4 @@ 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
+pwd = raw_input("Enter old keyring passphrase: ")
+pwd2 = raw_input("Enter new keyring passphrase: ")
+access.keyringpassphrasechange(pwd, pwd2)
diff --git a/contrib/wallettools/walletunlock.py b/contrib/wallettools/walletunlock.py
index f847c6f..7bcec90 100644
--- a/contrib/wallettools/walletunlock.py
+++ b/contrib/wallettools/walletunlock.py
@@ -2,3 +2,3 @@ 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
+pwd = raw_input("Enter keyring passphrase: ")
+access.keyringpassphrase(pwd, 60)
diff --git a/doc/build-unix.txt b/doc/build-unix.txt
index 5389339..47e6e45 100644
--- a/doc/build-unix.txt
+++ b/doc/build-unix.txt
@@ -28,3 +28,3 @@ Dependencies
libssl SSL Support Secure communications
- libdb4.8 Berkeley DB Blockchain & wallet storage
+ libdb4.8 Berkeley DB Blockchain & keyring storage
libboost Boost C++ Library
diff --git a/doc/coding.txt b/doc/coding.txt
index b3c812a..c93479c 100644
--- a/doc/coding.txt
+++ b/doc/coding.txt
@@ -49,3 +49,3 @@ CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main
-and then cs_wallet, while thread 2 locks them in the opposite order:
+and then cs_keyring, while thread 2 locks them in the opposite order:
result, deadlock as each waits for the other to release its lock) are
@@ -79,3 +79,3 @@ ThreadTopUpKeyPool : replenishes the keystore's keypool.
-ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user
+ThreadCleanWalletPassphrase : re-locks an encrypted keyring after user
has unlocked it for a period of time.
@@ -86,3 +86,3 @@ ThreadDelayedRepaint : repaint the gui
-ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used
+ThreadFlushWalletDB : Close the keyring.dat file if it hasn't been used
in 500ms.
diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst
index 0901773..ed6d2e3 100644
--- a/doc/readme-qt.rst
+++ b/doc/readme-qt.rst
@@ -6,3 +6,3 @@ Features
-- All functionality of the Wx GUI, including wallet encryption
+- All functionality of the Wx GUI, including keyring encryption
... and a whole lot more