backport: merge bitcoin#19289, #19998, #17775, #19401, #20167, #20187, #19961, #21114, #21170 (auxiliary backports: part 12)#5842
Merged
Conversation
kwvg
force-pushed
the
bps_jan_03
branch
2 times, most recently
from
28acf75 to
2b04c1e
Compare
knst
reviewed
Jan 25, 2024
Collaborator
knst
left a comment
knst
left a comment
There was a problem hiding this comment.
Overall seems fine, but check my suggestion please
Collaborator
There was a problem hiding this comment.
maybe refactor it to avoid code duplication?
bool isSpendable(const CTxDestination& dest) override
{
return isSpendable(GetScriptForDestination(dest));
}
Collaborator
Author
There was a problem hiding this comment.
Out of scope of the backport, can be done separately.
Collaborator
There was a problem hiding this comment.
could you mention that it's missing changes from bitcoin#15383 ?
Collaborator
Author
There was a problem hiding this comment.
These are not missing changes, these were intentional logic changes done when bitcoin#15383 was backported in dash#4638.
@UdjinM6 on Mar 6, 2022:
Have to bump mocktime on all nodes because otherwise other nodes will ban us for relaying blocks from the future.
UdjinM6
requested changes
Jan 25, 2024
kwvg
force-pushed
the
bps_jan_03
branch
2 times, most recently
from
ce9ff9b to
105519a
Compare
kwvg
changed the title
kwvg
changed the title
UdjinM6
previously approved these changes
Feb 1, 2024
|
This pull request has conflicts, please rebase. |
kwvg
changed the title
knst
approved these changes
Feb 1, 2024
Collaborator
knst
left a comment
knst
left a comment
There was a problem hiding this comment.
utACK
Let's have a draft PR with removed backports due to breaking changes?
[rpc] don't automatically append inputs in walletcreatefundedpsbt bitcoin/bitcoin#16377
The ultimate send RPC bitcoin/bitcoin#16378
test: Fix intermittent issue in wallet_import_rescan bitcoin/bitcoin#20179
5 tasks
PastaPastaPasta
approved these changes
Feb 6, 2024
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit
PastaPastaPasta
force-pushed
the
bps_jan_03
branch
from
690be2d to
bb02a88
Compare
PastaPastaPasta
added a commit
that referenced
this pull request
Mar 8, 2024
, bitcoin#19969 (send rpc) 76a49ad merge bitcoin#19969: Send RPC bug fix and touch-ups (Kittywhiskers Van Gogh) 17e2168 merge bitcoin#20179: Fix intermittent issue in wallet_import_rescan (Kittywhiskers Van Gogh) c0f6b55 merge bitcoin#16378: The ultimate send RPC (Kittywhiskers Van Gogh) a5da10e merge bitcoin#16377: don't automatically append inputs in walletcreatefundedpsbt (Kittywhiskers Van Gogh) Pull request description: ## Additional Information Extracted from [dash#5842](#5842) due to breaking changes and placed into its own PR to be merged during new major version development cycle. ## Breaking Changes _(Taken from `release-notes-5861.md`)_ - The `walletcreatefundedpsbt` RPC call will now fail with `Insufficient funds` when inputs are manually selected but are not enough to cover the outputs and fee. Additional inputs can automatically be added through the new `add_inputs` option. - The `fundrawtransaction` RPC now supports `add_inputs` option that when `false` prevents adding more inputs if necessary and consequently the RPC fails. - A new `send` RPC with similar syntax to `walletcreatefundedpsbt`, including support for coin selection and a custom fee rate. The `send` RPC is experimental and may change in subsequent releases. Using it is encouraged once it's no longer experimental: `sendmany` and `sendtoaddress` may be deprecated in a future release. ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: LGTM, utACK 76a49ad knst: utACK 76a49ad PastaPastaPasta: utACK 76a49ad Tree-SHA512: 05c5fc8c67b5ac9a97d28f8585f457904f71aed4702a0ffb8ec32dfd8e7f54f5bfd4981d53329e518cc0d29b9c4e830221b8e1f0bc4099f957778be420b6fb1f
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
5 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.
Additional Information
Soft dependency on backport: bitcoin#16528, #18027, #18782, #18787, #18805, #18888, #19502, #19077, #20125, #20153, #20198, #20262, #20266, #23608, #29510 - native descriptor wallets #5579 due to bitcoin#16377Retaining bitcoin#16377 as part of this PRNORMAL_GBT_REQUEST_PARAMShas been annotated withtype: ignore[var-annotated]to suppress amypytype annotation error that appeared an earlier build