Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102
Merged
UdjinM6 merged 10 commits intodashpay:developfrom Sep 24, 2019
Merged
Backport Bitcoin 0.16 PRs which were backported into 0.15 - part1#3102UdjinM6 merged 10 commits intodashpay:developfrom
UdjinM6 merged 10 commits intodashpay:developfrom
Conversation
UdjinM6
requested changes
Sep 20, 2019
UdjinM6
left a comment
There was a problem hiding this comment.
Looks good 👍 Just one small issue in tests, see below.
cc91c72 to
97a969e
Compare
Author
|
Rebased on develop to make sure this PR still works with the bunch of changes which happened on develop |
|
|
…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
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
…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
…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 bitcoin#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
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
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
…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
…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
5c81091 to
3eb0e14
Compare
Author
|
Rebased on develop to make Travis happy |
PastaPastaPasta
approved these changes
Sep 23, 2019
Member
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK, commits match bitcoin's merges
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.