From 655c1541a3298430c4bbf0cab784ec1d535f8a2d Mon Sep 17 00:00:00 2001 From: Ray Engelking Date: Fri, 5 Jan 2018 15:20:26 -0500 Subject: [PATCH] src converted to flo up to /wallet folder --- src/test/test_bitcoin.cpp | 2 +- src/wallet/rpcdump.cpp | 14 +++---- src/wallet/rpcwallet.cpp | 84 +++++++++++++++++++-------------------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 4b9e428f5..3247b015e 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -61,7 +61,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha RegisterAllCoreRPCCommands(tableRPC); ClearDatadirCache(); - pathTemp = GetTempPath() / strprintf("test_litecoin_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000))); + pathTemp = GetTempPath() / strprintf("test_flo_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000))); fs::create_directories(pathTemp); gArgs.ForceSetArg("-datadir", pathTemp.string()); diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index a2e51a6ee..8c7aacd20 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -79,10 +79,10 @@ UniValue importprivkey(const JSONRPCRequest& request) if (request.fHelp || request.params.size() < 1 || request.params.size() > 3) throw std::runtime_error( - "importprivkey \"litecoinprivkey\" ( \"label\" ) ( rescan )\n" + "importprivkey \"floprivkey\" ( \"label\" ) ( rescan )\n" "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n" "\nArguments:\n" - "1. \"litecoinprivkey\" (string, required) The private key (see dumpprivkey)\n" + "1. \"floprivkey\" (string, required) The private key (see dumpprivkey)\n" "2. \"label\" (string, optional, default=\"\") An optional label\n" "3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n" "\nNote: This call can take minutes to complete if rescan is true.\n" @@ -272,7 +272,7 @@ UniValue importaddress(const JSONRPCRequest& request) std::vector data(ParseHex(request.params[0].get_str())); ImportScript(pwallet, CScript(data.begin(), data.end()), strLabel, fP2SH); } else { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Litecoin address or script"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid FLO address or script"); } if (fRescan) @@ -557,7 +557,7 @@ UniValue dumpprivkey(const JSONRPCRequest& request) "\nReveals the private key corresponding to 'address'.\n" "Then the importprivkey can be used with this output\n" "\nArguments:\n" - "1. \"address\" (string, required) The litecoin address for the private key\n" + "1. \"address\" (string, required) The flo address for the private key\n" "\nResult:\n" "\"key\" (string) The private key\n" "\nExamples:\n" @@ -573,7 +573,7 @@ UniValue dumpprivkey(const JSONRPCRequest& request) std::string strAddress = request.params[0].get_str(); CBitcoinAddress address; if (!address.SetString(strAddress)) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Litecoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid FLO address"); CKeyID keyID; if (!address.GetKeyID(keyID)) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); @@ -597,7 +597,7 @@ UniValue dumpwallet(const JSONRPCRequest& request) "dumpwallet \"filename\"\n" "\nDumps all wallet keys in a human-readable format.\n" "\nArguments:\n" - "1. \"filename\" (string, required) The filename with path (either absolute or relative to litecoind)\n" + "1. \"filename\" (string, required) The filename with path (either absolute or relative to flod)\n" "\nResult:\n" "{ (json object)\n" " \"filename\" : { (string) The filename with full absolute path\n" @@ -633,7 +633,7 @@ UniValue dumpwallet(const JSONRPCRequest& request) std::sort(vKeyBirth.begin(), vKeyBirth.end()); // produce output - file << strprintf("# Wallet dump created by Litecoin %s\n", CLIENT_BUILD); + file << strprintf("# Wallet dump created by FLO %s\n", CLIENT_BUILD); file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime())); file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString()); file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime())); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 5f007c95d..78728d01e 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -136,13 +136,13 @@ UniValue getnewaddress(const JSONRPCRequest& request) if (request.fHelp || request.params.size() > 1) throw std::runtime_error( "getnewaddress ( \"account\" )\n" - "\nReturns a new Litecoin address for receiving payments.\n" + "\nReturns a new FLO address for receiving payments.\n" "If 'account' is specified (DEPRECATED), it is added to the address book \n" "so payments received with the address will be credited to 'account'.\n" "\nArguments:\n" "1. \"account\" (string, optional) DEPRECATED. The account name for the address to be linked to. If not provided, the default account \"\" is used. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created if there is no account by the given name.\n" "\nResult:\n" - "\"address\" (string) The new litecoin address\n" + "\"address\" (string) The new flo address\n" "\nExamples:\n" + HelpExampleCli("getnewaddress", "") + HelpExampleRpc("getnewaddress", "") @@ -192,11 +192,11 @@ UniValue getaccountaddress(const JSONRPCRequest& request) if (request.fHelp || request.params.size() != 1) throw std::runtime_error( "getaccountaddress \"account\"\n" - "\nDEPRECATED. Returns the current Litecoin address for receiving payments to this account.\n" + "\nDEPRECATED. Returns the current FLO address for receiving payments to this account.\n" "\nArguments:\n" "1. \"account\" (string, required) The account name for the address. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created and a new address created if there is no account by the given name.\n" "\nResult:\n" - "\"address\" (string) The account litecoin address\n" + "\"address\" (string) The account flo address\n" "\nExamples:\n" + HelpExampleCli("getaccountaddress", "") + HelpExampleCli("getaccountaddress", "\"\"") @@ -226,7 +226,7 @@ UniValue getrawchangeaddress(const JSONRPCRequest& request) if (request.fHelp || request.params.size() > 0) throw std::runtime_error( "getrawchangeaddress\n" - "\nReturns a new Litecoin address, for receiving change.\n" + "\nReturns a new FLO address, for receiving change.\n" "This is for use with raw transactions, NOT normal use.\n" "\nResult:\n" "\"address\" (string) The address\n" @@ -266,7 +266,7 @@ UniValue setaccount(const JSONRPCRequest& request) "setaccount \"address\" \"account\"\n" "\nDEPRECATED. Sets the account associated with the given address.\n" "\nArguments:\n" - "1. \"address\" (string, required) The litecoin address to be associated with an account.\n" + "1. \"address\" (string, required) The flo address to be associated with an account.\n" "2. \"account\" (string, required) The account to assign the address to.\n" "\nExamples:\n" + HelpExampleCli("setaccount", "\"LEr4hNAefWYhBMgxCFP2Po1NPrUeiK8kM2\" \"tabby\"") @@ -277,7 +277,7 @@ UniValue setaccount(const JSONRPCRequest& request) CBitcoinAddress address(request.params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Litecoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid FLO address"); std::string strAccount; if (request.params.size() > 1) @@ -313,7 +313,7 @@ UniValue getaccount(const JSONRPCRequest& request) "getaccount \"address\"\n" "\nDEPRECATED. Returns the account associated with the given address.\n" "\nArguments:\n" - "1. \"address\" (string, required) The litecoin address for account lookup.\n" + "1. \"address\" (string, required) The flo address for account lookup.\n" "\nResult:\n" "\"accountname\" (string) the account address\n" "\nExamples:\n" @@ -325,7 +325,7 @@ UniValue getaccount(const JSONRPCRequest& request) CBitcoinAddress address(request.params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Litecoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid FLO address"); std::string strAccount; std::map::iterator mi = pwallet->mapAddressBook.find(address.Get()); @@ -351,7 +351,7 @@ UniValue getaddressesbyaccount(const JSONRPCRequest& request) "1. \"account\" (string, required) The account name.\n" "\nResult:\n" "[ (json array of string)\n" - " \"address\" (string) a litecoin address associated with the given account\n" + " \"address\" (string) a flo address associated with the given account\n" " ,...\n" "]\n" "\nExamples:\n" @@ -425,7 +425,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request) "\nSend an amount to a given address.\n" + HelpRequiringPassphrase(pwallet) + "\nArguments:\n" - "1. \"address\" (string, required) The litecoin address to send to.\n" + "1. \"address\" (string, required) The flo address to send to.\n" "2. \"amount\" (numeric or string, required) The amount in " + CURRENCY_UNIT + " to send. eg 0.1\n" "3. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" " This is not part of the transaction, just kept in your wallet.\n" @@ -433,7 +433,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request) " to which you're sending the transaction. This is not part of the \n" " transaction, just kept in your wallet.\n" "5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n" - " The recipient will receive less litecoins than you enter in the amount field.\n" + " The recipient will receive less flos than you enter in the amount field.\n" "6. replaceable (boolean, optional) Allow this transaction to be replaced by a transaction with higher fees via BIP 125\n" "7. conf_target (numeric, optional) Confirmation target (in blocks)\n" "8. \"estimate_mode\" (string, optional, default=UNSET) The fee estimate mode, must be one of:\n" @@ -453,7 +453,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request) CBitcoinAddress address(request.params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Litecoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid FLO address"); // Amount CAmount nAmount = AmountFromValue(request.params[1]); @@ -512,7 +512,7 @@ UniValue listaddressgroupings(const JSONRPCRequest& request) "[\n" " [\n" " [\n" - " \"address\", (string) The litecoin address\n" + " \"address\", (string) The flo address\n" " amount, (numeric) The amount in " + CURRENCY_UNIT + "\n" " \"account\" (string, optional) DEPRECATED. The account\n" " ]\n" @@ -561,7 +561,7 @@ UniValue signmessage(const JSONRPCRequest& request) "\nSign a message with the private key of an address" + HelpRequiringPassphrase(pwallet) + "\n" "\nArguments:\n" - "1. \"address\" (string, required) The litecoin address to use for the private key.\n" + "1. \"address\" (string, required) The flo 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" @@ -619,7 +619,7 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request) "getreceivedbyaddress \"address\" ( minconf )\n" "\nReturns the total amount received by the given address in transactions with at least minconf confirmations.\n" "\nArguments:\n" - "1. \"address\" (string, required) The litecoin address for transactions.\n" + "1. \"address\" (string, required) The flo 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" @@ -639,7 +639,7 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request) // Bitcoin address CBitcoinAddress address = CBitcoinAddress(request.params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Litecoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid FLO address"); CScript scriptPubKey = GetScriptForDestination(address.Get()); if (!IsMine(*pwallet, scriptPubKey)) { return ValueFromAmount(0); @@ -863,14 +863,14 @@ UniValue sendfrom(const JSONRPCRequest& request) if (request.fHelp || request.params.size() < 3 || request.params.size() > 6) throw std::runtime_error( "sendfrom \"fromaccount\" \"toaddress\" amount ( minconf \"comment\" \"comment_to\" )\n" - "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a litecoin address." + "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a flo address." + HelpRequiringPassphrase(pwallet) + "\n" "\nArguments:\n" "1. \"fromaccount\" (string, required) The name of the account to send funds from. May be the default account using \"\".\n" " Specifying an account does not influence coin selection, but it does associate the newly created\n" " transaction with the account, so the account's balance computation and transaction history can reflect\n" " the spend.\n" - "2. \"toaddress\" (string, required) The litecoin address to send funds to.\n" + "2. \"toaddress\" (string, required) The flo address to send funds to.\n" "3. amount (numeric or string, required) The amount in " + CURRENCY_UNIT + " (transaction fee is added on top).\n" "4. minconf (numeric, optional, default=1) Only use funds with at least this many confirmations.\n" "5. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" @@ -894,7 +894,7 @@ UniValue sendfrom(const JSONRPCRequest& request) std::string strAccount = AccountFromValue(request.params[0]); CBitcoinAddress address(request.params[1].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Litecoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid FLO address"); CAmount nAmount = AmountFromValue(request.params[2]); if (nAmount <= 0) throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send"); @@ -939,14 +939,14 @@ UniValue sendmany(const JSONRPCRequest& request) "1. \"fromaccount\" (string, required) DEPRECATED. The account to send the funds from. Should be \"\" for the default account\n" "2. \"amounts\" (string, required) A json object with addresses and amounts\n" " {\n" - " \"address\":amount (numeric or string) The litecoin address is the key, the numeric amount (can be string) in " + CURRENCY_UNIT + " is the value\n" + " \"address\":amount (numeric or string) The flo address is the key, the numeric amount (can be string) in " + CURRENCY_UNIT + " is the value\n" " ,...\n" " }\n" "3. minconf (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n" "4. \"comment\" (string, optional) A comment\n" "5. subtractfeefrom (array, optional) A json array with addresses.\n" " The fee will be equally deducted from the amount of each selected address.\n" - " Those recipients will receive less litecoins than you enter in their corresponding amount field.\n" + " Those recipients will receive less flos than you enter in their corresponding amount field.\n" " If no addresses are specified here, the sender pays the fee.\n" " [\n" " \"address\" (string) Subtract fee from this address\n" @@ -1017,7 +1017,7 @@ UniValue sendmany(const JSONRPCRequest& request) { CBitcoinAddress address(name_); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Litecoin address: ")+name_); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid FLO address: ")+name_); if (setAddress.count(address)) throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ")+name_); @@ -1078,20 +1078,20 @@ UniValue addmultisigaddress(const JSONRPCRequest& request) { std::string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" "\nAdd a nrequired-to-sign multisignature address to the wallet.\n" - "Each key is a Litecoin address or hex-encoded public key.\n" + "Each key is a FLO address or hex-encoded public key.\n" "If 'account' is specified (DEPRECATED), assign address to that account.\n" "\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 litecoin addresses or hex-encoded public keys\n" + "2. \"keys\" (string, required) A json array of flo addresses or hex-encoded public keys\n" " [\n" - " \"address\" (string) litecoin address or hex-encoded public key\n" + " \"address\" (string) flo address or hex-encoded public key\n" " ...,\n" " ]\n" "3. \"account\" (string, optional) DEPRECATED. An account to assign the addresses to.\n" "\nResult:\n" - "\"address\" (string) A litecoin address associated with the keys.\n" + "\"address\" (string) A flo address associated with the keys.\n" "\nExamples:\n" "\nAdd a multisig address from 2 addresses\n" @@ -1204,7 +1204,7 @@ UniValue addwitnessaddress(const JSONRPCRequest& request) CBitcoinAddress address(request.params[0].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Litecoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid FLO address"); Witnessifier w(pwallet); CTxDestination dest = address.Get(); @@ -1569,7 +1569,7 @@ UniValue listtransactions(const JSONRPCRequest& request) " {\n" " \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. \n" " It will be \"\" for the default account.\n" - " \"address\":\"address\", (string) The litecoin address of the transaction. Not present for \n" + " \"address\":\"address\", (string) The flo 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" @@ -1783,7 +1783,7 @@ UniValue listsinceblock(const JSONRPCRequest& request) "{\n" " \"transactions\": [\n" " \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. Will be \"\" for the default account.\n" - " \"address\":\"address\", (string) The litecoin address of the transaction. Not present for move transactions (category = move).\n" + " \"address\":\"address\", (string) The flo 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" @@ -1925,7 +1925,7 @@ UniValue gettransaction(const JSONRPCRequest& request) " \"details\" : [\n" " {\n" " \"account\" : \"accountname\", (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n" - " \"address\" : \"address\", (string) The litecoin address involved in the transaction\n" + " \"address\" : \"address\", (string) The flo 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" " \"label\" : \"label\", (string) A comment for the address/transaction, if any\n" @@ -2109,7 +2109,7 @@ UniValue walletpassphrase(const JSONRPCRequest& request) throw std::runtime_error( "walletpassphrase \"passphrase\" timeout\n" "\nStores the wallet decryption key in memory for 'timeout' seconds.\n" - "This is needed prior to performing transactions related to private keys such as sending litecoins\n" + "This is needed prior to performing transactions related to private keys such as sending flos\n" "\nArguments:\n" "1. \"passphrase\" (string, required) The wallet passphrase\n" "2. timeout (numeric, required) The time to keep the decryption key in seconds.\n" @@ -2274,7 +2274,7 @@ UniValue encryptwallet(const JSONRPCRequest& request) "\nExamples:\n" "\nEncrypt your wallet\n" + HelpExampleCli("encryptwallet", "\"my pass phrase\"") + - "\nNow set the passphrase to use the wallet, such as for signing or sending litecoin\n" + "\nNow set the passphrase to use the wallet, such as for signing or sending flo\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\"") + "\nNow we can do something like sign\n" + HelpExampleCli("signmessage", "\"address\" \"test message\"") + @@ -2312,7 +2312,7 @@ UniValue encryptwallet(const JSONRPCRequest& request) // slack space in .dat files; that is bad if the old data is // unencrypted private keys. So: StartShutdown(); - return "wallet encrypted; Litecoin server stopping, restart to run with encrypted wallet. The keypool has been flushed and a new HD seed was generated (if you are using HD). You need to make a new backup."; + return "wallet encrypted; FLO server stopping, restart to run with encrypted wallet. The keypool has been flushed and a new HD seed was generated (if you are using HD). You need to make a new backup."; } UniValue lockunspent(const JSONRPCRequest& request) @@ -2328,7 +2328,7 @@ UniValue lockunspent(const JSONRPCRequest& request) "\nUpdates list of temporarily unspendable outputs.\n" "Temporarily lock (unlock=false) or unlock (unlock=true) specified transaction outputs.\n" "If no transaction outputs are specified when unlocking then all current locked transaction outputs are unlocked.\n" - "A locked transaction output will not be chosen by automatic coin selection, when spending litecoins.\n" + "A locked transaction output will not be chosen by automatic coin selection, when spending flos.\n" "Locks are stored in memory only. Nodes start with zero locked outputs, and the locked output list\n" "is always cleared (by virtue of process exit) when a node stops or fails.\n" "Also see the listunspent call\n" @@ -2627,9 +2627,9 @@ UniValue listunspent(const JSONRPCRequest& request) "\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 litecoin addresses to filter\n" + "3. \"addresses\" (string) A json array of flo addresses to filter\n" " [\n" - " \"address\" (string) litecoin address\n" + " \"address\" (string) flo address\n" " ,...\n" " ]\n" "4. include_unsafe (bool, optional, default=true) Include outputs that are not safe to spend\n" @@ -2646,7 +2646,7 @@ UniValue listunspent(const JSONRPCRequest& request) " {\n" " \"txid\" : \"txid\", (string) the transaction id \n" " \"vout\" : n, (numeric) the vout value\n" - " \"address\" : \"address\", (string) the litecoin address\n" + " \"address\" : \"address\", (string) the flo address\n" " \"account\" : \"account\", (string) DEPRECATED. The associated account, or \"\" for the default account\n" " \"scriptPubKey\" : \"key\", (string) the script key\n" " \"amount\" : x.xxx, (numeric) the transaction output amount in " + CURRENCY_UNIT + "\n" @@ -2689,7 +2689,7 @@ UniValue listunspent(const JSONRPCRequest& request) const UniValue& input = inputs[idx]; CBitcoinAddress address(input.get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Litecoin address: ")+input.get_str()); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid FLO address: ")+input.get_str()); if (setAddress.count(address)) throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ")+input.get_str()); setAddress.insert(address); @@ -2793,7 +2793,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) "1. \"hexstring\" (string, required) The hex string of the raw transaction\n" "2. options (object, optional)\n" " {\n" - " \"changeAddress\" (string, optional, default pool address) The litecoin address to receive the change\n" + " \"changeAddress\" (string, optional, default pool address) The flo address to receive the change\n" " \"changePosition\" (numeric, optional, default random) The index of the change output\n" " \"includeWatching\" (boolean, optional, default false) Also select inputs which are watch only\n" " \"lockUnspents\" (boolean, optional, default false) Lock selected unspent outputs\n" @@ -2801,7 +2801,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) " \"subtractFeeFromOutputs\" (array, optional) A json array of integers.\n" " The fee will be equally deducted from the amount of each specified output.\n" " The outputs are specified by their zero-based index, before any change output is added.\n" - " Those recipients will receive less litecoins than you enter in their corresponding amount field.\n" + " Those recipients will receive less flos than you enter in their corresponding amount field.\n" " If no outputs are specified here, the sender pays the fee.\n" " [vout_index,...]\n" " \"replaceable\" (boolean, optional) Marks this transaction as BIP125 replaceable.\n" @@ -2867,7 +2867,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) CBitcoinAddress address(options["changeAddress"].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "changeAddress must be a valid litecoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "changeAddress must be a valid flo address"); coinControl.destChange = address.Get(); }