Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1 - #3102

Merged
UdjinM6 merged 10 commits into
dashpay:developfrom
codablock:pr_pr_backports_v15_v16_2
Sep 24, 2019
Merged

Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
UdjinM6 merged 10 commits into
dashpay:developfrom
codablock:pr_pr_backports_v15_v16_2

Conversation

@codablock

@codablockcodablock commented Sep 20, 2019

Copy link
Copy Markdown

This is the first set of PRs which were backported into the Bitcoin 0.15 branch and then later released as minor 0.15.x releases. Instead of backporting the commits found in the 0.15 branch, I'm backporting the original PRs which were used to do the backports.

This PR currently builds on top of #3101. I'll rebase this PR later when this is merged.

@codablockcodablock added this to the 14.1 milestone Sep 20, 2019
UdjinM6
UdjinM6 requested changes Sep 20, 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.

Looks good 👍 Just one small issue in tests, see below.

Comment threadtest/functional/rawtransactions.py Outdated
@codablock
codablockforce-pushed the pr_pr_backports_v15_v16_2 branch from cc91c72 to 97a969eCompareSeptember 22, 2019 21:00
@codablock

codablock commented Sep 22, 2019

Copy link
Copy Markdown
Author

Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop

UdjinM6
UdjinM6 previously approved these changes Sep 22, 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

@UdjinM6UdjinM6 added the RPC Some notable changes to RPC params/behaviour/descriptions label Sep 22, 2019
@UdjinM6

UdjinM6 commented Sep 23, 2019

Copy link
Copy Markdown

llmq-is-cl-conflicts.py failed, should be fixed by #3094

laanwjand others added 10 commits September 23, 2019 20:49
@laanwj@codablock
Mergebitcoin#10571: [RPC]Move transaction combining from signrawtran…
8308012
…saction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of bitcoin#10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
@laanwj@codablock
Mergebitcoin#11083: Fix combinerawtransaction RPC help result section
124f3db
f9ca0fe Fix combinerawtransaction RPC help result section (Jonas Nick)
Pull request description:
Without this PR it looks like the RPC would return something like a dictionary. But it just returns the transaction in hex.
Tree-SHA512: 565571fbb60cb805f81198cf0eab9ecdc04b62aff58c56145449235cd7c21215f4a1d7a5694d01c1a815fe0e787e5b790d24b71e2f9cc595cda16462ab680b8d
@laanwj@codablock
Mergebitcoin#11081: Add length check for CExtKey deserialization (jo…
a31fb06
…nasschnelli, guidovranken)
07685d1 Add length check for CExtKey deserialization (Jonas Schnelli)
Pull request description:
Fix a potential overwrite or uninitialised data issue.
That code part is currently unused (at least in Bitcoin Core).
We already do the same check `CExtPubKey`.
Reported by @guidovranken
Tree-SHA512: 069ac5335248cf890491bc019537d3b0f7481428a4b240c5cd28ee89b56f4c9f45d947dd626fe89b2fae58472b6dbef57ed909876efe9963e2d72380d17cff12
@laanwj@codablock
Mergebitcoin#11097: gitian: quick hack to fix version string in rele…
7e8d1fc
…ases
4452829 gitian: quick hack to fix version string in releases (Cory Fields)
Pull request description:
Credit: @luke-jr
Release version strings were broken in Gitian by dashpay#7522. This is a minimal fix suitable for 0.15.
After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3
@laanwj@codablock
Mergebitcoin#11119: [doc] build-windows: Mention that only trusty works
10c505c
fa14b67 [doc] build-windows: Mention that only trusty works (MarcoFalke)
Pull request description:
This should prevent people from running into the issues to later find that there is no solution yet.
Tree-SHA512: c0512bb15ebd62113a4195a9577fec4ddacf164509673e178c6b5445c16ab7b110a13ba829e6eebb2a66dff61eeac6ec77f7c5f60bd64685a0c0d99f71f4edf7
@laanwj@codablock
Mergebitcoin#11145: Fix rounding bug in calculation of minimum change
f9453e0
6af49dd Output a bit more information for fee calculation report. (Alex Morcos)
a54c7b9 Fix rounding errors in calculation of minimum change size (Alex Morcos)
Pull request description:
Thanks to @juscamarena for reporting this.
Please backport to 0.15.
There was a potential rounding error where the fee for the change added to the fee for the original tx could be less than the fee for the tx including change.
This is fixed in the first commit. The second commit adds one more snippet of information in the fee calculation report. I actually realized that there is more information that would be nice to report, but we can add that post 0.15.
An open question is whether we should be returning failure if the test in line 2885 is hit or just resetting pick_new_inputs and continuing. Originally I made it a failure to avoid any possible infinite loops. But the case hit here is an example of where that logic possibly backfired.
Tree-SHA512: efe049781acc1f6a8ad429a689359ac6f7b7c44cdfc9578a866dff4a2f6596e8de474a89d25c704f31ef4f8c89af770e98b75ef06c25419d5a6dfc87247bf274
MarcoFalke@codablock
Mergebitcoin#11108: Changing -txindex requires -reindex, not -reinde…
a09370a
…x-chainstate
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo)
Pull request description:
If there's an 0.15.0rc3, this should go in it.
Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
@laanwj@codablock
Mergebitcoin#11334: qt: Remove custom fee radio group and remove nCu…
499fcec
…stomFeeRadio setting
e53fa4a Remove custom fee radio group (Andrew Chow)
Pull request description:
Removes the extraneous custom fee radio group and its single radio button. The radio button is replaced with a label that has the radio button's text.
Continuation of bitcoin#11332
Tree-SHA512: b47b675f900ee4e2f4823203a42bb697f707ba67a8504d730c53d4dae511d0ed03226af34efd7ea45570c6111f8b3b6c39ac28f1b5c090de225903442ad4159a
@codablock
Remove unsupported parameter from DecodeHexTx calls
93e3294
@codablock
Fix rawtransaction.py test
3eb0e14
@codablock
codablockforce-pushed the pr_pr_backports_v15_v16_2 branch from 5c81091 to 3eb0e14CompareSeptember 23, 2019 18:50
@codablock

codablock commented Sep 23, 2019

Copy link
Copy Markdown
Author

Rebased on develop to make Travis happy

UdjinM6
UdjinM6 approved these changes Sep 23, 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 Sep 23, 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, commits match bitcoin's merges

@PastaPastaPastaPastaPastaPasta mentioned this pull request Sep 24, 2019
Merged
@UdjinM6
UdjinM6 merged commit 20d59e1 into dashpay:developSep 24, 2019
@thephezthephez mentioned this pull request Oct 2, 2019
Merged
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

RPCSome notable changes to RPC params/behaviour/descriptions

Projects

None yet

Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@PastaPastaPasta@laanwj
, '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
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1 - #3102
Merged
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Sep 24, 2019
Merged
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Conversation
@codablock
@codablockcodablock
commented
Sep 20, 2019

Copy link


Copy Markdown

This is the first set of PRs which were backported into the Bitcoin 0.15 branch and then later released as minor 0.15.x releases. Instead of backporting the commits found in the 0.15 branch, I'm backporting the original PRs which were used to do the backports.
This PR currently builds on top of #3101. I'll rebase this PR later when this is merged.
@codablockcodablock
added this to the 14.1 milestone
Sep 20, 2019
UdjinM6
UdjinM6
requested changes
Sep 20, 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.

Looks good 👍 Just one small issue in tests, see below.
Comment threadtest/functional/rawtransactions.py
Outdated

@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
cc91c72 to
97a969eCompareSeptember 22, 2019 21:00
@codablock
codablock
commented
Sep 22, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop
UdjinM6
UdjinM6
previously approved these changes
Sep 22, 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
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
Sep 22, 2019
@UdjinM6
UdjinM6
commented
Sep 23, 2019

Copy link


Copy Markdown

llmq-is-cl-conflicts.py failed, should be fixed by #3094
laanwjand others
added 10 commits
September 23, 2019 20:49
@laanwj@codablock
Mergebitcoin#10571: [RPC]Move transaction combining from signrawtran…
8308012
…saction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of bitcoin#10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
@laanwj@codablock
Mergebitcoin#11083: Fix combinerawtransaction RPC help result section
124f3db
f9ca0fe Fix combinerawtransaction RPC help result section (Jonas Nick)
Pull request description:
Without this PR it looks like the RPC would return something like a dictionary. But it just returns the transaction in hex.
Tree-SHA512: 565571fbb60cb805f81198cf0eab9ecdc04b62aff58c56145449235cd7c21215f4a1d7a5694d01c1a815fe0e787e5b790d24b71e2f9cc595cda16462ab680b8d
@laanwj@codablock
Mergebitcoin#11081: Add length check for CExtKey deserialization (jo…
a31fb06
…nasschnelli, guidovranken)
07685d1 Add length check for CExtKey deserialization (Jonas Schnelli)
Pull request description:
Fix a potential overwrite or uninitialised data issue.
That code part is currently unused (at least in Bitcoin Core).
We already do the same check `CExtPubKey`.
Reported by @guidovranken
Tree-SHA512: 069ac5335248cf890491bc019537d3b0f7481428a4b240c5cd28ee89b56f4c9f45d947dd626fe89b2fae58472b6dbef57ed909876efe9963e2d72380d17cff12
@laanwj@codablock
Mergebitcoin#11097: gitian: quick hack to fix version string in rele…
7e8d1fc
…ases
4452829 gitian: quick hack to fix version string in releases (Cory Fields)
Pull request description:
Credit: @luke-jr
Release version strings were broken in Gitian by dashpay#7522. This is a minimal fix suitable for 0.15.
After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3
@laanwj@codablock
Mergebitcoin#11119: [doc] build-windows: Mention that only trusty works
10c505c
fa14b67 [doc] build-windows: Mention that only trusty works (MarcoFalke)
Pull request description:
This should prevent people from running into the issues to later find that there is no solution yet.
Tree-SHA512: c0512bb15ebd62113a4195a9577fec4ddacf164509673e178c6b5445c16ab7b110a13ba829e6eebb2a66dff61eeac6ec77f7c5f60bd64685a0c0d99f71f4edf7
@laanwj@codablock
Mergebitcoin#11145: Fix rounding bug in calculation of minimum change
f9453e0
6af49dd Output a bit more information for fee calculation report. (Alex Morcos)
a54c7b9 Fix rounding errors in calculation of minimum change size (Alex Morcos)
Pull request description:
Thanks to @juscamarena for reporting this.
Please backport to 0.15.
There was a potential rounding error where the fee for the change added to the fee for the original tx could be less than the fee for the tx including change.
This is fixed in the first commit. The second commit adds one more snippet of information in the fee calculation report. I actually realized that there is more information that would be nice to report, but we can add that post 0.15.
An open question is whether we should be returning failure if the test in line 2885 is hit or just resetting pick_new_inputs and continuing. Originally I made it a failure to avoid any possible infinite loops. But the case hit here is an example of where that logic possibly backfired.
Tree-SHA512: efe049781acc1f6a8ad429a689359ac6f7b7c44cdfc9578a866dff4a2f6596e8de474a89d25c704f31ef4f8c89af770e98b75ef06c25419d5a6dfc87247bf274
MarcoFalke@codablock
Mergebitcoin#11108: Changing -txindex requires -reindex, not -reinde…
a09370a
…x-chainstate
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo)
Pull request description:
If there's an 0.15.0rc3, this should go in it.
Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
@laanwj@codablock
Mergebitcoin#11334: qt: Remove custom fee radio group and remove nCu…
499fcec
…stomFeeRadio setting
e53fa4a Remove custom fee radio group (Andrew Chow)
Pull request description:
Removes the extraneous custom fee radio group and its single radio button. The radio button is replaced with a label that has the radio button's text.
Continuation of bitcoin#11332
Tree-SHA512: b47b675f900ee4e2f4823203a42bb697f707ba67a8504d730c53d4dae511d0ed03226af34efd7ea45570c6111f8b3b6c39ac28f1b5c090de225903442ad4159a
@codablock
Remove unsupported parameter from DecodeHexTx calls
93e3294
@codablock
Fix rawtransaction.py test
3eb0e14
@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
5c81091 to
3eb0e14CompareSeptember 23, 2019 18:50
@codablock
codablock
commented
Sep 23, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make Travis happy
UdjinM6
UdjinM6
approved these changes
Sep 23, 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
Sep 23, 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, commits match bitcoin's merges
@PastaPastaPastaPastaPastaPasta
mentioned this pull request
Sep 24, 2019
 Merged

@UdjinM6
UdjinM6
merged commit 20d59e1
into
dashpay:developSep 24, 2019
@thephezthephez
mentioned this pull request
Oct 2, 2019
 Merged

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

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@PastaPastaPasta@laanwj

, '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
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1 - #3102
Merged
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Sep 24, 2019
Merged
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Conversation
@codablock
@codablockcodablock
commented
Sep 20, 2019

Copy link


Copy Markdown

This is the first set of PRs which were backported into the Bitcoin 0.15 branch and then later released as minor 0.15.x releases. Instead of backporting the commits found in the 0.15 branch, I'm backporting the original PRs which were used to do the backports.
This PR currently builds on top of #3101. I'll rebase this PR later when this is merged.
@codablockcodablock
added this to the 14.1 milestone
Sep 20, 2019
UdjinM6
UdjinM6
requested changes
Sep 20, 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.

Looks good 👍 Just one small issue in tests, see below.
Comment threadtest/functional/rawtransactions.py
Outdated

@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
cc91c72 to
97a969eCompareSeptember 22, 2019 21:00
@codablock
codablock
commented
Sep 22, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop
UdjinM6
UdjinM6
previously approved these changes
Sep 22, 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
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
Sep 22, 2019
@UdjinM6
UdjinM6
commented
Sep 23, 2019

Copy link


Copy Markdown

llmq-is-cl-conflicts.py failed, should be fixed by #3094
laanwjand others
added 10 commits
September 23, 2019 20:49
@laanwj@codablock
Mergebitcoin#10571: [RPC]Move transaction combining from signrawtran…
8308012
…saction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of bitcoin#10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
@laanwj@codablock
Mergebitcoin#11083: Fix combinerawtransaction RPC help result section
124f3db
f9ca0fe Fix combinerawtransaction RPC help result section (Jonas Nick)
Pull request description:
Without this PR it looks like the RPC would return something like a dictionary. But it just returns the transaction in hex.
Tree-SHA512: 565571fbb60cb805f81198cf0eab9ecdc04b62aff58c56145449235cd7c21215f4a1d7a5694d01c1a815fe0e787e5b790d24b71e2f9cc595cda16462ab680b8d
@laanwj@codablock
Mergebitcoin#11081: Add length check for CExtKey deserialization (jo…
a31fb06
…nasschnelli, guidovranken)
07685d1 Add length check for CExtKey deserialization (Jonas Schnelli)
Pull request description:
Fix a potential overwrite or uninitialised data issue.
That code part is currently unused (at least in Bitcoin Core).
We already do the same check `CExtPubKey`.
Reported by @guidovranken
Tree-SHA512: 069ac5335248cf890491bc019537d3b0f7481428a4b240c5cd28ee89b56f4c9f45d947dd626fe89b2fae58472b6dbef57ed909876efe9963e2d72380d17cff12
@laanwj@codablock
Mergebitcoin#11097: gitian: quick hack to fix version string in rele…
7e8d1fc
…ases
4452829 gitian: quick hack to fix version string in releases (Cory Fields)
Pull request description:
Credit: @luke-jr
Release version strings were broken in Gitian by dashpay#7522. This is a minimal fix suitable for 0.15.
After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3
@laanwj@codablock
Mergebitcoin#11119: [doc] build-windows: Mention that only trusty works
10c505c
fa14b67 [doc] build-windows: Mention that only trusty works (MarcoFalke)
Pull request description:
This should prevent people from running into the issues to later find that there is no solution yet.
Tree-SHA512: c0512bb15ebd62113a4195a9577fec4ddacf164509673e178c6b5445c16ab7b110a13ba829e6eebb2a66dff61eeac6ec77f7c5f60bd64685a0c0d99f71f4edf7
@laanwj@codablock
Mergebitcoin#11145: Fix rounding bug in calculation of minimum change
f9453e0
6af49dd Output a bit more information for fee calculation report. (Alex Morcos)
a54c7b9 Fix rounding errors in calculation of minimum change size (Alex Morcos)
Pull request description:
Thanks to @juscamarena for reporting this.
Please backport to 0.15.
There was a potential rounding error where the fee for the change added to the fee for the original tx could be less than the fee for the tx including change.
This is fixed in the first commit. The second commit adds one more snippet of information in the fee calculation report. I actually realized that there is more information that would be nice to report, but we can add that post 0.15.
An open question is whether we should be returning failure if the test in line 2885 is hit or just resetting pick_new_inputs and continuing. Originally I made it a failure to avoid any possible infinite loops. But the case hit here is an example of where that logic possibly backfired.
Tree-SHA512: efe049781acc1f6a8ad429a689359ac6f7b7c44cdfc9578a866dff4a2f6596e8de474a89d25c704f31ef4f8c89af770e98b75ef06c25419d5a6dfc87247bf274
MarcoFalke@codablock
Mergebitcoin#11108: Changing -txindex requires -reindex, not -reinde…
a09370a
…x-chainstate
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo)
Pull request description:
If there's an 0.15.0rc3, this should go in it.
Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
@laanwj@codablock
Mergebitcoin#11334: qt: Remove custom fee radio group and remove nCu…
499fcec
…stomFeeRadio setting
e53fa4a Remove custom fee radio group (Andrew Chow)
Pull request description:
Removes the extraneous custom fee radio group and its single radio button. The radio button is replaced with a label that has the radio button's text.
Continuation of bitcoin#11332
Tree-SHA512: b47b675f900ee4e2f4823203a42bb697f707ba67a8504d730c53d4dae511d0ed03226af34efd7ea45570c6111f8b3b6c39ac28f1b5c090de225903442ad4159a
@codablock
Remove unsupported parameter from DecodeHexTx calls
93e3294
@codablock
Fix rawtransaction.py test
3eb0e14
@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
5c81091 to
3eb0e14CompareSeptember 23, 2019 18:50
@codablock
codablock
commented
Sep 23, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make Travis happy
UdjinM6
UdjinM6
approved these changes
Sep 23, 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
Sep 23, 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, commits match bitcoin's merges
@PastaPastaPastaPastaPastaPasta
mentioned this pull request
Sep 24, 2019
 Merged

@UdjinM6
UdjinM6
merged commit 20d59e1
into
dashpay:developSep 24, 2019
@thephezthephez
mentioned this pull request
Oct 2, 2019
 Merged

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

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@PastaPastaPasta@laanwj

, '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
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1 - #3102
Merged
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Sep 24, 2019
Merged
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Conversation
@codablock
@codablockcodablock
commented
Sep 20, 2019

Copy link


Copy Markdown

This is the first set of PRs which were backported into the Bitcoin 0.15 branch and then later released as minor 0.15.x releases. Instead of backporting the commits found in the 0.15 branch, I'm backporting the original PRs which were used to do the backports.
This PR currently builds on top of #3101. I'll rebase this PR later when this is merged.
@codablockcodablock
added this to the 14.1 milestone
Sep 20, 2019
UdjinM6
UdjinM6
requested changes
Sep 20, 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.

Looks good 👍 Just one small issue in tests, see below.
Comment threadtest/functional/rawtransactions.py
Outdated

@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
cc91c72 to
97a969eCompareSeptember 22, 2019 21:00
@codablock
codablock
commented
Sep 22, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop
UdjinM6
UdjinM6
previously approved these changes
Sep 22, 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
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
Sep 22, 2019
@UdjinM6
UdjinM6
commented
Sep 23, 2019

Copy link


Copy Markdown

llmq-is-cl-conflicts.py failed, should be fixed by #3094
laanwjand others
added 10 commits
September 23, 2019 20:49
@laanwj@codablock
Mergebitcoin#10571: [RPC]Move transaction combining from signrawtran…
8308012
…saction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of bitcoin#10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
@laanwj@codablock
Mergebitcoin#11083: Fix combinerawtransaction RPC help result section
124f3db
f9ca0fe Fix combinerawtransaction RPC help result section (Jonas Nick)
Pull request description:
Without this PR it looks like the RPC would return something like a dictionary. But it just returns the transaction in hex.
Tree-SHA512: 565571fbb60cb805f81198cf0eab9ecdc04b62aff58c56145449235cd7c21215f4a1d7a5694d01c1a815fe0e787e5b790d24b71e2f9cc595cda16462ab680b8d
@laanwj@codablock
Mergebitcoin#11081: Add length check for CExtKey deserialization (jo…
a31fb06
…nasschnelli, guidovranken)
07685d1 Add length check for CExtKey deserialization (Jonas Schnelli)
Pull request description:
Fix a potential overwrite or uninitialised data issue.
That code part is currently unused (at least in Bitcoin Core).
We already do the same check `CExtPubKey`.
Reported by @guidovranken
Tree-SHA512: 069ac5335248cf890491bc019537d3b0f7481428a4b240c5cd28ee89b56f4c9f45d947dd626fe89b2fae58472b6dbef57ed909876efe9963e2d72380d17cff12
@laanwj@codablock
Mergebitcoin#11097: gitian: quick hack to fix version string in rele…
7e8d1fc
…ases
4452829 gitian: quick hack to fix version string in releases (Cory Fields)
Pull request description:
Credit: @luke-jr
Release version strings were broken in Gitian by dashpay#7522. This is a minimal fix suitable for 0.15.
After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3
@laanwj@codablock
Mergebitcoin#11119: [doc] build-windows: Mention that only trusty works
10c505c
fa14b67 [doc] build-windows: Mention that only trusty works (MarcoFalke)
Pull request description:
This should prevent people from running into the issues to later find that there is no solution yet.
Tree-SHA512: c0512bb15ebd62113a4195a9577fec4ddacf164509673e178c6b5445c16ab7b110a13ba829e6eebb2a66dff61eeac6ec77f7c5f60bd64685a0c0d99f71f4edf7
@laanwj@codablock
Mergebitcoin#11145: Fix rounding bug in calculation of minimum change
f9453e0
6af49dd Output a bit more information for fee calculation report. (Alex Morcos)
a54c7b9 Fix rounding errors in calculation of minimum change size (Alex Morcos)
Pull request description:
Thanks to @juscamarena for reporting this.
Please backport to 0.15.
There was a potential rounding error where the fee for the change added to the fee for the original tx could be less than the fee for the tx including change.
This is fixed in the first commit. The second commit adds one more snippet of information in the fee calculation report. I actually realized that there is more information that would be nice to report, but we can add that post 0.15.
An open question is whether we should be returning failure if the test in line 2885 is hit or just resetting pick_new_inputs and continuing. Originally I made it a failure to avoid any possible infinite loops. But the case hit here is an example of where that logic possibly backfired.
Tree-SHA512: efe049781acc1f6a8ad429a689359ac6f7b7c44cdfc9578a866dff4a2f6596e8de474a89d25c704f31ef4f8c89af770e98b75ef06c25419d5a6dfc87247bf274
MarcoFalke@codablock
Mergebitcoin#11108: Changing -txindex requires -reindex, not -reinde…
a09370a
…x-chainstate
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo)
Pull request description:
If there's an 0.15.0rc3, this should go in it.
Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
@laanwj@codablock
Mergebitcoin#11334: qt: Remove custom fee radio group and remove nCu…
499fcec
…stomFeeRadio setting
e53fa4a Remove custom fee radio group (Andrew Chow)
Pull request description:
Removes the extraneous custom fee radio group and its single radio button. The radio button is replaced with a label that has the radio button's text.
Continuation of bitcoin#11332
Tree-SHA512: b47b675f900ee4e2f4823203a42bb697f707ba67a8504d730c53d4dae511d0ed03226af34efd7ea45570c6111f8b3b6c39ac28f1b5c090de225903442ad4159a
@codablock
Remove unsupported parameter from DecodeHexTx calls
93e3294
@codablock
Fix rawtransaction.py test
3eb0e14
@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
5c81091 to
3eb0e14CompareSeptember 23, 2019 18:50
@codablock
codablock
commented
Sep 23, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make Travis happy
UdjinM6
UdjinM6
approved these changes
Sep 23, 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
Sep 23, 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, commits match bitcoin's merges
@PastaPastaPastaPastaPastaPasta
mentioned this pull request
Sep 24, 2019
 Merged

@UdjinM6
UdjinM6
merged commit 20d59e1
into
dashpay:developSep 24, 2019
@thephezthephez
mentioned this pull request
Oct 2, 2019
 Merged

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

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@PastaPastaPasta@laanwj

, '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
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1 - #3102
Merged
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Sep 24, 2019
Merged
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Conversation
@codablock
@codablockcodablock
commented
Sep 20, 2019

Copy link


Copy Markdown

This is the first set of PRs which were backported into the Bitcoin 0.15 branch and then later released as minor 0.15.x releases. Instead of backporting the commits found in the 0.15 branch, I'm backporting the original PRs which were used to do the backports.
This PR currently builds on top of #3101. I'll rebase this PR later when this is merged.
@codablockcodablock
added this to the 14.1 milestone
Sep 20, 2019
UdjinM6
UdjinM6
requested changes
Sep 20, 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.

Looks good 👍 Just one small issue in tests, see below.
Comment threadtest/functional/rawtransactions.py
Outdated

@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
cc91c72 to
97a969eCompareSeptember 22, 2019 21:00
@codablock
codablock
commented
Sep 22, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop
UdjinM6
UdjinM6
previously approved these changes
Sep 22, 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
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
Sep 22, 2019
@UdjinM6
UdjinM6
commented
Sep 23, 2019

Copy link


Copy Markdown

llmq-is-cl-conflicts.py failed, should be fixed by #3094
laanwjand others
added 10 commits
September 23, 2019 20:49
@laanwj@codablock
Mergebitcoin#10571: [RPC]Move transaction combining from signrawtran…
8308012
…saction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of bitcoin#10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
@laanwj@codablock
Mergebitcoin#11083: Fix combinerawtransaction RPC help result section
124f3db
f9ca0fe Fix combinerawtransaction RPC help result section (Jonas Nick)
Pull request description:
Without this PR it looks like the RPC would return something like a dictionary. But it just returns the transaction in hex.
Tree-SHA512: 565571fbb60cb805f81198cf0eab9ecdc04b62aff58c56145449235cd7c21215f4a1d7a5694d01c1a815fe0e787e5b790d24b71e2f9cc595cda16462ab680b8d
@laanwj@codablock
Mergebitcoin#11081: Add length check for CExtKey deserialization (jo…
a31fb06
…nasschnelli, guidovranken)
07685d1 Add length check for CExtKey deserialization (Jonas Schnelli)
Pull request description:
Fix a potential overwrite or uninitialised data issue.
That code part is currently unused (at least in Bitcoin Core).
We already do the same check `CExtPubKey`.
Reported by @guidovranken
Tree-SHA512: 069ac5335248cf890491bc019537d3b0f7481428a4b240c5cd28ee89b56f4c9f45d947dd626fe89b2fae58472b6dbef57ed909876efe9963e2d72380d17cff12
@laanwj@codablock
Mergebitcoin#11097: gitian: quick hack to fix version string in rele…
7e8d1fc
…ases
4452829 gitian: quick hack to fix version string in releases (Cory Fields)
Pull request description:
Credit: @luke-jr
Release version strings were broken in Gitian by dashpay#7522. This is a minimal fix suitable for 0.15.
After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3
@laanwj@codablock
Mergebitcoin#11119: [doc] build-windows: Mention that only trusty works
10c505c
fa14b67 [doc] build-windows: Mention that only trusty works (MarcoFalke)
Pull request description:
This should prevent people from running into the issues to later find that there is no solution yet.
Tree-SHA512: c0512bb15ebd62113a4195a9577fec4ddacf164509673e178c6b5445c16ab7b110a13ba829e6eebb2a66dff61eeac6ec77f7c5f60bd64685a0c0d99f71f4edf7
@laanwj@codablock
Mergebitcoin#11145: Fix rounding bug in calculation of minimum change
f9453e0
6af49dd Output a bit more information for fee calculation report. (Alex Morcos)
a54c7b9 Fix rounding errors in calculation of minimum change size (Alex Morcos)
Pull request description:
Thanks to @juscamarena for reporting this.
Please backport to 0.15.
There was a potential rounding error where the fee for the change added to the fee for the original tx could be less than the fee for the tx including change.
This is fixed in the first commit. The second commit adds one more snippet of information in the fee calculation report. I actually realized that there is more information that would be nice to report, but we can add that post 0.15.
An open question is whether we should be returning failure if the test in line 2885 is hit or just resetting pick_new_inputs and continuing. Originally I made it a failure to avoid any possible infinite loops. But the case hit here is an example of where that logic possibly backfired.
Tree-SHA512: efe049781acc1f6a8ad429a689359ac6f7b7c44cdfc9578a866dff4a2f6596e8de474a89d25c704f31ef4f8c89af770e98b75ef06c25419d5a6dfc87247bf274
MarcoFalke@codablock
Mergebitcoin#11108: Changing -txindex requires -reindex, not -reinde…
a09370a
…x-chainstate
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo)
Pull request description:
If there's an 0.15.0rc3, this should go in it.
Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
@laanwj@codablock
Mergebitcoin#11334: qt: Remove custom fee radio group and remove nCu…
499fcec
…stomFeeRadio setting
e53fa4a Remove custom fee radio group (Andrew Chow)
Pull request description:
Removes the extraneous custom fee radio group and its single radio button. The radio button is replaced with a label that has the radio button's text.
Continuation of bitcoin#11332
Tree-SHA512: b47b675f900ee4e2f4823203a42bb697f707ba67a8504d730c53d4dae511d0ed03226af34efd7ea45570c6111f8b3b6c39ac28f1b5c090de225903442ad4159a
@codablock
Remove unsupported parameter from DecodeHexTx calls
93e3294
@codablock
Fix rawtransaction.py test
3eb0e14
@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
5c81091 to
3eb0e14CompareSeptember 23, 2019 18:50
@codablock
codablock
commented
Sep 23, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make Travis happy
UdjinM6
UdjinM6
approved these changes
Sep 23, 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
Sep 23, 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, commits match bitcoin's merges
@PastaPastaPastaPastaPastaPasta
mentioned this pull request
Sep 24, 2019
 Merged

@UdjinM6
UdjinM6
merged commit 20d59e1
into
dashpay:developSep 24, 2019
@thephezthephez
mentioned this pull request
Oct 2, 2019
 Merged

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

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@PastaPastaPasta@laanwj

, '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
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1 - #3102
Merged
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Sep 24, 2019
Merged
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Conversation
@codablock
@codablockcodablock
commented
Sep 20, 2019

Copy link


Copy Markdown

This is the first set of PRs which were backported into the Bitcoin 0.15 branch and then later released as minor 0.15.x releases. Instead of backporting the commits found in the 0.15 branch, I'm backporting the original PRs which were used to do the backports.
This PR currently builds on top of #3101. I'll rebase this PR later when this is merged.
@codablockcodablock
added this to the 14.1 milestone
Sep 20, 2019
UdjinM6
UdjinM6
requested changes
Sep 20, 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.

Looks good 👍 Just one small issue in tests, see below.
Comment threadtest/functional/rawtransactions.py
Outdated

@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
cc91c72 to
97a969eCompareSeptember 22, 2019 21:00
@codablock
codablock
commented
Sep 22, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop
UdjinM6
UdjinM6
previously approved these changes
Sep 22, 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
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
Sep 22, 2019
@UdjinM6
UdjinM6
commented
Sep 23, 2019

Copy link


Copy Markdown

llmq-is-cl-conflicts.py failed, should be fixed by #3094
laanwjand others
added 10 commits
September 23, 2019 20:49
@laanwj@codablock
Mergebitcoin#10571: [RPC]Move transaction combining from signrawtran…
8308012
…saction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of bitcoin#10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
@laanwj@codablock
Mergebitcoin#11083: Fix combinerawtransaction RPC help result section
124f3db
f9ca0fe Fix combinerawtransaction RPC help result section (Jonas Nick)
Pull request description:
Without this PR it looks like the RPC would return something like a dictionary. But it just returns the transaction in hex.
Tree-SHA512: 565571fbb60cb805f81198cf0eab9ecdc04b62aff58c56145449235cd7c21215f4a1d7a5694d01c1a815fe0e787e5b790d24b71e2f9cc595cda16462ab680b8d
@laanwj@codablock
Mergebitcoin#11081: Add length check for CExtKey deserialization (jo…
a31fb06
…nasschnelli, guidovranken)
07685d1 Add length check for CExtKey deserialization (Jonas Schnelli)
Pull request description:
Fix a potential overwrite or uninitialised data issue.
That code part is currently unused (at least in Bitcoin Core).
We already do the same check `CExtPubKey`.
Reported by @guidovranken
Tree-SHA512: 069ac5335248cf890491bc019537d3b0f7481428a4b240c5cd28ee89b56f4c9f45d947dd626fe89b2fae58472b6dbef57ed909876efe9963e2d72380d17cff12
@laanwj@codablock
Mergebitcoin#11097: gitian: quick hack to fix version string in rele…
7e8d1fc
…ases
4452829 gitian: quick hack to fix version string in releases (Cory Fields)
Pull request description:
Credit: @luke-jr
Release version strings were broken in Gitian by dashpay#7522. This is a minimal fix suitable for 0.15.
After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3
@laanwj@codablock
Mergebitcoin#11119: [doc] build-windows: Mention that only trusty works
10c505c
fa14b67 [doc] build-windows: Mention that only trusty works (MarcoFalke)
Pull request description:
This should prevent people from running into the issues to later find that there is no solution yet.
Tree-SHA512: c0512bb15ebd62113a4195a9577fec4ddacf164509673e178c6b5445c16ab7b110a13ba829e6eebb2a66dff61eeac6ec77f7c5f60bd64685a0c0d99f71f4edf7
@laanwj@codablock
Mergebitcoin#11145: Fix rounding bug in calculation of minimum change
f9453e0
6af49dd Output a bit more information for fee calculation report. (Alex Morcos)
a54c7b9 Fix rounding errors in calculation of minimum change size (Alex Morcos)
Pull request description:
Thanks to @juscamarena for reporting this.
Please backport to 0.15.
There was a potential rounding error where the fee for the change added to the fee for the original tx could be less than the fee for the tx including change.
This is fixed in the first commit. The second commit adds one more snippet of information in the fee calculation report. I actually realized that there is more information that would be nice to report, but we can add that post 0.15.
An open question is whether we should be returning failure if the test in line 2885 is hit or just resetting pick_new_inputs and continuing. Originally I made it a failure to avoid any possible infinite loops. But the case hit here is an example of where that logic possibly backfired.
Tree-SHA512: efe049781acc1f6a8ad429a689359ac6f7b7c44cdfc9578a866dff4a2f6596e8de474a89d25c704f31ef4f8c89af770e98b75ef06c25419d5a6dfc87247bf274
MarcoFalke@codablock
Mergebitcoin#11108: Changing -txindex requires -reindex, not -reinde…
a09370a
…x-chainstate
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo)
Pull request description:
If there's an 0.15.0rc3, this should go in it.
Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
@laanwj@codablock
Mergebitcoin#11334: qt: Remove custom fee radio group and remove nCu…
499fcec
…stomFeeRadio setting
e53fa4a Remove custom fee radio group (Andrew Chow)
Pull request description:
Removes the extraneous custom fee radio group and its single radio button. The radio button is replaced with a label that has the radio button's text.
Continuation of bitcoin#11332
Tree-SHA512: b47b675f900ee4e2f4823203a42bb697f707ba67a8504d730c53d4dae511d0ed03226af34efd7ea45570c6111f8b3b6c39ac28f1b5c090de225903442ad4159a
@codablock
Remove unsupported parameter from DecodeHexTx calls
93e3294
@codablock
Fix rawtransaction.py test
3eb0e14
@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
5c81091 to
3eb0e14CompareSeptember 23, 2019 18:50
@codablock
codablock
commented
Sep 23, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make Travis happy
UdjinM6
UdjinM6
approved these changes
Sep 23, 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
Sep 23, 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, commits match bitcoin's merges
@PastaPastaPastaPastaPastaPasta
mentioned this pull request
Sep 24, 2019
 Merged

@UdjinM6
UdjinM6
merged commit 20d59e1
into
dashpay:developSep 24, 2019
@thephezthephez
mentioned this pull request
Oct 2, 2019
 Merged

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

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@PastaPastaPasta@laanwj

, '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
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1 - #3102
Merged
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Sep 24, 2019
Merged
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Conversation
@codablock
@codablockcodablock
commented
Sep 20, 2019

Copy link


Copy Markdown

This is the first set of PRs which were backported into the Bitcoin 0.15 branch and then later released as minor 0.15.x releases. Instead of backporting the commits found in the 0.15 branch, I'm backporting the original PRs which were used to do the backports.
This PR currently builds on top of #3101. I'll rebase this PR later when this is merged.
@codablockcodablock
added this to the 14.1 milestone
Sep 20, 2019
UdjinM6
UdjinM6
requested changes
Sep 20, 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.

Looks good 👍 Just one small issue in tests, see below.
Comment threadtest/functional/rawtransactions.py
Outdated

@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
cc91c72 to
97a969eCompareSeptember 22, 2019 21:00
@codablock
codablock
commented
Sep 22, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop
UdjinM6
UdjinM6
previously approved these changes
Sep 22, 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
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
Sep 22, 2019
@UdjinM6
UdjinM6
commented
Sep 23, 2019

Copy link


Copy Markdown

llmq-is-cl-conflicts.py failed, should be fixed by #3094
laanwjand others
added 10 commits
September 23, 2019 20:49
@laanwj@codablock
Mergebitcoin#10571: [RPC]Move transaction combining from signrawtran…
8308012
…saction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of bitcoin#10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
@laanwj@codablock
Mergebitcoin#11083: Fix combinerawtransaction RPC help result section
124f3db
f9ca0fe Fix combinerawtransaction RPC help result section (Jonas Nick)
Pull request description:
Without this PR it looks like the RPC would return something like a dictionary. But it just returns the transaction in hex.
Tree-SHA512: 565571fbb60cb805f81198cf0eab9ecdc04b62aff58c56145449235cd7c21215f4a1d7a5694d01c1a815fe0e787e5b790d24b71e2f9cc595cda16462ab680b8d
@laanwj@codablock
Mergebitcoin#11081: Add length check for CExtKey deserialization (jo…
a31fb06
…nasschnelli, guidovranken)
07685d1 Add length check for CExtKey deserialization (Jonas Schnelli)
Pull request description:
Fix a potential overwrite or uninitialised data issue.
That code part is currently unused (at least in Bitcoin Core).
We already do the same check `CExtPubKey`.
Reported by @guidovranken
Tree-SHA512: 069ac5335248cf890491bc019537d3b0f7481428a4b240c5cd28ee89b56f4c9f45d947dd626fe89b2fae58472b6dbef57ed909876efe9963e2d72380d17cff12
@laanwj@codablock
Mergebitcoin#11097: gitian: quick hack to fix version string in rele…
7e8d1fc
…ases
4452829 gitian: quick hack to fix version string in releases (Cory Fields)
Pull request description:
Credit: @luke-jr
Release version strings were broken in Gitian by dashpay#7522. This is a minimal fix suitable for 0.15.
After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3
@laanwj@codablock
Mergebitcoin#11119: [doc] build-windows: Mention that only trusty works
10c505c
fa14b67 [doc] build-windows: Mention that only trusty works (MarcoFalke)
Pull request description:
This should prevent people from running into the issues to later find that there is no solution yet.
Tree-SHA512: c0512bb15ebd62113a4195a9577fec4ddacf164509673e178c6b5445c16ab7b110a13ba829e6eebb2a66dff61eeac6ec77f7c5f60bd64685a0c0d99f71f4edf7
@laanwj@codablock
Mergebitcoin#11145: Fix rounding bug in calculation of minimum change
f9453e0
6af49dd Output a bit more information for fee calculation report. (Alex Morcos)
a54c7b9 Fix rounding errors in calculation of minimum change size (Alex Morcos)
Pull request description:
Thanks to @juscamarena for reporting this.
Please backport to 0.15.
There was a potential rounding error where the fee for the change added to the fee for the original tx could be less than the fee for the tx including change.
This is fixed in the first commit. The second commit adds one more snippet of information in the fee calculation report. I actually realized that there is more information that would be nice to report, but we can add that post 0.15.
An open question is whether we should be returning failure if the test in line 2885 is hit or just resetting pick_new_inputs and continuing. Originally I made it a failure to avoid any possible infinite loops. But the case hit here is an example of where that logic possibly backfired.
Tree-SHA512: efe049781acc1f6a8ad429a689359ac6f7b7c44cdfc9578a866dff4a2f6596e8de474a89d25c704f31ef4f8c89af770e98b75ef06c25419d5a6dfc87247bf274
MarcoFalke@codablock
Mergebitcoin#11108: Changing -txindex requires -reindex, not -reinde…
a09370a
…x-chainstate
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo)
Pull request description:
If there's an 0.15.0rc3, this should go in it.
Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
@laanwj@codablock
Mergebitcoin#11334: qt: Remove custom fee radio group and remove nCu…
499fcec
…stomFeeRadio setting
e53fa4a Remove custom fee radio group (Andrew Chow)
Pull request description:
Removes the extraneous custom fee radio group and its single radio button. The radio button is replaced with a label that has the radio button's text.
Continuation of bitcoin#11332
Tree-SHA512: b47b675f900ee4e2f4823203a42bb697f707ba67a8504d730c53d4dae511d0ed03226af34efd7ea45570c6111f8b3b6c39ac28f1b5c090de225903442ad4159a
@codablock
Remove unsupported parameter from DecodeHexTx calls
93e3294
@codablock
Fix rawtransaction.py test
3eb0e14
@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
5c81091 to
3eb0e14CompareSeptember 23, 2019 18:50
@codablock
codablock
commented
Sep 23, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make Travis happy
UdjinM6
UdjinM6
approved these changes
Sep 23, 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
Sep 23, 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, commits match bitcoin's merges
@PastaPastaPastaPastaPastaPasta
mentioned this pull request
Sep 24, 2019
 Merged

@UdjinM6
UdjinM6
merged commit 20d59e1
into
dashpay:developSep 24, 2019
@thephezthephez
mentioned this pull request
Oct 2, 2019
 Merged

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

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@PastaPastaPasta@laanwj

, '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
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1 - #3102
Merged
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Sep 24, 2019
Merged
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
UdjinM6 merged 10 commits into
dashpay:developfrom 
codablock:pr_pr_backports_v15_v16_2
Conversation
@codablock
@codablockcodablock
commented
Sep 20, 2019

Copy link


Copy Markdown

This is the first set of PRs which were backported into the Bitcoin 0.15 branch and then later released as minor 0.15.x releases. Instead of backporting the commits found in the 0.15 branch, I'm backporting the original PRs which were used to do the backports.
This PR currently builds on top of #3101. I'll rebase this PR later when this is merged.
@codablockcodablock
added this to the 14.1 milestone
Sep 20, 2019
UdjinM6
UdjinM6
requested changes
Sep 20, 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.

Looks good 👍 Just one small issue in tests, see below.
Comment threadtest/functional/rawtransactions.py
Outdated

@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
cc91c72 to
97a969eCompareSeptember 22, 2019 21:00
@codablock
codablock
commented
Sep 22, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop
UdjinM6
UdjinM6
previously approved these changes
Sep 22, 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
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
Sep 22, 2019
@UdjinM6
UdjinM6
commented
Sep 23, 2019

Copy link


Copy Markdown

llmq-is-cl-conflicts.py failed, should be fixed by #3094
laanwjand others
added 10 commits
September 23, 2019 20:49
@laanwj@codablock
Mergebitcoin#10571: [RPC]Move transaction combining from signrawtran…
8308012
…saction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of bitcoin#10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
@laanwj@codablock
Mergebitcoin#11083: Fix combinerawtransaction RPC help result section
124f3db
f9ca0fe Fix combinerawtransaction RPC help result section (Jonas Nick)
Pull request description:
Without this PR it looks like the RPC would return something like a dictionary. But it just returns the transaction in hex.
Tree-SHA512: 565571fbb60cb805f81198cf0eab9ecdc04b62aff58c56145449235cd7c21215f4a1d7a5694d01c1a815fe0e787e5b790d24b71e2f9cc595cda16462ab680b8d
@laanwj@codablock
Mergebitcoin#11081: Add length check for CExtKey deserialization (jo…
a31fb06
…nasschnelli, guidovranken)
07685d1 Add length check for CExtKey deserialization (Jonas Schnelli)
Pull request description:
Fix a potential overwrite or uninitialised data issue.
That code part is currently unused (at least in Bitcoin Core).
We already do the same check `CExtPubKey`.
Reported by @guidovranken
Tree-SHA512: 069ac5335248cf890491bc019537d3b0f7481428a4b240c5cd28ee89b56f4c9f45d947dd626fe89b2fae58472b6dbef57ed909876efe9963e2d72380d17cff12
@laanwj@codablock
Mergebitcoin#11097: gitian: quick hack to fix version string in rele…
7e8d1fc
…ases
4452829 gitian: quick hack to fix version string in releases (Cory Fields)
Pull request description:
Credit: @luke-jr
Release version strings were broken in Gitian by dashpay#7522. This is a minimal fix suitable for 0.15.
After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3
@laanwj@codablock
Mergebitcoin#11119: [doc] build-windows: Mention that only trusty works
10c505c
fa14b67 [doc] build-windows: Mention that only trusty works (MarcoFalke)
Pull request description:
This should prevent people from running into the issues to later find that there is no solution yet.
Tree-SHA512: c0512bb15ebd62113a4195a9577fec4ddacf164509673e178c6b5445c16ab7b110a13ba829e6eebb2a66dff61eeac6ec77f7c5f60bd64685a0c0d99f71f4edf7
@laanwj@codablock
Mergebitcoin#11145: Fix rounding bug in calculation of minimum change
f9453e0
6af49dd Output a bit more information for fee calculation report. (Alex Morcos)
a54c7b9 Fix rounding errors in calculation of minimum change size (Alex Morcos)
Pull request description:
Thanks to @juscamarena for reporting this.
Please backport to 0.15.
There was a potential rounding error where the fee for the change added to the fee for the original tx could be less than the fee for the tx including change.
This is fixed in the first commit. The second commit adds one more snippet of information in the fee calculation report. I actually realized that there is more information that would be nice to report, but we can add that post 0.15.
An open question is whether we should be returning failure if the test in line 2885 is hit or just resetting pick_new_inputs and continuing. Originally I made it a failure to avoid any possible infinite loops. But the case hit here is an example of where that logic possibly backfired.
Tree-SHA512: efe049781acc1f6a8ad429a689359ac6f7b7c44cdfc9578a866dff4a2f6596e8de474a89d25c704f31ef4f8c89af770e98b75ef06c25419d5a6dfc87247bf274
MarcoFalke@codablock
Mergebitcoin#11108: Changing -txindex requires -reindex, not -reinde…
a09370a
…x-chainstate
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo)
Pull request description:
If there's an 0.15.0rc3, this should go in it.
Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
@laanwj@codablock
Mergebitcoin#11334: qt: Remove custom fee radio group and remove nCu…
499fcec
…stomFeeRadio setting
e53fa4a Remove custom fee radio group (Andrew Chow)
Pull request description:
Removes the extraneous custom fee radio group and its single radio button. The radio button is replaced with a label that has the radio button's text.
Continuation of bitcoin#11332
Tree-SHA512: b47b675f900ee4e2f4823203a42bb697f707ba67a8504d730c53d4dae511d0ed03226af34efd7ea45570c6111f8b3b6c39ac28f1b5c090de225903442ad4159a
@codablock
Remove unsupported parameter from DecodeHexTx calls
93e3294
@codablock
Fix rawtransaction.py test
3eb0e14
@codablock
codablockforce-pushed
the
pr_pr_backports_v15_v16_2
branch
from
5c81091 to
3eb0e14CompareSeptember 23, 2019 18:50
@codablock
codablock
commented
Sep 23, 2019

Copy link


Copy Markdown

Author
Rebased on develop to make Travis happy
UdjinM6
UdjinM6
approved these changes
Sep 23, 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
Sep 23, 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, commits match bitcoin's merges
@PastaPastaPastaPastaPastaPasta
mentioned this pull request
Sep 24, 2019
 Merged

@UdjinM6
UdjinM6
merged commit 20d59e1
into
dashpay:developSep 24, 2019
@thephezthephez
mentioned this pull request
Oct 2, 2019
 Merged

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

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

15

Development

Successfully merging this pull request may close these issues.

4 participants

@codablock@UdjinM6@PastaPastaPasta@laanwj