From ec8c5a23c3da3b489f5d0c18200e8b876aab0723 Mon Sep 17 00:00:00 2001
From: 8bitcoder <8bitcoder@users.noreply.guthub.com>
Date: Mon, 20 Jun 2016 11:43:59 +0200
Subject: [PATCH 1/5] Qt: MYR to XMY
---
src/qt/bitcoinunits.cpp | 14 +++++++-------
src/qt/forms/overviewpage.ui | 16 ++++++++--------
src/qt/forms/sendcoinsdialog.ui | 10 +++++-----
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index 45a0319e..27d52d9b 100644
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -45,11 +45,11 @@ QString BitcoinUnits::name(int unit)
{
switch(unit)
{
- case MBTC: return QString("MMYR");
- case kBTC: return QString("kMYR");
- case BTC: return QString("MYR");
- case mBTC: return QString("mMYR");
- case uBTC: return QString::fromUtf8("μMYR");
+ case MBTC: return QString("MXMY");
+ case kBTC: return QString("kXMY");
+ case BTC: return QString("XMY");
+ case mBTC: return QString("mXMY");
+ case uBTC: return QString::fromUtf8("μXMY");
default: return QString("???");
}
}
@@ -61,8 +61,8 @@ QString BitcoinUnits::description(int unit)
case MBTC: return QString("Mega-Myriad (1,000,000)");
case kBTC: return QString("Kilo-Myriad (1,000)");
case BTC: return QString("Myriad");
- case mBTC: return QString("Milli-Bitcoins (1 / 1" THIN_SP_UTF8 "000)");
- case uBTC: return QString("Micro-Bitcoins (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
+ case mBTC: return QString("Milli-Myriad (1 / 1" THIN_SP_UTF8 "000)");
+ case uBTC: return QString("Micro-Myriad (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
default: return QString("???");
}
}
diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index c21f4b3a..1d70217a 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -126,7 +126,7 @@
Unconfirmed transactions to watch-only addresses
- 0.000 000 00 MYR
+ 0.000 000 00 XMY
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -151,7 +151,7 @@
Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance
- 0.000 000 00 MYR
+ 0.000 000 00 XMY
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -176,7 +176,7 @@
Mined balance in watch-only addresses that has not yet matured
- 0.000 000 00 MYR
+ 0.000 000 00 XMY
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -234,7 +234,7 @@
Mined balance that has not yet matured
- 0.000 000 00 MYR
+ 0.000 000 00 XMY
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -279,7 +279,7 @@
Your current total balance
- 0.000 000 00 MYR
+ 0.000 000 00 XMY
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -304,7 +304,7 @@
Current total balance in watch-only addresses
- 0.000 000 00 MYR
+ 0.000 000 00 XMY
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -346,7 +346,7 @@
Your current spendable balance
- 0.000 000 00 MYR
+ 0.000 000 00 XMY
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -371,7 +371,7 @@
Your current balance in watch-only addresses
- 0.000 000 00 MYR
+ 0.000 000 00 XMY
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index f4c8b048..b5833414 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -324,7 +324,7 @@
Qt::ActionsContextMenu
- 0.00 MYR
+ 0.00 XMY
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
@@ -404,7 +404,7 @@
Qt::ActionsContextMenu
- 0.00 MYR
+ 0.00 XMY
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
@@ -484,7 +484,7 @@
Qt::ActionsContextMenu
- 0.00 MYR
+ 0.00 XMY
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
@@ -513,7 +513,7 @@
Qt::ActionsContextMenu
- 0.00 MYR
+ 0.00 XMY
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
@@ -1352,7 +1352,7 @@
IBeamCursor
- 123.456 MYR
+ 123.456 XMY
Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
From 4c9f77db3a44a2dfc7bd134f4514f536a44966a1 Mon Sep 17 00:00:00 2001
From: 8bitcoder <8bitcoder@users.noreply.guthub.com>
Date: Mon, 20 Jun 2016 11:47:07 +0200
Subject: [PATCH 2/5] daemon: MYR to XMY
---
src/amount.cpp | 2 +-
src/init.cpp | 6 +++---
src/rpcblockchain.cpp | 4 ++--
src/rpcmisc.cpp | 4 ++--
src/rpcrawtransaction.cpp | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/amount.cpp b/src/amount.cpp
index 061de357..d4e7ef83 100644
--- a/src/amount.cpp
+++ b/src/amount.cpp
@@ -27,5 +27,5 @@ CAmount CFeeRate::GetFee(size_t nSize) const
std::string CFeeRate::ToString() const
{
- return strprintf("%d.%08d MYR/kB", nSatoshisPerK / COIN, nSatoshisPerK % COIN);
+ return strprintf("%d.%08d XMY/kB", nSatoshisPerK / COIN, nSatoshisPerK % COIN);
}
diff --git a/src/init.cpp b/src/init.cpp
index 0f4f8d28..6d759024 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -339,9 +339,9 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls"));
strUsage += HelpMessageOpt("-keypool=", strprintf(_("Set key pool size to (default: %u)"), 100));
if (showDebug)
- strUsage += HelpMessageOpt("-mintxfee=", strprintf("Fees (in MYR/Kb) smaller than this are considered zero fee for transaction creation (default: %s)",
+ strUsage += HelpMessageOpt("-mintxfee=", strprintf("Fees (in XMY/Kb) smaller than this are considered zero fee for transaction creation (default: %s)",
FormatMoney(CWallet::minTxFee.GetFeePerK())));
- strUsage += HelpMessageOpt("-paytxfee=", strprintf(_("Fee (in MYR/kB) to add to transactions you send (default: %s)"), FormatMoney(payTxFee.GetFeePerK())));
+ strUsage += HelpMessageOpt("-paytxfee=", strprintf(_("Fee (in XMY/kB) to add to transactions you send (default: %s)"), FormatMoney(payTxFee.GetFeePerK())));
strUsage += HelpMessageOpt("-rescan", _("Rescan the block chain for missing wallet transactions") + " " + _("on startup"));
strUsage += HelpMessageOpt("-salvagewallet", _("Attempt to recover private keys from a corrupt wallet.dat") + " " + _("on startup"));
strUsage += HelpMessageOpt("-sendfreetransactions", strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), 0));
@@ -388,7 +388,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-relaypriority", strprintf("Require high priority for relaying free or low-fee transactions (default: %u)", 1));
strUsage += HelpMessageOpt("-maxsigcachesize=", strprintf("Limit size of signature cache to entries (default: %u)", 50000));
}
- strUsage += HelpMessageOpt("-minrelaytxfee=", strprintf(_("Fees (in MYR/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK())));
+ strUsage += HelpMessageOpt("-minrelaytxfee=", strprintf(_("Fees (in XMY/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK())));
strUsage += HelpMessageOpt("-printtoconsole", _("Send trace/debug info to console instead of debug.log file"));
if (showDebug)
{
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index e1f38335..8a1b9102 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 MYR\n"
+ " \"fee\" : n, (numeric) transaction fee in XMY\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,7 +421,7 @@ 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 XMY\n"
" \"scriptPubKey\" : { (json object)\n"
" \"asm\" : \"code\", (string) \n"
" \"hex\" : \"hex\", (string) \n"
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index bebf79a3..43ae0ab6 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -67,8 +67,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 XMY/kb\n"
+ " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in XMY/kb\n"
" \"errors\": \"...\" (string) any error messages\n"
"}\n"
"\nExamples:\n"
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index 6204ad4e..188c0284 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -389,7 +389,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 myriad address, the value is the MYR amount\n"
+ " \"address\": x.xxx (numeric, required) The key is the myriad address, the value is the XMY amount\n"
" ,...\n"
" }\n"
From ebaaf40b488230ec58e405fa4aa9e8d2f9d859eb Mon Sep 17 00:00:00 2001
From: 8bitcoder <8bitcoder@users.noreply.guthub.com>
Date: Mon, 20 Jun 2016 11:51:40 +0200
Subject: [PATCH 3/5] rpc wallet: MYR to XMY
---
src/wallet/rpcwallet.cpp | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 331faaf2..0b2ff1dc 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -391,7 +391,7 @@ Value sendtoaddress(const Array& params, bool fHelp)
+ HelpRequiringPassphrase() +
"\nArguments:\n"
"1. \"myriadaddress\" (string, required) The myriad address to send to.\n"
- "2. \"amount\" (numeric, required) The amount in MYR to send. eg 0.1\n"
+ "2. \"amount\" (numeric, required) The amount in XMY 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"
"4. \"comment-to\" (string, optional) A comment to store the name of the person or organization \n"
@@ -451,7 +451,7 @@ Value listaddressgroupings(const Array& params, bool fHelp)
" [\n"
" [\n"
" \"myriadaddress\", (string) The myriad address\n"
- " amount, (numeric) The amount in MYR\n"
+ " amount, (numeric) The amount in XMY\n"
" \"account\" (string, optional) The account (DEPRECATED)\n"
" ]\n"
" ,...\n"
@@ -555,7 +555,7 @@ Value getreceivedbyaddress(const Array& params, bool fHelp)
"1. \"myriadaddress\" (string, required) The myriad 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 MYR received at this address.\n"
+ "amount (numeric) The total amount in XMY received at this address.\n"
"\nExamples:\n"
"\nThe amount from transactions with at least 1 confirmation\n"
+ HelpExampleCli("getreceivedbyaddress", "\"MJPyMHUJiQpwM5ZkzKXDo5UPYTNh5yJ9Vf\"") +
@@ -613,7 +613,7 @@ Value getreceivedbyaccount(const Array& params, bool fHelp)
"1. \"account\" (string, required) The selected account, may be the default account using \"\".\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 MYR received for this account.\n"
+ "amount (numeric) The total amount in XMY received for this account.\n"
"\nExamples:\n"
"\nAmount received by the default account with at least 1 confirmation\n"
+ HelpExampleCli("getreceivedbyaccount", "\"\"") +
@@ -706,7 +706,7 @@ Value getbalance(const Array& params, bool fHelp)
"2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
"3. includeWatchonly (bool, optional, default=false) Also include balance in watchonly addresses (see 'importaddress')\n"
"\nResult:\n"
- "amount (numeric) The total amount in MYR received for this account.\n"
+ "amount (numeric) The total amount in XMY received for this account.\n"
"\nExamples:\n"
"\nThe total amount in the wallet\n"
+ HelpExampleCli("getbalance", "") +
@@ -797,9 +797,9 @@ Value movecmd(const Array& params, bool fHelp)
"\nResult:\n"
"true|false (boolean) true if successful.\n"
"\nExamples:\n"
- "\nMove 0.01 MYR from the default account to the account named tabby\n"
+ "\nMove 0.01 XMY from the default account to the account named tabby\n"
+ HelpExampleCli("move", "\"\" \"tabby\" 0.01") +
- "\nMove 0.01 MYR timotei to akiko with a comment and funds have 6 confirmations\n"
+ "\nMove 0.01 XMY timotei to akiko with a comment and funds have 6 confirmations\n"
+ HelpExampleCli("move", "\"timotei\" \"akiko\" 0.01 6 \"happy birthday!\"") +
"\nAs a json rpc call\n"
+ HelpExampleRpc("move", "\"timotei\", \"akiko\", 0.01, 6, \"happy birthday!\"")
@@ -864,7 +864,7 @@ Value sendfrom(const Array& params, bool fHelp)
"\nArguments:\n"
"1. \"fromaccount\" (string, required) The name of the account to send funds from. May be the default account using \"\".\n"
"2. \"tomyriadaddress\" (string, required) The myriad address to send funds to.\n"
- "3. amount (numeric, required) The amount in MYR. (transaction fee is added on top).\n"
+ "3. amount (numeric, required) The amount in XMY. (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"
" This is not part of the transaction, just kept in your wallet.\n"
@@ -874,7 +874,7 @@ Value sendfrom(const Array& params, bool fHelp)
"\nResult:\n"
"\"transactionid\" (string) The transaction id.\n"
"\nExamples:\n"
- "\nSend 0.01 MYR from the default account to the address, must have at least 1 confirmation\n"
+ "\nSend 0.01 XMY from the default account to the address, must have at least 1 confirmation\n"
+ HelpExampleCli("sendfrom", "\"\" \"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.01") +
"\nSend 0.01 from the tabby account to the given address, funds must have at least 6 confirmations\n"
+ HelpExampleCli("sendfrom", "\"tabby\" \"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.01 6 \"donation\" \"seans outpost\"") +
@@ -927,7 +927,7 @@ Value sendmany(const Array& params, bool fHelp)
"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) The myriad address is the key, the numeric amount in MYR is the value\n"
+ " \"address\":amount (numeric) The myriad address is the key, the numeric amount in XMY is the value\n"
" ,...\n"
" }\n"
"3. minconf (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n"
@@ -1223,7 +1223,7 @@ Value listreceivedbyaddress(const Array& params, bool fHelp)
" \"involvesWatchonly\" : true, (bool) Only returned if imported addresses were involved in transaction\n"
" \"address\" : \"receivingaddress\", (string) The receiving address\n"
" \"account\" : \"accountname\", (string) DEPRECATED. The account of the receiving address. The default account is \"\".\n"
- " \"amount\" : x.xxx, (numeric) The total amount in MYR received by the address\n"
+ " \"amount\" : x.xxx, (numeric) The total amount in XMY received by the address\n"
" \"confirmations\" : n (numeric) The number of confirmations of the most recent transaction included\n"
" }\n"
" ,...\n"
@@ -1395,11 +1395,11 @@ Value listtransactions(const Array& params, bool fHelp)
" transaction between accounts, and not associated with an address,\n"
" transaction id or block. 'send' and 'receive' transactions are \n"
" associated with an address, transaction id and block details\n"
- " \"amount\": x.xxx, (numeric) The amount in MYR. This is negative for the 'send' category, and for the\n"
+ " \"amount\": x.xxx, (numeric) The amount in XMY. This is negative for the 'send' category, and for the\n"
" 'move' category for moves outbound. It is positive for the 'receive' category,\n"
" and for the 'move' category for inbound funds.\n"
" \"vout\" : n, (numeric) the vout value\n"
- " \"fee\": x.xxx, (numeric) The amount of the fee in MYR. This is negative and only available for the \n"
+ " \"fee\": x.xxx, (numeric) The amount of the fee in XMY. This is negative and only available for the \n"
" 'send' category of transactions.\n"
" \"confirmations\": n, (numeric) The number of confirmations for the transaction. Available for 'send' and \n"
" 'receive' category of transactions.\n"
@@ -1583,10 +1583,10 @@ Value listsinceblock(const Array& params, bool fHelp)
" \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. Will be \"\" for the default account.\n"
" \"address\":\"myriadaddress\", (string) The myriad 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 MYR. This is negative for the 'send' category, and for the 'move' category for moves \n"
+ " \"amount\": x.xxx, (numeric) The amount in XMY. 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"
" \"vout\" : n, (numeric) the vout value\n"
- " \"fee\": x.xxx, (numeric) The amount of the fee in MYR. This is negative and only available for the 'send' category of transactions.\n"
+ " \"fee\": x.xxx, (numeric) The amount of the fee in XMY. This is negative and only available for the 'send' category of transactions.\n"
" \"confirmations\": n, (numeric) The number of confirmations for the transaction. Available for 'send' and 'receive' category of transactions.\n"
" \"blockhash\": \"hashvalue\", (string) The block hash containing the transaction. Available for 'send' and 'receive' category of transactions.\n"
" \"blockindex\": n, (numeric) The block index containing the transaction. Available for 'send' and 'receive' category of transactions.\n"
@@ -1669,7 +1669,7 @@ Value gettransaction(const Array& params, bool fHelp)
"2. \"includeWatchonly\" (bool, optional, default=false) Whether to include watchonly addresses in balance calculation and details[]\n"
"\nResult:\n"
"{\n"
- " \"amount\" : x.xxx, (numeric) The transaction amount in MYR\n"
+ " \"amount\" : x.xxx, (numeric) The transaction amount in XMY\n"
" \"confirmations\" : n, (numeric) The number of confirmations\n"
" \"blockhash\" : \"hash\", (string) The block hash\n"
" \"blockindex\" : xx, (numeric) The block index\n"
@@ -1682,7 +1682,7 @@ Value gettransaction(const Array& params, bool fHelp)
" \"account\" : \"accountname\", (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n"
" \"address\" : \"myriadaddress\", (string) The myriad address involved in the transaction\n"
" \"category\" : \"send|receive\", (string) The category, either 'send' or 'receive'\n"
- " \"amount\" : x.xxx (numeric) The amount in MYR\n"
+ " \"amount\" : x.xxx (numeric) The amount in XMY\n"
" \"vout\" : n, (numeric) the vout value\n"
" }\n"
" ,...\n"
@@ -2261,7 +2261,7 @@ Value listunspent(const Array& params, bool fHelp)
" \"address\" : \"address\", (string) the myriad 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 amount in MYR\n"
+ " \"amount\" : x.xxx, (numeric) the transaction amount in XMY\n"
" \"confirmations\" : n (numeric) The number of confirmations\n"
" }\n"
" ,...\n"
From 6d246ce6471c82b0afecb47befdf631de3a3d6c9 Mon Sep 17 00:00:00 2001
From: 8bitcoder <8bitcoder@users.noreply.github.com>
Date: Tue, 21 Jun 2016 07:32:25 +0200
Subject: [PATCH 4/5] Add mman lib dependency under mingw for Yescrypt
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index 72d67e52..d6906edc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,6 +211,7 @@ case $host in
AC_CHECK_LIB([shlwapi], [main],, AC_MSG_ERROR(lib missing))
AC_CHECK_LIB([iphlpapi], [main],, AC_MSG_ERROR(lib missing))
AC_CHECK_LIB([crypt32], [main],, AC_MSG_ERROR(lib missing))
+ AC_CHECK_LIB([mman], [main],, AC_MSG_ERROR(lib missing))
# -static is interpreted by libtool, where it has a different meaning.
# In libtool-speak, it's -all-static.
From 685d8dd971690bdc0ef8333c988419ae2a040038 Mon Sep 17 00:00:00 2001
From: 8bitcoder <8bitcoder@users.noreply.github.com>
Date: Tue, 21 Jun 2016 07:37:10 +0200
Subject: [PATCH 5/5] Testnet algo switch
---
src/chainparams.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 236e5eb2..8c3944eb 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -212,6 +212,7 @@ public:
consensus.nBlockAlgoNormalisedWorkDecayStart1 = 0; // block where weight decay starts
consensus.nBlockAlgoNormalisedWorkDecayStart2 = 0; // block where weight decay starts
consensus.nGeoAvgWork_Start = 150;
+ consensus.nAlgoSwitchBlock1 = 100;
pchMessageStart[0] = 0x01;
pchMessageStart[1] = 0xf5;