[0.13.x] Backport multiple PRs from develop - #2746

Merged
codablock merged 9 commits into
dashpay:v0.13.xfrom
codablock:pr_v13_backport
Mar 8, 2019
Merged

[0.13.x] Backport multiple PRs from develop#2746
codablock merged 9 commits into
dashpay:v0.13.xfrom
codablock:pr_v13_backport

Conversation

@codablock

@codablockcodablock commented Mar 7, 2019

Copy link
Copy Markdown

Includes all PRs currently marked with backport-candidate-13.x. See individual commits.

The backport for #2740 turned out to be more then a simple backport. Things have changed at the affected location quite a bit, so this is more like a reimplementation.

PastaPastaPastaand others added 5 commits March 7, 2019 06:56
@PastaPastaPasta@codablock
Backportbitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGe…
1cc47eb
…tInfoString (dashpay#2687)
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
Pull request description:
As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
<img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">
This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
<img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">
Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@UdjinM6@codablock
Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698)
* Do not process blocks in CDeterministicMNManager before dip3 activation
This should save us some cpu/disk on initial sync/reindex
* Write initial snapshot on dip3 activation
@codablock
Fix incorrect usage of begin() when genesis block is requested in "pr…
9e233f3
…otx diff" (dashpay#2699)
* Fix incorrect usage of begin() when genesis block is requested in "protx diff"
.begin() on mapBlockIndex does NOT return the genesis block, but just the
block with lowest hash.
The fix is to use chainActive[0] to get the genesis block.
* Update src/evo/simplifiedmns.cpp
Co-Authored-By: codablock <ablock84@gmail.com>
@codablock
Stop g_connman first before deleting it (dashpay#2734)
f868fbc
@codablock
Only include selected TX types into CMerkleBlock (dashpay#2737)
43612a2
It was reported on iOS that CMerkleBlock sometimes included the dummy
quorum commitments introduced with v13, which led to banning of nodes as
these were not supported/expected there.
We should in general only include TXs here that are of interest for SPV
nodes, so we should maintain the list of allowed TX types.
@codablockcodablock added this to the 13.2 milestone Mar 7, 2019
UdjinM6and others added 3 commits March 7, 2019 07:01
@UdjinM6@codablock
Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)
@codablock
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
0364e03
…ashes (dashpay#2744)
* Let Commit() return void
The boolean return value will loose its meaning in the next commit
* Implement 2-stage commits for CDBTransaction and CScopedDBTransaction
CDBTransaction is changed to allow CDBBatch, CDBWrapper and other
CDBTransactions as parent instead of just CDBWrapper. This in turn allows
to implement multi-staged commits in CEvoDB.
We now have the "current transaction" which is started and ended (commit
or rollback) for each call to Connect-/DisconnectBlock. When the current
transaction is committed, it moves its contents into the "root transaction"
instead of directly writing to CDBWrapper.
CommitRootTransaction() then handles the final commitment to CDBWrapper. It
is called at the same time when the chainstate is flushed to disk, which
guarantees consistency between chainstate and CEvoDB.
* Allow to efficiently move values into parent transactions to avoid copies
When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid
copying values from this transaction to the parent transaction and instead
pass values by rvalue and let the contents be moved.
* Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)"
This reverts commit 6dfceab.
@codablock
Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)
UdjinM6
UdjinM6 previously approved these changes Mar 7, 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

@codablock

codablock commented Mar 7, 2019

Copy link
Copy Markdown
Author

I'm going to #2747 as well after it got merged into develop

@codablock

codablock commented Mar 7, 2019

Copy link
Copy Markdown
Author

Added #2747 this PR

UdjinM6
UdjinM6 approved these changes Mar 7, 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.

re-utACK

PastaPastaPasta
PastaPastaPasta approved these changes Mar 7, 2019
View reviewed changes

@PastaPastaPastaPastaPastaPasta left a comment

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.

utACK

@codablock
codablock merged commit 4d62f3c into dashpay:v0.13.xMar 8, 2019
@codablock
codablock deleted the pr_v13_backport branch March 8, 2019 05:45
@UdjinM6UdjinM6 mentioned this pull request Mar 17, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

13.2

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@UdjinM6@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
[0.13.x] Backport multiple PRs from develop - #2746
Merged
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Mar 8, 2019
Merged
[0.13.x] Backport multiple PRs from develop#2746
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Conversation
@codablock
@codablockcodablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Includes all PRs currently marked with backport-candidate-13.x. See individual commits.
The backport for #2740 turned out to be more then a simple backport. Things have changed at the affected location quite a bit, so this is more like a reimplementation.
PastaPastaPastaand others
added 5 commits
March 7, 2019 06:56
@PastaPastaPasta@codablock
Backportbitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGe…
1cc47eb
…tInfoString (dashpay#2687)
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
Pull request description:
As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
<img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">
This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
<img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">
Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@UdjinM6@codablock
Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698)
* Do not process blocks in CDeterministicMNManager before dip3 activation
This should save us some cpu/disk on initial sync/reindex
* Write initial snapshot on dip3 activation
@codablock
Fix incorrect usage of begin() when genesis block is requested in "pr…
9e233f3
…otx diff" (dashpay#2699)
* Fix incorrect usage of begin() when genesis block is requested in "protx diff"
.begin() on mapBlockIndex does NOT return the genesis block, but just the
block with lowest hash.
The fix is to use chainActive[0] to get the genesis block.
* Update src/evo/simplifiedmns.cpp
Co-Authored-By: codablock <ablock84@gmail.com>
@codablock
Stop g_connman first before deleting it (dashpay#2734)
f868fbc
@codablock
Only include selected TX types into CMerkleBlock (dashpay#2737)
43612a2
It was reported on iOS that CMerkleBlock sometimes included the dummy
quorum commitments introduced with v13, which led to banning of nodes as
these were not supported/expected there.
We should in general only include TXs here that are of interest for SPV
nodes, so we should maintain the list of allowed TX types.
@codablockcodablock
added this to the 13.2 milestone
Mar 7, 2019
UdjinM6and others
added 3 commits
March 7, 2019 07:01
@UdjinM6@codablock
Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)
@codablock
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
0364e03
…ashes (dashpay#2744)
* Let Commit() return void
The boolean return value will loose its meaning in the next commit
* Implement 2-stage commits for CDBTransaction and CScopedDBTransaction
CDBTransaction is changed to allow CDBBatch, CDBWrapper and other
CDBTransactions as parent instead of just CDBWrapper. This in turn allows
to implement multi-staged commits in CEvoDB.
We now have the "current transaction" which is started and ended (commit
or rollback) for each call to Connect-/DisconnectBlock. When the current
transaction is committed, it moves its contents into the "root transaction"
instead of directly writing to CDBWrapper.
CommitRootTransaction() then handles the final commitment to CDBWrapper. It
is called at the same time when the chainstate is flushed to disk, which
guarantees consistency between chainstate and CEvoDB.
* Allow to efficiently move values into parent transactions to avoid copies
When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid
copying values from this transaction to the parent transaction and instead
pass values by rvalue and let the contents be moved.
* Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)"
This reverts commit 6dfceab.
@codablock
Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)
UdjinM6
UdjinM6
previously approved these changes
Mar 7, 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
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
I'm going to #2747 as well after it got merged into develop
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
Added #2747 this PR
UdjinM6
UdjinM6
approved these changes
Mar 7, 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.

re-utACK
PastaPastaPasta
PastaPastaPasta
approved these changes
Mar 7, 2019
View reviewed changes
@PastaPastaPastaPastaPastaPasta
left a comment


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.

utACK
@codablock
codablock
merged commit 4d62f3c
into
dashpay:v0.13.xMar 8, 2019
@codablock
codablock
deleted the

pr_v13_backport

branch
March 8, 2019 05:45
@UdjinM6UdjinM6
mentioned this pull request
Mar 17, 2019

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

13.2

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@UdjinM6@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
[0.13.x] Backport multiple PRs from develop - #2746
Merged
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Mar 8, 2019
Merged
[0.13.x] Backport multiple PRs from develop#2746
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Conversation
@codablock
@codablockcodablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Includes all PRs currently marked with backport-candidate-13.x. See individual commits.
The backport for #2740 turned out to be more then a simple backport. Things have changed at the affected location quite a bit, so this is more like a reimplementation.
PastaPastaPastaand others
added 5 commits
March 7, 2019 06:56
@PastaPastaPasta@codablock
Backportbitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGe…
1cc47eb
…tInfoString (dashpay#2687)
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
Pull request description:
As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
<img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">
This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
<img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">
Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@UdjinM6@codablock
Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698)
* Do not process blocks in CDeterministicMNManager before dip3 activation
This should save us some cpu/disk on initial sync/reindex
* Write initial snapshot on dip3 activation
@codablock
Fix incorrect usage of begin() when genesis block is requested in "pr…
9e233f3
…otx diff" (dashpay#2699)
* Fix incorrect usage of begin() when genesis block is requested in "protx diff"
.begin() on mapBlockIndex does NOT return the genesis block, but just the
block with lowest hash.
The fix is to use chainActive[0] to get the genesis block.
* Update src/evo/simplifiedmns.cpp
Co-Authored-By: codablock <ablock84@gmail.com>
@codablock
Stop g_connman first before deleting it (dashpay#2734)
f868fbc
@codablock
Only include selected TX types into CMerkleBlock (dashpay#2737)
43612a2
It was reported on iOS that CMerkleBlock sometimes included the dummy
quorum commitments introduced with v13, which led to banning of nodes as
these were not supported/expected there.
We should in general only include TXs here that are of interest for SPV
nodes, so we should maintain the list of allowed TX types.
@codablockcodablock
added this to the 13.2 milestone
Mar 7, 2019
UdjinM6and others
added 3 commits
March 7, 2019 07:01
@UdjinM6@codablock
Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)
@codablock
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
0364e03
…ashes (dashpay#2744)
* Let Commit() return void
The boolean return value will loose its meaning in the next commit
* Implement 2-stage commits for CDBTransaction and CScopedDBTransaction
CDBTransaction is changed to allow CDBBatch, CDBWrapper and other
CDBTransactions as parent instead of just CDBWrapper. This in turn allows
to implement multi-staged commits in CEvoDB.
We now have the "current transaction" which is started and ended (commit
or rollback) for each call to Connect-/DisconnectBlock. When the current
transaction is committed, it moves its contents into the "root transaction"
instead of directly writing to CDBWrapper.
CommitRootTransaction() then handles the final commitment to CDBWrapper. It
is called at the same time when the chainstate is flushed to disk, which
guarantees consistency between chainstate and CEvoDB.
* Allow to efficiently move values into parent transactions to avoid copies
When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid
copying values from this transaction to the parent transaction and instead
pass values by rvalue and let the contents be moved.
* Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)"
This reverts commit 6dfceab.
@codablock
Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)
UdjinM6
UdjinM6
previously approved these changes
Mar 7, 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
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
I'm going to #2747 as well after it got merged into develop
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
Added #2747 this PR
UdjinM6
UdjinM6
approved these changes
Mar 7, 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.

re-utACK
PastaPastaPasta
PastaPastaPasta
approved these changes
Mar 7, 2019
View reviewed changes
@PastaPastaPastaPastaPastaPasta
left a comment


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.

utACK
@codablock
codablock
merged commit 4d62f3c
into
dashpay:v0.13.xMar 8, 2019
@codablock
codablock
deleted the

pr_v13_backport

branch
March 8, 2019 05:45
@UdjinM6UdjinM6
mentioned this pull request
Mar 17, 2019

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

13.2

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@UdjinM6@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
[0.13.x] Backport multiple PRs from develop - #2746
Merged
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Mar 8, 2019
Merged
[0.13.x] Backport multiple PRs from develop#2746
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Conversation
@codablock
@codablockcodablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Includes all PRs currently marked with backport-candidate-13.x. See individual commits.
The backport for #2740 turned out to be more then a simple backport. Things have changed at the affected location quite a bit, so this is more like a reimplementation.
PastaPastaPastaand others
added 5 commits
March 7, 2019 06:56
@PastaPastaPasta@codablock
Backportbitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGe…
1cc47eb
…tInfoString (dashpay#2687)
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
Pull request description:
As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
<img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">
This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
<img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">
Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@UdjinM6@codablock
Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698)
* Do not process blocks in CDeterministicMNManager before dip3 activation
This should save us some cpu/disk on initial sync/reindex
* Write initial snapshot on dip3 activation
@codablock
Fix incorrect usage of begin() when genesis block is requested in "pr…
9e233f3
…otx diff" (dashpay#2699)
* Fix incorrect usage of begin() when genesis block is requested in "protx diff"
.begin() on mapBlockIndex does NOT return the genesis block, but just the
block with lowest hash.
The fix is to use chainActive[0] to get the genesis block.
* Update src/evo/simplifiedmns.cpp
Co-Authored-By: codablock <ablock84@gmail.com>
@codablock
Stop g_connman first before deleting it (dashpay#2734)
f868fbc
@codablock
Only include selected TX types into CMerkleBlock (dashpay#2737)
43612a2
It was reported on iOS that CMerkleBlock sometimes included the dummy
quorum commitments introduced with v13, which led to banning of nodes as
these were not supported/expected there.
We should in general only include TXs here that are of interest for SPV
nodes, so we should maintain the list of allowed TX types.
@codablockcodablock
added this to the 13.2 milestone
Mar 7, 2019
UdjinM6and others
added 3 commits
March 7, 2019 07:01
@UdjinM6@codablock
Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)
@codablock
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
0364e03
…ashes (dashpay#2744)
* Let Commit() return void
The boolean return value will loose its meaning in the next commit
* Implement 2-stage commits for CDBTransaction and CScopedDBTransaction
CDBTransaction is changed to allow CDBBatch, CDBWrapper and other
CDBTransactions as parent instead of just CDBWrapper. This in turn allows
to implement multi-staged commits in CEvoDB.
We now have the "current transaction" which is started and ended (commit
or rollback) for each call to Connect-/DisconnectBlock. When the current
transaction is committed, it moves its contents into the "root transaction"
instead of directly writing to CDBWrapper.
CommitRootTransaction() then handles the final commitment to CDBWrapper. It
is called at the same time when the chainstate is flushed to disk, which
guarantees consistency between chainstate and CEvoDB.
* Allow to efficiently move values into parent transactions to avoid copies
When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid
copying values from this transaction to the parent transaction and instead
pass values by rvalue and let the contents be moved.
* Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)"
This reverts commit 6dfceab.
@codablock
Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)
UdjinM6
UdjinM6
previously approved these changes
Mar 7, 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
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
I'm going to #2747 as well after it got merged into develop
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
Added #2747 this PR
UdjinM6
UdjinM6
approved these changes
Mar 7, 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.

re-utACK
PastaPastaPasta
PastaPastaPasta
approved these changes
Mar 7, 2019
View reviewed changes
@PastaPastaPastaPastaPastaPasta
left a comment


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.

utACK
@codablock
codablock
merged commit 4d62f3c
into
dashpay:v0.13.xMar 8, 2019
@codablock
codablock
deleted the

pr_v13_backport

branch
March 8, 2019 05:45
@UdjinM6UdjinM6
mentioned this pull request
Mar 17, 2019

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

13.2

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@UdjinM6@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
[0.13.x] Backport multiple PRs from develop - #2746
Merged
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Mar 8, 2019
Merged
[0.13.x] Backport multiple PRs from develop#2746
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Conversation
@codablock
@codablockcodablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Includes all PRs currently marked with backport-candidate-13.x. See individual commits.
The backport for #2740 turned out to be more then a simple backport. Things have changed at the affected location quite a bit, so this is more like a reimplementation.
PastaPastaPastaand others
added 5 commits
March 7, 2019 06:56
@PastaPastaPasta@codablock
Backportbitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGe…
1cc47eb
…tInfoString (dashpay#2687)
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
Pull request description:
As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
<img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">
This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
<img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">
Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@UdjinM6@codablock
Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698)
* Do not process blocks in CDeterministicMNManager before dip3 activation
This should save us some cpu/disk on initial sync/reindex
* Write initial snapshot on dip3 activation
@codablock
Fix incorrect usage of begin() when genesis block is requested in "pr…
9e233f3
…otx diff" (dashpay#2699)
* Fix incorrect usage of begin() when genesis block is requested in "protx diff"
.begin() on mapBlockIndex does NOT return the genesis block, but just the
block with lowest hash.
The fix is to use chainActive[0] to get the genesis block.
* Update src/evo/simplifiedmns.cpp
Co-Authored-By: codablock <ablock84@gmail.com>
@codablock
Stop g_connman first before deleting it (dashpay#2734)
f868fbc
@codablock
Only include selected TX types into CMerkleBlock (dashpay#2737)
43612a2
It was reported on iOS that CMerkleBlock sometimes included the dummy
quorum commitments introduced with v13, which led to banning of nodes as
these were not supported/expected there.
We should in general only include TXs here that are of interest for SPV
nodes, so we should maintain the list of allowed TX types.
@codablockcodablock
added this to the 13.2 milestone
Mar 7, 2019
UdjinM6and others
added 3 commits
March 7, 2019 07:01
@UdjinM6@codablock
Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)
@codablock
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
0364e03
…ashes (dashpay#2744)
* Let Commit() return void
The boolean return value will loose its meaning in the next commit
* Implement 2-stage commits for CDBTransaction and CScopedDBTransaction
CDBTransaction is changed to allow CDBBatch, CDBWrapper and other
CDBTransactions as parent instead of just CDBWrapper. This in turn allows
to implement multi-staged commits in CEvoDB.
We now have the "current transaction" which is started and ended (commit
or rollback) for each call to Connect-/DisconnectBlock. When the current
transaction is committed, it moves its contents into the "root transaction"
instead of directly writing to CDBWrapper.
CommitRootTransaction() then handles the final commitment to CDBWrapper. It
is called at the same time when the chainstate is flushed to disk, which
guarantees consistency between chainstate and CEvoDB.
* Allow to efficiently move values into parent transactions to avoid copies
When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid
copying values from this transaction to the parent transaction and instead
pass values by rvalue and let the contents be moved.
* Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)"
This reverts commit 6dfceab.
@codablock
Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)
UdjinM6
UdjinM6
previously approved these changes
Mar 7, 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
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
I'm going to #2747 as well after it got merged into develop
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
Added #2747 this PR
UdjinM6
UdjinM6
approved these changes
Mar 7, 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.

re-utACK
PastaPastaPasta
PastaPastaPasta
approved these changes
Mar 7, 2019
View reviewed changes
@PastaPastaPastaPastaPastaPasta
left a comment


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.

utACK
@codablock
codablock
merged commit 4d62f3c
into
dashpay:v0.13.xMar 8, 2019
@codablock
codablock
deleted the

pr_v13_backport

branch
March 8, 2019 05:45
@UdjinM6UdjinM6
mentioned this pull request
Mar 17, 2019

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

13.2

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@UdjinM6@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
[0.13.x] Backport multiple PRs from develop - #2746
Merged
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Mar 8, 2019
Merged
[0.13.x] Backport multiple PRs from develop#2746
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Conversation
@codablock
@codablockcodablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Includes all PRs currently marked with backport-candidate-13.x. See individual commits.
The backport for #2740 turned out to be more then a simple backport. Things have changed at the affected location quite a bit, so this is more like a reimplementation.
PastaPastaPastaand others
added 5 commits
March 7, 2019 06:56
@PastaPastaPasta@codablock
Backportbitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGe…
1cc47eb
…tInfoString (dashpay#2687)
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
Pull request description:
As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
<img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">
This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
<img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">
Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@UdjinM6@codablock
Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698)
* Do not process blocks in CDeterministicMNManager before dip3 activation
This should save us some cpu/disk on initial sync/reindex
* Write initial snapshot on dip3 activation
@codablock
Fix incorrect usage of begin() when genesis block is requested in "pr…
9e233f3
…otx diff" (dashpay#2699)
* Fix incorrect usage of begin() when genesis block is requested in "protx diff"
.begin() on mapBlockIndex does NOT return the genesis block, but just the
block with lowest hash.
The fix is to use chainActive[0] to get the genesis block.
* Update src/evo/simplifiedmns.cpp
Co-Authored-By: codablock <ablock84@gmail.com>
@codablock
Stop g_connman first before deleting it (dashpay#2734)
f868fbc
@codablock
Only include selected TX types into CMerkleBlock (dashpay#2737)
43612a2
It was reported on iOS that CMerkleBlock sometimes included the dummy
quorum commitments introduced with v13, which led to banning of nodes as
these were not supported/expected there.
We should in general only include TXs here that are of interest for SPV
nodes, so we should maintain the list of allowed TX types.
@codablockcodablock
added this to the 13.2 milestone
Mar 7, 2019
UdjinM6and others
added 3 commits
March 7, 2019 07:01
@UdjinM6@codablock
Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)
@codablock
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
0364e03
…ashes (dashpay#2744)
* Let Commit() return void
The boolean return value will loose its meaning in the next commit
* Implement 2-stage commits for CDBTransaction and CScopedDBTransaction
CDBTransaction is changed to allow CDBBatch, CDBWrapper and other
CDBTransactions as parent instead of just CDBWrapper. This in turn allows
to implement multi-staged commits in CEvoDB.
We now have the "current transaction" which is started and ended (commit
or rollback) for each call to Connect-/DisconnectBlock. When the current
transaction is committed, it moves its contents into the "root transaction"
instead of directly writing to CDBWrapper.
CommitRootTransaction() then handles the final commitment to CDBWrapper. It
is called at the same time when the chainstate is flushed to disk, which
guarantees consistency between chainstate and CEvoDB.
* Allow to efficiently move values into parent transactions to avoid copies
When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid
copying values from this transaction to the parent transaction and instead
pass values by rvalue and let the contents be moved.
* Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)"
This reverts commit 6dfceab.
@codablock
Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)
UdjinM6
UdjinM6
previously approved these changes
Mar 7, 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
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
I'm going to #2747 as well after it got merged into develop
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
Added #2747 this PR
UdjinM6
UdjinM6
approved these changes
Mar 7, 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.

re-utACK
PastaPastaPasta
PastaPastaPasta
approved these changes
Mar 7, 2019
View reviewed changes
@PastaPastaPastaPastaPastaPasta
left a comment


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.

utACK
@codablock
codablock
merged commit 4d62f3c
into
dashpay:v0.13.xMar 8, 2019
@codablock
codablock
deleted the

pr_v13_backport

branch
March 8, 2019 05:45
@UdjinM6UdjinM6
mentioned this pull request
Mar 17, 2019

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

13.2

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@UdjinM6@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
[0.13.x] Backport multiple PRs from develop - #2746
Merged
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Mar 8, 2019
Merged
[0.13.x] Backport multiple PRs from develop#2746
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Conversation
@codablock
@codablockcodablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Includes all PRs currently marked with backport-candidate-13.x. See individual commits.
The backport for #2740 turned out to be more then a simple backport. Things have changed at the affected location quite a bit, so this is more like a reimplementation.
PastaPastaPastaand others
added 5 commits
March 7, 2019 06:56
@PastaPastaPasta@codablock
Backportbitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGe…
1cc47eb
…tInfoString (dashpay#2687)
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
Pull request description:
As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
<img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">
This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
<img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">
Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@UdjinM6@codablock
Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698)
* Do not process blocks in CDeterministicMNManager before dip3 activation
This should save us some cpu/disk on initial sync/reindex
* Write initial snapshot on dip3 activation
@codablock
Fix incorrect usage of begin() when genesis block is requested in "pr…
9e233f3
…otx diff" (dashpay#2699)
* Fix incorrect usage of begin() when genesis block is requested in "protx diff"
.begin() on mapBlockIndex does NOT return the genesis block, but just the
block with lowest hash.
The fix is to use chainActive[0] to get the genesis block.
* Update src/evo/simplifiedmns.cpp
Co-Authored-By: codablock <ablock84@gmail.com>
@codablock
Stop g_connman first before deleting it (dashpay#2734)
f868fbc
@codablock
Only include selected TX types into CMerkleBlock (dashpay#2737)
43612a2
It was reported on iOS that CMerkleBlock sometimes included the dummy
quorum commitments introduced with v13, which led to banning of nodes as
these were not supported/expected there.
We should in general only include TXs here that are of interest for SPV
nodes, so we should maintain the list of allowed TX types.
@codablockcodablock
added this to the 13.2 milestone
Mar 7, 2019
UdjinM6and others
added 3 commits
March 7, 2019 07:01
@UdjinM6@codablock
Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)
@codablock
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
0364e03
…ashes (dashpay#2744)
* Let Commit() return void
The boolean return value will loose its meaning in the next commit
* Implement 2-stage commits for CDBTransaction and CScopedDBTransaction
CDBTransaction is changed to allow CDBBatch, CDBWrapper and other
CDBTransactions as parent instead of just CDBWrapper. This in turn allows
to implement multi-staged commits in CEvoDB.
We now have the "current transaction" which is started and ended (commit
or rollback) for each call to Connect-/DisconnectBlock. When the current
transaction is committed, it moves its contents into the "root transaction"
instead of directly writing to CDBWrapper.
CommitRootTransaction() then handles the final commitment to CDBWrapper. It
is called at the same time when the chainstate is flushed to disk, which
guarantees consistency between chainstate and CEvoDB.
* Allow to efficiently move values into parent transactions to avoid copies
When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid
copying values from this transaction to the parent transaction and instead
pass values by rvalue and let the contents be moved.
* Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)"
This reverts commit 6dfceab.
@codablock
Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)
UdjinM6
UdjinM6
previously approved these changes
Mar 7, 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
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
I'm going to #2747 as well after it got merged into develop
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
Added #2747 this PR
UdjinM6
UdjinM6
approved these changes
Mar 7, 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.

re-utACK
PastaPastaPasta
PastaPastaPasta
approved these changes
Mar 7, 2019
View reviewed changes
@PastaPastaPastaPastaPastaPasta
left a comment


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.

utACK
@codablock
codablock
merged commit 4d62f3c
into
dashpay:v0.13.xMar 8, 2019
@codablock
codablock
deleted the

pr_v13_backport

branch
March 8, 2019 05:45
@UdjinM6UdjinM6
mentioned this pull request
Mar 17, 2019

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

13.2

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@UdjinM6@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
[0.13.x] Backport multiple PRs from develop - #2746
Merged
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Mar 8, 2019
Merged
[0.13.x] Backport multiple PRs from develop#2746
codablock merged 9 commits into
dashpay:v0.13.xfrom 
codablock:pr_v13_backport
Conversation
@codablock
@codablockcodablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Includes all PRs currently marked with backport-candidate-13.x. See individual commits.
The backport for #2740 turned out to be more then a simple backport. Things have changed at the affected location quite a bit, so this is more like a reimplementation.
PastaPastaPastaand others
added 5 commits
March 7, 2019 06:56
@PastaPastaPasta@codablock
Backportbitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGe…
1cc47eb
…tInfoString (dashpay#2687)
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
Pull request description:
As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
<img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">
This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
<img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">
Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@UdjinM6@codablock
Do not process blocks in CDeterministicMNManager before dip3 activati…
e75f971
…on (dashpay#2698)
* Do not process blocks in CDeterministicMNManager before dip3 activation
This should save us some cpu/disk on initial sync/reindex
* Write initial snapshot on dip3 activation
@codablock
Fix incorrect usage of begin() when genesis block is requested in "pr…
9e233f3
…otx diff" (dashpay#2699)
* Fix incorrect usage of begin() when genesis block is requested in "protx diff"
.begin() on mapBlockIndex does NOT return the genesis block, but just the
block with lowest hash.
The fix is to use chainActive[0] to get the genesis block.
* Update src/evo/simplifiedmns.cpp
Co-Authored-By: codablock <ablock84@gmail.com>
@codablock
Stop g_connman first before deleting it (dashpay#2734)
f868fbc
@codablock
Only include selected TX types into CMerkleBlock (dashpay#2737)
43612a2
It was reported on iOS that CMerkleBlock sometimes included the dummy
quorum commitments introduced with v13, which led to banning of nodes as
these were not supported/expected there.
We should in general only include TXs here that are of interest for SPV
nodes, so we should maintain the list of allowed TX types.
@codablockcodablock
added this to the 13.2 milestone
Mar 7, 2019
UdjinM6and others
added 3 commits
March 7, 2019 07:01
@UdjinM6@codablock
Add collateraladdress into masternode/protx list rpc output (dashpay#…
a11e2f9
…2740)
@codablock
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
0364e03
…ashes (dashpay#2744)
* Let Commit() return void
The boolean return value will loose its meaning in the next commit
* Implement 2-stage commits for CDBTransaction and CScopedDBTransaction
CDBTransaction is changed to allow CDBBatch, CDBWrapper and other
CDBTransactions as parent instead of just CDBWrapper. This in turn allows
to implement multi-staged commits in CEvoDB.
We now have the "current transaction" which is started and ended (commit
or rollback) for each call to Connect-/DisconnectBlock. When the current
transaction is committed, it moves its contents into the "root transaction"
instead of directly writing to CDBWrapper.
CommitRootTransaction() then handles the final commitment to CDBWrapper. It
is called at the same time when the chainstate is flushed to disk, which
guarantees consistency between chainstate and CEvoDB.
* Allow to efficiently move values into parent transactions to avoid copies
When CDBTransaction<CDBTransaction<...>>::Commit() is called, we can avoid
copying values from this transaction to the parent transaction and instead
pass values by rvalue and let the contents be moved.
* Revert "Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (dashpay#2560)"
This reverts commit 6dfceab.
@codablock
Make -masternodeblsprivkey mandatory when -masternode is given (dashp…
25222b3
…ay#2745)
UdjinM6
UdjinM6
previously approved these changes
Mar 7, 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
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
I'm going to #2747 as well after it got merged into develop
@codablock
codablock
commented
Mar 7, 2019

Copy link


Copy Markdown

Author
Added #2747 this PR
UdjinM6
UdjinM6
approved these changes
Mar 7, 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.

re-utACK
PastaPastaPasta
PastaPastaPasta
approved these changes
Mar 7, 2019
View reviewed changes
@PastaPastaPastaPastaPastaPasta
left a comment


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.

utACK
@codablock
codablock
merged commit 4d62f3c
into
dashpay:v0.13.xMar 8, 2019
@codablock
codablock
deleted the

pr_v13_backport

branch
March 8, 2019 05:45
@UdjinM6UdjinM6
mentioned this pull request
Mar 17, 2019

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

13.2

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@UdjinM6@PastaPastaPasta