Skip to content

Show number of InstantSend locks in Debug Console#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 3 commits into from
May 22, 2019
Merged

Show number of InstantSend locks in Debug Console #2919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61a7be3
Implement GetInstantSendLockCount in CInstantSendManager
codablock May 10, 2019
edd8466
Add islockCountChanged signal to client model
codablock May 10, 2019
a80743e
Show number of InstantSend locks in debug console
codablock May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/llmq/quorums_instantsend.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,28 @@ bool CInstantSendDb::HasArchivedInstantSendLock(const uint256& islockHash)
return db.Exists(std::make_tuple(std::string("is_a2"), islockHash));
}

size_t CInstantSendDb::GetInstantSendLockCount()
{
auto it = std::unique_ptr<CDBIterator>(db.NewIterator());
auto firstKey = std::make_tuple(std::string("is_i"), uint256());

it->Seek(firstKey);

size_t cnt = 0;
Comment thread
UdjinM6 marked this conversation as resolved.
while (it->Valid()) {
decltype(firstKey) curKey;
if (!it->GetKey(curKey) || std::get<0>(curKey) != "is_i") {
break;
}

cnt++;

it->Next();
}

return cnt;
}

CInstantSendLockPtr CInstantSendDb::GetInstantSendLockByHash(const uint256& hash)
{
CInstantSendLockPtr ret;
Expand DownExpand Up@@ -1410,6 +1432,11 @@ CInstantSendLockPtr CInstantSendManager::GetConflictingLock(const CTransaction&
return nullptr;
}

size_t CInstantSendManager::GetInstantSendLockCount()
{
return db.GetInstantSendLockCount();
}

void CInstantSendManager::WorkThreadMain()
{
while (!workInterrupt) {
Expand Down
3 changes: 3 additions & 0 deletions src/llmq/quorums_instantsend.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ class CInstantSendDb
std::unordered_map<uint256, CInstantSendLockPtr> RemoveConfirmedInstantSendLocks(int nUntilHeight);
void RemoveArchivedInstantSendLocks(int nUntilHeight);
bool HasArchivedInstantSendLock(const uint256& islockHash);
size_t GetInstantSendLockCount();

CInstantSendLockPtr GetInstantSendLockByHash(const uint256& hash);
uint256 GetInstantSendLockHashByTxid(const uint256& txid);
Expand DownExpand Up@@ -159,6 +160,8 @@ class CInstantSendManager : public CRecoveredSigsListener
bool AlreadyHave(const CInv& inv);
bool GetInstantSendLockByHash(const uint256& hash, CInstantSendLock& ret);

size_t GetInstantSendLockCount();

void WorkThreadMain();
};

Expand Down
11 changes: 11 additions & 0 deletions src/qt/clientmodel.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
#include "masternode-sync.h"
#include "privatesend.h"

#include "llmq/quorums_instantsend.h"

#include <stdint.h>

#include <QDebug>
Expand DownExpand Up@@ -161,6 +163,14 @@ size_t ClientModel::getMempoolDynamicUsage() const
return mempool.DynamicMemoryUsage();
}

size_t ClientModel::getInstantSentLockCount() const
{
if (!llmq::quorumInstantSendManager) {
return 0;
}
return llmq::quorumInstantSendManager->GetInstantSendLockCount();
}

double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
{
CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
Expand All@@ -177,6 +187,7 @@ void ClientModel::updateTimer()
// no locking required at this point
// the following calls will acquire the required lock
Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
Q_EMIT islockCountChanged(getInstantSentLockCount());
Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
}

Expand Down
3 changes: 3 additions & 0 deletions src/qt/clientmodel.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ class ClientModel : public QObject
long getMempoolSize() const;
//! Return the dynamic memory usage of the mempool
size_t getMempoolDynamicUsage() const;
//! Return number of ISLOCKs
size_t getInstantSentLockCount() const;

void setMasternodeList(const CDeterministicMNList& mnList);
CDeterministicMNList getMasternodeList() const;
Expand DownExpand Up@@ -117,6 +119,7 @@ class ClientModel : public QObject
void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
void additionalDataSyncProgressChanged(double nSyncProgress);
void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
void islockCountChanged(size_t count);
void networkActiveChanged(bool networkActive);
void alertsChanged(const QString &warnings);
void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
Expand Down
14 changes: 14 additions & 0 deletions src/qt/forms/debugwindow.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,20 @@
</property>
</spacer>
</item>
<item row="16" column="0">
<widget class="QLabel" name="labelInstantSendLockCount">
<property name="text">
<string>InstantSend locks</string>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QLabel" name="instantSendLockCount">
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_console">
Expand Down
6 changes: 6 additions & 0 deletions src/qt/rpcconsole.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -563,6 +563,7 @@ void RPCConsole::setClientModel(ClientModel *model)
connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));

connect(model, SIGNAL(mempoolSizeChanged(long,size_t)), this, SLOT(setMempoolSize(long,size_t)));
connect(model, SIGNAL(islockCountChanged(size_t)), this, SLOT(setInstantSendLockCount(size_t)));

// set up peer table
ui->peerWidget->setModel(model->getPeerTableModel());
Expand DownExpand Up@@ -906,6 +907,11 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
ui->mempoolSize->setText(QString::number(dynUsage/1000000.0, 'f', 2) + " MB");
}

void RPCConsole::setInstantSendLockCount(size_t count)
{
ui->instantSendLockCount->setText(QString::number(count));
}

void RPCConsole::on_lineEdit_returnPressed()
{
QString cmd = ui->lineEdit->text();
Expand Down
2 changes: 2 additions & 0 deletions src/qt/rpcconsole.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public Q_SLOTS:
void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
/** Set size (number of transactions and memory usage) of the mempool in the UI */
void setMempoolSize(long numberOfTxs, size_t dynUsage);
/** Set number of InstantSend locks */
void setInstantSendLockCount(size_t count);
/** Go forward or back in history */
void browseHistory(int offset);
/** Scroll console view to end */
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Show number of InstantSend locks in Debug Console by codablock · Pull Request #2919 · dashpay/dash · GitHub
Skip to content
Show number of InstantSend locks in Debug Console#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

UdjinM6
merged 3 commits into

from

May 22, 2019
 Merged


Show number of InstantSend locks in Debug Console
#2919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
61a7be3

Implement GetInstantSendLockCount in CInstantSendManager


codablock May 10, 2019
edd8466

Add islockCountChanged signal to client model


codablock May 10, 2019
a80743e

Show number of InstantSend locks in debug console


codablock May 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 27 additions & 0 deletions
src/llmq/quorums_instantsend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,28 @@ bool CInstantSendDb::HasArchivedInstantSendLock(const uint256& islockHash)
 return db.Exists(std::make_tuple(std::string("is_a2"), islockHash));
}

size_t CInstantSendDb::GetInstantSendLockCount()
{
 auto it = std::unique_ptr<CDBIterator>(db.NewIterator());
 auto firstKey = std::make_tuple(std::string("is_i"), uint256());

 it->Seek(firstKey);

 size_t cnt = 0;
Comment thread
UdjinM6 marked this conversation as resolved.

 while (it->Valid()) {
 decltype(firstKey) curKey;
 if (!it->GetKey(curKey) || std::get<0>(curKey) != "is_i") {
 break;
 }

 cnt++;

 it->Next();
 }

 return cnt;
}

CInstantSendLockPtr CInstantSendDb::GetInstantSendLockByHash(const uint256& hash)
{
 CInstantSendLockPtr ret;
Expand DownExpand Up@@ -1410,6 +1432,11 @@ CInstantSendLockPtr CInstantSendManager::GetConflictingLock(const CTransaction&
 return nullptr;
}

size_t CInstantSendManager::GetInstantSendLockCount()
{
 return db.GetInstantSendLockCount();
}

void CInstantSendManager::WorkThreadMain()
{
 while (!workInterrupt) {
Expand Down

3 changes: 3 additions & 0 deletions
src/llmq/quorums_instantsend.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ class CInstantSendDb
 std::unordered_map<uint256, CInstantSendLockPtr> RemoveConfirmedInstantSendLocks(int nUntilHeight);
 void RemoveArchivedInstantSendLocks(int nUntilHeight);
 bool HasArchivedInstantSendLock(const uint256& islockHash);
 size_t GetInstantSendLockCount();

 CInstantSendLockPtr GetInstantSendLockByHash(const uint256& hash);
 uint256 GetInstantSendLockHashByTxid(const uint256& txid);
Expand DownExpand Up@@ -159,6 +160,8 @@ class CInstantSendManager : public CRecoveredSigsListener
 bool AlreadyHave(const CInv& inv);
 bool GetInstantSendLockByHash(const uint256& hash, CInstantSendLock& ret);

 size_t GetInstantSendLockCount();

 void WorkThreadMain();
};

Expand Down

11 changes: 11 additions & 0 deletions
src/qt/clientmodel.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
#include "masternode-sync.h"
#include "privatesend.h"

#include "llmq/quorums_instantsend.h"

#include <stdint.h>

#include <QDebug>
Expand DownExpand Up@@ -161,6 +163,14 @@ size_t ClientModel::getMempoolDynamicUsage() const
 return mempool.DynamicMemoryUsage();
}

size_t ClientModel::getInstantSentLockCount() const
{
 if (!llmq::quorumInstantSendManager) {
 return 0;
 }
 return llmq::quorumInstantSendManager->GetInstantSendLockCount();
}

double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
{
 CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
Expand All@@ -177,6 +187,7 @@ void ClientModel::updateTimer()
 // no locking required at this point
 // the following calls will acquire the required lock
 Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
 Q_EMIT islockCountChanged(getInstantSentLockCount());
 Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
}

Expand Down

3 changes: 3 additions & 0 deletions
src/qt/clientmodel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ class ClientModel : public QObject
 long getMempoolSize() const;
 //! Return the dynamic memory usage of the mempool
 size_t getMempoolDynamicUsage() const;
 //! Return number of ISLOCKs
 size_t getInstantSentLockCount() const;

 void setMasternodeList(const CDeterministicMNList& mnList);
 CDeterministicMNList getMasternodeList() const;
Expand DownExpand Up@@ -117,6 +119,7 @@ class ClientModel : public QObject
 void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
 void additionalDataSyncProgressChanged(double nSyncProgress);
 void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
 void islockCountChanged(size_t count);
 void networkActiveChanged(bool networkActive);
 void alertsChanged(const QString &warnings);
 void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
Expand Down

14 changes: 14 additions & 0 deletions
src/qt/forms/debugwindow.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,20 @@
 </property>
 </spacer>
 </item>
 <item row="16" column="0">
 <widget class="QLabel" name="labelInstantSendLockCount">
 <property name="text">
 <string>InstantSend locks</string>
 </property>
 </widget>
 </item>
 <item row="16" column="1">
 <widget class="QLabel" name="instantSendLockCount">
 <property name="text">
 <string>N/A</string>
 </property>
 </widget>
 </item>
 </layout>
 </widget>
 <widget class="QWidget" name="tab_console">
Expand Down

6 changes: 6 additions & 0 deletions
src/qt/rpcconsole.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,6 +563,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));

 connect(model, SIGNAL(mempoolSizeChanged(long,size_t)), this, SLOT(setMempoolSize(long,size_t)));
 connect(model, SIGNAL(islockCountChanged(size_t)), this, SLOT(setInstantSendLockCount(size_t)));

 // set up peer table
 ui->peerWidget->setModel(model->getPeerTableModel());
Expand DownExpand Up@@ -906,6 +907,11 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
 ui->mempoolSize->setText(QString::number(dynUsage/1000000.0, 'f', 2) + " MB");
}

void RPCConsole::setInstantSendLockCount(size_t count)
{
 ui->instantSendLockCount->setText(QString::number(count));
}

void RPCConsole::on_lineEdit_returnPressed()
{
 QString cmd = ui->lineEdit->text();
Expand Down

2 changes: 2 additions & 0 deletions
src/qt/rpcconsole.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public Q_SLOTS:
 void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 /** Set size (number of transactions and memory usage) of the mempool in the UI */
 void setMempoolSize(long numberOfTxs, size_t dynUsage);
 /** Set number of InstantSend locks */
 void setInstantSendLockCount(size_t count);
 /** Go forward or back in history */
 void browseHistory(int offset);
 /** Scroll console view to end */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Show number of InstantSend locks in Debug Console by codablock · Pull Request #2919 · dashpay/dash · GitHub
Skip to content
Show number of InstantSend locks in Debug Console#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

UdjinM6
merged 3 commits into

from

May 22, 2019
 Merged


Show number of InstantSend locks in Debug Console
#2919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
61a7be3

Implement GetInstantSendLockCount in CInstantSendManager


codablock May 10, 2019
edd8466

Add islockCountChanged signal to client model


codablock May 10, 2019
a80743e

Show number of InstantSend locks in debug console


codablock May 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 27 additions & 0 deletions
src/llmq/quorums_instantsend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,28 @@ bool CInstantSendDb::HasArchivedInstantSendLock(const uint256& islockHash)
 return db.Exists(std::make_tuple(std::string("is_a2"), islockHash));
}

size_t CInstantSendDb::GetInstantSendLockCount()
{
 auto it = std::unique_ptr<CDBIterator>(db.NewIterator());
 auto firstKey = std::make_tuple(std::string("is_i"), uint256());

 it->Seek(firstKey);

 size_t cnt = 0;
Comment thread
UdjinM6 marked this conversation as resolved.

 while (it->Valid()) {
 decltype(firstKey) curKey;
 if (!it->GetKey(curKey) || std::get<0>(curKey) != "is_i") {
 break;
 }

 cnt++;

 it->Next();
 }

 return cnt;
}

CInstantSendLockPtr CInstantSendDb::GetInstantSendLockByHash(const uint256& hash)
{
 CInstantSendLockPtr ret;
Expand DownExpand Up@@ -1410,6 +1432,11 @@ CInstantSendLockPtr CInstantSendManager::GetConflictingLock(const CTransaction&
 return nullptr;
}

size_t CInstantSendManager::GetInstantSendLockCount()
{
 return db.GetInstantSendLockCount();
}

void CInstantSendManager::WorkThreadMain()
{
 while (!workInterrupt) {
Expand Down

3 changes: 3 additions & 0 deletions
src/llmq/quorums_instantsend.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ class CInstantSendDb
 std::unordered_map<uint256, CInstantSendLockPtr> RemoveConfirmedInstantSendLocks(int nUntilHeight);
 void RemoveArchivedInstantSendLocks(int nUntilHeight);
 bool HasArchivedInstantSendLock(const uint256& islockHash);
 size_t GetInstantSendLockCount();

 CInstantSendLockPtr GetInstantSendLockByHash(const uint256& hash);
 uint256 GetInstantSendLockHashByTxid(const uint256& txid);
Expand DownExpand Up@@ -159,6 +160,8 @@ class CInstantSendManager : public CRecoveredSigsListener
 bool AlreadyHave(const CInv& inv);
 bool GetInstantSendLockByHash(const uint256& hash, CInstantSendLock& ret);

 size_t GetInstantSendLockCount();

 void WorkThreadMain();
};

Expand Down

11 changes: 11 additions & 0 deletions
src/qt/clientmodel.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
#include "masternode-sync.h"
#include "privatesend.h"

#include "llmq/quorums_instantsend.h"

#include <stdint.h>

#include <QDebug>
Expand DownExpand Up@@ -161,6 +163,14 @@ size_t ClientModel::getMempoolDynamicUsage() const
 return mempool.DynamicMemoryUsage();
}

size_t ClientModel::getInstantSentLockCount() const
{
 if (!llmq::quorumInstantSendManager) {
 return 0;
 }
 return llmq::quorumInstantSendManager->GetInstantSendLockCount();
}

double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
{
 CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
Expand All@@ -177,6 +187,7 @@ void ClientModel::updateTimer()
 // no locking required at this point
 // the following calls will acquire the required lock
 Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
 Q_EMIT islockCountChanged(getInstantSentLockCount());
 Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
}

Expand Down

3 changes: 3 additions & 0 deletions
src/qt/clientmodel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ class ClientModel : public QObject
 long getMempoolSize() const;
 //! Return the dynamic memory usage of the mempool
 size_t getMempoolDynamicUsage() const;
 //! Return number of ISLOCKs
 size_t getInstantSentLockCount() const;

 void setMasternodeList(const CDeterministicMNList& mnList);
 CDeterministicMNList getMasternodeList() const;
Expand DownExpand Up@@ -117,6 +119,7 @@ class ClientModel : public QObject
 void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
 void additionalDataSyncProgressChanged(double nSyncProgress);
 void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
 void islockCountChanged(size_t count);
 void networkActiveChanged(bool networkActive);
 void alertsChanged(const QString &warnings);
 void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
Expand Down

14 changes: 14 additions & 0 deletions
src/qt/forms/debugwindow.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,20 @@
 </property>
 </spacer>
 </item>
 <item row="16" column="0">
 <widget class="QLabel" name="labelInstantSendLockCount">
 <property name="text">
 <string>InstantSend locks</string>
 </property>
 </widget>
 </item>
 <item row="16" column="1">
 <widget class="QLabel" name="instantSendLockCount">
 <property name="text">
 <string>N/A</string>
 </property>
 </widget>
 </item>
 </layout>
 </widget>
 <widget class="QWidget" name="tab_console">
Expand Down

6 changes: 6 additions & 0 deletions
src/qt/rpcconsole.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,6 +563,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));

 connect(model, SIGNAL(mempoolSizeChanged(long,size_t)), this, SLOT(setMempoolSize(long,size_t)));
 connect(model, SIGNAL(islockCountChanged(size_t)), this, SLOT(setInstantSendLockCount(size_t)));

 // set up peer table
 ui->peerWidget->setModel(model->getPeerTableModel());
Expand DownExpand Up@@ -906,6 +907,11 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
 ui->mempoolSize->setText(QString::number(dynUsage/1000000.0, 'f', 2) + " MB");
}

void RPCConsole::setInstantSendLockCount(size_t count)
{
 ui->instantSendLockCount->setText(QString::number(count));
}

void RPCConsole::on_lineEdit_returnPressed()
{
 QString cmd = ui->lineEdit->text();
Expand Down

2 changes: 2 additions & 0 deletions
src/qt/rpcconsole.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public Q_SLOTS:
 void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 /** Set size (number of transactions and memory usage) of the mempool in the UI */
 void setMempoolSize(long numberOfTxs, size_t dynUsage);
 /** Set number of InstantSend locks */
 void setInstantSendLockCount(size_t count);
 /** Go forward or back in history */
 void browseHistory(int offset);
 /** Scroll console view to end */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Show number of InstantSend locks in Debug Console by codablock · Pull Request #2919 · dashpay/dash · GitHub
Skip to content
Show number of InstantSend locks in Debug Console#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

UdjinM6
merged 3 commits into

from

May 22, 2019
 Merged


Show number of InstantSend locks in Debug Console
#2919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
61a7be3

Implement GetInstantSendLockCount in CInstantSendManager


codablock May 10, 2019
edd8466

Add islockCountChanged signal to client model


codablock May 10, 2019
a80743e

Show number of InstantSend locks in debug console


codablock May 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 27 additions & 0 deletions
src/llmq/quorums_instantsend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,28 @@ bool CInstantSendDb::HasArchivedInstantSendLock(const uint256& islockHash)
 return db.Exists(std::make_tuple(std::string("is_a2"), islockHash));
}

size_t CInstantSendDb::GetInstantSendLockCount()
{
 auto it = std::unique_ptr<CDBIterator>(db.NewIterator());
 auto firstKey = std::make_tuple(std::string("is_i"), uint256());

 it->Seek(firstKey);

 size_t cnt = 0;
Comment thread
UdjinM6 marked this conversation as resolved.

 while (it->Valid()) {
 decltype(firstKey) curKey;
 if (!it->GetKey(curKey) || std::get<0>(curKey) != "is_i") {
 break;
 }

 cnt++;

 it->Next();
 }

 return cnt;
}

CInstantSendLockPtr CInstantSendDb::GetInstantSendLockByHash(const uint256& hash)
{
 CInstantSendLockPtr ret;
Expand DownExpand Up@@ -1410,6 +1432,11 @@ CInstantSendLockPtr CInstantSendManager::GetConflictingLock(const CTransaction&
 return nullptr;
}

size_t CInstantSendManager::GetInstantSendLockCount()
{
 return db.GetInstantSendLockCount();
}

void CInstantSendManager::WorkThreadMain()
{
 while (!workInterrupt) {
Expand Down

3 changes: 3 additions & 0 deletions
src/llmq/quorums_instantsend.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ class CInstantSendDb
 std::unordered_map<uint256, CInstantSendLockPtr> RemoveConfirmedInstantSendLocks(int nUntilHeight);
 void RemoveArchivedInstantSendLocks(int nUntilHeight);
 bool HasArchivedInstantSendLock(const uint256& islockHash);
 size_t GetInstantSendLockCount();

 CInstantSendLockPtr GetInstantSendLockByHash(const uint256& hash);
 uint256 GetInstantSendLockHashByTxid(const uint256& txid);
Expand DownExpand Up@@ -159,6 +160,8 @@ class CInstantSendManager : public CRecoveredSigsListener
 bool AlreadyHave(const CInv& inv);
 bool GetInstantSendLockByHash(const uint256& hash, CInstantSendLock& ret);

 size_t GetInstantSendLockCount();

 void WorkThreadMain();
};

Expand Down

11 changes: 11 additions & 0 deletions
src/qt/clientmodel.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
#include "masternode-sync.h"
#include "privatesend.h"

#include "llmq/quorums_instantsend.h"

#include <stdint.h>

#include <QDebug>
Expand DownExpand Up@@ -161,6 +163,14 @@ size_t ClientModel::getMempoolDynamicUsage() const
 return mempool.DynamicMemoryUsage();
}

size_t ClientModel::getInstantSentLockCount() const
{
 if (!llmq::quorumInstantSendManager) {
 return 0;
 }
 return llmq::quorumInstantSendManager->GetInstantSendLockCount();
}

double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
{
 CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
Expand All@@ -177,6 +187,7 @@ void ClientModel::updateTimer()
 // no locking required at this point
 // the following calls will acquire the required lock
 Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
 Q_EMIT islockCountChanged(getInstantSentLockCount());
 Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
}

Expand Down

3 changes: 3 additions & 0 deletions
src/qt/clientmodel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ class ClientModel : public QObject
 long getMempoolSize() const;
 //! Return the dynamic memory usage of the mempool
 size_t getMempoolDynamicUsage() const;
 //! Return number of ISLOCKs
 size_t getInstantSentLockCount() const;

 void setMasternodeList(const CDeterministicMNList& mnList);
 CDeterministicMNList getMasternodeList() const;
Expand DownExpand Up@@ -117,6 +119,7 @@ class ClientModel : public QObject
 void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
 void additionalDataSyncProgressChanged(double nSyncProgress);
 void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
 void islockCountChanged(size_t count);
 void networkActiveChanged(bool networkActive);
 void alertsChanged(const QString &warnings);
 void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
Expand Down

14 changes: 14 additions & 0 deletions
src/qt/forms/debugwindow.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,20 @@
 </property>
 </spacer>
 </item>
 <item row="16" column="0">
 <widget class="QLabel" name="labelInstantSendLockCount">
 <property name="text">
 <string>InstantSend locks</string>
 </property>
 </widget>
 </item>
 <item row="16" column="1">
 <widget class="QLabel" name="instantSendLockCount">
 <property name="text">
 <string>N/A</string>
 </property>
 </widget>
 </item>
 </layout>
 </widget>
 <widget class="QWidget" name="tab_console">
Expand Down

6 changes: 6 additions & 0 deletions
src/qt/rpcconsole.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,6 +563,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));

 connect(model, SIGNAL(mempoolSizeChanged(long,size_t)), this, SLOT(setMempoolSize(long,size_t)));
 connect(model, SIGNAL(islockCountChanged(size_t)), this, SLOT(setInstantSendLockCount(size_t)));

 // set up peer table
 ui->peerWidget->setModel(model->getPeerTableModel());
Expand DownExpand Up@@ -906,6 +907,11 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
 ui->mempoolSize->setText(QString::number(dynUsage/1000000.0, 'f', 2) + " MB");
}

void RPCConsole::setInstantSendLockCount(size_t count)
{
 ui->instantSendLockCount->setText(QString::number(count));
}

void RPCConsole::on_lineEdit_returnPressed()
{
 QString cmd = ui->lineEdit->text();
Expand Down

2 changes: 2 additions & 0 deletions
src/qt/rpcconsole.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public Q_SLOTS:
 void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 /** Set size (number of transactions and memory usage) of the mempool in the UI */
 void setMempoolSize(long numberOfTxs, size_t dynUsage);
 /** Set number of InstantSend locks */
 void setInstantSendLockCount(size_t count);
 /** Go forward or back in history */
 void browseHistory(int offset);
 /** Scroll console view to end */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Show number of InstantSend locks in Debug Console by codablock · Pull Request #2919 · dashpay/dash · GitHub
Skip to content
Show number of InstantSend locks in Debug Console#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

UdjinM6
merged 3 commits into

from

May 22, 2019
 Merged


Show number of InstantSend locks in Debug Console
#2919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
61a7be3

Implement GetInstantSendLockCount in CInstantSendManager


codablock May 10, 2019
edd8466

Add islockCountChanged signal to client model


codablock May 10, 2019
a80743e

Show number of InstantSend locks in debug console


codablock May 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 27 additions & 0 deletions
src/llmq/quorums_instantsend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,28 @@ bool CInstantSendDb::HasArchivedInstantSendLock(const uint256& islockHash)
 return db.Exists(std::make_tuple(std::string("is_a2"), islockHash));
}

size_t CInstantSendDb::GetInstantSendLockCount()
{
 auto it = std::unique_ptr<CDBIterator>(db.NewIterator());
 auto firstKey = std::make_tuple(std::string("is_i"), uint256());

 it->Seek(firstKey);

 size_t cnt = 0;
Comment thread
UdjinM6 marked this conversation as resolved.

 while (it->Valid()) {
 decltype(firstKey) curKey;
 if (!it->GetKey(curKey) || std::get<0>(curKey) != "is_i") {
 break;
 }

 cnt++;

 it->Next();
 }

 return cnt;
}

CInstantSendLockPtr CInstantSendDb::GetInstantSendLockByHash(const uint256& hash)
{
 CInstantSendLockPtr ret;
Expand DownExpand Up@@ -1410,6 +1432,11 @@ CInstantSendLockPtr CInstantSendManager::GetConflictingLock(const CTransaction&
 return nullptr;
}

size_t CInstantSendManager::GetInstantSendLockCount()
{
 return db.GetInstantSendLockCount();
}

void CInstantSendManager::WorkThreadMain()
{
 while (!workInterrupt) {
Expand Down

3 changes: 3 additions & 0 deletions
src/llmq/quorums_instantsend.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ class CInstantSendDb
 std::unordered_map<uint256, CInstantSendLockPtr> RemoveConfirmedInstantSendLocks(int nUntilHeight);
 void RemoveArchivedInstantSendLocks(int nUntilHeight);
 bool HasArchivedInstantSendLock(const uint256& islockHash);
 size_t GetInstantSendLockCount();

 CInstantSendLockPtr GetInstantSendLockByHash(const uint256& hash);
 uint256 GetInstantSendLockHashByTxid(const uint256& txid);
Expand DownExpand Up@@ -159,6 +160,8 @@ class CInstantSendManager : public CRecoveredSigsListener
 bool AlreadyHave(const CInv& inv);
 bool GetInstantSendLockByHash(const uint256& hash, CInstantSendLock& ret);

 size_t GetInstantSendLockCount();

 void WorkThreadMain();
};

Expand Down

11 changes: 11 additions & 0 deletions
src/qt/clientmodel.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
#include "masternode-sync.h"
#include "privatesend.h"

#include "llmq/quorums_instantsend.h"

#include <stdint.h>

#include <QDebug>
Expand DownExpand Up@@ -161,6 +163,14 @@ size_t ClientModel::getMempoolDynamicUsage() const
 return mempool.DynamicMemoryUsage();
}

size_t ClientModel::getInstantSentLockCount() const
{
 if (!llmq::quorumInstantSendManager) {
 return 0;
 }
 return llmq::quorumInstantSendManager->GetInstantSendLockCount();
}

double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
{
 CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
Expand All@@ -177,6 +187,7 @@ void ClientModel::updateTimer()
 // no locking required at this point
 // the following calls will acquire the required lock
 Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
 Q_EMIT islockCountChanged(getInstantSentLockCount());
 Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
}

Expand Down

3 changes: 3 additions & 0 deletions
src/qt/clientmodel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ class ClientModel : public QObject
 long getMempoolSize() const;
 //! Return the dynamic memory usage of the mempool
 size_t getMempoolDynamicUsage() const;
 //! Return number of ISLOCKs
 size_t getInstantSentLockCount() const;

 void setMasternodeList(const CDeterministicMNList& mnList);
 CDeterministicMNList getMasternodeList() const;
Expand DownExpand Up@@ -117,6 +119,7 @@ class ClientModel : public QObject
 void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
 void additionalDataSyncProgressChanged(double nSyncProgress);
 void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
 void islockCountChanged(size_t count);
 void networkActiveChanged(bool networkActive);
 void alertsChanged(const QString &warnings);
 void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
Expand Down

14 changes: 14 additions & 0 deletions
src/qt/forms/debugwindow.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,20 @@
 </property>
 </spacer>
 </item>
 <item row="16" column="0">
 <widget class="QLabel" name="labelInstantSendLockCount">
 <property name="text">
 <string>InstantSend locks</string>
 </property>
 </widget>
 </item>
 <item row="16" column="1">
 <widget class="QLabel" name="instantSendLockCount">
 <property name="text">
 <string>N/A</string>
 </property>
 </widget>
 </item>
 </layout>
 </widget>
 <widget class="QWidget" name="tab_console">
Expand Down

6 changes: 6 additions & 0 deletions
src/qt/rpcconsole.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,6 +563,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));

 connect(model, SIGNAL(mempoolSizeChanged(long,size_t)), this, SLOT(setMempoolSize(long,size_t)));
 connect(model, SIGNAL(islockCountChanged(size_t)), this, SLOT(setInstantSendLockCount(size_t)));

 // set up peer table
 ui->peerWidget->setModel(model->getPeerTableModel());
Expand DownExpand Up@@ -906,6 +907,11 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
 ui->mempoolSize->setText(QString::number(dynUsage/1000000.0, 'f', 2) + " MB");
}

void RPCConsole::setInstantSendLockCount(size_t count)
{
 ui->instantSendLockCount->setText(QString::number(count));
}

void RPCConsole::on_lineEdit_returnPressed()
{
 QString cmd = ui->lineEdit->text();
Expand Down

2 changes: 2 additions & 0 deletions
src/qt/rpcconsole.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public Q_SLOTS:
 void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 /** Set size (number of transactions and memory usage) of the mempool in the UI */
 void setMempoolSize(long numberOfTxs, size_t dynUsage);
 /** Set number of InstantSend locks */
 void setInstantSendLockCount(size_t count);
 /** Go forward or back in history */
 void browseHistory(int offset);
 /** Scroll console view to end */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Show number of InstantSend locks in Debug Console by codablock · Pull Request #2919 · dashpay/dash · GitHub
Skip to content
Show number of InstantSend locks in Debug Console#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

UdjinM6
merged 3 commits into

from

May 22, 2019
 Merged


Show number of InstantSend locks in Debug Console
#2919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
61a7be3

Implement GetInstantSendLockCount in CInstantSendManager


codablock May 10, 2019
edd8466

Add islockCountChanged signal to client model


codablock May 10, 2019
a80743e

Show number of InstantSend locks in debug console


codablock May 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 27 additions & 0 deletions
src/llmq/quorums_instantsend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,28 @@ bool CInstantSendDb::HasArchivedInstantSendLock(const uint256& islockHash)
 return db.Exists(std::make_tuple(std::string("is_a2"), islockHash));
}

size_t CInstantSendDb::GetInstantSendLockCount()
{
 auto it = std::unique_ptr<CDBIterator>(db.NewIterator());
 auto firstKey = std::make_tuple(std::string("is_i"), uint256());

 it->Seek(firstKey);

 size_t cnt = 0;
Comment thread
UdjinM6 marked this conversation as resolved.

 while (it->Valid()) {
 decltype(firstKey) curKey;
 if (!it->GetKey(curKey) || std::get<0>(curKey) != "is_i") {
 break;
 }

 cnt++;

 it->Next();
 }

 return cnt;
}

CInstantSendLockPtr CInstantSendDb::GetInstantSendLockByHash(const uint256& hash)
{
 CInstantSendLockPtr ret;
Expand DownExpand Up@@ -1410,6 +1432,11 @@ CInstantSendLockPtr CInstantSendManager::GetConflictingLock(const CTransaction&
 return nullptr;
}

size_t CInstantSendManager::GetInstantSendLockCount()
{
 return db.GetInstantSendLockCount();
}

void CInstantSendManager::WorkThreadMain()
{
 while (!workInterrupt) {
Expand Down

3 changes: 3 additions & 0 deletions
src/llmq/quorums_instantsend.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ class CInstantSendDb
 std::unordered_map<uint256, CInstantSendLockPtr> RemoveConfirmedInstantSendLocks(int nUntilHeight);
 void RemoveArchivedInstantSendLocks(int nUntilHeight);
 bool HasArchivedInstantSendLock(const uint256& islockHash);
 size_t GetInstantSendLockCount();

 CInstantSendLockPtr GetInstantSendLockByHash(const uint256& hash);
 uint256 GetInstantSendLockHashByTxid(const uint256& txid);
Expand DownExpand Up@@ -159,6 +160,8 @@ class CInstantSendManager : public CRecoveredSigsListener
 bool AlreadyHave(const CInv& inv);
 bool GetInstantSendLockByHash(const uint256& hash, CInstantSendLock& ret);

 size_t GetInstantSendLockCount();

 void WorkThreadMain();
};

Expand Down

11 changes: 11 additions & 0 deletions
src/qt/clientmodel.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
#include "masternode-sync.h"
#include "privatesend.h"

#include "llmq/quorums_instantsend.h"

#include <stdint.h>

#include <QDebug>
Expand DownExpand Up@@ -161,6 +163,14 @@ size_t ClientModel::getMempoolDynamicUsage() const
 return mempool.DynamicMemoryUsage();
}

size_t ClientModel::getInstantSentLockCount() const
{
 if (!llmq::quorumInstantSendManager) {
 return 0;
 }
 return llmq::quorumInstantSendManager->GetInstantSendLockCount();
}

double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
{
 CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
Expand All@@ -177,6 +187,7 @@ void ClientModel::updateTimer()
 // no locking required at this point
 // the following calls will acquire the required lock
 Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
 Q_EMIT islockCountChanged(getInstantSentLockCount());
 Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
}

Expand Down

3 changes: 3 additions & 0 deletions
src/qt/clientmodel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ class ClientModel : public QObject
 long getMempoolSize() const;
 //! Return the dynamic memory usage of the mempool
 size_t getMempoolDynamicUsage() const;
 //! Return number of ISLOCKs
 size_t getInstantSentLockCount() const;

 void setMasternodeList(const CDeterministicMNList& mnList);
 CDeterministicMNList getMasternodeList() const;
Expand DownExpand Up@@ -117,6 +119,7 @@ class ClientModel : public QObject
 void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
 void additionalDataSyncProgressChanged(double nSyncProgress);
 void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
 void islockCountChanged(size_t count);
 void networkActiveChanged(bool networkActive);
 void alertsChanged(const QString &warnings);
 void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
Expand Down

14 changes: 14 additions & 0 deletions
src/qt/forms/debugwindow.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,20 @@
 </property>
 </spacer>
 </item>
 <item row="16" column="0">
 <widget class="QLabel" name="labelInstantSendLockCount">
 <property name="text">
 <string>InstantSend locks</string>
 </property>
 </widget>
 </item>
 <item row="16" column="1">
 <widget class="QLabel" name="instantSendLockCount">
 <property name="text">
 <string>N/A</string>
 </property>
 </widget>
 </item>
 </layout>
 </widget>
 <widget class="QWidget" name="tab_console">
Expand Down

6 changes: 6 additions & 0 deletions
src/qt/rpcconsole.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,6 +563,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));

 connect(model, SIGNAL(mempoolSizeChanged(long,size_t)), this, SLOT(setMempoolSize(long,size_t)));
 connect(model, SIGNAL(islockCountChanged(size_t)), this, SLOT(setInstantSendLockCount(size_t)));

 // set up peer table
 ui->peerWidget->setModel(model->getPeerTableModel());
Expand DownExpand Up@@ -906,6 +907,11 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
 ui->mempoolSize->setText(QString::number(dynUsage/1000000.0, 'f', 2) + " MB");
}

void RPCConsole::setInstantSendLockCount(size_t count)
{
 ui->instantSendLockCount->setText(QString::number(count));
}

void RPCConsole::on_lineEdit_returnPressed()
{
 QString cmd = ui->lineEdit->text();
Expand Down

2 changes: 2 additions & 0 deletions
src/qt/rpcconsole.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public Q_SLOTS:
 void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 /** Set size (number of transactions and memory usage) of the mempool in the UI */
 void setMempoolSize(long numberOfTxs, size_t dynUsage);
 /** Set number of InstantSend locks */
 void setInstantSendLockCount(size_t count);
 /** Go forward or back in history */
 void browseHistory(int offset);
 /** Scroll console view to end */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Show number of InstantSend locks in Debug Console by codablock · Pull Request #2919 · dashpay/dash · GitHub
Skip to content
Show number of InstantSend locks in Debug Console#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

UdjinM6
merged 3 commits into

from

May 22, 2019
 Merged


Show number of InstantSend locks in Debug Console
#2919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
61a7be3

Implement GetInstantSendLockCount in CInstantSendManager


codablock May 10, 2019
edd8466

Add islockCountChanged signal to client model


codablock May 10, 2019
a80743e

Show number of InstantSend locks in debug console


codablock May 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 27 additions & 0 deletions
src/llmq/quorums_instantsend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,28 @@ bool CInstantSendDb::HasArchivedInstantSendLock(const uint256& islockHash)
 return db.Exists(std::make_tuple(std::string("is_a2"), islockHash));
}

size_t CInstantSendDb::GetInstantSendLockCount()
{
 auto it = std::unique_ptr<CDBIterator>(db.NewIterator());
 auto firstKey = std::make_tuple(std::string("is_i"), uint256());

 it->Seek(firstKey);

 size_t cnt = 0;
Comment thread
UdjinM6 marked this conversation as resolved.

 while (it->Valid()) {
 decltype(firstKey) curKey;
 if (!it->GetKey(curKey) || std::get<0>(curKey) != "is_i") {
 break;
 }

 cnt++;

 it->Next();
 }

 return cnt;
}

CInstantSendLockPtr CInstantSendDb::GetInstantSendLockByHash(const uint256& hash)
{
 CInstantSendLockPtr ret;
Expand DownExpand Up@@ -1410,6 +1432,11 @@ CInstantSendLockPtr CInstantSendManager::GetConflictingLock(const CTransaction&
 return nullptr;
}

size_t CInstantSendManager::GetInstantSendLockCount()
{
 return db.GetInstantSendLockCount();
}

void CInstantSendManager::WorkThreadMain()
{
 while (!workInterrupt) {
Expand Down

3 changes: 3 additions & 0 deletions
src/llmq/quorums_instantsend.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ class CInstantSendDb
 std::unordered_map<uint256, CInstantSendLockPtr> RemoveConfirmedInstantSendLocks(int nUntilHeight);
 void RemoveArchivedInstantSendLocks(int nUntilHeight);
 bool HasArchivedInstantSendLock(const uint256& islockHash);
 size_t GetInstantSendLockCount();

 CInstantSendLockPtr GetInstantSendLockByHash(const uint256& hash);
 uint256 GetInstantSendLockHashByTxid(const uint256& txid);
Expand DownExpand Up@@ -159,6 +160,8 @@ class CInstantSendManager : public CRecoveredSigsListener
 bool AlreadyHave(const CInv& inv);
 bool GetInstantSendLockByHash(const uint256& hash, CInstantSendLock& ret);

 size_t GetInstantSendLockCount();

 void WorkThreadMain();
};

Expand Down

11 changes: 11 additions & 0 deletions
src/qt/clientmodel.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
#include "masternode-sync.h"
#include "privatesend.h"

#include "llmq/quorums_instantsend.h"

#include <stdint.h>

#include <QDebug>
Expand DownExpand Up@@ -161,6 +163,14 @@ size_t ClientModel::getMempoolDynamicUsage() const
 return mempool.DynamicMemoryUsage();
}

size_t ClientModel::getInstantSentLockCount() const
{
 if (!llmq::quorumInstantSendManager) {
 return 0;
 }
 return llmq::quorumInstantSendManager->GetInstantSendLockCount();
}

double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
{
 CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
Expand All@@ -177,6 +187,7 @@ void ClientModel::updateTimer()
 // no locking required at this point
 // the following calls will acquire the required lock
 Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
 Q_EMIT islockCountChanged(getInstantSentLockCount());
 Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
}

Expand Down

3 changes: 3 additions & 0 deletions
src/qt/clientmodel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ class ClientModel : public QObject
 long getMempoolSize() const;
 //! Return the dynamic memory usage of the mempool
 size_t getMempoolDynamicUsage() const;
 //! Return number of ISLOCKs
 size_t getInstantSentLockCount() const;

 void setMasternodeList(const CDeterministicMNList& mnList);
 CDeterministicMNList getMasternodeList() const;
Expand DownExpand Up@@ -117,6 +119,7 @@ class ClientModel : public QObject
 void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
 void additionalDataSyncProgressChanged(double nSyncProgress);
 void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
 void islockCountChanged(size_t count);
 void networkActiveChanged(bool networkActive);
 void alertsChanged(const QString &warnings);
 void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
Expand Down

14 changes: 14 additions & 0 deletions
src/qt/forms/debugwindow.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,20 @@
 </property>
 </spacer>
 </item>
 <item row="16" column="0">
 <widget class="QLabel" name="labelInstantSendLockCount">
 <property name="text">
 <string>InstantSend locks</string>
 </property>
 </widget>
 </item>
 <item row="16" column="1">
 <widget class="QLabel" name="instantSendLockCount">
 <property name="text">
 <string>N/A</string>
 </property>
 </widget>
 </item>
 </layout>
 </widget>
 <widget class="QWidget" name="tab_console">
Expand Down

6 changes: 6 additions & 0 deletions
src/qt/rpcconsole.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,6 +563,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));

 connect(model, SIGNAL(mempoolSizeChanged(long,size_t)), this, SLOT(setMempoolSize(long,size_t)));
 connect(model, SIGNAL(islockCountChanged(size_t)), this, SLOT(setInstantSendLockCount(size_t)));

 // set up peer table
 ui->peerWidget->setModel(model->getPeerTableModel());
Expand DownExpand Up@@ -906,6 +907,11 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
 ui->mempoolSize->setText(QString::number(dynUsage/1000000.0, 'f', 2) + " MB");
}

void RPCConsole::setInstantSendLockCount(size_t count)
{
 ui->instantSendLockCount->setText(QString::number(count));
}

void RPCConsole::on_lineEdit_returnPressed()
{
 QString cmd = ui->lineEdit->text();
Expand Down

2 changes: 2 additions & 0 deletions
src/qt/rpcconsole.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public Q_SLOTS:
 void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 /** Set size (number of transactions and memory usage) of the mempool in the UI */
 void setMempoolSize(long numberOfTxs, size_t dynUsage);
 /** Set number of InstantSend locks */
 void setInstantSendLockCount(size_t count);
 /** Go forward or back in history */
 void browseHistory(int offset);
 /** Scroll console view to end */
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Show number of InstantSend locks in Debug Console by codablock · Pull Request #2919 · dashpay/dash · GitHub
Skip to content
Show number of InstantSend locks in Debug Console#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

UdjinM6
merged 3 commits into

from

May 22, 2019
 Merged


Show number of InstantSend locks in Debug Console
#2919
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
61a7be3

Implement GetInstantSendLockCount in CInstantSendManager


codablock May 10, 2019
edd8466

Add islockCountChanged signal to client model


codablock May 10, 2019
a80743e

Show number of InstantSend locks in debug console


codablock May 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


27 changes: 27 additions & 0 deletions
src/llmq/quorums_instantsend.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,6 +185,28 @@ bool CInstantSendDb::HasArchivedInstantSendLock(const uint256& islockHash)
 return db.Exists(std::make_tuple(std::string("is_a2"), islockHash));
}

size_t CInstantSendDb::GetInstantSendLockCount()
{
 auto it = std::unique_ptr<CDBIterator>(db.NewIterator());
 auto firstKey = std::make_tuple(std::string("is_i"), uint256());

 it->Seek(firstKey);

 size_t cnt = 0;
Comment thread
UdjinM6 marked this conversation as resolved.

 while (it->Valid()) {
 decltype(firstKey) curKey;
 if (!it->GetKey(curKey) || std::get<0>(curKey) != "is_i") {
 break;
 }

 cnt++;

 it->Next();
 }

 return cnt;
}

CInstantSendLockPtr CInstantSendDb::GetInstantSendLockByHash(const uint256& hash)
{
 CInstantSendLockPtr ret;
Expand DownExpand Up@@ -1410,6 +1432,11 @@ CInstantSendLockPtr CInstantSendManager::GetConflictingLock(const CTransaction&
 return nullptr;
}

size_t CInstantSendManager::GetInstantSendLockCount()
{
 return db.GetInstantSendLockCount();
}

void CInstantSendManager::WorkThreadMain()
{
 while (!workInterrupt) {
Expand Down

3 changes: 3 additions & 0 deletions
src/llmq/quorums_instantsend.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,7 @@ class CInstantSendDb
 std::unordered_map<uint256, CInstantSendLockPtr> RemoveConfirmedInstantSendLocks(int nUntilHeight);
 void RemoveArchivedInstantSendLocks(int nUntilHeight);
 bool HasArchivedInstantSendLock(const uint256& islockHash);
 size_t GetInstantSendLockCount();

 CInstantSendLockPtr GetInstantSendLockByHash(const uint256& hash);
 uint256 GetInstantSendLockHashByTxid(const uint256& txid);
Expand DownExpand Up@@ -159,6 +160,8 @@ class CInstantSendManager : public CRecoveredSigsListener
 bool AlreadyHave(const CInv& inv);
 bool GetInstantSendLockByHash(const uint256& hash, CInstantSendLock& ret);

 size_t GetInstantSendLockCount();

 void WorkThreadMain();
};

Expand Down

11 changes: 11 additions & 0 deletions
src/qt/clientmodel.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,8 @@
#include "masternode-sync.h"
#include "privatesend.h"

#include "llmq/quorums_instantsend.h"

#include <stdint.h>

#include <QDebug>
Expand DownExpand Up@@ -161,6 +163,14 @@ size_t ClientModel::getMempoolDynamicUsage() const
 return mempool.DynamicMemoryUsage();
}

size_t ClientModel::getInstantSentLockCount() const
{
 if (!llmq::quorumInstantSendManager) {
 return 0;
 }
 return llmq::quorumInstantSendManager->GetInstantSendLockCount();
}

double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
{
 CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
Expand All@@ -177,6 +187,7 @@ void ClientModel::updateTimer()
 // no locking required at this point
 // the following calls will acquire the required lock
 Q_EMIT mempoolSizeChanged(getMempoolSize(), getMempoolDynamicUsage());
 Q_EMIT islockCountChanged(getInstantSentLockCount());
 Q_EMIT bytesChanged(getTotalBytesRecv(), getTotalBytesSent());
}

Expand Down

3 changes: 3 additions & 0 deletions
src/qt/clientmodel.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,8 @@ class ClientModel : public QObject
 long getMempoolSize() const;
 //! Return the dynamic memory usage of the mempool
 size_t getMempoolDynamicUsage() const;
 //! Return number of ISLOCKs
 size_t getInstantSentLockCount() const;

 void setMasternodeList(const CDeterministicMNList& mnList);
 CDeterministicMNList getMasternodeList() const;
Expand DownExpand Up@@ -117,6 +119,7 @@ class ClientModel : public QObject
 void numBlocksChanged(int count, const QDateTime& blockDate, double nVerificationProgress, bool header);
 void additionalDataSyncProgressChanged(double nSyncProgress);
 void mempoolSizeChanged(long count, size_t mempoolSizeInBytes);
 void islockCountChanged(size_t count);
 void networkActiveChanged(bool networkActive);
 void alertsChanged(const QString &warnings);
 void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
Expand Down

14 changes: 14 additions & 0 deletions
src/qt/forms/debugwindow.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,20 @@
 </property>
 </spacer>
 </item>
 <item row="16" column="0">
 <widget class="QLabel" name="labelInstantSendLockCount">
 <property name="text">
 <string>InstantSend locks</string>
 </property>
 </widget>
 </item>
 <item row="16" column="1">
 <widget class="QLabel" name="instantSendLockCount">
 <property name="text">
 <string>N/A</string>
 </property>
 </widget>
 </item>
 </layout>
 </widget>
 <widget class="QWidget" name="tab_console">
Expand Down

6 changes: 6 additions & 0 deletions
src/qt/rpcconsole.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,6 +563,7 @@ void RPCConsole::setClientModel(ClientModel *model)
 connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));

 connect(model, SIGNAL(mempoolSizeChanged(long,size_t)), this, SLOT(setMempoolSize(long,size_t)));
 connect(model, SIGNAL(islockCountChanged(size_t)), this, SLOT(setInstantSendLockCount(size_t)));

 // set up peer table
 ui->peerWidget->setModel(model->getPeerTableModel());
Expand DownExpand Up@@ -906,6 +907,11 @@ void RPCConsole::setMempoolSize(long numberOfTxs, size_t dynUsage)
 ui->mempoolSize->setText(QString::number(dynUsage/1000000.0, 'f', 2) + " MB");
}

void RPCConsole::setInstantSendLockCount(size_t count)
{
 ui->instantSendLockCount->setText(QString::number(count));
}

void RPCConsole::on_lineEdit_returnPressed()
{
 QString cmd = ui->lineEdit->text();
Expand Down

2 changes: 2 additions & 0 deletions
src/qt/rpcconsole.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public Q_SLOTS:
 void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
 /** Set size (number of transactions and memory usage) of the mempool in the UI */
 void setMempoolSize(long numberOfTxs, size_t dynUsage);
 /** Set number of InstantSend locks */
 void setInstantSendLockCount(size_t count);
 /** Go forward or back in history */
 void browseHistory(int offset);
 /** Scroll console view to end */
Expand Down