aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-17Merge bitcoin/bitcoin#26503: [24.x] bump version to v24.0v24.0fanquake
0ee1cfe94a1b735edc2581a05c4b12f8340ff609 doc: add 24.0 release notes (fanquake) 7b9d904c685bb6796dec522344b1de8b7df79683 doc: Generate manual pages for 24.0 final (fanquake) 7c8e5e69d95477fa4277105a4cedc41fafa698b1 build: Bump version to 24.0 final (fanquake) Pull request description: Bump version to v24.0. Regenerate manpages. Pull in the release notes from [the devwiki](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/24.0-Release-Notes-draft): - I've added the credits section; please comment if a name is missing / needs amending. - I've dropped any content-less sections. - If there are items that should be in the release notes, and are still missing, please comment. ACKs for top commit: 0xB10C: ACK 0ee1cfe94a1b735edc2581a05c4b12f8340ff609 Tree-SHA512: b2e9477f515709faf3991a5b4aa4b300cb24178e282bf544e0b86a2cb18e8d79f5f42e65addbf90d74862b816d333735c2793f1bcb50e1b0ed0974ea5821f909
2022-11-17doc: add 24.0 release notesfanquake
2022-11-15doc: Generate manual pages for 24.0 finalfanquake
2022-11-15build: Bump version to 24.0 finalfanquake
2022-11-09Merge bitcoin/bitcoin#26475: [24.x] Bump version to 24.0rc4v24.0rc4MacroFake
da1e753eeb078c98abce3d726c7bd7391faea839 doc: Generate manual pages for 24.0rc4 (fanquake) 1e4db14df9c3026ae1deb45e3f2112ed1f24eeaa build: Bump version to 24.0rc4 (fanquake) Pull request description: Bump version. Regen manpages. Hopefully the final rc given no further bugs / major issues. ACKs for top commit: dergoegge: ACK da1e753eeb078c98abce3d726c7bd7391faea839 hebasto: ACK da1e753eeb078c98abce3d726c7bd7391faea839 Tree-SHA512: aa1e6c44f0d0acdc7348587fc085540e6ea87e09fe9ec5f5856a572f9bbb9ec89c1e16a8c767e26168b32802735108021dd08da3a21d7238296fd7e9c3377d30
2022-11-09Merge bitcoin/bitcoin#26476: qt: 24.0rc4 translations updateMacroFake
7948fdd06059f28a829a38818be641c8bd1992a0 qt: 24.0rc4 translations update (Hennadii Stepanov) Pull request description: This PR pulls the recent translations from the [Transifex.com](https://www.transifex.com/bitcoin/bitcoin) using the [`bitcoin-maintainer-tools/update-translations.py`](https://github.com/bitcoin-core/bitcoin-maintainer-tools/blob/main/update-translations.py) tool. According to our [Release Process docs](https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-every-release-candidate), it is supposed to be merged (just) before `v24.0rc4` tagging. Will keep this PR updated regularly until merging. Top commit has no ACKs. Tree-SHA512: 600e07bbd48116726899b60086acf1e507722bf7458c78f812e13110e58f67cefc6dd8833fcfeb649b40285b706ab89c2ee88a7ac9f6aeb4fc935e47c33f6bdc
2022-11-09qt: 24.0rc4 translations updateHennadii Stepanov
2022-11-09doc: Generate manual pages for 24.0rc4fanquake
2022-11-09build: Bump version to 24.0rc4fanquake
2022-11-09Merge bitcoin/bitcoin#26452: [24.x] rc4 backportsfanquake
42c74a0a4c05c9b44593bacfb444949a8c152236 rpc: doc: add missing option "bech32m" for `change_type` parameters (Sebastian Falbesoner) 6e4d87e69622be8cd9ea199ac62ae36b4ab4f49f tests: Test Taproot PSBT signing with keys in other descriptor (Andrew Chow) 0a5ea2aa84cb8ad8387482c6b1b09322830171bd tests: Use new wallets for each test in wallet_taproot.py (Andrew Chow) 2159676b6e5ce2753db294068a699c0bfc0809fa psbt: Include output pubkey in additional pubkeys to sign (Andrew Chow) 754eefd21cf7bd253d0000e998115406ed7433c6 sign: Fill in taproot pubkey info for all script path sigs (Andrew Chow) bb1fabda307b58a5a48d063e1b72491c17666f97 doc: mention BIP86 in doc/bips.md (Sebastian Falbesoner) Pull request description: Currently backports: * https://github.com/bitcoin/bitcoin/pull/26418 * https://github.com/bitcoin/bitcoin/pull/26443 * https://github.com/bitcoin/bitcoin/pull/26449 ACKs for top commit: dergoegge: ACK 42c74a0a4c05c9b44593bacfb444949a8c152236 Tree-SHA512: e40f57b28cc4c06fc9dedebad6c9ab647fa0b98af1aef2d36874c6a05d39164c99fd763a2eb9ca162b7e276aa2e7d0f5934465ab4d7c1f5ba4a3162087e7089f
2022-11-07rpc: doc: add missing option "bech32m" for `change_type` parametersSebastian Falbesoner
Affects the help of the `fundrawtransaction`, `send` and `walletcratefundedpsbt` RPCs. Github-Pull: #26449 Rebased-From: c3b1fe59dbc7abe45973e282cddf3677514e220f
2022-11-04tests: Test Taproot PSBT signing with keys in other descriptorAndrew Chow
Test that the same keys included in other descriptors will still be able to sign a PSBT that requires those keys. Github-Pull: #26418 Rebased-From: 0de30ed509a9969cb254e00097671625c9e107d2
2022-11-04tests: Use new wallets for each test in wallet_taproot.pyAndrew Chow
To avoid a wallet potentially being able to sign a transaction using keys from descriptors imported in previous tests, make new wallets for each test case rather than sharing them. Github-Pull: #26418 Rebased-From: 6efcdf6b7f6daa83b5937aa630fce358fdaed333
2022-11-04psbt: Include output pubkey in additional pubkeys to signAndrew Chow
In addition to the pubkeys in hd_keypaths and tap_bip32_keypaths, also see if the descriptor can produce a SigningProvider for the output pubkey. Also slightly refactors this area to reduce code duplication. Github-Pull: #26418 Rebased-From: 8781a1b6bbd0af3cfdf1421fd18de5432494619a
2022-11-04sign: Fill in taproot pubkey info for all script path sigsAndrew Chow
Taproot pubkey info was not being added for multi_a signing. The filling of this info is moved into the common function CreateTaprootScriptSig so that any signing of taproot scripts will include the pubkey info. Github-Pull: #26418 Rebased-From: 323890d0d7db2628f9dc6eaeba6e99ce0a12e1f5
2022-11-04doc: mention BIP86 in doc/bips.mdSebastian Falbesoner
Github-Pull: #26443 Rebased-From: 303fb8ff459e67baf97c2ab0b6dd6fa25aff76e3
2022-11-01Merge bitcoin/bitcoin#26436: [24.x] CI backportsMacroFake
7f2dc610a5ac68c915192bf5df5ad9e7177bf18e ci: Use same `merge_script` implementation for Windows as for all (Hennadii Stepanov) 14784aa02c61ef71f028ef1e61e567d7131f79b9 ci: Move `git config` commands into script where they are used (Hennadii Stepanov) b1268254bacabbd5e5c783dd06879ea96c327ad8 ci: Use remote pull/merge ref instead of local git merge (MacroFake) Pull request description: This PR backports: - https://github.com/bitcoin/bitcoin/pull/26202 - https://github.com/bitcoin/bitcoin/pull/26236 to avoid CI failures like that: - https://cirrus-ci.com/task/5653459278495744 - https://cirrus-ci.com/task/6075671743561728 ACKs for top commit: fanquake: ACK 7f2dc610a5ac68c915192bf5df5ad9e7177bf18e - backports look correct. Tree-SHA512: 46b45df8137efd42491dd3ac110c00e6e1bf4ab18a6bbbf68307fe976f391055b1987a22c101060ef5ae8ff1a2b738e197ad579754d1068d78f5eddcd45c7f69
2022-11-01Merge bitcoin/bitcoin#26434: [24.x] [gui] Bugfix: Check for readlink buffer ↵fanquake
overflow and handle gracefully e049fd76f0d57c1e6400fbfbaf4cc6ebe540f16f Bugfix: Check for readlink buffer overflow and handle gracefully (Luke Dashjr) Pull request description: Identical commit taken as-is from https://github.com/bitcoin/bitcoin/pull/25548 for backport ACKs for top commit: hebasto: ACK e049fd76f0d57c1e6400fbfbaf4cc6ebe540f16f Tree-SHA512: 37e63d570de898187c1bc8dd311c299c527adea51faa08aa6a3923bdb9390e3263902ace3d52a1cfc34ac2ba84e9358961574f886be1f64b5749a62e3c50ad57
2022-11-01ci: Use same `merge_script` implementation for Windows as for allHennadii Stepanov
Github-Pull: bitcoin/bitcoin#26236 Rebased-From: 37cf4720635b63cbe36a900a2411718704b63899
2022-11-01ci: Move `git config` commands into script where they are usedHennadii Stepanov
Github-Pull: bitcoin/bitcoin#26236 Rebased-From: ac1d99240af6c5d3ed5db2beea1479903d949a37
2022-11-01ci: Use remote pull/merge ref instead of local git mergeMacroFake
The merge strategy on the remote may be different than the local one. This may cause local merges to be different or fail completely. Fix this by using the result of the remote merge. Github-Pull: bitcoin/bitcoin#26202 Rebased-From: fad7281d7842f337932cf44e703fdd631230ddd6
2022-10-31Merge bitcoin/bitcoin#26428: [24.x] Bump version to 24.0rc3v24.0rc3MacroFake
1727b3bc5424b2a35bed69e12b7e8cfacdb4b52e doc: Generate manual pages for 24.0rc3 (fanquake) 3905706b706825f65646e8ee3bb0e90d91254819 build: Bump version to 24.0rc3 (fanquake) Pull request description: It's been a number of weeks since rc2. Bump version. Regen manpages. ACKs for top commit: instagibbs: ACK https://github.com/bitcoin/bitcoin/pull/26428/commits/1727b3bc5424b2a35bed69e12b7e8cfacdb4b52e Tree-SHA512: 52ee45cfa4e2fc193e2747472d267a8c473ad8ed33abc6fbb0e2834bcf84adde050d51789f8bb150d62dfef70a59d52fe3b93e02d31675c054f6435323036df4
2022-10-31doc: Generate manual pages for 24.0rc3fanquake
2022-10-31build: Bump version to 24.0rc3fanquake
2022-10-31Merge bitcoin/bitcoin#26410: [24.x] rc3 backportsfanquake
d5701900fcf70220701a1686588114db165dce1c rpc: make `address` field optional (w0xlt) e4b8c9b2bf2118064e68d33f6b7207e721ae03dd rpc: add non-regression test about deriveaddresses crash when index is 2147483647 (muxator) bf2bf73bcbc5277074f1211c20b71995a175c314 rpc: fix crash in deriveaddresses when derivation index is 2147483647 (muxator) b04f5f960893983400e07b96dbe9fe68383a21d2 test: Test for out of bounds vout in sendall (Andrew Chow) dedee6af572471b9beeebca9543934e788484b2e wallet: Check utxo prevout index out of bounds in sendall (Andrew Chow) 931db785ee6f5c34e0f053314bc8c70b01642b72 test: Test that sendall works with watchonly spending specific utxos (Andrew Chow) bbe864a13a2e5ce15674eda5c3760ee851120c63 wallet: Correctly check ismine for sendall (Andrew Chow) 4b7d30d026815dbe2330cd3e2edc044835a3eaed Adjust `.tx/config` for new Transifex CLI (Hennadii Stepanov) Pull request description: Backports: * https://github.com/bitcoin/bitcoin/pull/26321 * https://github.com/bitcoin/bitcoin/pull/26344 * https://github.com/bitcoin/bitcoin/pull/26275 * https://github.com/bitcoin/bitcoin/pull/26349 ACKs for top commit: instagibbs: ACK https://github.com/bitcoin/bitcoin/pull/26410/commits/d5701900fcf70220701a1686588114db165dce1c hebasto: ACK d5701900fcf70220701a1686588114db165dce1c, I've cherry-picked commits manually and got zero diff with this PR branch. Tree-SHA512: dad64f4074b4f06d666c0f2d804eda92df241bcce0a49c28486311a151f2e9d46b75e1bce02de570dcc85957c9ce936debb2a4faa045800c9757c6c495115d7c
2022-10-31Merge bitcoin/bitcoin#26379: qt: 24.0rc3 translations updatefanquake
33a61018b2e3618f5eb72b7c5aaf25f8d98762fc qt: 24.0rc3 translations update (Hennadii Stepanov) Pull request description: This PR pulls the recent translations from the [Transifex.com](https://www.transifex.com/bitcoin/bitcoin) using the [`bitcoin-maintainer-tools/update-translations.py`](https://github.com/bitcoin-core/bitcoin-maintainer-tools/blob/main/update-translations.py) tool. According to our [Release Process docs](https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-every-release-candidate), it is supposed to be merged (just) before `v24.0rc3` tagging. Will keep this PR updated regularly until merging. Top commit has no ACKs. Tree-SHA512: ab8c44961356333cb60e102f54852b9721fb0d4a9dbe719c049007f522218391e29898c698b7e142512f98d21ef4c6b500b00c6ce107600690421ab2ade1cc70
2022-10-30qt: 24.0rc3 translations updateHennadii Stepanov
2022-10-28rpc: make `address` field optionalw0xlt
Github-Pull: #26349 Rebased-From: eb679a7896ce00e322972a011b023661766923b9
2022-10-28rpc: add non-regression test about deriveaddresses crash when index is ↵muxator
2147483647 This test would cause a crash in bitcoind (see #26274) if the fix given in the previous commit was not applied. Github-Pull: #26275 Rebased-From: 9153ff3e274953ea0d92d53ddab4c72deeace1b1
2022-10-28rpc: fix crash in deriveaddresses when derivation index is 2147483647muxator
2147483647 is the maximum positive value of a signed int32, and - currently - the maximum value that the deriveaddresses bitcoin RPC call accepts as derivation index due to its input validation routines. Before this change, when the derivation index (and thus range_end) reached std::numeric_limits<int_32_t>::max(), the "i" variable in the for cycle (which is declared as int, and as such 32 bits in size on most platforms) would be incremented at the end of the first iteration and then warp back to -2147483648. This caused SIGABRT in bitcoind and a core dump. This change assigns "i" an explicit size of 64 bits on every platform, sidestepping the problem. Fixes #26274. Github-Pull: #26275 Rebased-From: addf9d6502db12cebcc5976df3111cac1a369b82
2022-10-28test: Test for out of bounds vout in sendallAndrew Chow
Github-Pull: #26344 Rebased-From: 315fd4dbabb6b631b755811742a3bdf93e1241bf
2022-10-28wallet: Check utxo prevout index out of bounds in sendallAndrew Chow
Github-Pull: #26344 Rebased-From: b132c85650afb2182f2e58e903f3d6f86fd3fb22
2022-10-28test: Test that sendall works with watchonly spending specific utxosAndrew Chow
Github-Pull: #26344 Rebased-From: 708b72b7151c855cb5dac2fb6a81e8f35153c46f
2022-10-28wallet: Correctly check ismine for sendallAndrew Chow
sendall should be using a bitwise AND for sendall's IsMine check rather than an equality as IsMine will never return ISMINE_ALL. Github-Pull: #26344 Rebased-From: 6bcd7e2a3b52f855db84cd23b5ee70d27be3434f
2022-10-28Adjust `.tx/config` for new Transifex CLIHennadii Stepanov
The old Transifex Command-Line Tool is considered deprecated (as of January 2022) and will sunset on Nov 30, 2022. See: https://github.com/transifex/cli/blob/devel/README.md#migrating-from-older-versions-of-the-client An accompanying PR: https://github.com/bitcoin-core/bitcoin-maintainer-tools/pull/142 Github-Pull: #26321 Rebased-From: d6adbb7ee1de661ad89879609eecd11129322405
2022-10-27Merge bitcoin/bitcoin#26382: [24.x] p2p: Handle ↵glozow
IsContinuationOfLowWorkHeadersSync return value correctly when new headers sync is started e23def8fcc4558b1a49ee8f2dd608fe91ced1d6d [net processing] Handle IsContinuationOfLowWorkHeadersSync return value correctly when new headers sync is started (dergoegge) Pull request description: Backport of #26355. ACKs for top commit: dergoegge: ACK e23def8fcc4558b1a49ee8f2dd608fe91ced1d6d stickies-v: ACK e23def8fcc4558b1a49ee8f2dd608fe91ced1d6d Tree-SHA512: 051ecb08f1f96557b5b6d01cc9d29a5dfabbb48afffd52cba662251c23277938fcbb6f207fc7575774ef627a9484ceb056cc75476861b920723c35c2f5da36c8
2022-10-24[net processing] Handle IsContinuationOfLowWorkHeadersSync return value ↵dergoegge
correctly when new headers sync is started
2022-10-18Merge bitcoin/bitcoin#26327: [24.x] Revert "build: Use Homebrew's sqlite ↵fanquake
package if it is available" d216d714aae36e6f1c95f82aef81a0be74dee2f3 Revert "build: Use Homebrew's sqlite package if it is available" (fanquake) Pull request description: Identical commit, taken as-is from https://github.com/bitcoin/bitcoin/pull/25985 ACKs for top commit: dergoegge: ACK d216d714aae36e6f1c95f82aef81a0be74dee2f3 hebasto: ACK d216d714aae36e6f1c95f82aef81a0be74dee2f3 Tree-SHA512: 8fe4cd20602e506f9cf4caa4d7b6c59142eccdd103cd6748f6e3e23464836d620b2d6142cb247a991fa8df5aa19678635d00ece5cf24d825ae6ca184c3bf7c48
2022-10-14Merge bitcoin/bitcoin#26309: [24.x] Bump version to 24.0rc2v24.0rc2fanquake
d68b6abeb844daa907c7d8c103efac4092de34c0 doc: Generate example bitcoin conf for 24.0rc2 (fanquake) c349096fa26171a6753dc114252d7cecdc9df412 doc: Generate manual pages for 24.0rc2 (fanquake) e5aec59e0f5c4e7ae1e91e0fe619eec7d8187ea8 build: Bump version to 24.0rc2 (fanquake) Pull request description: We are due for an rc2. Bump version. Regen manpages. Regen exmaple bitcoin.conf. ACKs for top commit: LarryRuane: utACK d68b6abeb844daa907c7d8c103efac4092de34c0 jarolrod: ACK d68b6abeb844daa907c7d8c103efac4092de34c0 hebasto: ACK d68b6abeb844daa907c7d8c103efac4092de34c0, also verified the diff in `bitcoind -help` output between rc1 and rc2, and its reflection in the last commit. Tree-SHA512: 258091f68f82b449810f3220170cbb4d22424061a753a3e99edf5df15881885dc74e07c7ba1b45f9b2623cee2dcdaabb82109b0bdce7a30b6623454d5346ddef
2022-10-14doc: Generate example bitcoin conf for 24.0rc2fanquake
2022-10-14doc: Generate manual pages for 24.0rc2fanquake
2022-10-14build: Bump version to 24.0rc2fanquake
2022-10-13Merge bitcoin/bitcoin#26133: [24.x] Backports for rc2Andrew Chow
e2e4c2969ba753a94587985582123a596f57067b tests: Test that PSBT_OUT_TAP_TREE is included correctly (Andrew Chow) 4d42c3a2401c63084bf94433609240daa366753e psbt: Only include m_tap_tree if it has scripts (Andrew Chow) d810fde8ea64b71567f8b50895ac76bcb7afbfbc psbt: Change m_tap_tree to store just the tuples (Andrew Chow) a9419eff0cc21d21755165e66cc0e496aab65650 tests: Test that PSBT_OUT_TAP_TREE is combined correctly (Andrew Chow) 4abd2ab18e26999e2dafcb15a58a7979de90af34 psbt: Fix merging of m_tap_tree (Andrew Chow) 1390c96c8e9c56e0d8348ef056f18e3e04f0f63f [BugFix]: Do not allow deserializing PSBT with empty PSBT_OUT_TAP_TREE (Jeremy Rubin) 9b438f06ecfc3fb21d2c5219b71fb4aa77875b8c refactor: revert m_next_resend to not be std::atomic (stickies-v) 43ced0b436b05ed12489a99bbac89f3b4c9ac035 wallet: only update m_next_resend when actually resending (stickies-v) fc8f2bfa3abc284ae3c1127fcf36535603ecc891 refactor: carve out tx resend timer logic into ShouldResend (stickies-v) a6fb674f966df27c09dc3d2b81040ce2965b2d7e refactor: remove unused locks for ResubmitWalletTransactions (stickies-v) 5ad82a09b409d416236092062a4201e238dfd68b index: Improve BaseIndex::BlockUntilSyncedToCurrentChain reliability (Ryan Ofsky) 997faf6b6c774dc87ae730f2f08d7f4f08bdfd04 contrib: Fix capture_output in getcoins.py (willcl-ark) 7e0bcfbfef61cb688bc92a96003c1219cad67935 p2p: ProcessHeadersMessage(): fix received_new_header (Larry Ruane) c97d924880eaad136c5f7776f05bf887657ccca7 Correct sanity-checking script_size calculation (Pieter Wuille) da6fba6fe785ba2c54f9b88dd5b1b4ceb02c18c9 docs: Add 371 to bips.md (Andrew Chow) Pull request description: Will collect backports for rc2 as they become available. Currently: * https://github.com/bitcoin/bitcoin/pull/25858 * https://github.com/bitcoin/bitcoin/pull/26124 * https://github.com/bitcoin/bitcoin/pull/26149 * https://github.com/bitcoin/bitcoin/pull/26172 * https://github.com/bitcoin/bitcoin/pull/26205 * https://github.com/bitcoin/bitcoin/pull/26212 * https://github.com/bitcoin/bitcoin/pull/26215 ACKs for top commit: dergoegge: ACK e2e4c2969ba753a94587985582123a596f57067b achow101: ACK e2e4c2969ba753a94587985582123a596f57067b instagibbs: ACK https://github.com/bitcoin/bitcoin/pull/26133/commits/e2e4c2969ba753a94587985582123a596f57067b Tree-SHA512: b6374fe202561057dbe1430d4c40f06f721eb568f91e7275ae1ee7747edf780ce64620382d13ecc4b9571d931dc25d226af8284987cf35ff6a6182c5f64eb10c
2022-10-13tests: Test that PSBT_OUT_TAP_TREE is included correctlyAndrew Chow
Github-Pull: #25858 Rebased-From: 9e386afb67bf8fa71b72f730da1695eeb11828cd
2022-10-13psbt: Only include m_tap_tree if it has scriptsAndrew Chow
Github-Pull: #25858 Rebased-From: 30ff25cf37eec4b09ab40424eb5d6a4a80410955
2022-10-13psbt: Change m_tap_tree to store just the tuplesAndrew Chow
Instead of having an entire TaprootBuilder which may or may not be complete, and could potentially have future changes that interact oddly with taproot tree tuples, have m_tap_tree be just the tuples. When needed in other a TaprootBuilder for actual use, the tuples will be added to a a TaprootBuilder that, in the future, can take in whatever other data is needed as well. Github-Pull: #25858 Rebased-From: 0577d423adda8e719d7611d03355680c8fbacab8
2022-10-13tests: Test that PSBT_OUT_TAP_TREE is combined correctlyAndrew Chow
Github-Pull: #25858 Rebased-From: 22c051ca70bae73e0430b05fb9d879591df27699
2022-10-13psbt: Fix merging of m_tap_treeAndrew Chow
Merging should be checking that the current PSBTOutput doesn't have a taptree and the other one's is copied over. The original merging had this inverted and would remove m_tap_tree if the other did not have it. Github-Pull: #25858 Rebased-From: 7df6e1bb77a96eac4fbcba424bbe780636b86650
2022-10-13[BugFix]: Do not allow deserializing PSBT with empty PSBT_OUT_TAP_TREEJeremy Rubin
Github-Pull: #25858 Rebased-From: 0652dc53b291bd295caff4093ec2854fd4b34645
2022-10-13refactor: revert m_next_resend to not be std::atomicstickies-v
Since m_next_resend is now only called from MaybeResendWalletTxs() we don't have any potential race conditions anymore, so the usage of std::atomic can be reverted. Github-Pull: #26205 Rebased-From: b01682a812f0841170657708ef0e896b904fcd77