Removes out bitcoin mention in favor for zcash
Bitcoin Core => Zcash bitcoin address => Zcash address bitcoinaddress => zcashaddress Closes #1756
This commit is contained in:
parent
b86b9feb6c
commit
d2c1e4a807
|
@ -419,6 +419,10 @@ std::string HelpMessage(HelpMessageMode mode)
|
|||
strUsage += HelpMessageOpt("-walletnotify=<cmd>", _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)"));
|
||||
strUsage += HelpMessageOpt("-zapwallettxes=<mode>", _("Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup") +
|
||||
" " + _("(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)"));
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> Removes out bitcoin mention in favor for zcash
|
||||
#endif
|
||||
|
||||
#if ENABLE_ZMQ
|
||||
|
@ -1487,10 +1491,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
|||
InitWarning(msg);
|
||||
}
|
||||
else if (nLoadWalletRet == DB_TOO_NEW)
|
||||
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin Core") << "\n";
|
||||
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Zcash") << "\n";
|
||||
else if (nLoadWalletRet == DB_NEED_REWRITE)
|
||||
{
|
||||
strErrors << _("Wallet needed to be rewritten: restart Bitcoin Core to complete") << "\n";
|
||||
strErrors << _("Wallet needed to be rewritten: restart Zcash to complete") << "\n";
|
||||
LogPrintf("%s", strErrors.str());
|
||||
return InitError(strErrors.str());
|
||||
}
|
||||
|
|
|
@ -221,7 +221,7 @@ bool CKey::VerifyPubKey(const CPubKey& pubkey) const {
|
|||
return false;
|
||||
}
|
||||
unsigned char rnd[8];
|
||||
std::string str = "Bitcoin key verification\n";
|
||||
std::string str = "Zcash key verification\n";
|
||||
GetRandBytes(rnd, sizeof(rnd));
|
||||
uint256 hash;
|
||||
CHash256().Write((unsigned char*)str.data(), str.size()).Write(rnd, sizeof(rnd)).Finalize(hash.begin());
|
||||
|
|
|
@ -519,13 +519,13 @@ UniValue gettxout(const UniValue& params, bool fHelp)
|
|||
" \"hex\" : \"hex\", (string) \n"
|
||||
" \"reqSigs\" : n, (numeric) Number of required signatures\n"
|
||||
" \"type\" : \"pubkeyhash\", (string) The type, eg pubkeyhash\n"
|
||||
" \"addresses\" : [ (array of string) array of bitcoin addresses\n"
|
||||
" \"bitcoinaddress\" (string) bitcoin address\n"
|
||||
" \"addresses\" : [ (array of string) array of zcash addresses\n"
|
||||
" \"zcashaddress\" (string) zcash address\n"
|
||||
" ,...\n"
|
||||
" ]\n"
|
||||
" },\n"
|
||||
" \"version\" : n, (numeric) The version\n"
|
||||
" \"coinbase\" : true|false (boolean) Coinbase or not\n"
|
||||
" \"version\" : n, (numeric) The version\n"
|
||||
" \"coinbase\" : true|false (boolean) Coinbase or not\n"
|
||||
"}\n"
|
||||
|
||||
"\nExamples:\n"
|
||||
|
|
|
@ -51,7 +51,7 @@ UniValue getinfo(const UniValue& params, bool fHelp)
|
|||
" \"version\": xxxxx, (numeric) the server version\n"
|
||||
" \"protocolversion\": xxxxx, (numeric) the protocol version\n"
|
||||
" \"walletversion\": xxxxx, (numeric) the wallet version\n"
|
||||
" \"balance\": xxxxxxx, (numeric) the total bitcoin balance of the wallet\n"
|
||||
" \"balance\": xxxxxxx, (numeric) the total zcash balance of the wallet\n"
|
||||
" \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n"
|
||||
" \"timeoffset\": xxxxx, (numeric) the time offset\n"
|
||||
" \"connections\": xxxxx, (numeric) the number of connections\n"
|
||||
|
@ -152,14 +152,14 @@ UniValue validateaddress(const UniValue& params, bool fHelp)
|
|||
{
|
||||
if (fHelp || params.size() != 1)
|
||||
throw runtime_error(
|
||||
"validateaddress \"bitcoinaddress\"\n"
|
||||
"\nReturn information about the given bitcoin address.\n"
|
||||
"validateaddress \"zcashaddress\"\n"
|
||||
"\nReturn information about the given zcash address.\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"bitcoinaddress\" (string, required) The bitcoin address to validate\n"
|
||||
"1. \"zcashaddress\" (string, required) The zcash address to validate\n"
|
||||
"\nResult:\n"
|
||||
"{\n"
|
||||
" \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n"
|
||||
" \"address\" : \"bitcoinaddress\", (string) The bitcoin address validated\n"
|
||||
" \"address\" : \"zcashaddress\", (string) The zcash address validated\n"
|
||||
" \"scriptPubKey\" : \"hex\", (string) The hex encoded scriptPubKey generated by the address\n"
|
||||
" \"ismine\" : true|false, (boolean) If the address is yours or not\n"
|
||||
" \"isscript\" : true|false, (boolean) If the key is a script\n"
|
||||
|
@ -342,9 +342,9 @@ UniValue createmultisig(const UniValue& params, bool fHelp)
|
|||
|
||||
"\nArguments:\n"
|
||||
"1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n"
|
||||
"2. \"keys\" (string, required) A json array of keys which are bitcoin addresses or hex-encoded public keys\n"
|
||||
"2. \"keys\" (string, required) A json array of keys which are zcash addresses or hex-encoded public keys\n"
|
||||
" [\n"
|
||||
" \"key\" (string) bitcoin address or hex-encoded public key\n"
|
||||
" \"key\" (string) zcash address or hex-encoded public key\n"
|
||||
" ,...\n"
|
||||
" ]\n"
|
||||
|
||||
|
@ -379,10 +379,10 @@ UniValue verifymessage(const UniValue& params, bool fHelp)
|
|||
{
|
||||
if (fHelp || params.size() != 3)
|
||||
throw runtime_error(
|
||||
"verifymessage \"bitcoinaddress\" \"signature\" \"message\"\n"
|
||||
"verifymessage \"zcashaddress\" \"signature\" \"message\"\n"
|
||||
"\nVerify a signed message\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"bitcoinaddress\" (string, required) The bitcoin address to use for the signature.\n"
|
||||
"1. \"zcashaddress\" (string, required) The zcash address to use for the signature.\n"
|
||||
"2. \"signature\" (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n"
|
||||
"3. \"message\" (string, required) The message that was signed.\n"
|
||||
"\nResult:\n"
|
||||
|
|
|
@ -255,7 +255,7 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
|
|||
" \"connected\" : true|false, (boolean) If connected\n"
|
||||
" \"addresses\" : [\n"
|
||||
" {\n"
|
||||
" \"address\" : \"192.168.0.201:8233\", (string) The bitcoin server host and port\n"
|
||||
" \"address\" : \"192.168.0.201:8233\", (string) The zcash server host and port\n"
|
||||
" \"connected\" : \"outbound\" (string) connection, inbound or outbound\n"
|
||||
" }\n"
|
||||
" ,...\n"
|
||||
|
|
|
@ -212,7 +212,7 @@ UniValue getrawtransaction(const UniValue& params, bool fHelp)
|
|||
" \"reqSigs\" : n, (numeric) The required sigs\n"
|
||||
" \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n"
|
||||
" \"addresses\" : [ (json array of string)\n"
|
||||
" \"bitcoinaddress\" (string) bitcoin address\n"
|
||||
" \"zcashaddress\" (string) zcash address\n"
|
||||
" ,...\n"
|
||||
" ]\n"
|
||||
" }\n"
|
||||
|
@ -582,7 +582,7 @@ UniValue decodescript(const UniValue& params, bool fHelp)
|
|||
" \"type\":\"type\", (string) The output type\n"
|
||||
" \"reqSigs\": n, (numeric) The required signatures\n"
|
||||
" \"addresses\": [ (json array of string)\n"
|
||||
" \"address\" (string) bitcoin address\n"
|
||||
" \"address\" (string) zcash address\n"
|
||||
" ,...\n"
|
||||
" ],\n"
|
||||
" \"p2sh\",\"address\" (string) script address\n"
|
||||
|
|
|
@ -119,7 +119,7 @@ UniValue getnewaddress(const UniValue& params, bool fHelp)
|
|||
"\nArguments:\n"
|
||||
"1. \"account\" (string, optional) DEPRECATED. If provided, it MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n"
|
||||
"\nResult:\n"
|
||||
"\"zcashaddress\" (string) The new zcash address\n"
|
||||
"\"zcashaddress\" (string) The new Zcash address\n"
|
||||
"\nExamples:\n"
|
||||
+ HelpExampleCli("getnewaddress", "")
|
||||
+ HelpExampleRpc("getnewaddress", "")
|
||||
|
@ -196,7 +196,7 @@ UniValue getaccountaddress(const UniValue& params, bool fHelp)
|
|||
"\nArguments:\n"
|
||||
"1. \"account\" (string, required) MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n"
|
||||
"\nResult:\n"
|
||||
"\"zcashaddress\" (string) The account zcash address\n"
|
||||
"\"zcashaddress\" (string) The account Zcash address\n"
|
||||
"\nExamples:\n"
|
||||
+ HelpExampleCli("getaccountaddress", "")
|
||||
+ HelpExampleCli("getaccountaddress", "\"\"")
|
||||
|
@ -261,7 +261,7 @@ UniValue setaccount(const UniValue& params, bool fHelp)
|
|||
"setaccount \"zcashaddress\" \"account\"\n"
|
||||
"\nDEPRECATED. Sets the account associated with the given address.\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"zcashaddress\" (string, required) The zcash address to be associated with an account.\n"
|
||||
"1. \"zcashaddress\" (string, required) The Zcash address to be associated with an account.\n"
|
||||
"2. \"account\" (string, required) MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n"
|
||||
"\nExamples:\n"
|
||||
+ HelpExampleCli("setaccount", "\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\" \"tabby\"")
|
||||
|
@ -307,7 +307,7 @@ UniValue getaccount(const UniValue& params, bool fHelp)
|
|||
"getaccount \"zcashaddress\"\n"
|
||||
"\nDEPRECATED. Returns the account associated with the given address.\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"zcashaddress\" (string, required) The zcash address for account lookup.\n"
|
||||
"1. \"zcashaddress\" (string, required) The Zcash address for account lookup.\n"
|
||||
"\nResult:\n"
|
||||
"\"accountname\" (string) the account address\n"
|
||||
"\nExamples:\n"
|
||||
|
@ -342,7 +342,7 @@ UniValue getaddressesbyaccount(const UniValue& params, bool fHelp)
|
|||
"1. \"account\" (string, required) MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n"
|
||||
"\nResult:\n"
|
||||
"[ (json array of string)\n"
|
||||
" \"zcashaddress\" (string) a zcash address associated with the given account\n"
|
||||
" \"zcashaddress\" (string) a Zcash address associated with the given account\n"
|
||||
" ,...\n"
|
||||
"]\n"
|
||||
"\nExamples:\n"
|
||||
|
@ -517,7 +517,7 @@ UniValue signmessage(const UniValue& params, bool fHelp)
|
|||
"\nSign a message with the private key of an address"
|
||||
+ HelpRequiringPassphrase() + "\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"zcashaddress\" (string, required) The zcash address to use for the private key.\n"
|
||||
"1. \"zcashaddress\" (string, required) The Zcash address to use for the private key.\n"
|
||||
"2. \"message\" (string, required) The message to create a signature of.\n"
|
||||
"\nResult:\n"
|
||||
"\"signature\" (string) The signature of the message encoded in base 64\n"
|
||||
|
@ -572,7 +572,7 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
|
|||
"getreceivedbyaddress \"zcashaddress\" ( minconf )\n"
|
||||
"\nReturns the total amount received by the given zcashaddress in transactions with at least minconf confirmations.\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"zcashaddress\" (string, required) The zcash address for transactions.\n"
|
||||
"1. \"zcashaddress\" (string, required) The Zcash address for transactions.\n"
|
||||
"2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
|
||||
"\nResult:\n"
|
||||
"amount (numeric) The total amount in " + CURRENCY_UNIT + " received at this address.\n"
|
||||
|
@ -878,7 +878,7 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
|
|||
if (fHelp || params.size() < 3 || params.size() > 6)
|
||||
throw runtime_error(
|
||||
"sendfrom \"fromaccount\" \"tozcashaddress\" amount ( minconf \"comment\" \"comment-to\" )\n"
|
||||
"\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a zcash address.\n"
|
||||
"\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a Zcash address.\n"
|
||||
"The amount is a real and is rounded to the nearest 0.00000001."
|
||||
+ HelpRequiringPassphrase() + "\n"
|
||||
"\nArguments:\n"
|
||||
|
@ -1063,15 +1063,15 @@ UniValue addmultisigaddress(const UniValue& params, bool fHelp)
|
|||
|
||||
"\nArguments:\n"
|
||||
"1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n"
|
||||
"2. \"keysobject\" (string, required) A json array of zcash addresses or hex-encoded public keys\n"
|
||||
"2. \"keysobject\" (string, required) A json array of Zcash addresses or hex-encoded public keys\n"
|
||||
" [\n"
|
||||
" \"address\" (string) zcash address or hex-encoded public key\n"
|
||||
" \"address\" (string) Zcash address or hex-encoded public key\n"
|
||||
" ...,\n"
|
||||
" ]\n"
|
||||
"3. \"account\" (string, optional) DEPRECATED. If provided, MUST be set to the empty string \"\" to represent the default account. Passing any other string will result in an error.\n"
|
||||
|
||||
"\nResult:\n"
|
||||
"\"zcashaddress\" (string) A zcash address associated with the keys.\n"
|
||||
"\"zcashaddress\" (string) A Zcash address associated with the keys.\n"
|
||||
|
||||
"\nExamples:\n"
|
||||
"\nAdd a multisig address from 2 addresses\n"
|
||||
|
@ -1418,7 +1418,7 @@ UniValue listtransactions(const UniValue& params, bool fHelp)
|
|||
" {\n"
|
||||
" \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. \n"
|
||||
" It will be \"\" for the default account.\n"
|
||||
" \"address\":\"zcashaddress\", (string) The zcash address of the transaction. Not present for \n"
|
||||
" \"address\":\"zcashaddress\", (string) The Zcash address of the transaction. Not present for \n"
|
||||
" move transactions (category = move).\n"
|
||||
" \"category\":\"send|receive|move\", (string) The transaction category. 'move' is a local (off blockchain)\n"
|
||||
" transaction between accounts, and not associated with an address,\n"
|
||||
|
@ -1618,7 +1618,7 @@ UniValue listsinceblock(const UniValue& params, bool fHelp)
|
|||
"{\n"
|
||||
" \"transactions\": [\n"
|
||||
" \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. Will be \"\" for the default account.\n"
|
||||
" \"address\":\"zcashaddress\", (string) The zcash address of the transaction. Not present for move transactions (category = move).\n"
|
||||
" \"address\":\"zcashaddress\", (string) The Zcash address of the transaction. Not present for move transactions (category = move).\n"
|
||||
" \"category\":\"send|receive\", (string) The transaction category. 'send' has negative amounts, 'receive' has positive amounts.\n"
|
||||
" \"amount\": x.xxx, (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and for the 'move' category for moves \n"
|
||||
" outbound. It is positive for the 'receive' category, and for the 'move' category for inbound funds.\n"
|
||||
|
@ -1717,7 +1717,7 @@ UniValue gettransaction(const UniValue& params, bool fHelp)
|
|||
" \"details\" : [\n"
|
||||
" {\n"
|
||||
" \"account\" : \"accountname\", (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n"
|
||||
" \"address\" : \"zcashaddress\", (string) The zcash address involved in the transaction\n"
|
||||
" \"address\" : \"zcashaddress\", (string) The Zcash address involved in the transaction\n"
|
||||
" \"category\" : \"send|receive\", (string) The category, either 'send' or 'receive'\n"
|
||||
" \"amount\" : x.xxx (numeric) The amount in " + CURRENCY_UNIT + "\n"
|
||||
" \"vout\" : n, (numeric) the vout value\n"
|
||||
|
@ -2326,9 +2326,9 @@ UniValue listunspent(const UniValue& params, bool fHelp)
|
|||
"\nArguments:\n"
|
||||
"1. minconf (numeric, optional, default=1) The minimum confirmations to filter\n"
|
||||
"2. maxconf (numeric, optional, default=9999999) The maximum confirmations to filter\n"
|
||||
"3. \"addresses\" (string) A json array of zcash addresses to filter\n"
|
||||
"3. \"addresses\" (string) A json array of Zcash addresses to filter\n"
|
||||
" [\n"
|
||||
" \"address\" (string) zcash address\n"
|
||||
" \"address\" (string) Zcash address\n"
|
||||
" ,...\n"
|
||||
" ]\n"
|
||||
"\nResult\n"
|
||||
|
|
Loading…
Reference in New Issue