Also consider txindex for transactions in AlreadyHave() - #3126

Merged
UdjinM6 merged 1 commit into
dashpay:developfrom
codablock:pr_alreadyhave_optimizations
Oct 1, 2019
Merged

Also consider txindex for transactions in AlreadyHave()#3126
UdjinM6 merged 1 commit into
dashpay:developfrom
codablock:pr_alreadyhave_optimizations

Conversation

@codablock

@codablockcodablock commented Sep 30, 2019

Copy link
Copy Markdown

This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.

This also avoids TXs going into the orphan map even though they were already mined.

@codablockcodablock added this to the 14.1 milestone Sep 30, 2019
UdjinM6
UdjinM6 reviewed Sep 30, 2019
View reviewed changes
Comment threadsrc/net_processing.cpp Outdated
@codablock
Also consider txindex for transactions in AlreadyHave()
82b81d8
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
@codablock
codablockforce-pushed the pr_alreadyhave_optimizations branch from d0eb676 to 82b81d8CompareSeptember 30, 2019 13:32
UdjinM6
UdjinM6 approved these changes Sep 30, 2019
View reviewed changes

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

PastaPastaPasta
PastaPastaPasta requested changes Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.cpp
return WriteBatch(batch, true);
}

bool CBlockTreeDB::HasTxIndex(const uint256& txid) {

@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the { down to the next line)

PastaPastaPasta
PastaPastaPasta reviewed Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.h
bool ReadLastBlockFile(int &nFile);
bool WriteReindexing(bool fReindex);
bool ReadReindexing(bool &fReindex);
bool HasTxIndex(const uint256 &txid);

@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I understand you are replicating surrounding code, but according to clang, it should be:

Suggested change
boolHasTxIndex(constuint256&txid);
boolHasTxIndex(constuint256&txid);

nmarley
nmarley approved these changes Oct 1, 2019
View reviewed changes

@nmarleynmarley left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6

UdjinM6 commented Oct 1, 2019

Copy link
Copy Markdown

After some discussion on Slack I'm leaning towards merging it as is in this specific case.

@UdjinM6
UdjinM6 merged commit b4aefb5 into dashpay:developOct 1, 2019
@codablock
codablock deleted the pr_alreadyhave_optimizations branch November 18, 2019 14:33
codablock added a commit to codablock/dash that referenced this pull request Nov 19, 2019
@codablock
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
0031d6b
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
MIPPL pushed a commit to biblepay/biblepay that referenced this pull request Nov 24, 2019
MIPPL
Merge Dash master 0.14.0.4 into Biblepay develop
25d33a4
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits)
[v0.14.0.x] Update release notes with change log (dashpay#3213)
[v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203)
Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100)
Fix compile issues
Merge bitcoin#11397: net: Improve and document SOCKS code
Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184)
Update activemn if protx info changed (dashpay#3176)
Actually update spent index on DisconnectBlock (dashpay#3167)
Only track last seen time instead of first and last seen time (dashpay#3165)
Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161)
Simulate BlockConnected/BlockDisconnected for PS caches
Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144)
Various fixes for mixing queues (dashpay#3138)
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
Ignore recent rejects filter for locked txes (dashpay#3124)
Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121)
Update/modernize macOS plist (dashpay#3074)
Fix bip69 vs change position issue (dashpay#3063)
Partially revert 3061 (dashpay#3150)
Fix SelectCoinsMinConf to allow instant respends (dashpay#3061)
...
# Conflicts:
#	configure.ac
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/release-notes.md
#	src/clientversion.h
#	src/wallet/wallet.cpp
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PastaPastaPastaPastaPastaPastaPastaPastaPasta requested changes
@UdjinM6UdjinM6UdjinM6 approved these changes
+1 more reviewer
@nmarleynmarleynmarley approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@nmarley@PastaPastaPasta
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Also consider txindex for transactions in AlreadyHave() - #3126
Merged
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Oct 1, 2019
Merged
Also consider txindex for transactions in AlreadyHave()#3126
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Conversation
@codablock
@codablockcodablock
commented
Sep 30, 2019

Copy link


Copy Markdown

This avoids many false negatives where TXs are announced to us which are

already mined and then were spent later.
This also avoids TXs going into the orphan map even though they were already mined.
@codablockcodablock
added this to the 14.1 milestone
Sep 30, 2019
UdjinM6
UdjinM6
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/net_processing.cpp
Outdated

@codablock
Also consider txindex for transactions in AlreadyHave()
82b81d8
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
@codablock
codablockforce-pushed
the
pr_alreadyhave_optimizations
branch
from
d0eb676 to
82b81d8CompareSeptember 30, 2019 13:32
UdjinM6
UdjinM6
approved these changes
Sep 30, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
PastaPastaPasta
PastaPastaPasta
requested changes
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.cpp
 return WriteBatch(batch, true);
}

bool CBlockTreeDB::HasTxIndex(const uint256& txid) {
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the { down to the next line)
PastaPastaPasta
PastaPastaPasta
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.h
 bool ReadLastBlockFile(int &nFile);
 bool WriteReindexing(bool fReindex);
 bool ReadReindexing(bool &fReindex);
 bool HasTxIndex(const uint256 &txid);
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I understand you are replicating surrounding code, but according to clang, it should be:

Suggested change

boolHasTxIndex(constuint256&txid);
boolHasTxIndex(constuint256&txid);
nmarley
nmarley
approved these changes
Oct 1, 2019
View reviewed changes
@nmarleynmarley
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
@UdjinM6
UdjinM6
commented
Oct 1, 2019

Copy link


Copy Markdown

After some discussion on Slack I'm leaning towards merging it as is in this specific case.
@UdjinM6
UdjinM6
merged commit b4aefb5
into
dashpay:developOct 1, 2019
@codablock
codablock
deleted the

pr_alreadyhave_optimizations

branch
November 18, 2019 14:33
codablock added a commit
to codablock/dash
that referenced
this pull request
Nov 19, 2019
@codablock
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
0031d6b
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Nov 24, 2019
MIPPL
Merge Dash master 0.14.0.4 into Biblepay develop
25d33a4
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits)
[v0.14.0.x] Update release notes with change log (dashpay#3213)
[v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203)
Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100)
Fix compile issues
Merge bitcoin#11397: net: Improve and document SOCKS code
Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184)
Update activemn if protx info changed (dashpay#3176)
Actually update spent index on DisconnectBlock (dashpay#3167)
Only track last seen time instead of first and last seen time (dashpay#3165)
Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161)
Simulate BlockConnected/BlockDisconnected for PS caches
Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144)
Various fixes for mixing queues (dashpay#3138)
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
Ignore recent rejects filter for locked txes (dashpay#3124)
Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121)
Update/modernize macOS plist (dashpay#3074)
Fix bip69 vs change position issue (dashpay#3063)
Partially revert 3061 (dashpay#3150)
Fix SelectCoinsMinConf to allow instant respends (dashpay#3061)
...
# Conflicts:
#	configure.ac
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/release-notes.md
#	src/clientversion.h
#	src/wallet/wallet.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@PastaPastaPastaPastaPastaPastaPastaPastaPasta requested changes
@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

@nmarleynmarleynmarley approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@nmarley@PastaPastaPasta

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

Skip to content
Also consider txindex for transactions in AlreadyHave() - #3126
Merged
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Oct 1, 2019
Merged
Also consider txindex for transactions in AlreadyHave()#3126
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Conversation
@codablock
@codablockcodablock
commented
Sep 30, 2019

Copy link


Copy Markdown

This avoids many false negatives where TXs are announced to us which are

already mined and then were spent later.
This also avoids TXs going into the orphan map even though they were already mined.
@codablockcodablock
added this to the 14.1 milestone
Sep 30, 2019
UdjinM6
UdjinM6
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/net_processing.cpp
Outdated

@codablock
Also consider txindex for transactions in AlreadyHave()
82b81d8
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
@codablock
codablockforce-pushed
the
pr_alreadyhave_optimizations
branch
from
d0eb676 to
82b81d8CompareSeptember 30, 2019 13:32
UdjinM6
UdjinM6
approved these changes
Sep 30, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
PastaPastaPasta
PastaPastaPasta
requested changes
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.cpp
 return WriteBatch(batch, true);
}

bool CBlockTreeDB::HasTxIndex(const uint256& txid) {
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the { down to the next line)
PastaPastaPasta
PastaPastaPasta
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.h
 bool ReadLastBlockFile(int &nFile);
 bool WriteReindexing(bool fReindex);
 bool ReadReindexing(bool &fReindex);
 bool HasTxIndex(const uint256 &txid);
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I understand you are replicating surrounding code, but according to clang, it should be:

Suggested change

boolHasTxIndex(constuint256&txid);
boolHasTxIndex(constuint256&txid);
nmarley
nmarley
approved these changes
Oct 1, 2019
View reviewed changes
@nmarleynmarley
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
@UdjinM6
UdjinM6
commented
Oct 1, 2019

Copy link


Copy Markdown

After some discussion on Slack I'm leaning towards merging it as is in this specific case.
@UdjinM6
UdjinM6
merged commit b4aefb5
into
dashpay:developOct 1, 2019
@codablock
codablock
deleted the

pr_alreadyhave_optimizations

branch
November 18, 2019 14:33
codablock added a commit
to codablock/dash
that referenced
this pull request
Nov 19, 2019
@codablock
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
0031d6b
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Nov 24, 2019
MIPPL
Merge Dash master 0.14.0.4 into Biblepay develop
25d33a4
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits)
[v0.14.0.x] Update release notes with change log (dashpay#3213)
[v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203)
Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100)
Fix compile issues
Merge bitcoin#11397: net: Improve and document SOCKS code
Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184)
Update activemn if protx info changed (dashpay#3176)
Actually update spent index on DisconnectBlock (dashpay#3167)
Only track last seen time instead of first and last seen time (dashpay#3165)
Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161)
Simulate BlockConnected/BlockDisconnected for PS caches
Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144)
Various fixes for mixing queues (dashpay#3138)
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
Ignore recent rejects filter for locked txes (dashpay#3124)
Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121)
Update/modernize macOS plist (dashpay#3074)
Fix bip69 vs change position issue (dashpay#3063)
Partially revert 3061 (dashpay#3150)
Fix SelectCoinsMinConf to allow instant respends (dashpay#3061)
...
# Conflicts:
#	configure.ac
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/release-notes.md
#	src/clientversion.h
#	src/wallet/wallet.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@PastaPastaPastaPastaPastaPastaPastaPastaPasta requested changes
@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

@nmarleynmarleynmarley approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@nmarley@PastaPastaPasta

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

Skip to content
Also consider txindex for transactions in AlreadyHave() - #3126
Merged
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Oct 1, 2019
Merged
Also consider txindex for transactions in AlreadyHave()#3126
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Conversation
@codablock
@codablockcodablock
commented
Sep 30, 2019

Copy link


Copy Markdown

This avoids many false negatives where TXs are announced to us which are

already mined and then were spent later.
This also avoids TXs going into the orphan map even though they were already mined.
@codablockcodablock
added this to the 14.1 milestone
Sep 30, 2019
UdjinM6
UdjinM6
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/net_processing.cpp
Outdated

@codablock
Also consider txindex for transactions in AlreadyHave()
82b81d8
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
@codablock
codablockforce-pushed
the
pr_alreadyhave_optimizations
branch
from
d0eb676 to
82b81d8CompareSeptember 30, 2019 13:32
UdjinM6
UdjinM6
approved these changes
Sep 30, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
PastaPastaPasta
PastaPastaPasta
requested changes
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.cpp
 return WriteBatch(batch, true);
}

bool CBlockTreeDB::HasTxIndex(const uint256& txid) {
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the { down to the next line)
PastaPastaPasta
PastaPastaPasta
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.h
 bool ReadLastBlockFile(int &nFile);
 bool WriteReindexing(bool fReindex);
 bool ReadReindexing(bool &fReindex);
 bool HasTxIndex(const uint256 &txid);
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I understand you are replicating surrounding code, but according to clang, it should be:

Suggested change

boolHasTxIndex(constuint256&txid);
boolHasTxIndex(constuint256&txid);
nmarley
nmarley
approved these changes
Oct 1, 2019
View reviewed changes
@nmarleynmarley
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
@UdjinM6
UdjinM6
commented
Oct 1, 2019

Copy link


Copy Markdown

After some discussion on Slack I'm leaning towards merging it as is in this specific case.
@UdjinM6
UdjinM6
merged commit b4aefb5
into
dashpay:developOct 1, 2019
@codablock
codablock
deleted the

pr_alreadyhave_optimizations

branch
November 18, 2019 14:33
codablock added a commit
to codablock/dash
that referenced
this pull request
Nov 19, 2019
@codablock
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
0031d6b
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Nov 24, 2019
MIPPL
Merge Dash master 0.14.0.4 into Biblepay develop
25d33a4
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits)
[v0.14.0.x] Update release notes with change log (dashpay#3213)
[v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203)
Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100)
Fix compile issues
Merge bitcoin#11397: net: Improve and document SOCKS code
Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184)
Update activemn if protx info changed (dashpay#3176)
Actually update spent index on DisconnectBlock (dashpay#3167)
Only track last seen time instead of first and last seen time (dashpay#3165)
Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161)
Simulate BlockConnected/BlockDisconnected for PS caches
Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144)
Various fixes for mixing queues (dashpay#3138)
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
Ignore recent rejects filter for locked txes (dashpay#3124)
Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121)
Update/modernize macOS plist (dashpay#3074)
Fix bip69 vs change position issue (dashpay#3063)
Partially revert 3061 (dashpay#3150)
Fix SelectCoinsMinConf to allow instant respends (dashpay#3061)
...
# Conflicts:
#	configure.ac
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/release-notes.md
#	src/clientversion.h
#	src/wallet/wallet.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@PastaPastaPastaPastaPastaPastaPastaPastaPasta requested changes
@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

@nmarleynmarleynmarley approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@nmarley@PastaPastaPasta

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

Skip to content
Also consider txindex for transactions in AlreadyHave() - #3126
Merged
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Oct 1, 2019
Merged
Also consider txindex for transactions in AlreadyHave()#3126
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Conversation
@codablock
@codablockcodablock
commented
Sep 30, 2019

Copy link


Copy Markdown

This avoids many false negatives where TXs are announced to us which are

already mined and then were spent later.
This also avoids TXs going into the orphan map even though they were already mined.
@codablockcodablock
added this to the 14.1 milestone
Sep 30, 2019
UdjinM6
UdjinM6
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/net_processing.cpp
Outdated

@codablock
Also consider txindex for transactions in AlreadyHave()
82b81d8
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
@codablock
codablockforce-pushed
the
pr_alreadyhave_optimizations
branch
from
d0eb676 to
82b81d8CompareSeptember 30, 2019 13:32
UdjinM6
UdjinM6
approved these changes
Sep 30, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
PastaPastaPasta
PastaPastaPasta
requested changes
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.cpp
 return WriteBatch(batch, true);
}

bool CBlockTreeDB::HasTxIndex(const uint256& txid) {
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the { down to the next line)
PastaPastaPasta
PastaPastaPasta
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.h
 bool ReadLastBlockFile(int &nFile);
 bool WriteReindexing(bool fReindex);
 bool ReadReindexing(bool &fReindex);
 bool HasTxIndex(const uint256 &txid);
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I understand you are replicating surrounding code, but according to clang, it should be:

Suggested change

boolHasTxIndex(constuint256&txid);
boolHasTxIndex(constuint256&txid);
nmarley
nmarley
approved these changes
Oct 1, 2019
View reviewed changes
@nmarleynmarley
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
@UdjinM6
UdjinM6
commented
Oct 1, 2019

Copy link


Copy Markdown

After some discussion on Slack I'm leaning towards merging it as is in this specific case.
@UdjinM6
UdjinM6
merged commit b4aefb5
into
dashpay:developOct 1, 2019
@codablock
codablock
deleted the

pr_alreadyhave_optimizations

branch
November 18, 2019 14:33
codablock added a commit
to codablock/dash
that referenced
this pull request
Nov 19, 2019
@codablock
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
0031d6b
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Nov 24, 2019
MIPPL
Merge Dash master 0.14.0.4 into Biblepay develop
25d33a4
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits)
[v0.14.0.x] Update release notes with change log (dashpay#3213)
[v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203)
Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100)
Fix compile issues
Merge bitcoin#11397: net: Improve and document SOCKS code
Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184)
Update activemn if protx info changed (dashpay#3176)
Actually update spent index on DisconnectBlock (dashpay#3167)
Only track last seen time instead of first and last seen time (dashpay#3165)
Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161)
Simulate BlockConnected/BlockDisconnected for PS caches
Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144)
Various fixes for mixing queues (dashpay#3138)
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
Ignore recent rejects filter for locked txes (dashpay#3124)
Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121)
Update/modernize macOS plist (dashpay#3074)
Fix bip69 vs change position issue (dashpay#3063)
Partially revert 3061 (dashpay#3150)
Fix SelectCoinsMinConf to allow instant respends (dashpay#3061)
...
# Conflicts:
#	configure.ac
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/release-notes.md
#	src/clientversion.h
#	src/wallet/wallet.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@PastaPastaPastaPastaPastaPastaPastaPastaPasta requested changes
@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

@nmarleynmarleynmarley approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@nmarley@PastaPastaPasta

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Also consider txindex for transactions in AlreadyHave() - #3126
Merged
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Oct 1, 2019
Merged
Also consider txindex for transactions in AlreadyHave()#3126
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Conversation
@codablock
@codablockcodablock
commented
Sep 30, 2019

Copy link


Copy Markdown

This avoids many false negatives where TXs are announced to us which are

already mined and then were spent later.
This also avoids TXs going into the orphan map even though they were already mined.
@codablockcodablock
added this to the 14.1 milestone
Sep 30, 2019
UdjinM6
UdjinM6
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/net_processing.cpp
Outdated

@codablock
Also consider txindex for transactions in AlreadyHave()
82b81d8
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
@codablock
codablockforce-pushed
the
pr_alreadyhave_optimizations
branch
from
d0eb676 to
82b81d8CompareSeptember 30, 2019 13:32
UdjinM6
UdjinM6
approved these changes
Sep 30, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
PastaPastaPasta
PastaPastaPasta
requested changes
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.cpp
 return WriteBatch(batch, true);
}

bool CBlockTreeDB::HasTxIndex(const uint256& txid) {
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the { down to the next line)
PastaPastaPasta
PastaPastaPasta
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.h
 bool ReadLastBlockFile(int &nFile);
 bool WriteReindexing(bool fReindex);
 bool ReadReindexing(bool &fReindex);
 bool HasTxIndex(const uint256 &txid);
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I understand you are replicating surrounding code, but according to clang, it should be:

Suggested change

boolHasTxIndex(constuint256&txid);
boolHasTxIndex(constuint256&txid);
nmarley
nmarley
approved these changes
Oct 1, 2019
View reviewed changes
@nmarleynmarley
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
@UdjinM6
UdjinM6
commented
Oct 1, 2019

Copy link


Copy Markdown

After some discussion on Slack I'm leaning towards merging it as is in this specific case.
@UdjinM6
UdjinM6
merged commit b4aefb5
into
dashpay:developOct 1, 2019
@codablock
codablock
deleted the

pr_alreadyhave_optimizations

branch
November 18, 2019 14:33
codablock added a commit
to codablock/dash
that referenced
this pull request
Nov 19, 2019
@codablock
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
0031d6b
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Nov 24, 2019
MIPPL
Merge Dash master 0.14.0.4 into Biblepay develop
25d33a4
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits)
[v0.14.0.x] Update release notes with change log (dashpay#3213)
[v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203)
Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100)
Fix compile issues
Merge bitcoin#11397: net: Improve and document SOCKS code
Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184)
Update activemn if protx info changed (dashpay#3176)
Actually update spent index on DisconnectBlock (dashpay#3167)
Only track last seen time instead of first and last seen time (dashpay#3165)
Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161)
Simulate BlockConnected/BlockDisconnected for PS caches
Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144)
Various fixes for mixing queues (dashpay#3138)
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
Ignore recent rejects filter for locked txes (dashpay#3124)
Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121)
Update/modernize macOS plist (dashpay#3074)
Fix bip69 vs change position issue (dashpay#3063)
Partially revert 3061 (dashpay#3150)
Fix SelectCoinsMinConf to allow instant respends (dashpay#3061)
...
# Conflicts:
#	configure.ac
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/release-notes.md
#	src/clientversion.h
#	src/wallet/wallet.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@PastaPastaPastaPastaPastaPastaPastaPastaPasta requested changes
@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

@nmarleynmarleynmarley approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@nmarley@PastaPastaPasta

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Also consider txindex for transactions in AlreadyHave() - #3126
Merged
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Oct 1, 2019
Merged
Also consider txindex for transactions in AlreadyHave()#3126
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Conversation
@codablock
@codablockcodablock
commented
Sep 30, 2019

Copy link


Copy Markdown

This avoids many false negatives where TXs are announced to us which are

already mined and then were spent later.
This also avoids TXs going into the orphan map even though they were already mined.
@codablockcodablock
added this to the 14.1 milestone
Sep 30, 2019
UdjinM6
UdjinM6
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/net_processing.cpp
Outdated

@codablock
Also consider txindex for transactions in AlreadyHave()
82b81d8
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
@codablock
codablockforce-pushed
the
pr_alreadyhave_optimizations
branch
from
d0eb676 to
82b81d8CompareSeptember 30, 2019 13:32
UdjinM6
UdjinM6
approved these changes
Sep 30, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
PastaPastaPasta
PastaPastaPasta
requested changes
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.cpp
 return WriteBatch(batch, true);
}

bool CBlockTreeDB::HasTxIndex(const uint256& txid) {
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the { down to the next line)
PastaPastaPasta
PastaPastaPasta
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.h
 bool ReadLastBlockFile(int &nFile);
 bool WriteReindexing(bool fReindex);
 bool ReadReindexing(bool &fReindex);
 bool HasTxIndex(const uint256 &txid);
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I understand you are replicating surrounding code, but according to clang, it should be:

Suggested change

boolHasTxIndex(constuint256&txid);
boolHasTxIndex(constuint256&txid);
nmarley
nmarley
approved these changes
Oct 1, 2019
View reviewed changes
@nmarleynmarley
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
@UdjinM6
UdjinM6
commented
Oct 1, 2019

Copy link


Copy Markdown

After some discussion on Slack I'm leaning towards merging it as is in this specific case.
@UdjinM6
UdjinM6
merged commit b4aefb5
into
dashpay:developOct 1, 2019
@codablock
codablock
deleted the

pr_alreadyhave_optimizations

branch
November 18, 2019 14:33
codablock added a commit
to codablock/dash
that referenced
this pull request
Nov 19, 2019
@codablock
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
0031d6b
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Nov 24, 2019
MIPPL
Merge Dash master 0.14.0.4 into Biblepay develop
25d33a4
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits)
[v0.14.0.x] Update release notes with change log (dashpay#3213)
[v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203)
Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100)
Fix compile issues
Merge bitcoin#11397: net: Improve and document SOCKS code
Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184)
Update activemn if protx info changed (dashpay#3176)
Actually update spent index on DisconnectBlock (dashpay#3167)
Only track last seen time instead of first and last seen time (dashpay#3165)
Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161)
Simulate BlockConnected/BlockDisconnected for PS caches
Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144)
Various fixes for mixing queues (dashpay#3138)
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
Ignore recent rejects filter for locked txes (dashpay#3124)
Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121)
Update/modernize macOS plist (dashpay#3074)
Fix bip69 vs change position issue (dashpay#3063)
Partially revert 3061 (dashpay#3150)
Fix SelectCoinsMinConf to allow instant respends (dashpay#3061)
...
# Conflicts:
#	configure.ac
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/release-notes.md
#	src/clientversion.h
#	src/wallet/wallet.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@PastaPastaPastaPastaPastaPastaPastaPastaPasta requested changes
@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

@nmarleynmarleynmarley approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@nmarley@PastaPastaPasta

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

Skip to content
Also consider txindex for transactions in AlreadyHave() - #3126
Merged
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Oct 1, 2019
Merged
Also consider txindex for transactions in AlreadyHave()#3126
UdjinM6 merged 1 commit into
dashpay:developfrom 
codablock:pr_alreadyhave_optimizations
Conversation
@codablock
@codablockcodablock
commented
Sep 30, 2019

Copy link


Copy Markdown

This avoids many false negatives where TXs are announced to us which are

already mined and then were spent later.
This also avoids TXs going into the orphan map even though they were already mined.
@codablockcodablock
added this to the 14.1 milestone
Sep 30, 2019
UdjinM6
UdjinM6
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/net_processing.cpp
Outdated

@codablock
Also consider txindex for transactions in AlreadyHave()
82b81d8
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
@codablock
codablockforce-pushed
the
pr_alreadyhave_optimizations
branch
from
d0eb676 to
82b81d8CompareSeptember 30, 2019 13:32
UdjinM6
UdjinM6
approved these changes
Sep 30, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
PastaPastaPasta
PastaPastaPasta
requested changes
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.cpp
 return WriteBatch(batch, true);
}

bool CBlockTreeDB::HasTxIndex(const uint256& txid) {
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that you are trying to replicate surrounding code, but when adding new code we should follow code guidelines (ie move the { down to the next line)
PastaPastaPasta
PastaPastaPasta
reviewed
Sep 30, 2019
View reviewed changes
Comment threadsrc/txdb.h
 bool ReadLastBlockFile(int &nFile);
 bool WriteReindexing(bool fReindex);
 bool ReadReindexing(bool &fReindex);
 bool HasTxIndex(const uint256 &txid);
@PastaPastaPastaPastaPastaPastaSep 30, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I understand you are replicating surrounding code, but according to clang, it should be:

Suggested change

boolHasTxIndex(constuint256&txid);
boolHasTxIndex(constuint256&txid);
nmarley
nmarley
approved these changes
Oct 1, 2019
View reviewed changes
@nmarleynmarley
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
@UdjinM6
UdjinM6
commented
Oct 1, 2019

Copy link


Copy Markdown

After some discussion on Slack I'm leaning towards merging it as is in this specific case.
@UdjinM6
UdjinM6
merged commit b4aefb5
into
dashpay:developOct 1, 2019
@codablock
codablock
deleted the

pr_alreadyhave_optimizations

branch
November 18, 2019 14:33
codablock added a commit
to codablock/dash
that referenced
this pull request
Nov 19, 2019
@codablock
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
0031d6b
This avoids many false negatives where TXs are announced to us which are
already mined and then were spent later.
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Nov 24, 2019
MIPPL
Merge Dash master 0.14.0.4 into Biblepay develop
25d33a4
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits)
[v0.14.0.x] Update release notes with change log (dashpay#3213)
[v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203)
Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100)
Fix compile issues
Merge bitcoin#11397: net: Improve and document SOCKS code
Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184)
Update activemn if protx info changed (dashpay#3176)
Actually update spent index on DisconnectBlock (dashpay#3167)
Only track last seen time instead of first and last seen time (dashpay#3165)
Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161)
Simulate BlockConnected/BlockDisconnected for PS caches
Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144)
Various fixes for mixing queues (dashpay#3138)
Also consider txindex for transactions in AlreadyHave() (dashpay#3126)
Ignore recent rejects filter for locked txes (dashpay#3124)
Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121)
Update/modernize macOS plist (dashpay#3074)
Fix bip69 vs change position issue (dashpay#3063)
Partially revert 3061 (dashpay#3150)
Fix SelectCoinsMinConf to allow instant respends (dashpay#3061)
...
# Conflicts:
#	configure.ac
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/release-notes.md
#	src/clientversion.h
#	src/wallet/wallet.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@PastaPastaPastaPastaPastaPastaPastaPastaPasta requested changes
@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

@nmarleynmarleynmarley approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@nmarley@PastaPastaPasta