aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-21Use CAmount for fee delta and modified feeMarcoFalke
2022-03-21Replace struct update_fee_delta with lambdaMarcoFalke
2022-03-21Merge bitcoin/bitcoin#23880: p2p: Serialize cmpctblock at most once in ↵MarcoFalke
NewPoWValidBlock fa61dd44f99323d10b0122c13224bc5cdb5e3d2a p2p: Serialize cmpctblock at most once in NewPoWValidBlock (MarcoFalke) Pull request description: Instead of serializing for each peer, serialize at most once and copy the raw data for each peer. ACKs for top commit: shaavan: reACK fa61dd44f99323d10b0122c13224bc5cdb5e3d2a theStack: Code-review ACK fa61dd44f99323d10b0122c13224bc5cdb5e3d2a Tree-SHA512: ed029aeaea67fdac8ddb865069f8166bc0dd8480418c405628e3e1a43b61161584a09a1814668bcd220602e8732e188be2bfed9242aa81bdbd92c64c702ed138
2022-03-21Merge bitcoin/bitcoin#24601: ci: add ci/scratch dir to .gitignoreMarcoFalke
702759588d62869321b3359f0716247d8c4a1471 add ci/scratch dir to gitignore (josibake) Pull request description: Not sure if I'm missing some context as to why this isn't already ignored? ACKs for top commit: hebasto: re-ACK 702759588d62869321b3359f0716247d8c4a1471, tested on Ubuntu 22.04. Tree-SHA512: 1f13041cb27cd3687619105ac1bb3af4c31d000fcd98e5f84160c34649de532fcd8b98cb8a5bed0ba68e25b3bb344f669ea3567b9c9d86cf73386ddf276f292e
2022-03-20Merge bitcoin-core/gui#554: Add and improve translator comments and tooltips ↵Hennadii Stepanov
for peers tab address fields 4d2b503d6cbb593cf75cf053fd480de64b3f4fc0 gui: improve "Addresses Rate-Limited" translator comments and tooltip in peers tab (Jon Atack) 81ef1f7ef182050efaed7ab40b1b159a8ada3739 gui: improve "Addresses Processed" translator comments and tooltip in peers tab (Jon Atack) 77f24aac52288532f2a818e49482b0d4761dff27 gui: improve "Address Relay" translator comments and tooltip in peers tab (Jon Atack) Pull request description: Per translator feedback in this thread: https://github.com/bitcoin-core/gui/pull/526#discussion_r809237830 *"The lack of string context in Transifex is a real problem for this project, as proper context (dev notes and/or screenshots) are essential to achieve quality translations."* This pull adds developer notes for transifex translators via `extracomment` tags, and it improves the existing ones and their tooltips with more context, clarity and completeness for the following peer tab fields as a follow-up to bitcoin-core/gui#526: - address relay - addresses processed - addressed rate-limited It looks like only six lines of diff, but they are loooong lines. If this is the right direction, the same can be done for other fields in follow-ups. ACKs for top commit: jarolrod: re-ACK [4d2b503](https://github.com/bitcoin-core/gui/commit/4d2b503d6cbb593cf75cf053fd480de64b3f4fc0) hebasto: ACK 4d2b503d6cbb593cf75cf053fd480de64b3f4fc0, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: a185f46a66375a5fd6854640745b7d1d00740cf7be58db03256f44d71acc351e1770de137cb3bc9c1f0ea3cabd7cfa1cb1ccb87ec0df222680924ca3dab6c8bf
2022-03-18Merge bitcoin/bitcoin#24608: doc: clarify that BDB is only required for the ↵fanquake
legacy wallet in build-unix.md 307215b6c5e4a4689fabb37f246a410767c8a3f4 doc: clarify that BDB is only required for the legacy wallet (fanquake) Pull request description: ACKs for top commit: gruve-p: ACK https://github.com/bitcoin/bitcoin/pull/24608/commits/307215b6c5e4a4689fabb37f246a410767c8a3f4 darosior: ACK 307215b6c5e4a4689fabb37f246a410767c8a3f4 Tree-SHA512: d77d013831e3e76a596603fbea80958c1cf4d3e65591debd66cd4f5ff77300dae7e81df8e7d79f3f4d2e561bb3e8090434b704586e2568ca8e89ba8196de173c
2022-03-18add ci/scratch dir to gitignorejosibake
2022-03-18Merge bitcoin/bitcoin#24578: test: Fix intermittent failure in feature_segwitMarcoFalke
d6b24e14d2a828ba7328f0cae1d0d7c5f4f6b3bd test: Fix intermittent failure in feature_segwit (DrahtBot) Pull request description: There are intermittent failures on current master (https://github.com/bitcoin/bitcoin/pull/24421#issuecomment-1067451667) as the witness txs occasionally make it into other node's mempools when they shouldn't. Fix this by removing the test as suggested earlier in https://github.com/bitcoin/bitcoin/pull/24421#discussion_r822933721. Fixes https://github.com/bitcoin/bitcoin/issues/24590 ACKs for top commit: aureleoules: tACK d6b24e14d2a828ba7328f0cae1d0d7c5f4f6b3bd. jnewbery: Code review ACK d6b24e14d2a828ba7328f0cae1d0d7c5f4f6b3bd Tree-SHA512: ef7be52bdbde97b6921b44824e7fbc2dd92b77b8f076794867259f2b0bff08e0def06f4b2576f63a8ccb737a15cd8441fb7db20fa1f0d4fa9c7c76d5b83388ef
2022-03-18Merge bitcoin/bitcoin#24609: Clarify -maxtimeadjustment that only outbound ↵MarcoFalke
peers influence timedata 1bba72d824224f8a2625f529963d8982a00dfe14 Clarify in -maxtimeadjustment that only outbound peers influence time data (Jon Atack) Pull request description: #23631 changed our adjusted time to only take into account time from outbound peers. Update `-maxtimeadjustment` to clarify this for users. ACKs for top commit: MarcoFalke: cr ACK 1bba72d824224f8a2625f529963d8982a00dfe14 mzumsande: code Review ACK 1bba72d824224f8a2625f529963d8982a00dfe14 brunoerg: crACK 1bba72d824224f8a2625f529963d8982a00dfe14 Tree-SHA512: ad610ab3038fb83134e21d31cca952ef9ac926e88992ff93023b7010f2499f9a4d952e8e98a0ec56f8949872d966e5ffdd01a81e6b6115768f1992bd81be7a56
2022-03-18Clarify in -maxtimeadjustment that only outbound peers influence time dataJon Atack
2022-03-18doc: clarify that BDB is only required for the legacy walletfanquake
2022-03-18Merge bitcoin/bitcoin#24603: macdeploy: remove unused detached-sig-apply.shfanquake
979271a5d9ff887cb2efb199feaf9602c9b2086d macdeploy: remove unused detached-sig-apply (fanquake) Pull request description: Signature application is now done with signapple. https://github.com/bitcoin/bitcoin/blob/8435d7f11a89bb3f93306646f62cc2179693e072/contrib/guix/libexec/codesign.sh#L84-L85 ACKs for top commit: laanwj: ACK 979271a5d9ff887cb2efb199feaf9602c9b2086d gruve-p: ACK https://github.com/bitcoin/bitcoin/pull/24603/commits/979271a5d9ff887cb2efb199feaf9602c9b2086d achow101: ACK 979271a5d9ff887cb2efb199feaf9602c9b2086d hebasto: ACK 979271a5d9ff887cb2efb199feaf9602c9b2086d, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: ab51a609d00cead4f33bcfc5b5ff1008ee02363ab1f4c4bf9544631069c237bfa92eac4dfa231bff8a1d702bda6cc92b4151361f74f58e77b595e0cb82a8391a
2022-03-17Merge bitcoin/bitcoin#24585: doc: mention that BDB is for the legacy wallet ↵MarcoFalke
in build-osx.md 57f3f5cecfac45b3f399ff174905dca25ca556b5 doc: s/Compiler/Dependency in dependencies.md (fanquake) bf846779caf13673d4daca190a652c4e14b2200b doc: cleanup wallet docs in build-osx.md (fanquake) Pull request description: Re-order legacy and descriptor wallet section. Installing sqlite isn't required (the version pre-installed on macOS is just as good as what will be installed via `brew`). Remove prelude that pointlessly repeats the same info. Basically the macOS version of #23446. Includes a small fixup from #23565. ACKs for top commit: RandyMcMillan: ACK 57f3f5c hebasto: ACK 57f3f5cecfac45b3f399ff174905dca25ca556b5, I have reviewed the changes and they look OK, I agree they can be merged. Tree-SHA512: a1ca5f73aa4f4f56de747fd9669bce572c1d7d23925afb47b5d963314df1738762ea26428c040e9c706d288eb7e775227d2387a322cda065885b89c6a619314f
2022-03-17macdeploy: remove unused detached-sig-applyfanquake
Signature application is now done with signapple.
2022-03-17Merge bitcoin/bitcoin#24597: doc, guix: Include `arm64-apple-darwin` into ↵fanquake
codesigned archs 1f4801b6b197657b81daba52ef62c146fc6bd584 doc, guix: Include arm64-apple-darwin into codesigned archs (Hennadii Stepanov) Pull request description: ACKs for top commit: fanquake: ACK 1f4801b6b197657b81daba52ef62c146fc6bd584 Tree-SHA512: 6e0d5f463a97d3a87ce2c503a97762bd756ae44e1b8d343477de68fa4188f9be44752484a60ee08db389567ca456efb7789635ab921197b33eed974d0cee2f0b
2022-03-17doc, guix: Include arm64-apple-darwin into codesigned archsHennadii Stepanov
2022-03-17Merge bitcoin/bitcoin#24472: fuzz: execute each file in dir without fuzz engineMarcoFalke
f59bee3fb242c9e02781a35272cf9644f37e7fc1 fuzz: execute each file in dir without fuzz engine (Anthony Towns) Pull request description: Phony fuzzing (phuzzing)! Run the fuzz testing code against known inputs to detect errors. Advantage is you can easily test using the existing qa-assets datasets without having to compile with fuzzing enabled; disadvantage is that it doesn't do any actual fuzzing. Example usage: ``` $ for a in ${QA_ASSETS}/fuzz_seed_corpus/*; do echo ${a##*/}; done | xargs -P8 -I {} /bin/sh -c "FUZZ={} test/fuzz/fuzz ${QA_ASSETS}/fuzz_seed_corpus/{}" No fuzzer for address_deserialize. No fuzzer for addrdb. No fuzzer for banentry_deserialize. addition_overflow: succeeded against 848 files in 0s. asmap: succeeded against 981 files in 0s. checkqueue: succeeded against 211 files in 0s. ... ``` (`-P8` says run 8 of the tasks in parallel) If there are failures, the first one will be reported and the program will abort with output like: ``` fuzz: test/fuzz/versionbits.cpp:336: void (anonymous namespace)::versionbits_fuzz_target(FuzzBufferType): Assertion `exp_state != ThresholdState::FAILED' failed. Error processing seed "corpus/versionbits/35345ae8e722234095810b1117a29b63af7621af" ``` Rebase of #22763, which was a rebase of #21496, but also reports the name of the fuzzer and the time taken. Fixes #21461 Top commit has no ACKs. Tree-SHA512: d8d046d4a309652eb13de42116276bf992480bc887ad3535a8ff18b354cb24826bc562b06af63802ec945c637f046563b6a5601d6321b46a5543127daafea09b
2022-03-17Merge bitcoin/bitcoin#24515: Only load BlockMan in BlockMan member functionsMarcoFalke
f865cf8ded2b2fbc82a6fbc41226d991909a6880 Add and use BlockManager::GetAllBlockIndices (Carl Dong) 28ba0313eac37e4a900b7e97af7169ce999c4024 Add and use CBlockIndexHeightOnlyComparator (Carl Dong) 12eb05df63f930969115af6dc66e2e5d02f2a517 move-only: Move CBlockIndexWorkComparator to blockstorage (Carl Dong) c600ee38168a460d3026eae0e289c976194aad14 Only load BlockMan in BlockMan member functions (Carl Dong) 42e56d9b188f97c077ed2269e24acc0be35ece17 style-only: No need for std::pair for vSortedByHeight (Carl Dong) 3bbb6fea051f4e19bd2448e401a6c4e9b4cc7a41 style-only: Various blockstorage.cpp cleanups (Carl Dong) 5be9ee3c54dcb396ff52fc8c8b7e4e6e39ec4a3b refactor: more const annotations for uses of CBlockIndex* (Anthony Towns) Pull request description: The only important commit is "Only load BlockMan in BlockMan member functions", everything else is all just small style changes. Here's the commit message, reproduced: ``` This commit effectively splits the "load block index itself" logic from "derive Chainstate variables from loaded block index" logic. This means that BlockManager::LoadBlockIndex{,DB} will only load what's relevant to the BlockManager. ``` ACKs for top commit: ajtowns: ACK f865cf8ded2b2fbc82a6fbc41226d991909a6880 ; code review only MarcoFalke: review ACK f865cf8ded2b2fbc82a6fbc41226d991909a6880 🗂 Tree-SHA512: 7b204d782834e06fd7329d022e2ae860181b4e8105c33bfb928539a4ec24161dc7438a9c4d4ee279dcad77de310c160b997bb8aa18923243d0fd55ccf4ad7c3a
2022-03-17Merge bitcoin-core/gui#555: Restore Send button when using external signerHennadii Stepanov
2efdfb88aab6496dcf2b98e0de30635bc6bade85 gui: restore Send for external signer (Sjors Provoost) 4b5a6cd14967b8ec3cb525e4cb18628de6c15091 refactor: helper function signWithExternalSigner() (Sjors Provoost) 026b5b4523317fdefc69cf5cec55f76f18ad0c0a move-only: helper function to present PSBT (Sjors Provoost) Pull request description: Fixes #551 For the simplest use case of a wallet with one external signer and "PSBT Controls" disabled in settings (the default), the send dialog will behave the same as when using a wallet with private keys. I.e. there's no "Create Unsigned" button. When PSBT controls are turned on, you can now actually make a PSBT with signing it; before this PR that button would trigger a sign event and would broadcast the transaction. In case a multisig, the Send button will sign on the device, and then fall back to presenting a PSBT (same behavior as before #441). This PR starts with two refactoring commits to move some stuff into a helper function for improved readability in general, and to make the main commit easier to review. ACKs for top commit: jonatack: utACK 2efdfb88aab6496dcf2b98e0de30635bc6bade85 diff review since my last review, code re-review, rebased to current master, verified clean debug build of each commit luke-jr: utACK 2efdfb88aab6496dcf2b98e0de30635bc6bade85 Tree-SHA512: e8731a0ef9e87564b2676c7b022b742d9621bba964c19dba9fd9f6961eb608737a9e1a22c0a3c8b2f2f6d583bba067606ee8392422e82082deefb20ea7b88c7c
2022-03-17Merge bitcoin/bitcoin#24553: contrib: fix signet miner (sighash mismatch)MarcoFalke
12cc0201c26f4214d9e1dee1e6d0ddb97b7ab20f contrib: fix signet miner (sighash mismatch) (Sebastian Falbesoner) Pull request description: gruve-p reported that the signet miner doesn't work anymore (see https://github.com/bitcoin/bitcoin/issues/24501#issuecomment-1062088351), failing with the following error of the `walletprocesspsbt` RPC: ``` error code: -22 error message: Specified sighash value does not match value stored in PSBT ..... subprocess.CalledProcessError: Command '['bitcoin-cli', '-signet', '-stdin', 'walletprocesspsbt']' returned non-zero exit status 22 ``` PSBT signing was changed to use SIGHASH_DEFAULT by default in #22514. The signet miner script sets the sighash type of the created PSBT to SIGHASH_ALL (3 is the per-input type PSBT_IN_SIGHASH_TYPE, following a little-endian 32 unsigned integer of the sighash type): https://github.com/bitcoin/bitcoin/blob/e04720ec3336e3df7fce522e3b1da972aa65ff62/contrib/signet/miner#L169-L170 hence this leads to a sighash mismatch when the `walletprocesspsbt` RPC is called. Fix this by explicitly passing the correct sighash type. The same change was needed in one of our functional tests, see commit d3992669df826899a3de78a77a366dab46028026. Note that instead of feeding the PSBT via `-stdin` it is directly passed as parameter, as I couldn't figure out a way to pass multiple parameters otherwise (separating by newline also didn't work). ACKs for top commit: kallewoof: ACK 12cc0201c26f4214d9e1dee1e6d0ddb97b7ab20f ajtowns: ACK 12cc0201c26f4214d9e1dee1e6d0ddb97b7ab20f ; code review only Tree-SHA512: 8509e768e96f85e28c0ca0dc2d35874aa29623febddc46bf90472ec38f38cb3a1b5407c563fd9101d07088775d0fdb18e9137cc38955e847885b83c16591c736
2022-03-17fuzz: execute each file in dir without fuzz engineAnthony Towns
Co-Authored-By: Anthony Ronning <anthonyronning@gmail.com>
2022-03-16Merge bitcoin/bitcoin#24549: guix: Use $HOST instead of generic osx{64} for ↵fanquake
macOS artifacts 53dd6165b8994301d638298906b006032e0bbe48 guix: Use "win64" for Windows artifacts consistently (Hennadii Stepanov) 4b4b04a66d8f088f6aa9ec6398db49d40481910f guix: Drop "-signed" suffix for signed macOS .dmg files (Hennadii Stepanov) 933a43018f0f1c0b72acbfa9de5e0f84bf49d0a2 guix: Use $HOST instead of generic osx{64} for macOS artifacts (Hennadii Stepanov) Pull request description: On master (f94784f5bcfd0adf5d20f9631cde454348b4ff71) and 23.x branches some GUIX artifacts for `x86_64` and `arm64` macOS have indistinguishable names: ``` d34646cbaf05e03195eb1e426f72fb471fe2d87ab18c9a656600089597703a38 bitcoin-23.0rc2-arm64-apple-darwin.tar.gz 968767b39442e179e5976b948112a0904374eb4cfb9cba22863408a70a1d99f9 bitcoin-23.0rc2-osx-unsigned.dmg d8a7037d5bb845a214e45a52abcf9119bfbe72a76d6370e9560c18fda74a70db bitcoin-23.0rc2-osx-unsigned.tar.gz 71092f37985d556bdd25d33fb8571e13664eacadda90efcf21eaa1ba8a32eabd bitcoin-23.0rc2-osx-unsigned.dmg cb10c49b486085b89393955a7a168c32e2f2a4911f2b8d44494bd8f2bd0acf2f bitcoin-23.0rc2-osx-unsigned.tar.gz 6d4c44726cd45711c4cb7257c6b46731be1446fc85e79ac86f2def19be45ced3 bitcoin-23.0rc2-osx64.tar.gz ``` With this PR: ``` $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum 054c3765381b6d59c6ad8e5e3cbbdd23e330bd579f88b399f78f296d1a4536d0 guix-build-53dd6165b899/output/arm64-apple-darwin/SHA256SUMS.part 18750c1ff71d014fe5f976da738bfa04a4cd02af6b0d575def8d83160552de2d guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.dmg fa2b16684060202d1918c658b446909ee10999a8b9a85018ca2f6a09eaa11c8e guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin-unsigned.tar.gz b865000eb4b291a51d1920eec63dcbc9b47dedb1cc7fda0af3ab9b321db36b82 guix-build-53dd6165b899/output/arm64-apple-darwin/bitcoin-53dd6165b899-arm64-apple-darwin.tar.gz dd88ce6660754987abf95fc2c4d09f6d2248f12ecee4ef2c03f4fa74bbd8e3ae guix-build-53dd6165b899/output/dist-archive/bitcoin-53dd6165b899.tar.gz fb1871c134e079aa970c5317cad258540e2642cc7ff60a794c85651c85fc6fc4 guix-build-53dd6165b899/output/x86_64-apple-darwin/SHA256SUMS.part b1f4c04f7dbd85798ed7cd76fd7948299dfb5653c6c68df0b0839be1c1b295dd guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.dmg f1f8b2774ba3028d6cdde509076614067a6affc0fa176fdbb03829109ae47022 guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin-unsigned.tar.gz 20b9386a81e70f848db7c4f14bcb6cf2fbc1dc17aad1b9a2e6f04ac6fa86a4c9 guix-build-53dd6165b899/output/x86_64-apple-darwin/bitcoin-53dd6165b899-x86_64-apple-darwin.tar.gz 6f764a8fe876359d3c377fd934eb6595cc06d746980e07320565566abe9409f9 guix-build-53dd6165b899/output/x86_64-w64-mingw32/SHA256SUMS.part 446b24b2e01608d3dc09db29545db2cdb716c161b19356f4fae930d3ebb299f8 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-debug.zip d1660e6839a1358ae2d164958b551b81338cca9b740b3dc314397a35b17ba2a6 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-setup-unsigned.exe 4ab0d948f3864f0d5d220c570b57a02e040f936a8f6b9dba3b4688c80667def9 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64-unsigned.tar.gz 481177329998fcbb71ab1fc9542a6ffcea623cebddf567981cfa76a7320ec115 guix-build-53dd6165b899/output/x86_64-w64-mingw32/bitcoin-53dd6165b899-win64.zip ``` Also naming of Windows artifacts has been improved. ACKs for top commit: gruve-p: ACK https://github.com/bitcoin/bitcoin/pull/24549/commits/53dd6165b8994301d638298906b006032e0bbe48 achow101: ACK 53dd6165b8994301d638298906b006032e0bbe48 Tree-SHA512: 2a60d8b33608aa18b8bc4376eccca813e482571138524b9e3f8f7ab9a085df79faa1f05bc6e07bbfaf01ddd7a3d17172a6061162ab055fb51ea01e8ccf3e4422
2022-03-16Merge bitcoin/bitcoin#24588: doc: Drop a note about Intel-based Macsfanquake
e359ba6b35edebf02b968fe60cae48473ed88826 doc: Drop a note about Intel-based Macs (Hennadii Stepanov) Pull request description: The work on building stuff during the recent months made the removed note obsolete. ACKs for top commit: fanquake: ACK e359ba6b35edebf02b968fe60cae48473ed88826 Tree-SHA512: 8cf851c8602ef004c9ca009a97345b828bacbb6ecf1eee803d3ce64870a9766c196849b8843237e7bc1be5697de928b759a6dfa0407022c144d23d0293322200
2022-03-16Merge bitcoin/bitcoin#24519: doc: update multisig-tutorial.md to descriptor ↵Andrew Chow
wallet by default 5347c9732ff24bfcdcd62d0291972c86c80558dc doc: update multisig-tutorial.md to default wallet type (Jon Atack) Pull request description: Follow-up to #24281 and https://github.com/bitcoin/bitcoin/pull/24281#issuecomment-1033996386. The default wallet type was changed to descriptor wallets in #23002. ACKs for top commit: laanwj: ACK 5347c9732ff24bfcdcd62d0291972c86c80558dc michaelfolkson: ACK 5347c9732ff24bfcdcd62d0291972c86c80558dc achow101: ACK 5347c9732ff24bfcdcd62d0291972c86c80558dc theStack: Concept and code-review ACK 5347c9732ff24bfcdcd62d0291972c86c80558dc Tree-SHA512: 8074a33ad253ecb7d3f78645a00c808c7c224996cc1748067928aa59ef31a58f24fcfc75169494b26a19c7fbbf23bbd78516ab4102bc52fa92f08f1f49b18b63
2022-03-16Merge bitcoin/bitcoin#24592: doc: Delete old line of code that was commented outAndrew Chow
9a5b4d78921ffd16c78d3661447faa065426da67 doc: Delete old line of code that was commented out (Michael Folkson) Pull request description: In #23288 MarcoFalke [highlighted](https://github.com/bitcoin/bitcoin/pull/23288/files#r739817055) an old BOOST_CHECK that was commented out and replaced by a different BOOST_CHECK. I think this can be deleted and wasn't deliberately left in by achow101. ACKs for top commit: achow101: ACK 9a5b4d78921ffd16c78d3661447faa065426da67 jonatack: ACK 9a5b4d78921ffd16c78d3661447faa065426da67 Tree-SHA512: 69aa71d362bb190c75d617766f6af945a43211ddb315ccfef5ebab2beefe020032d99f0d0d4b312aa349e605ba712a8bc91d7f0a22427681e08c95f8a6ea7e64
2022-03-16doc: Delete old line of code that was commented outMichael Folkson
2022-03-16test: Fix intermittent failure in feature_segwitDrahtBot
2022-03-16doc: Drop a note about Intel-based MacsHennadii Stepanov
2022-03-16Merge bitcoin/bitcoin#14752: tests: Unit tests for IsPayToWitnessScriptHash ↵MarcoFalke
and IsWitnessProgram bce9aaf31e2b0428e686e151324f8561ad71f11f Unit tests for IsWitnessProgram and IsP2WSH. (Daniel Kraft) Pull request description: This adds basic unit tests for `CScript::IsPayToWitnessScriptHash` and `CScript::IsWitnessProgram`, similar to the existing tests for `CScript::IsPayToScriptHash`. These tests are probably not super important given the other existing tests for segwit related code, but may be useful in catching some errors early. This implements #14737. ACKs for top commit: aureleoules: tACK bce9aaf31e2b0428e686e151324f8561ad71f11f (`make check)`. Tree-SHA512: 3cff5efc4ac53079289c72bfba8b1937bc103baadd32bb1fba41e78017f65f9cca17678c3202ad0711eae42b351d4132d9ed9b4e2dc07d138298691a09c4e822
2022-03-16Merge bitcoin/bitcoin#24573: Update signapple for platform identifier fixfanquake
3c74f775ac956de4da4fc076b2360b687531cd63 Update signapple for platform identifier fix (Andrew Chow) Pull request description: Apparently #23134 is caused by the platform identifier field being set to the incorrect value in our code signatures. The problem has been resolved in signapple, and so guix should point to the latest commit containing the fix. I suppose guix does not strictly need to have this; only the macOS code signer will need to have the fix. Fixes #23134 ACKs for top commit: gruve-p: ACK https://github.com/bitcoin/bitcoin/pull/24573/commits/3c74f775ac956de4da4fc076b2360b687531cd63 hebasto: re-ACK 3c74f775ac956de4da4fc076b2360b687531cd63 fanquake: ACK 3c74f775ac956de4da4fc076b2360b687531cd63 Tree-SHA512: 7df844793fa77be4ddc4ef02f26980d6368b50421b7bd9a15f7d6a0c3b5c5f4f0cc0889e065689956583a2173875d33406dbe3a52a72c75a7f23a33c733c2378
2022-03-16doc: s/Compiler/Dependency in dependencies.mdfanquake
2022-03-16doc: cleanup wallet docs in build-osx.mdfanquake
Re-order legacy and descriptor wallet section. Installing sqlite isn't required. Remove prelude that pointlessly reqpeats the same info.
2022-03-16Merge bitcoin/bitcoin#18815: bench: Add logging benchmarkMarcoFalke
fafe06c379316f165e88b8de7300a716cef25d0a bench: Sort bench_bench_bitcoin_SOURCES (MarcoFalke) fa31dc9b714401b67480232ef552d1479f5e6902 bench: Add logging benchmark (MarcoFalke) Pull request description: Might make finding performance bottlenecks or regressions (https://github.com/bitcoin/bitcoin/pull/17218) easier. For example, fuzzing relies on disabled logging to be as fast as possible. ACKs for top commit: dergoegge: ACK fafe06c379316f165e88b8de7300a716cef25d0a Tree-SHA512: dd858f3234a4dfb00bd7dec4398eb076370a4b9746aa24eecee7da86f6882398a2d086e5ab0b7c9f7321abcb135e7ffc54cc78e60d18b90379c6dba6d613b3f7
2022-03-16Merge bitcoin/bitcoin#23565: doc: rewrite dependencies.mdfanquake
893e18059f1f92a254aa2026312a769c0e711db6 doc: rework dependencies.md (fanquake) Pull request description: This PR rewrites dependencies.md. The current list is hard to parse, includes information that is either incorrect and/or misleading, and duplicates info in other documentation. The list of dependencies is much smaller, because it's now just the actual dependencies of Bitcoin Core, not random Qt things, or the dependencies of other tooling. We don't need _another_ section on configure flag usage, or, to have duplicated lists of dependencies in other build docs, as that somewhat defeats the point of having dependencies.md, and just means more effort keeping things in sync. ACKs for top commit: MarcoFalke: cr ACK 893e18059f1f92a254aa2026312a769c0e711db6 hebasto: ACK 893e18059f1f92a254aa2026312a769c0e711db6, I have reviewed the code and it looks OK, I agree it can be merged. jarolrod: crACK https://github.com/bitcoin/bitcoin/commit/893e18059f1f92a254aa2026312a769c0e711db6 Tree-SHA512: 6750eaf70d5ebc9c364ade1d4b5b689e3094020eeb444a3de93b33d9a57a1577949a461f8209442d3954ccb22ab038c7e8cf6dfff5623e4f2713606b6798c37e
2022-03-16Update signapple for platform identifier fixAndrew Chow
2022-03-16guix: Use "win64" for Windows artifacts consistentlyHennadii Stepanov
2022-03-16doc: rework dependencies.mdfanquake
2022-03-16gui: restore Send for external signerSjors Provoost
Before this change the send confirmation dialog would keep the Send option disabled. The Create Unsigned choice would actually send. This is potentially confusing. With this change the Create Unsigned button will not attempt to sign and always produce a PSBT. The Send button will attempt to sign, and only return a PSBT if more signatures are needed. When using an external signer, the Create Unsigned option only appears when PSBT controls are enabled in the wallet settings. This commit maintains the pre-existing behavior of filling the PSBT (without signing) even when not using an external signer. Closes #551 Co-authored-by: Jon Atack <jon@atack.com>
2022-03-16refactor: helper function signWithExternalSigner()Sjors Provoost
Does not change behavior. Review hint: git show --color-moved --color-moved-ws=allow-indentation-change
2022-03-16Merge bitcoin/bitcoin#24537: rpc: Split mempool RPCs from blockchain.cppMarcoFalke
fad4c8934c7b4342076bd01daa4abf4d83617b17 Add RegisterMempoolRPCCommands helper (MarcoFalke) fafd40b5413aea5f8ec47c24fdb2ccc702e7cdd7 refactor: Avoid int64_t -> size_t -> int64_t conversion (MarcoFalke) fa2a5f301aa678aa7b6be4bb7987f2bcbdaf2be2 rpc: Move mempool RPCs to new file (MarcoFalke) Pull request description: The `blockchain.cpp` file is quite large. This makes it harder to navigate and increases the memory required to compile. Improve on both issues by splitting up the mempool RPCs to a separate file. ACKs for top commit: promag: Code review ACK fad4c8934c7b4342076bd01daa4abf4d83617b17. theStack: Code-review ACK fad4c8934c7b4342076bd01daa4abf4d83617b17 🏞️ Tree-SHA512: 7f13168ea2cbea51eaef05ca1604fddc919480a2128ec7fa6b1f9365ec5e4822c3df93eb408a19f038c627f2309fa282b9f7f7ec45e5e661fc728f6b33157f89
2022-03-16Merge bitcoin/bitcoin#24572: ci: Temporarily use clang-13 to work around ↵MarcoFalke
clang-14 TSan bug fa43933e3b3f8bd2992340bdd744fdab680565f8 ci: Temporarily use clang-13 to work around clang-14 TSan bug (MarcoFalke) Pull request description: There is an increase in intermittent issues in the TSan task. The increase correlates with Ubuntu Jammy's bump of `clang` from `clang-13` to `clang-14`. Temporarily work around that. ACKs for top commit: hebasto: ACK fa43933e3b3f8bd2992340bdd744fdab680565f8, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: adf7d385e1cddaeb2d06c3a3838f87070fb4ffdcc9a37da204b332ab28f40042bd34bd8b6d1d4710511865b4acafa7cf7303c4abf59862c5d29b168e2774da31
2022-03-16guix: Drop "-signed" suffix for signed macOS .dmg filesHennadii Stepanov
This change makes naming of the signed artifacts consistent across different OSes, including Windows.
2022-03-15Add and use BlockManager::GetAllBlockIndicesCarl Dong
2022-03-15Add and use CBlockIndexHeightOnlyComparatorCarl Dong
...also use std::sort for clarity
2022-03-15move-only: Move CBlockIndexWorkComparator to blockstorageCarl Dong
...it's declared in blockstorage.h
2022-03-15Only load BlockMan in BlockMan member functionsCarl Dong
This commit effectively splits the "load block index itself" logic from "derive Chainstate variables from loaded block index" logic. This means that BlockManager::LoadBlockIndex{,DB} will only load what's relevant to the BlockManager. I strongly recommend reviewing with the following git-diff flags: --color-moved=dimmed_zebra --color-moved-ws=allow-indentation-change
2022-03-15style-only: No need for std::pair for vSortedByHeightCarl Dong
...since the height information in already in CBlockIndex* and we can use an easy custom sorter.
2022-03-15Add RegisterMempoolRPCCommands helperMarcoFalke
2022-03-15ci: Temporarily use clang-13 to work around clang-14 TSan bugMarcoFalke
2022-03-15Merge bitcoin/bitcoin#24510: test: check for importprunedfunds RPC errorsMarcoFalke
7573789925f6b5c3d73f43d2ebf8c732945c1824 test: check for importprunedfunds RPC errors (Sebastian Falbesoner) Pull request description: This PR adds missing test coverage for the following errors of the `importprunedfunds` RPC: https://github.com/bitcoin/bitcoin/blob/7003b6ab24f6adfffd71d7b7d4182afde52ff859/src/wallet/rpc/backup.cpp#L320-L322 https://github.com/bitcoin/bitcoin/blob/7003b6ab24f6adfffd71d7b7d4182afde52ff859/src/wallet/rpc/backup.cpp#L332-L334 https://github.com/bitcoin/bitcoin/blob/7003b6ab24f6adfffd71d7b7d4182afde52ff859/src/wallet/rpc/backup.cpp#L338-L340 https://github.com/bitcoin/bitcoin/blob/7003b6ab24f6adfffd71d7b7d4182afde52ff859/src/wallet/rpc/backup.cpp#L343-L345 ACKs for top commit: MarcoFalke: review ACK 7573789925f6b5c3d73f43d2ebf8c732945c1824 Tree-SHA512: b054520d102e5940bdeed2456ca644e91afb187d169b751b1262ce34480e4e9fbe1616ab184a78777c184350dced23508c3d367ed5825cab78bb5ad687fd7dac