diff --git a/src/policy/feerate.cpp b/src/policy/feerate.cpp index 660cab2df..6e72d59cf 100644 --- a/src/policy/feerate.cpp +++ b/src/policy/feerate.cpp @@ -7,7 +7,7 @@ #include -const std::string CURRENCY_UNIT = "LTC"; +const std::string CURRENCY_UNIT = "KVA"; CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nBytes_) { diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui index 48b27f94f..80385b948 100644 --- a/src/qt/forms/coincontroldialog.ui +++ b/src/qt/forms/coincontroldialog.ui @@ -132,7 +132,7 @@ Qt::ActionsContextMenu - 0.00 LTC + 0.00 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -212,7 +212,7 @@ Qt::ActionsContextMenu - 0.00 LTC + 0.00 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -257,7 +257,7 @@ Qt::ActionsContextMenu - 0.00 LTC + 0.00 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -292,7 +292,7 @@ Qt::ActionsContextMenu - 0.00 LTC + 0.00 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 70fdfbf16..3446f02aa 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -129,7 +129,7 @@ Unconfirmed transactions to watch-only addresses - 0.000 000 00 LTC + 0.000 000 00 KVA Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -154,7 +154,7 @@ Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance - 0.000 000 00 LTC + 0.000 000 00 KVA Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -179,7 +179,7 @@ Mined balance in watch-only addresses that has not yet matured - 0.000 000 00 LTC + 0.000 000 00 KVA Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -237,7 +237,7 @@ Mined balance that has not yet matured - 0.000 000 00 LTC + 0.000 000 00 KVA Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -282,7 +282,7 @@ Your current total balance - 0.000 000 00 LTC + 0.000 000 00 KVA Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -307,7 +307,7 @@ Current total balance in watch-only addresses - 0.000 000 00 LTC + 0.000 000 00 KVA Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -349,7 +349,7 @@ Your current spendable balance - 0.000 000 00 LTC + 0.000 000 00 KVA Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -374,7 +374,7 @@ Your current balance in watch-only addresses - 0.000 000 00 LTC + 0.000 000 00 KVA Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 1c424a1fe..e1f8f677a 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -324,7 +324,7 @@ Qt::ActionsContextMenu - 0.00 LTC + 0.00 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -404,7 +404,7 @@ Qt::ActionsContextMenu - 0.00 LTC + 0.00 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -455,7 +455,7 @@ Qt::ActionsContextMenu - 0.00 LTC + 0.00 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -484,7 +484,7 @@ Qt::ActionsContextMenu - 0.00 LTC + 0.00 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -1237,7 +1237,7 @@ IBeamCursor - 123.456 LTC + 123.456 KVA Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/qt/test/paymentrequestdata.h b/src/qt/test/paymentrequestdata.h index 8431b940f..191da4590 100644 --- a/src/qt/test/paymentrequestdata.h +++ b/src/qt/test/paymentrequestdata.h @@ -435,7 +435,7 @@ d2hj739GDLz0b5KuJ2SG6VknMRQM976w/m2qlq0ccVGaaZ2zMIGfpzL3p6adwx/5\ "; // -// Payment request with amount overflow (amount is set to 84000001 LTC) +// Payment request with amount overflow (amount is set to 84000001 KVA) // const char* paymentrequest5_cert2_BASE64 = "\ diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 6e8062512..0f1869a25 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -188,6 +188,9 @@ void PaymentServerTests::paymentServerTests() // compares 50001 <= BIP70_MAX_PAYMENTREQUEST_SIZE == false QCOMPARE(PaymentServer::verifySize(tempFile.size()), false); + // TODO: MAX_AMOUNT of Kevacoin is 16 * 84000000 (amount.h) + // Update paymentrequest5_cert2_BASE64 to reflect this difference. +#if 0 // Payment request with amount overflow (amount is set to 21000001 BTC): data = DecodeBase64(paymentrequest5_cert2_BASE64); byteArray = QByteArray((const char*)data.data(), data.size()); @@ -201,6 +204,7 @@ void PaymentServerTests::paymentServerTests() if (ExtractDestination(sendingTo.first, dest)) QCOMPARE(PaymentServer::verifyAmount(sendingTo.second), false); } +#endif delete server; } diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index e6aaa0317..27d2b3a3d 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -73,7 +73,7 @@ void RPCNestedTests::rpcNestedTests() QVERIFY(result == result2); RPCConsole::RPCExecuteCommandLine(result, "getblock(getbestblockhash())[tx][0]", &filtered); - QVERIFY(result == "97ddfbbae6be97fd6cdf3e7ca13232a3afff2353e29badfab7f73011edd4ced9"); + QVERIFY(result == "b21d4680875c0e472b7dbf3dbab2aaeb2dbbb5fa8b154f978b5ea0706d1fd5b9"); QVERIFY(filtered == "getblock(getbestblockhash())[tx][0]"); RPCConsole::RPCParseCommandLine(result, "importprivkey", false, &filtered); diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp index b9ab82453..ae5490a67 100644 --- a/src/test/amount_tests.cpp +++ b/src/test/amount_tests.cpp @@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE(ToStringTest) { CFeeRate feeRate; feeRate = CFeeRate(1); - BOOST_CHECK_EQUAL(feeRate.ToString(), "0.00000001 LTC/kB"); + BOOST_CHECK_EQUAL(feeRate.ToString(), "0.00000001 KVA/kB"); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/validation.cpp b/src/validation.cpp index 5fb43602a..da2591b64 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -993,7 +993,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool // Remove conflicting transactions from the mempool for (const CTxMemPool::txiter it : allConflicting) { - LogPrint(BCLog::MEMPOOL, "replacing tx %s with %s for %s LTC additional fees, %d delta bytes\n", + LogPrint(BCLog::MEMPOOL, "replacing tx %s with %s for %s KVA additional fees, %d delta bytes\n", it->GetTx().GetHash().ToString(), hash.ToString(), FormatMoney(nModifiedFees - nConflictingFees),