-
Notifications
You must be signed in to change notification settings - Fork 386
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
merging: v24/v25 branch #1415
Draft
delta1
wants to merge
3,936
commits into
master
Choose a base branch
from
merged-master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
merging: v24/v25 branch #1415
Conversation
This file contains 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
Also removes the redundant redeclaration of CheckMinimalPush from interpreter.h that was moved to script.h in f4e289f
2 minor rbf tests commented out with ELEMENTS FIXME
related to the FIXME in #25625, PSBT python class needs to be reworked for elements
This should be reviewed carefully. The new availablecoins_test was showing an intermittent error [1]. The test variants were split out into their own test cases to work around the issue, but requires further investigation. [1]: #1370
FIXME introduces a new regression test to reproduce the issue commented out in the confidential transaction functional test
…oin#26448) 1667577042 2022-11-04T16:50:42+01:00 e42ba13 Bitcoin Merge bitcoin/bitcoin#26448: test: fix intermittent failure in p2p_sendtxrcncl.py 1667576919 2022-11-04T15:48:39+00:00 83cf055 Bitcoin Merge bitcoin/bitcoin#26443: doc: mention BIP86 in doc/bips.md 1667478613 2022-11-03T13:30:13+01:00 28653a5 Bitcoin Merge bitcoin/bitcoin#26445: .python-version: bump patch version to 3.6.15 1667471345 2022-11-03T10:29:05+00:00 2a7c998 Bitcoin Merge bitcoin/bitcoin#25248: refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert() 1667397640 2022-11-02T15:00:40+01:00 5274f32 Bitcoin Merge bitcoin/bitcoin#26417: test: fix intermittent failure in feature_index_prune.py 1667372848 2022-11-02T08:07:28+01:00 39f026b Bitcoin Merge bitcoin/bitcoin#26396: net: Avoid SetTxRelay for feeler connections 1667316369 2022-11-01T16:26:09+01:00 bf0cb43 Bitcoin Merge bitcoin/bitcoin#26437: test: remove unused `CHANGE_{XPRV,XPUB}` constants 1667300957 2022-11-01T11:09:17+00:00 5668cce Bitcoin Merge bitcoin/bitcoin#25548: gui: Check for readlink buffer overflow and handle gracefully 1667297563 2022-11-01T10:12:43+00:00 c041d8f Bitcoin Merge bitcoin/bitcoin#26360: build: remove threadinterrupt from libbitcoinkernel 1667297149 2022-11-01T10:05:49+00:00 27e76af Bitcoin Merge bitcoin/bitcoin#26294: build: move util/url to common/url 1667291397 2022-11-01T08:29:57+00:00 d08b63b Bitcoin Merge bitcoin/bitcoin#26373: Update minisketch subtree to latest upstream 1667230521 2022-10-31T15:35:21+00:00 43e813c Bitcoin Merge bitcoin/bitcoin#26387: p2p: TryLowWorkHeadersSync follow-ups 1667217075 2022-10-31T11:51:15+00:00 4766cd1 Bitcoin Merge bitcoin/bitcoin#24051: Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ 1667213203 2022-10-31T11:46:43+01:00 2856dee Bitcoin Merge bitcoin/bitcoin#26402: doc: Fix typos 1667202170 2022-10-31T08:42:50+01:00 c75c0d8 Bitcoin Merge bitcoin/bitcoin#26424: doc: correct deriveaddresses RPC name 1667034850 2022-10-29T11:14:10+02:00 4f270d2 Bitcoin Merge bitcoin/bitcoin#26404: test: fix intermittent failure in rpc_getblockfrompeer.py 1667030363 2022-10-29T09:59:23+02:00 984a015 Bitcoin Merge bitcoin/bitcoin#26408: test: Remove spam from debug log 1666985837 2022-10-28T15:37:17-04:00 8b05076 Bitcoin Merge bitcoin/bitcoin#26409: refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts 1666949533 2022-10-28T11:32:13+02:00 1bad29f Bitcoin Merge bitcoin/bitcoin#26377: test: Make `system_tests/run_command` test locale and platform agnostic
…oin#26240) FIXME in wallet_taproot.py functional test 1668424146 2022-11-14T12:09:06+01:00 48174c0 Bitcoin Merge bitcoin/bitcoin#26240: rpc: Adjust RPCTypeCheckObj error string 1668417474 2022-11-14T10:17:54+01:00 59e00c7 Bitcoin Merge bitcoin/bitcoin#25714: univalue: Avoid std::string copies 1668111238 2022-11-10T15:13:58-05:00 7ef730c Bitcoin Merge bitcoin/bitcoin#26483: test: Don't pass add_to_wallet option to walletcreatefundedpsbt 1668004459 2022-11-09T15:34:19+01:00 9dce301 Bitcoin Merge bitcoin/bitcoin#26472: test: add missing bech32m / BIP86 test-cases to wallet_descriptor.py 1667992471 2022-11-09T12:14:31+01:00 44ca5d5 Bitcoin Merge bitcoin/bitcoin#26473: test: Avoid collision with valid path names in `getarg_tests/logargs` 1667640759 2022-11-05T10:32:39+01:00 50422b7 Bitcoin Merge bitcoin/bitcoin#26419: log: mempool: log removal reason in validation interface 1667636699 2022-11-05T09:24:59+01:00 ce57dba Bitcoin Merge bitcoin/bitcoin#26449: rpc: doc: add missing option "bech32m" for `change_type` parameters 1667577253 2022-11-04T15:54:13+00:00 ae6bb6e Bitcoin Merge bitcoin/bitcoin#26418: Fix signing of multi_a and rawtr scripts with wallets that only have corresponding keys
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
merges past bitcoin v24 and part way to v25, with latest from elements
draft while I continue working towards v25, and to see how bad CI is