From ba561faa2b57cd29d3189b68a09afa4563947a78 Mon Sep 17 00:00:00 2001 From: nzsquirrell Date: Wed, 2 Mar 2016 13:44:39 +1300 Subject: [PATCH] name changes --- src/bitcoin-cli-res.rc | 4 ++-- src/bitcoin-tx-res.rc | 4 ++-- src/bitcoind-res.rc | 4 ++-- src/init.cpp | 16 ++++++++++------ src/miner.cpp | 30 +++++++++++++++--------------- src/net.cpp | 4 ++-- src/rpcblockchain.cpp | 8 ++++---- src/rpcmining.cpp | 8 ++++---- src/rpcmisc.cpp | 28 ++++++++++++++-------------- src/rpcnet.cpp | 2 +- src/rpcprotocol.cpp | 4 ++-- src/rpcrawtransaction.cpp | 8 ++++---- src/rpcserver.cpp | 6 +++--- 13 files changed, 65 insertions(+), 61 deletions(-) diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc index c7e19693..b505bed1 100644 --- a/src/bitcoin-cli-res.rc +++ b/src/bitcoin-cli-res.rc @@ -16,8 +16,8 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Myriadcoin" - VALUE "FileDescription", "myriadcoin-cli (JSON-RPC client for Myriadcoin Core)" + VALUE "CompanyName", "Myriad" + VALUE "FileDescription", "myriadcoin-cli (JSON-RPC client for Myriad Core)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "myriadcoin-cli" VALUE "LegalCopyright", COPYRIGHT_STR diff --git a/src/bitcoin-tx-res.rc b/src/bitcoin-tx-res.rc index 46bf9087..89919687 100644 --- a/src/bitcoin-tx-res.rc +++ b/src/bitcoin-tx-res.rc @@ -16,8 +16,8 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Myriadcoin" - VALUE "FileDescription", "myriadcoin-tx (CLI Myriadcoin transaction editor utility)" + VALUE "CompanyName", "Myriad" + VALUE "FileDescription", "myriadcoin-tx (CLI Myriad transaction editor utility)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "myriadcoin-tx" VALUE "LegalCopyright", COPYRIGHT_STR diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc index 3fa4abfd..ab6654a3 100644 --- a/src/bitcoind-res.rc +++ b/src/bitcoind-res.rc @@ -16,8 +16,8 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Myriadcoin" - VALUE "FileDescription", "myriadcoind (Myriadcoin node with a JSON-RPC server)" + VALUE "CompanyName", "Myriad" + VALUE "FileDescription", "myriadcoind (Myriad node with a JSON-RPC server)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "myriadcoind" VALUE "LegalCopyright", COPYRIGHT_STR diff --git a/src/init.cpp b/src/init.cpp index 4cc491f6..c3337814 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -899,7 +899,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) // Sanity check if (!InitSanityCheck()) - return InitError(_("Initialization sanity check failed. Myriadcoin Core is shutting down.")); + return InitError(_("Initialization sanity check failed. Myriad Core is shutting down.")); std::string strDataDir = GetDataDir().string(); #ifdef ENABLE_WALLET @@ -915,9 +915,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) try { static boost::interprocess::file_lock lock(pathLockFile.string().c_str()); if (!lock.try_lock()) - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Myriadcoin Core is probably already running."), strDataDir)); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Myriad Core is probably already running."), strDataDir)); } catch(const boost::interprocess::interprocess_exception& e) { - return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Myriadcoin Core is probably already running.") + " %s.", strDataDir, e.what())); + return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Myriad Core is probably already running.") + " %s.", strDataDir, e.what())); } #ifndef WIN32 @@ -926,7 +926,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) if (GetBoolArg("-shrinkdebugfile", !fDebug)) ShrinkDebugFile(); LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - LogPrintf("Myriadcoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); + LogPrintf("Myriad version %s (%s)\n", FormatFullVersion(), CLIENT_DATE); LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION)); #ifdef ENABLE_WALLET LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); @@ -964,6 +964,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) int64_t nStart; +#if defined(USE_SSE2) + scrypt_detect_sse2(); +#endif + // ********************************************************* Step 5: verify wallet database integrity #ifdef ENABLE_WALLET if (!fDisableWallet) { @@ -1283,10 +1287,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 Myriadcoin Core") << "\n"; + strErrors << _("Error loading wallet.dat: Wallet requires newer version of Myriad Core") << "\n"; else if (nLoadWalletRet == DB_NEED_REWRITE) { - strErrors << _("Wallet needed to be rewritten: restart Myriadcoin Core to complete") << "\n"; + strErrors << _("Wallet needed to be rewritten: restart Myriad Core to complete") << "\n"; LogPrintf("%s", strErrors.str()); return InitError(strErrors.str()); } diff --git a/src/miner.cpp b/src/miner.cpp index 5b69585a..66807f28 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -434,7 +434,7 @@ static bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& rese { LOCK(cs_main); if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash()) - return error("BitcoinMiner: generated block is stale"); + return error("MyriadMiner: generated block is stale"); } // Remove key from key pool @@ -449,14 +449,14 @@ static bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& rese // Process this block the same as if we had received it from another node CValidationState state; if (!ProcessNewBlock(state, NULL, pblock, true, NULL)) - return error("BitcoinMiner: ProcessNewBlock, block not accepted"); + return error("MyriadMiner: ProcessNewBlock, block not accepted"); return true; } void static BitcoinMiner(CWallet *pwallet) { - LogPrintf("MyriadcoinMiner started\n"); + LogPrintf("MyriadMiner started\n"); SetThreadPriority(THREAD_PRIORITY_LOWEST); RenameThread("bitcoin-miner"); const CChainParams& chainparams = Params(); @@ -491,13 +491,13 @@ void static BitcoinMiner(CWallet *pwallet) auto_ptr pblocktemplate(CreateNewBlockWithKey(reservekey, ALGO_SHA256D)); if (!pblocktemplate.get()) { - LogPrintf("Error in BitcoinMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n"); + LogPrintf("Error in MyriadMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n"); return; } CBlock *pblock = &pblocktemplate->block; IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); - LogPrintf("Running BitcoinMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(), + LogPrintf("Running MyriadMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(), ::GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION)); // @@ -518,7 +518,7 @@ void static BitcoinMiner(CWallet *pwallet) assert(hash == pblock->GetHash()); SetThreadPriority(THREAD_PRIORITY_NORMAL); - LogPrintf("BitcoinMiner:\n"); + LogPrintf("MyriadMiner:\n"); LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex()); ProcessBlockFound(pblock, *pwallet, reservekey); SetThreadPriority(THREAD_PRIORITY_LOWEST); @@ -555,12 +555,12 @@ void static BitcoinMiner(CWallet *pwallet) } catch (const boost::thread_interrupted&) { - LogPrintf("BitcoinMiner terminated\n"); + LogPrintf("MyriadMiner terminated\n"); throw; } catch (const std::runtime_error &e) { - LogPrintf("BitcoinMiner runtime error: %s\n", e.what()); + LogPrintf("MyriadMiner runtime error: %s\n", e.what()); return; } } @@ -574,7 +574,7 @@ void static GenericMiner(CWallet *pwallet, int algo) while(true) { -/* if (chainparams.MiningRequiresPeers()) { + if (chainparams.MiningRequiresPeers()) { // Busy-wait for the network to come online so we don't waste time mining // on an obsolete chain. In regtest mode we expect to fly solo. do { @@ -587,7 +587,7 @@ void static GenericMiner(CWallet *pwallet, int algo) break; MilliSleep(1000); } while (true); - }*/ + } // // Create new block @@ -598,7 +598,7 @@ void static GenericMiner(CWallet *pwallet, int algo) auto_ptr pblocktemplate(CreateNewBlockWithKey(reservekey, algo)); if (!pblocktemplate.get()) { - LogPrintf("Error in MyriadcoinMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n"); + LogPrintf("Error in MyriadMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n"); return; } CBlock *pblock = &pblocktemplate->block; @@ -613,14 +613,14 @@ void static GenericMiner(CWallet *pwallet, int algo) // int64_t nStart = GetTime(); arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); - LogPrintf("MyriadcoinMiner target hash: %s\n", hashTarget.GetHex()); + LogPrintf("MyriadMiner target hash: %s\n", hashTarget.GetHex()); uint256 hash; while(true) { hash = pblock->GetPoWHash(algo); if (UintToArith256(hash) <= hashTarget){ SetThreadPriority(THREAD_PRIORITY_NORMAL); - LogPrintf("MyriadcoinMiner:\n"); + LogPrintf("MyriadMiner:\n"); LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex()); ProcessBlockFound(pblock, *pwallet, reservekey); SetThreadPriority(THREAD_PRIORITY_LOWEST); @@ -658,7 +658,7 @@ void static GenericMiner(CWallet *pwallet, int algo) void static ThreadMiner(CWallet *pwallet) { - LogPrintf("Myriadcoin miner started\n"); + LogPrintf("MyriadMiner miner started\n"); SetThreadPriority(THREAD_PRIORITY_LOWEST); RenameThread("bitcoin-miner"); @@ -686,7 +686,7 @@ void static ThreadMiner(CWallet *pwallet) } catch (boost::thread_interrupted) { - LogPrintf("Myriadcoin miner terminated\n"); + LogPrintf("MyriadMiner miner terminated\n"); throw; } } diff --git a/src/net.cpp b/src/net.cpp index 8b24ac29..5cb6fd9c 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1050,7 +1050,7 @@ void ThreadMapPort() } } - string strDesc = "Myriadcoin " + FormatFullVersion(); + string strDesc = "Myriad " + FormatFullVersion(); try { while (true) { @@ -1551,7 +1551,7 @@ bool BindListenPort(const CService &addrBind, string& strError, bool fWhiteliste { int nErr = WSAGetLastError(); if (nErr == WSAEADDRINUSE) - strError = strprintf(_("Unable to bind to %s on this computer. Myriadcoin Core is probably already running."), addrBind.ToString()); + strError = strprintf(_("Unable to bind to %s on this computer. Myriad Core is probably already running."), addrBind.ToString()); else strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr)); LogPrintf("%s\n", strError); diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 9cd39763..afdf68a9 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -211,7 +211,7 @@ Value getrawmempool(const Array& params, bool fHelp) "{ (json object)\n" " \"transactionid\" : { (json object)\n" " \"size\" : n, (numeric) transaction size in bytes\n" - " \"fee\" : n, (numeric) transaction fee in myriadcoins\n" + " \"fee\" : n, (numeric) transaction fee in MYR\n" " \"time\" : n, (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n" " \"height\" : n, (numeric) block height when transaction entered pool\n" " \"startingpriority\" : n, (numeric) priority when transaction entered pool\n" @@ -421,14 +421,14 @@ Value gettxout(const Array& params, bool fHelp) "{\n" " \"bestblock\" : \"hash\", (string) the block hash\n" " \"confirmations\" : n, (numeric) The number of confirmations\n" - " \"value\" : x.xxx, (numeric) The transaction value in myr\n" + " \"value\" : x.xxx, (numeric) The transaction value in MYR\n" " \"scriptPubKey\" : { (json object)\n" " \"asm\" : \"code\", (string) \n" " \"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 myriadcoin addresses\n" - " \"myriadcoinaddress\" (string) myriadcoin address\n" + " \"addresses\" : [ (array of string) array of myriad addresses\n" + " \"myriadaddress\" (string) myriad address\n" " ,...\n" " ]\n" " },\n" diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 632342a6..db2f3088 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -441,10 +441,10 @@ Value getblocktemplate(const Array& params, bool fHelp) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode"); if (vNodes.empty()) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Myriadcoin is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Myriad is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Myriadcoin is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Myriad is downloading blocks..."); static unsigned int nTransactionsUpdatedLast; @@ -775,11 +775,11 @@ Value getauxblockbip22(const Array& params, bool fHelp) if (vNodes.empty() && !Params().MineBlocksOnDemand()) throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, - "Dogecoin is not connected!"); + "Myriad is not connected!"); if (IsInitialBlockDownload() && !Params().MineBlocksOnDemand()) throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, - "Dogecoin is downloading blocks..."); + "Myriad is downloading blocks..."); /* The variables below are used to keep track of created and not yet submitted auxpow blocks. Lock them, just in case. In principle diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 00f8d176..5276bf76 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -60,8 +60,8 @@ Value getinfo(const Array& params, bool fHelp) " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n" " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" - " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in myr/kb\n" - " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in myr/kb\n" + " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in MYR/kb\n" + " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in MYR/kb\n" " \"errors\": \"...\" (string) any error messages\n" "}\n" "\nExamples:\n" @@ -172,7 +172,7 @@ Value validateaddress(const Array& params, bool fHelp) "\nResult:\n" "{\n" " \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n" - " \"address\" : \"myriadcoinaddress\", (string) The myriadcoin address validated\n" + " \"address\" : \"myriadaddress\", (string) The myriad 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" @@ -181,8 +181,8 @@ Value validateaddress(const Array& params, bool fHelp) " \"account\" : \"account\" (string) DEPRECATED. The account associated with the address, \"\" is the default account\n" "}\n" "\nExamples:\n" - + HelpExampleCli("validateaddress", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"") - + HelpExampleRpc("validateaddress", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"") + + HelpExampleCli("validateaddress", "\"MJPyMHUJiQpwM5ZkzKXDo5UPYTNh5yJ9Vf\"") + + HelpExampleRpc("validateaddress", "\"MJPyMHUJiQpwM5ZkzKXDo5UPYTNh5yJ9Vf\"") ); #ifdef ENABLE_WALLET @@ -294,9 +294,9 @@ Value createmultisig(const Array& 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 myriadcoin addresses or hex-encoded public keys\n" + "2. \"keys\" (string, required) A json array of keys which are myriad addresses or hex-encoded public keys\n" " [\n" - " \"key\" (string) myriadcoin address or hex-encoded public key\n" + " \"key\" (string) myriad address or hex-encoded public key\n" " ,...\n" " ]\n" @@ -308,9 +308,9 @@ Value createmultisig(const Array& params, bool fHelp) "\nExamples:\n" "\nCreate a multisig address from 2 addresses\n" - + HelpExampleCli("createmultisig", "2 \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") + + + HelpExampleCli("createmultisig", "2 \"[\\\"MJPyMHUJiQpwM5ZkzKXDo5UPYTNh5yJ9Vf\\\",\\\"MFGBGKCBXvTsnEk4Bf8buY3AvF8qMDGZuR\\\"]\"") + "\nAs a json rpc call\n" - + HelpExampleRpc("createmultisig", "2, \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") + + HelpExampleRpc("createmultisig", "2, \"[\\\"MJPyMHUJiQpwM5ZkzKXDo5UPYTNh5yJ9Vf\\\",\\\"MFGBGKCBXvTsnEk4Bf8buY3AvF8qMDGZuR\\\"]\"") ; throw runtime_error(msg); } @@ -331,10 +331,10 @@ Value verifymessage(const Array& params, bool fHelp) { if (fHelp || params.size() != 3) throw runtime_error( - "verifymessage \"myriadcoinaddress\" \"signature\" \"message\"\n" + "verifymessage \"myriadaddress\" \"signature\" \"message\"\n" "\nVerify a signed message\n" "\nArguments:\n" - "1. \"myriadcoinaddress\" (string, required) The myriadcoin address to use for the signature.\n" + "1. \"myriadaddress\" (string, required) The myriad 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" @@ -343,11 +343,11 @@ Value verifymessage(const Array& params, bool fHelp) "\nUnlock the wallet for 30 seconds\n" + HelpExampleCli("walletpassphrase", "\"mypassphrase\" 30") + "\nCreate the signature\n" - + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"my message\"") + + + HelpExampleCli("signmessage", "\"MJPyMHUJiQpwM5ZkzKXDo5UPYTNh5yJ9Vf\" \"my message\"") + "\nVerify the signature\n" - + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") + + + HelpExampleCli("verifymessage", "\"MJPyMHUJiQpwM5ZkzKXDo5UPYTNh5yJ9Vf\" \"signature\" \"my message\"") + "\nAs json rpc\n" - + HelpExampleRpc("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"signature\", \"my message\"") + + HelpExampleRpc("verifymessage", "\"MJPyMHUJiQpwM5ZkzKXDo5UPYTNh5yJ9Vf\", \"signature\", \"my message\"") ); LOCK(cs_main); diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 9cc3690f..c4ef4d7a 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -234,7 +234,7 @@ Value getaddednodeinfo(const Array& params, bool fHelp) " \"connected\" : true|false, (boolean) If connected\n" " \"addresses\" : [\n" " {\n" - " \"address\" : \"192.168.0.201:8333\", (string) The myriadcoin server host and port\n" + " \"address\" : \"192.168.0.201:8333\", (string) The myriad server host and port\n" " \"connected\" : \"outbound\" (string) connection, inbound or outbound\n" " }\n" " ,...\n" diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp index 4e5750c9..d67cb452 100644 --- a/src/rpcprotocol.cpp +++ b/src/rpcprotocol.cpp @@ -42,7 +42,7 @@ string HTTPPost(const string& strMsg, const map& mapRequestHeader { ostringstream s; s << "POST / HTTP/1.1\r\n" - << "User-Agent: myriadcoin-json-rpc/" << FormatFullVersion() << "\r\n" + << "User-Agent: myriad-json-rpc/" << FormatFullVersion() << "\r\n" << "Host: 127.0.0.1\r\n" << "Content-Type: application/json\r\n" << "Content-Length: " << strMsg.size() << "\r\n" @@ -77,7 +77,7 @@ string HTTPError(int nStatus, bool keepalive, bool headersOnly) if (nStatus == HTTP_UNAUTHORIZED) return strprintf("HTTP/1.0 401 Authorization Required\r\n" "Date: %s\r\n" - "Server: myriadcoin-json-rpc/%s\r\n" + "Server: myriad-json-rpc/%s\r\n" "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n" "Content-Type: text/html\r\n" "Content-Length: 296\r\n" diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index b02b74b3..633f6df1 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -153,7 +153,7 @@ Value getrawtransaction(const Array& params, bool fHelp) " \"reqSigs\" : n, (numeric) The required sigs\n" " \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n" " \"addresses\" : [ (json array of string)\n" - " \"myriadcoinaddress\" (string) myriadcoin address\n" + " \"myriadaddress\" (string) myriadcoin address\n" " ,...\n" " ]\n" " }\n" @@ -330,7 +330,7 @@ Value createrawtransaction(const Array& params, bool fHelp) " ]\n" "2. \"addresses\" (string, required) a json object with addresses as keys and amounts as values\n" " {\n" - " \"address\": x.xxx (numeric, required) The key is the myriadcoin address, the value is the myr amount\n" + " \"address\": x.xxx (numeric, required) The key is the myriad address, the value is the MYR amount\n" " ,...\n" " }\n" @@ -423,7 +423,7 @@ Value decoderawtransaction(const Array& params, bool fHelp) " \"reqSigs\" : n, (numeric) The required sigs\n" " \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n" " \"addresses\" : [ (json array of string)\n" - " \"12tvKAXCxZjSmdNbao16dKXC8tRWfcF5oc\" (string) myriadcoin address\n" + " \"12tvKAXCxZjSmdNbao16dKXC8tRWfcF5oc\" (string) myriad address\n" " ,...\n" " ]\n" " }\n" @@ -466,7 +466,7 @@ Value decodescript(const Array& 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) myriadcoin address\n" + " \"address\" (string) myriad address\n" " ,...\n" " ],\n" " \"p2sh\",\"address\" (string) script address\n" diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index d32af6f8..157f89f3 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -605,16 +605,16 @@ void StartRPCThreads() unsigned char rand_pwd[32]; GetRandBytes(rand_pwd, 32); uiInterface.ThreadSafeMessageBox(strprintf( - _("To use myriadcoind, or the -server option to myriadcoin-qt, you must set an rpcpassword in the configuration file:\n" + _("To use myriadcoind, or the -server option to myriad-qt, you must set an rpcpassword in the configuration file:\n" "%s\n" "It is recommended you use the following random password:\n" - "rpcuser=myriadcoinrpc\n" + "rpcuser=myriadrpc\n" "rpcpassword=%s\n" "(you do not need to remember this password)\n" "The username and password MUST NOT be the same.\n" "If the file does not exist, create it with owner-readable-only file permissions.\n" "It is also recommended to set alertnotify so you are notified of problems;\n" - "for example: alertnotify=echo %%s | mail -s \"Myriadcoin Alert\" admin@foo.com\n"), + "for example: alertnotify=echo %%s | mail -s \"Myriad Alert\" admin@foo.com\n"), GetConfigFile().string(), EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32)), "", CClientUIInterface::MSG_ERROR | CClientUIInterface::SECURE);