mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 04:22:55 +01:00
Fix more spelling errors
This commit is contained in:
parent
550a702dfe
commit
95f89eec56
@ -127,7 +127,7 @@ Configuring the github-merge tool for the bitcoin repository is done in the foll
|
|||||||
Create and verify timestamps of merge commits
|
Create and verify timestamps of merge commits
|
||||||
---------------------------------------------
|
---------------------------------------------
|
||||||
To create or verify timestamps on the merge commits, install the OpenTimestamps
|
To create or verify timestamps on the merge commits, install the OpenTimestamps
|
||||||
client via `pip3 install opentimestamps-client`. Then, dowload the gpg wrapper
|
client via `pip3 install opentimestamps-client`. Then, download the gpg wrapper
|
||||||
`ots-git-gpg-wrapper.sh` and set it as git's `gpg.program`. See
|
`ots-git-gpg-wrapper.sh` and set it as git's `gpg.program`. See
|
||||||
[the ots git integration documentation](https://github.com/opentimestamps/opentimestamps-client/blob/master/doc/git-integration.md#usage)
|
[the ots git integration documentation](https://github.com/opentimestamps/opentimestamps-client/blob/master/doc/git-integration.md#usage)
|
||||||
for further details.
|
for further details.
|
||||||
|
@ -829,7 +829,7 @@ introduce accidental changes.
|
|||||||
Some good examples of scripted-diff:
|
Some good examples of scripted-diff:
|
||||||
|
|
||||||
- [scripted-diff: Rename InitInterfaces to NodeContext](https://github.com/bitcoin/bitcoin/commit/301bd41a2e6765b185bd55f4c541f9e27aeea29d)
|
- [scripted-diff: Rename InitInterfaces to NodeContext](https://github.com/bitcoin/bitcoin/commit/301bd41a2e6765b185bd55f4c541f9e27aeea29d)
|
||||||
uses an elegant script to replace occurences of multiple terms in all source files.
|
uses an elegant script to replace occurrences of multiple terms in all source files.
|
||||||
|
|
||||||
- [scripted-diff: Remove g_connman, g_banman globals](https://github.com/bitcoin/bitcoin/commit/8922d7f6b751a3e6b3b9f6fb7961c442877fb65a)
|
- [scripted-diff: Remove g_connman, g_banman globals](https://github.com/bitcoin/bitcoin/commit/8922d7f6b751a3e6b3b9f6fb7961c442877fb65a)
|
||||||
replaces specific terms in a list of specific source files.
|
replaces specific terms in a list of specific source files.
|
||||||
|
@ -1697,7 +1697,7 @@ bool CCoinJoinClientSession::CreateDenominated(CAmount nBalanceToDenominate, con
|
|||||||
__func__, (float) it.first / COIN, it.second, (float) nBalanceToDenominate / COIN, txBuilder.ToString());
|
__func__, (float) it.first / COIN, it.second, (float) nBalanceToDenominate / COIN, txBuilder.ToString());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
LogPrint(BCLog::COINJOIN, "CCoinJoinClientSession::%s -- 1 - FINSHED - nDenomValue: %f, count: %d, nBalanceToDenominate: %f, %s\n",
|
LogPrint(BCLog::COINJOIN, "CCoinJoinClientSession::%s -- 1 - FINISHED - nDenomValue: %f, count: %d, nBalanceToDenominate: %f, %s\n",
|
||||||
__func__, (float) it.first / COIN, it.second, (float) nBalanceToDenominate / COIN, txBuilder.ToString());
|
__func__, (float) it.first / COIN, it.second, (float) nBalanceToDenominate / COIN, txBuilder.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -878,7 +878,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
|
|||||||
uint32_t quorumHeight = qc.nHeight - (qc.nHeight % llmq_params.dkgInterval);
|
uint32_t quorumHeight = qc.nHeight - (qc.nHeight % llmq_params.dkgInterval);
|
||||||
auto quorumIndex = pindexPrev->GetAncestor(quorumHeight);
|
auto quorumIndex = pindexPrev->GetAncestor(quorumHeight);
|
||||||
if (!quorumIndex || quorumIndex->GetBlockHash() != qc.commitment.quorumHash) {
|
if (!quorumIndex || quorumIndex->GetBlockHash() != qc.commitment.quorumHash) {
|
||||||
// we should actually never get into this case as validation should have catched it...but lets be sure
|
// we should actually never get into this case as validation should have caught it...but lets be sure
|
||||||
return _state.DoS(100, false, REJECT_INVALID, "bad-qc-quorum-hash");
|
return _state.DoS(100, false, REJECT_INVALID, "bad-qc-quorum-hash");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ private:
|
|||||||
const std::string m_title{};
|
const std::string m_title{};
|
||||||
|
|
||||||
//! Forwarded on to LogPrint if specified - has the effect of only
|
//! Forwarded on to LogPrint if specified - has the effect of only
|
||||||
//! outputing the timing log when a particular debug= category is specified.
|
//! outputting the timing log when a particular debug= category is specified.
|
||||||
const BCLog::LogFlags m_log_category{};
|
const BCLog::LogFlags m_log_category{};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -29,9 +29,9 @@ class CHashSigner
|
|||||||
public:
|
public:
|
||||||
/// Sign the hash, returns true if successful
|
/// Sign the hash, returns true if successful
|
||||||
static bool SignHash(const uint256& hash, const CKey& key, std::vector<unsigned char>& vchSigRet);
|
static bool SignHash(const uint256& hash, const CKey& key, std::vector<unsigned char>& vchSigRet);
|
||||||
/// Verify the hash signature, returns true if succcessful
|
/// Verify the hash signature, returns true if successful
|
||||||
static bool VerifyHash(const uint256& hash, const CPubKey& pubkey, const std::vector<unsigned char>& vchSig, std::string& strErrorRet);
|
static bool VerifyHash(const uint256& hash, const CPubKey& pubkey, const std::vector<unsigned char>& vchSig, std::string& strErrorRet);
|
||||||
/// Verify the hash signature, returns true if succcessful
|
/// Verify the hash signature, returns true if successful
|
||||||
static bool VerifyHash(const uint256& hash, const CKeyID& keyID, const std::vector<unsigned char>& vchSig, std::string& strErrorRet);
|
static bool VerifyHash(const uint256& hash, const CKeyID& keyID, const std::vector<unsigned char>& vchSig, std::string& strErrorRet);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2602,7 +2602,7 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
|
|||||||
|
|
||||||
{
|
{
|
||||||
LOCK(pnode->cs_hSocket);
|
LOCK(pnode->cs_hSocket);
|
||||||
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- succesfully connected to %s, sock=%d, peer=%d\n", __func__, getIpStr(), pnode->hSocket, pnode->GetId());
|
LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- successfully connected to %s, sock=%d, peer=%d\n", __func__, getIpStr(), pnode->hSocket, pnode->GetId());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (grantOutbound)
|
if (grantOutbound)
|
||||||
|
@ -82,7 +82,7 @@ private:
|
|||||||
std::vector<double> txCtAvg;
|
std::vector<double> txCtAvg;
|
||||||
|
|
||||||
// Count the total # of txs confirmed within Y blocks in each bucket
|
// Count the total # of txs confirmed within Y blocks in each bucket
|
||||||
// Track the historical moving average of theses totals over blocks
|
// Track the historical moving average of these totals over blocks
|
||||||
std::vector<std::vector<double>> confAvg; // confAvg[Y][X]
|
std::vector<std::vector<double>> confAvg; // confAvg[Y][X]
|
||||||
|
|
||||||
// Track moving avg of txs which have been evicted from the mempool
|
// Track moving avg of txs which have been evicted from the mempool
|
||||||
|
@ -504,7 +504,7 @@ void BitcoinApplication::initializeResult(bool success)
|
|||||||
}
|
}
|
||||||
Q_EMIT splashFinished(window);
|
Q_EMIT splashFinished(window);
|
||||||
|
|
||||||
// Let the users setup their prefered appearance if there are no settings for it defined yet.
|
// Let the users setup their preferred appearance if there are no settings for it defined yet.
|
||||||
GUIUtil::setupAppearance(window, clientModel->getOptionsModel());
|
GUIUtil::setupAppearance(window, clientModel->getOptionsModel());
|
||||||
|
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
|
@ -1411,7 +1411,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</string>
|
<string>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockchain files or missing/obsolete transactions.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -22,9 +22,9 @@ static const bool DEFAULT_SPLASHSCREEN = true;
|
|||||||
|
|
||||||
/** Defines the half in RGB space, basically a grey in the middle between black and white */
|
/** Defines the half in RGB space, basically a grey in the middle between black and white */
|
||||||
#define RGB_HALF 0x7f7f7f
|
#define RGB_HALF 0x7f7f7f
|
||||||
/** Path to the icon ressource folder */
|
/** Path to the icon resource folder */
|
||||||
#define ICONS_PATH ":icons/"
|
#define ICONS_PATH ":icons/"
|
||||||
/** Path to the movies ressource folder */
|
/** Path to the movies resource folder */
|
||||||
#define MOVIES_PATH ":movies/"
|
#define MOVIES_PATH ":movies/"
|
||||||
|
|
||||||
/* Tooltips longer than this (in characters) are converted into rich text,
|
/* Tooltips longer than this (in characters) are converted into rich text,
|
||||||
|
@ -1544,7 +1544,7 @@ void updateFonts()
|
|||||||
<< ", removed items: mapWidgetDefaultFontSizes/mapFontUpdates(" << nRemovedDefaultFonts << "/" << nRemovedFontUpdates << ")";
|
<< ", removed items: mapWidgetDefaultFontSizes/mapFontUpdates(" << nRemovedDefaultFonts << "/" << nRemovedFontUpdates << ")";
|
||||||
|
|
||||||
// Perform the required font updates
|
// Perform the required font updates
|
||||||
// NOTE: This is done as seperate step to avoid scaling issues due to font inheritance
|
// NOTE: This is done as separate step to avoid scaling issues due to font inheritance
|
||||||
// hence all fonts are calculated and stored in mapWidgetFonts above.
|
// hence all fonts are calculated and stored in mapWidgetFonts above.
|
||||||
for (auto it : mapWidgetFonts) {
|
for (auto it : mapWidgetFonts) {
|
||||||
it.first->setFont(it.second);
|
it.first->setFont(it.second);
|
||||||
|
@ -83,7 +83,7 @@ namespace GUIUtil
|
|||||||
TS_ERROR,
|
TS_ERROR,
|
||||||
/* Failed operation text style */
|
/* Failed operation text style */
|
||||||
TS_SUCCESS,
|
TS_SUCCESS,
|
||||||
/* Comand text style */
|
/* Command text style */
|
||||||
TS_COMMAND,
|
TS_COMMAND,
|
||||||
/* General text styles */
|
/* General text styles */
|
||||||
TS_PRIMARY,
|
TS_PRIMARY,
|
||||||
|
@ -1176,7 +1176,7 @@ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /*
|
|||||||
background-position: center;
|
background-position: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::seperator {
|
QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::separator {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw
|
|||||||
pixPaint.setFont(fontBold);
|
pixPaint.setFont(fontBold);
|
||||||
fm = pixPaint.fontMetrics();
|
fm = pixPaint.fontMetrics();
|
||||||
int titleAddTextWidth = fm.width(titleAddText);
|
int titleAddTextWidth = fm.width(titleAddText);
|
||||||
// Draw the badge backround with the network-specific color
|
// Draw the badge background with the network-specific color
|
||||||
QRect badgeRect = QRect(width - titleAddTextWidth - 20, 5, width, fm.height() + 10);
|
QRect badgeRect = QRect(width - titleAddTextWidth - 20, 5, width, fm.height() + 10);
|
||||||
QColor badgeColor = networkStyle->getBadgeColor();
|
QColor badgeColor = networkStyle->getBadgeColor();
|
||||||
pixPaint.fillRect(badgeRect, badgeColor);
|
pixPaint.fillRect(badgeRect, badgeColor);
|
||||||
|
@ -82,10 +82,10 @@ static UniValue getpeerinfo(const JSONRPCRequest& request)
|
|||||||
" \"addrlocal\":\"ip:port\", (string) Local address as reported by the peer\n"
|
" \"addrlocal\":\"ip:port\", (string) Local address as reported by the peer\n"
|
||||||
" \"mapped_as\":\"mapped_as\", (string) The AS in the BGP route to the peer used for diversifying peer selection\n"
|
" \"mapped_as\":\"mapped_as\", (string) The AS in the BGP route to the peer used for diversifying peer selection\n"
|
||||||
" \"services\":\"xxxxxxxxxxxxxxxx\", (string) The services offered\n"
|
" \"services\":\"xxxxxxxxxxxxxxxx\", (string) The services offered\n"
|
||||||
" \"verified_proregtx_hash\": h, (hex) Only present when the peer is a masternode and succesfully\n"
|
" \"verified_proregtx_hash\": h, (hex) Only present when the peer is a masternode and successfully\n"
|
||||||
" authenticated via MNAUTH. In this case, this field contains the\n"
|
" authenticated via MNAUTH. In this case, this field contains the\n"
|
||||||
" protx hash of the masternode\n"
|
" protx hash of the masternode\n"
|
||||||
" \"verified_pubkey_hash\": h, (hex) Only present when the peer is a masternode and succesfully\n"
|
" \"verified_pubkey_hash\": h, (hex) Only present when the peer is a masternode and successfully\n"
|
||||||
" authenticated via MNAUTH. In this case, this field contains the\n"
|
" authenticated via MNAUTH. In this case, this field contains the\n"
|
||||||
" hash of the masternode's operator public key\n"
|
" hash of the masternode's operator public key\n"
|
||||||
" \"relaytxes\":true|false, (boolean) Whether peer has asked us to relay transactions to it\n"
|
" \"relaytxes\":true|false, (boolean) Whether peer has asked us to relay transactions to it\n"
|
||||||
|
@ -882,11 +882,11 @@ static void protx_list_help()
|
|||||||
"If \"height\" is not specified, it defaults to the current chain-tip.\n"
|
"If \"height\" is not specified, it defaults to the current chain-tip.\n"
|
||||||
"\nAvailable types:\n"
|
"\nAvailable types:\n"
|
||||||
" registered - List all ProTx which are registered at the given chain height.\n"
|
" registered - List all ProTx which are registered at the given chain height.\n"
|
||||||
" This will also include ProTx which failed PoSe verfication.\n"
|
" This will also include ProTx which failed PoSe verification.\n"
|
||||||
" valid - List only ProTx which are active/valid at the given chain height.\n"
|
" valid - List only ProTx which are active/valid at the given chain height.\n"
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
" wallet - List only ProTx which are found in your wallet at the given chain height.\n"
|
" wallet - List only ProTx which are found in your wallet at the given chain height.\n"
|
||||||
" This will also include ProTx which failed PoSe verfication.\n"
|
" This will also include ProTx which failed PoSe verification.\n"
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -676,7 +676,7 @@
|
|||||||
["0 0x02 0x0000 0", "CHECKMULTISIGVERIFY 1", "", "OK"],
|
["0 0x02 0x0000 0", "CHECKMULTISIGVERIFY 1", "", "OK"],
|
||||||
|
|
||||||
["While not really correctly DER encoded, the empty signature is allowed by"],
|
["While not really correctly DER encoded, the empty signature is allowed by"],
|
||||||
["STRICTENC to provide a compact way to provide a delibrately invalid signature."],
|
["STRICTENC to provide a compact way to provide a deliberately invalid signature."],
|
||||||
["0", "0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 CHECKSIG NOT", "STRICTENC", "OK"],
|
["0", "0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 CHECKSIG NOT", "STRICTENC", "OK"],
|
||||||
["0 0", "1 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 1 CHECKMULTISIG NOT", "STRICTENC", "OK"],
|
["0 0", "1 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 1 CHECKMULTISIG NOT", "STRICTENC", "OK"],
|
||||||
|
|
||||||
@ -1208,7 +1208,7 @@
|
|||||||
"0x09 0x300702010102020001 0",
|
"0x09 0x300702010102020001 0",
|
||||||
"0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG",
|
"0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIG",
|
||||||
"P2SH,STRICTENC,NULLFAIL,DIP0020_OPCODES",
|
"P2SH,STRICTENC,NULLFAIL,DIP0020_OPCODES",
|
||||||
"SIG_DER", "Non cannonical DER encoding"
|
"SIG_DER", "Non canonical DER encoding"
|
||||||
],
|
],
|
||||||
|
|
||||||
["CHECKDATASIGVERIFY"],
|
["CHECKDATASIGVERIFY"],
|
||||||
@ -1244,7 +1244,7 @@
|
|||||||
"0x09 0x300702010102020001 0",
|
"0x09 0x300702010102020001 0",
|
||||||
"0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
|
"0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 CHECKDATASIGVERIFY 1",
|
||||||
"P2SH,STRICTENC,NULLFAIL,DIP0020_OPCODES",
|
"P2SH,STRICTENC,NULLFAIL,DIP0020_OPCODES",
|
||||||
"SIG_DER", "Non cannonical DER encoding"
|
"SIG_DER", "Non canonical DER encoding"
|
||||||
],
|
],
|
||||||
|
|
||||||
["ADD"],
|
["ADD"],
|
||||||
|
@ -1122,7 +1122,7 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
|
|||||||
thr.join();
|
thr.join();
|
||||||
BOOST_CHECK_EQUAL(threadresult, true);
|
BOOST_CHECK_EQUAL(threadresult, true);
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
// Try to aquire lock in child process while we're holding it, this should fail.
|
// Try to acquire lock in child process while we're holding it, this should fail.
|
||||||
char ch;
|
char ch;
|
||||||
BOOST_CHECK_EQUAL(write(fd[1], &LockCommand, 1), 1);
|
BOOST_CHECK_EQUAL(write(fd[1], &LockCommand, 1), 1);
|
||||||
BOOST_CHECK_EQUAL(read(fd[1], &ch, 1), 1);
|
BOOST_CHECK_EQUAL(read(fd[1], &ch, 1), 1);
|
||||||
@ -1133,7 +1133,7 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
|
|||||||
// Probing lock from our side now should succeed, but not hold on to the lock.
|
// Probing lock from our side now should succeed, but not hold on to the lock.
|
||||||
BOOST_CHECK_EQUAL(LockDirectory(dirname, lockname, true), true);
|
BOOST_CHECK_EQUAL(LockDirectory(dirname, lockname, true), true);
|
||||||
|
|
||||||
// Try to acquire the lock in the child process, this should be succesful.
|
// Try to acquire the lock in the child process, this should be successful.
|
||||||
BOOST_CHECK_EQUAL(write(fd[1], &LockCommand, 1), 1);
|
BOOST_CHECK_EQUAL(write(fd[1], &LockCommand, 1), 1);
|
||||||
BOOST_CHECK_EQUAL(read(fd[1], &ch, 1), 1);
|
BOOST_CHECK_EQUAL(read(fd[1], &ch, 1), 1);
|
||||||
BOOST_CHECK_EQUAL((bool)ch, true);
|
BOOST_CHECK_EQUAL((bool)ch, true);
|
||||||
|
@ -414,7 +414,7 @@ public:
|
|||||||
TorController(struct event_base* base, const std::string& target);
|
TorController(struct event_base* base, const std::string& target);
|
||||||
~TorController();
|
~TorController();
|
||||||
|
|
||||||
/** Get name fo file to store private key in */
|
/** Get name for file to store private key in */
|
||||||
fs::path GetPrivateKeyFile();
|
fs::path GetPrivateKeyFile();
|
||||||
|
|
||||||
/** Reconnect, after getting disconnected */
|
/** Reconnect, after getting disconnected */
|
||||||
|
@ -748,7 +748,7 @@ public:
|
|||||||
* determine if that transaction has not yet been visited during the current
|
* determine if that transaction has not yet been visited during the current
|
||||||
* traversal's epoch.
|
* traversal's epoch.
|
||||||
* Algorithms using std::set can be replaced on a one by one basis.
|
* Algorithms using std::set can be replaced on a one by one basis.
|
||||||
* Both techniques are not fundamentally incomaptible across the codebase.
|
* Both techniques are not fundamentally incompatible across the codebase.
|
||||||
* Generally speaking, however, the remaining use of std::set for mempool
|
* Generally speaking, however, the remaining use of std::set for mempool
|
||||||
* traversal should be viewed as a TODO for replacement with an epoch based
|
* traversal should be viewed as a TODO for replacement with an epoch based
|
||||||
* traversal, rather than a preference for std::set over epochs in that
|
* traversal, rather than a preference for std::set over epochs in that
|
||||||
|
@ -523,7 +523,7 @@ UniValue importwallet(const JSONRPCRequest& request)
|
|||||||
file.seekg(0, file.beg);
|
file.seekg(0, file.beg);
|
||||||
|
|
||||||
// Use uiInterface.ShowProgress instead of pwallet.ShowProgress because pwallet.ShowProgress has a cancel button tied to AbortRescan which
|
// Use uiInterface.ShowProgress instead of pwallet.ShowProgress because pwallet.ShowProgress has a cancel button tied to AbortRescan which
|
||||||
// we don't want for this progress bar shoing the import progress. uiInterface.ShowProgress does not have a cancel button.
|
// we don't want for this progress bar showing the import progress. uiInterface.ShowProgress does not have a cancel button.
|
||||||
uiInterface.ShowProgress(strprintf("%s " + _("Importing..."), pwallet->GetDisplayName()), 0, false); // show progress dialog in GUI
|
uiInterface.ShowProgress(strprintf("%s " + _("Importing..."), pwallet->GetDisplayName()), 0, false); // show progress dialog in GUI
|
||||||
while (file.good()) {
|
while (file.good()) {
|
||||||
uiInterface.ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100))), false);
|
uiInterface.ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100))), false);
|
||||||
|
@ -1870,7 +1870,7 @@ static UniValue listtransactions(const JSONRPCRequest& request)
|
|||||||
" 'send' category of transactions.\n"
|
" 'send' category of transactions.\n"
|
||||||
" \"confirmations\": n, (numeric) The number of blockchain confirmations for the transaction. Available for 'send' and \n"
|
" \"confirmations\": n, (numeric) The number of blockchain confirmations for the transaction. Available for 'send' and \n"
|
||||||
" 'receive' category of transactions. Negative confirmations indicate the\n"
|
" 'receive' category of transactions. Negative confirmations indicate the\n"
|
||||||
" transation conflicts with the block chain\n"
|
" transaction conflicts with the block chain\n"
|
||||||
" \"instantlock\" : true|false, (bool) Current transaction lock state. Available for 'send' and 'receive' category of transactions\n"
|
" \"instantlock\" : true|false, (bool) Current transaction lock state. Available for 'send' and 'receive' category of transactions\n"
|
||||||
" \"instantlock_internal\" : true|false, (bool) Current internal transaction lock state. Available for 'send' and 'receive' category of transactions\n"
|
" \"instantlock_internal\" : true|false, (bool) Current internal transaction lock state. Available for 'send' and 'receive' category of transactions\n"
|
||||||
" \"chainlock\" : true|false, (bool) The state of the corresponding block chainlock\n"
|
" \"chainlock\" : true|false, (bool) The state of the corresponding block chainlock\n"
|
||||||
@ -1925,7 +1925,7 @@ static UniValue listtransactions(const JSONRPCRequest& request)
|
|||||||
" 'send' category of transactions.\n"
|
" 'send' category of transactions.\n"
|
||||||
" \"confirmations\": n, (numeric) The number of blockchain confirmations for the transaction. Available for 'send' and \n"
|
" \"confirmations\": n, (numeric) The number of blockchain confirmations for the transaction. Available for 'send' and \n"
|
||||||
" 'receive' category of transactions. Negative confirmations indicate the\n"
|
" 'receive' category of transactions. Negative confirmations indicate the\n"
|
||||||
" transation conflicts with the block chain\n"
|
" transaction conflicts with the block chain\n"
|
||||||
" \"instantlock\" : true|false, (bool) Current transaction lock state. Available for 'send' and 'receive' category of transactions\n"
|
" \"instantlock\" : true|false, (bool) Current transaction lock state. Available for 'send' and 'receive' category of transactions\n"
|
||||||
" \"instantlock_internal\" : true|false, (bool) Current internal transaction lock state. Available for 'send' and 'receive' category of transactions\n"
|
" \"instantlock_internal\" : true|false, (bool) Current internal transaction lock state. Available for 'send' and 'receive' category of transactions\n"
|
||||||
" \"chainlock\" : true|false, (bool) The state of the corresponding block chainlock\n"
|
" \"chainlock\" : true|false, (bool) The state of the corresponding block chainlock\n"
|
||||||
|
@ -42,7 +42,7 @@ std::string GetWarnings(const std::string& strFor)
|
|||||||
{
|
{
|
||||||
std::string strStatusBar;
|
std::string strStatusBar;
|
||||||
std::string strGUI;
|
std::string strGUI;
|
||||||
const std::string uiAlertSeperator = "<hr />";
|
const std::string uiAlertSeparator = "<hr />";
|
||||||
|
|
||||||
LOCK(cs_warnings);
|
LOCK(cs_warnings);
|
||||||
|
|
||||||
@ -55,18 +55,18 @@ std::string GetWarnings(const std::string& strFor)
|
|||||||
if (strMiscWarning != "")
|
if (strMiscWarning != "")
|
||||||
{
|
{
|
||||||
strStatusBar = strMiscWarning;
|
strStatusBar = strMiscWarning;
|
||||||
strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
|
strGUI += (strGUI.empty() ? "" : uiAlertSeparator) + strMiscWarning;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fLargeWorkForkFound)
|
if (fLargeWorkForkFound)
|
||||||
{
|
{
|
||||||
strStatusBar = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
|
strStatusBar = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
|
||||||
strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
|
strGUI += (strGUI.empty() ? "" : uiAlertSeparator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
|
||||||
}
|
}
|
||||||
else if (fLargeWorkInvalidChainFound)
|
else if (fLargeWorkInvalidChainFound)
|
||||||
{
|
{
|
||||||
strStatusBar = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
|
strStatusBar = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.";
|
||||||
strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
|
strGUI += (strGUI.empty() ? "" : uiAlertSeparator) + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strFor == "gui")
|
if (strFor == "gui")
|
||||||
|
@ -109,7 +109,7 @@ class InvalidTxRequestTest(BitcoinTestFramework):
|
|||||||
def test_orphan_tx_handling(self, base_tx, resolve_via_block):
|
def test_orphan_tx_handling(self, base_tx, resolve_via_block):
|
||||||
node = self.nodes[0] # convenience reference to the node
|
node = self.nodes[0] # convenience reference to the node
|
||||||
|
|
||||||
# Create a root transaction that we withold until all dependent transactions
|
# Create a root transaction that we withhold until all dependent transactions
|
||||||
# are sent out and in the orphan cache
|
# are sent out and in the orphan cache
|
||||||
SCRIPT_PUB_KEY_OP_TRUE = b'\x51\x75' * 15 + b'\x51'
|
SCRIPT_PUB_KEY_OP_TRUE = b'\x51\x75' * 15 + b'\x51'
|
||||||
tx_withhold = CTransaction()
|
tx_withhold = CTransaction()
|
||||||
|
@ -137,7 +137,6 @@ class WalletUpgradeToHDTest(BitcoinTestFramework):
|
|||||||
|
|
||||||
self.log.info("Same mnemonic, same mnemonic passphrase, encrypt wallet on upgrade, should recover all coins after rescan")
|
self.log.info("Same mnemonic, same mnemonic passphrase, encrypt wallet on upgrade, should recover all coins after rescan")
|
||||||
walletpass = "111pass222"
|
walletpass = "111pass222"
|
||||||
# Upgrading and encrypting at the saame time results in a warning
|
|
||||||
assert node.upgradetohd(mnemonic, "", walletpass)
|
assert node.upgradetohd(mnemonic, "", walletpass)
|
||||||
node.stop()
|
node.stop()
|
||||||
node.wait_until_stopped()
|
node.wait_until_stopped()
|
||||||
|
Loading…
Reference in New Issue
Block a user