-
Notifications
You must be signed in to change notification settings - Fork 36.7k
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
cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice #17687
Conversation
ACK 034561f 📖 Show signature and timestampSignature:
Timestamp of file with hash |
I think this could have been done with a smaller change: collect into a set at argument parsing, then copy it into the vector. A vector is slightly more efficient to iterate over than a set. ACK 034561f |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK 034561f - Tested with src/bitcoind --blockfilterindex=basic --blockfilterindex=basic
…erindex=basic twice 034561f cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) Pull request description: This PR fixes #17679 by replacing BlockFilterType-vector with a set of the same type to make sure that only unique filter types get inserted. ACKs for top commit: MarcoFalke: ACK 034561f 📖 laanwj: ACK 034561f fanquake: ACK 034561f - Tested with `src/bitcoind --blockfilterindex=basic --blockfilterindex=basic` Tree-SHA512: 64ccec4d23528abfbb564f2b41fb846137875260ce06ea461da12175819985964a1a7442788d5ff7282b5de0c5fd46524d9a793788ee3b876626cbdf05b28c16
Does this need backport to any branch? |
0.19.1, if it is a clean cherry-pick |
…ockfilterindex=basic twice 034561f cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) Pull request description: This PR fixes bitcoin#17679 by replacing BlockFilterType-vector with a set of the same type to make sure that only unique filter types get inserted. ACKs for top commit: MarcoFalke: ACK 034561f 📖 laanwj: ACK 034561f fanquake: ACK 034561f - Tested with `src/bitcoind --blockfilterindex=basic --blockfilterindex=basic` Tree-SHA512: 64ccec4d23528abfbb564f2b41fb846137875260ce06ea461da12175819985964a1a7442788d5ff7282b5de0c5fd46524d9a793788ee3b876626cbdf05b28c16
…twice Github-Pull: bitcoin#17687 Rebased-From: 034561f
Being backported in 17858. |
99b5407 scripts: fix check-symbols & check-security argument passing (fanquake) 4330a1e Update msvc build for Visual Studio 2019 v16.4 (Aaron Clauson) b0f9b8e Moves vcpkg list to a text file and updates the appveyor job and readme to use it. (Aaron Clauson) cd7b3b2 Updated appveyor config: - Update build image from Visual Studio 2017 to Visual Studio 2019. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added commands to update vcpkg port files (this does not update already installed packages). - Updated vcpkg package list as per #17309. - Removed commands setting common project file options. Now done via common.init.vcxproj include. - Changed msbuild verbosity from normal to quiet. Normal rights a LOT of logs and impacts appveyor job duration. Updated msvc project configs: - Updated platform toolset from v141 to v142. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added ignore for linker warning building bitcoin-qt program. - Added missing util/str.cpp class file to test_bitcoin project file. (Aaron Clauson) 112144d Add missing typeinfo includes (Wladimir J. van der Laan) 1a6a534 net: Log to net category for exceptions in ProcessMessages (Wladimir J. van der Laan) c0dc728 test: fix bitcoind already running warnings on macOS (fanquake) 5276b0e util: Add missing headers to util/fees.cpp (Hennadii Stepanov) 4d7875c rpc: require second argument only for scantxoutset start action (Andrew Chow) bda2f5b cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) d14ab7c gui: disable File->CreateWallet during startup (fanquake) b9f1bc0 wallet: unbreak with boost 1.72 (Jan Beich) Pull request description: Backports the following PRs to the 0.19 branch: * #17654 - Unbreak build with Boost 1.72.0 * #17695 - gui: disable File->CreateWallet during startup * #17687 - cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice * #17728 - rpc: require second argument only for scantxoutset start action * #17450 - util: Add missing headers to util/fees.cpp * #17488 - test: fix "bitcoind already running" warnings on macOS * #17762 - Log to net category for exceptions in ProcessMessages * #17364 - Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes * #17416 - Appveyor improvement - text file for vcpkg package list * #17736 - Update msvc build for Visual Studio 2019 v16.4 * #17857 - scripts: fix symbol-check & security-check argument passing Fixes #17856. ACKs for top commit: sipsorcery: ACK (tested: Windows 10 & msvc build) 99b5407. Tree-SHA512: 91313de56fb0825e70a4be30ba0bf561b8c26d7dcf60549185df4f5e3524099398c828bb46faae807b631634d1afd5a1d397fb41e61ecfa0d746e4bf10b923cb
[0.19] Backports bitcoin#17858 Unbreak build with Boost 1.72.0 bitcoin#17654 cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice bitcoin#17687 rpc: require second argument only for scantxoutset start action bitcoin#17728 wallet: Fix origfee return for bumpfee with feerate arg bitcoin#17643 test: fix "bitcoind already running" warnings on macOS bitcoin#17488 net: Log to net category for exceptions in ProcessMessages bitcoin#17762 Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes bitcoin#17364 Appveyor improvement - text file for vcpkg package list bitcoin#17416 Update msvc build for Visual Studio 2019 v16.4 bitcoin#17736 scripts: fix symbol-check & security-check argument passing bitcoin#17857 qt: Periodic translations update for 0.19 branch IsUsedDestination should count any known single-key address bitcoin#17621 init: Stop indexes on shutdown after ChainStateFlushed callback. bitcoin#17897 qt: Translations update pre-rc1 wallet: Reset reused transactions cache bitcoin#17843 Squashed 'src/univalue/' changes from 7890db9..98261b1 0.19: Update univalue subtree bitcoin#18100 qt: Pre-rc2 translations update
[0.19] Backports bitcoin#17858 Unbreak build with Boost 1.72.0 bitcoin#17654 cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice bitcoin#17687 rpc: require second argument only for scantxoutset start action bitcoin#17728 wallet: Fix origfee return for bumpfee with feerate arg bitcoin#17643 test: fix "bitcoind already running" warnings on macOS bitcoin#17488 net: Log to net category for exceptions in ProcessMessages bitcoin#17762 Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes bitcoin#17364 Appveyor improvement - text file for vcpkg package list bitcoin#17416 Update msvc build for Visual Studio 2019 v16.4 bitcoin#17736 scripts: fix symbol-check & security-check argument passing bitcoin#17857 qt: Periodic translations update for 0.19 branch IsUsedDestination should count any known single-key address bitcoin#17621 init: Stop indexes on shutdown after ChainStateFlushed callback. bitcoin#17897 qt: Translations update pre-rc1 wallet: Reset reused transactions cache bitcoin#17843 Squashed 'src/univalue/' changes from 7890db9..98261b1 0.19: Update univalue subtree bitcoin#18100 qt: Pre-rc2 translations update [0.19] Further 0.19 backports bitcoin#18218 build: don't embed a build-id when building libdmg-hfsplus bitcoin#18004
…twice Summary: If `blockfilterindex=basic` is specified in `bitcoin.conf` and again on the command line, `bitcoind -chain=regtest -blockfilterindex=basic`, `bitcoind` crashes. This commit fixes it by replacing BlockFilterType-vector with a set of the same type to make sure that only unique filter types get inserted. This is a backport of Core [[bitcoin/bitcoin#17687 | PR17687]] Test Plan: After adding `blockfilterindex=basic` to `bitcoin.conf`, run: `src/bitcoind -chain=regtest -blockfilterindex=basic` Alternatively, run `src/bitcoind --blockfilterindex=basic --blockfilterindex=basic` Reviewers: #bitcoin_abc, majcosta Reviewed By: #bitcoin_abc, majcosta Subscribers: majcosta Differential Revision: https://reviews.bitcoinabc.org/D8322
…ockfilterindex=basic twice 034561f cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) Pull request description: This PR fixes bitcoin#17679 by replacing BlockFilterType-vector with a set of the same type to make sure that only unique filter types get inserted. ACKs for top commit: MarcoFalke: ACK 034561f 📖 laanwj: ACK 034561f fanquake: ACK 034561f - Tested with `src/bitcoind --blockfilterindex=basic --blockfilterindex=basic` Tree-SHA512: 64ccec4d23528abfbb564f2b41fb846137875260ce06ea461da12175819985964a1a7442788d5ff7282b5de0c5fd46524d9a793788ee3b876626cbdf05b28c16
…lterindex twice
99b5407 scripts: fix check-symbols & check-security argument passing (fanquake) 4330a1e Update msvc build for Visual Studio 2019 v16.4 (Aaron Clauson) b0f9b8e Moves vcpkg list to a text file and updates the appveyor job and readme to use it. (Aaron Clauson) cd7b3b2 Updated appveyor config: - Update build image from Visual Studio 2017 to Visual Studio 2019. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added commands to update vcpkg port files (this does not update already installed packages). - Updated vcpkg package list as per bitcoin#17309. - Removed commands setting common project file options. Now done via common.init.vcxproj include. - Changed msbuild verbosity from normal to quiet. Normal rights a LOT of logs and impacts appveyor job duration. Updated msvc project configs: - Updated platform toolset from v141 to v142. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added ignore for linker warning building bitcoin-qt program. - Added missing util/str.cpp class file to test_bitcoin project file. (Aaron Clauson) 112144d Add missing typeinfo includes (Wladimir J. van der Laan) 1a6a534 net: Log to net category for exceptions in ProcessMessages (Wladimir J. van der Laan) c0dc728 test: fix bitcoind already running warnings on macOS (fanquake) 5276b0e util: Add missing headers to util/fees.cpp (Hennadii Stepanov) 4d7875c rpc: require second argument only for scantxoutset start action (Andrew Chow) bda2f5b cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) d14ab7c gui: disable File->CreateWallet during startup (fanquake) b9f1bc0 wallet: unbreak with boost 1.72 (Jan Beich) Pull request description: Backports the following PRs to the 0.19 branch: * bitcoin#17654 - Unbreak build with Boost 1.72.0 * bitcoin#17695 - gui: disable File->CreateWallet during startup * bitcoin#17687 - cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice * bitcoin#17728 - rpc: require second argument only for scantxoutset start action * bitcoin#17450 - util: Add missing headers to util/fees.cpp * bitcoin#17488 - test: fix "bitcoind already running" warnings on macOS * bitcoin#17762 - Log to net category for exceptions in ProcessMessages * bitcoin#17364 - Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes * bitcoin#17416 - Appveyor improvement - text file for vcpkg package list * bitcoin#17736 - Update msvc build for Visual Studio 2019 v16.4 * bitcoin#17857 - scripts: fix symbol-check & security-check argument passing Fixes bitcoin#17856. ACKs for top commit: sipsorcery: ACK (tested: Windows 10 & msvc build) 99b5407. Tree-SHA512: 91313de56fb0825e70a4be30ba0bf561b8c26d7dcf60549185df4f5e3524099398c828bb46faae807b631634d1afd5a1d397fb41e61ecfa0d746e4bf10b923cb
99b5407 scripts: fix check-symbols & check-security argument passing (fanquake) 4330a1e Update msvc build for Visual Studio 2019 v16.4 (Aaron Clauson) b0f9b8e Moves vcpkg list to a text file and updates the appveyor job and readme to use it. (Aaron Clauson) cd7b3b2 Updated appveyor config: - Update build image from Visual Studio 2017 to Visual Studio 2019. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added commands to update vcpkg port files (this does not update already installed packages). - Updated vcpkg package list as per bitcoin#17309. - Removed commands setting common project file options. Now done via common.init.vcxproj include. - Changed msbuild verbosity from normal to quiet. Normal rights a LOT of logs and impacts appveyor job duration. Updated msvc project configs: - Updated platform toolset from v141 to v142. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added ignore for linker warning building bitcoin-qt program. - Added missing util/str.cpp class file to test_bitcoin project file. (Aaron Clauson) 112144d Add missing typeinfo includes (Wladimir J. van der Laan) 1a6a534 net: Log to net category for exceptions in ProcessMessages (Wladimir J. van der Laan) c0dc728 test: fix bitcoind already running warnings on macOS (fanquake) 5276b0e util: Add missing headers to util/fees.cpp (Hennadii Stepanov) 4d7875c rpc: require second argument only for scantxoutset start action (Andrew Chow) bda2f5b cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) d14ab7c gui: disable File->CreateWallet during startup (fanquake) b9f1bc0 wallet: unbreak with boost 1.72 (Jan Beich) Pull request description: Backports the following PRs to the 0.19 branch: * bitcoin#17654 - Unbreak build with Boost 1.72.0 * bitcoin#17695 - gui: disable File->CreateWallet during startup * bitcoin#17687 - cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice * bitcoin#17728 - rpc: require second argument only for scantxoutset start action * bitcoin#17450 - util: Add missing headers to util/fees.cpp * bitcoin#17488 - test: fix "bitcoind already running" warnings on macOS * bitcoin#17762 - Log to net category for exceptions in ProcessMessages * bitcoin#17364 - Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes * bitcoin#17416 - Appveyor improvement - text file for vcpkg package list * bitcoin#17736 - Update msvc build for Visual Studio 2019 v16.4 * bitcoin#17857 - scripts: fix symbol-check & security-check argument passing Fixes bitcoin#17856. ACKs for top commit: sipsorcery: ACK (tested: Windows 10 & msvc build) 99b5407. Tree-SHA512: 91313de56fb0825e70a4be30ba0bf561b8c26d7dcf60549185df4f5e3524099398c828bb46faae807b631634d1afd5a1d397fb41e61ecfa0d746e4bf10b923cb
99b5407 scripts: fix check-symbols & check-security argument passing (fanquake) 4330a1e Update msvc build for Visual Studio 2019 v16.4 (Aaron Clauson) b0f9b8e Moves vcpkg list to a text file and updates the appveyor job and readme to use it. (Aaron Clauson) cd7b3b2 Updated appveyor config: - Update build image from Visual Studio 2017 to Visual Studio 2019. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added commands to update vcpkg port files (this does not update already installed packages). - Updated vcpkg package list as per bitcoin#17309. - Removed commands setting common project file options. Now done via common.init.vcxproj include. - Changed msbuild verbosity from normal to quiet. Normal rights a LOT of logs and impacts appveyor job duration. Updated msvc project configs: - Updated platform toolset from v141 to v142. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added ignore for linker warning building bitcoin-qt program. - Added missing util/str.cpp class file to test_bitcoin project file. (Aaron Clauson) 112144d Add missing typeinfo includes (Wladimir J. van der Laan) 1a6a534 net: Log to net category for exceptions in ProcessMessages (Wladimir J. van der Laan) c0dc728 test: fix bitcoind already running warnings on macOS (fanquake) 5276b0e util: Add missing headers to util/fees.cpp (Hennadii Stepanov) 4d7875c rpc: require second argument only for scantxoutset start action (Andrew Chow) bda2f5b cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) d14ab7c gui: disable File->CreateWallet during startup (fanquake) b9f1bc0 wallet: unbreak with boost 1.72 (Jan Beich) Pull request description: Backports the following PRs to the 0.19 branch: * bitcoin#17654 - Unbreak build with Boost 1.72.0 * bitcoin#17695 - gui: disable File->CreateWallet during startup * bitcoin#17687 - cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice * bitcoin#17728 - rpc: require second argument only for scantxoutset start action * bitcoin#17450 - util: Add missing headers to util/fees.cpp * bitcoin#17488 - test: fix "bitcoind already running" warnings on macOS * bitcoin#17762 - Log to net category for exceptions in ProcessMessages * bitcoin#17364 - Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes * bitcoin#17416 - Appveyor improvement - text file for vcpkg package list * bitcoin#17736 - Update msvc build for Visual Studio 2019 v16.4 * bitcoin#17857 - scripts: fix symbol-check & security-check argument passing Fixes bitcoin#17856. ACKs for top commit: sipsorcery: ACK (tested: Windows 10 & msvc build) 99b5407. Tree-SHA512: 91313de56fb0825e70a4be30ba0bf561b8c26d7dcf60549185df4f5e3524099398c828bb46faae807b631634d1afd5a1d397fb41e61ecfa0d746e4bf10b923cb
99b5407 scripts: fix check-symbols & check-security argument passing (fanquake) 4330a1e Update msvc build for Visual Studio 2019 v16.4 (Aaron Clauson) b0f9b8e Moves vcpkg list to a text file and updates the appveyor job and readme to use it. (Aaron Clauson) cd7b3b2 Updated appveyor config: - Update build image from Visual Studio 2017 to Visual Studio 2019. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added commands to update vcpkg port files (this does not update already installed packages). - Updated vcpkg package list as per bitcoin#17309. - Removed commands setting common project file options. Now done via common.init.vcxproj include. - Changed msbuild verbosity from normal to quiet. Normal rights a LOT of logs and impacts appveyor job duration. Updated msvc project configs: - Updated platform toolset from v141 to v142. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added ignore for linker warning building bitcoin-qt program. - Added missing util/str.cpp class file to test_bitcoin project file. (Aaron Clauson) 112144d Add missing typeinfo includes (Wladimir J. van der Laan) 1a6a534 net: Log to net category for exceptions in ProcessMessages (Wladimir J. van der Laan) c0dc728 test: fix bitcoind already running warnings on macOS (fanquake) 5276b0e util: Add missing headers to util/fees.cpp (Hennadii Stepanov) 4d7875c rpc: require second argument only for scantxoutset start action (Andrew Chow) bda2f5b cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) d14ab7c gui: disable File->CreateWallet during startup (fanquake) b9f1bc0 wallet: unbreak with boost 1.72 (Jan Beich) Pull request description: Backports the following PRs to the 0.19 branch: * bitcoin#17654 - Unbreak build with Boost 1.72.0 * bitcoin#17695 - gui: disable File->CreateWallet during startup * bitcoin#17687 - cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice * bitcoin#17728 - rpc: require second argument only for scantxoutset start action * bitcoin#17450 - util: Add missing headers to util/fees.cpp * bitcoin#17488 - test: fix "bitcoind already running" warnings on macOS * bitcoin#17762 - Log to net category for exceptions in ProcessMessages * bitcoin#17364 - Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes * bitcoin#17416 - Appveyor improvement - text file for vcpkg package list * bitcoin#17736 - Update msvc build for Visual Studio 2019 v16.4 * bitcoin#17857 - scripts: fix symbol-check & security-check argument passing Fixes bitcoin#17856. ACKs for top commit: sipsorcery: ACK (tested: Windows 10 & msvc build) 99b5407. Tree-SHA512: 91313de56fb0825e70a4be30ba0bf561b8c26d7dcf60549185df4f5e3524099398c828bb46faae807b631634d1afd5a1d397fb41e61ecfa0d746e4bf10b923cb
This PR fixes #17679 by replacing BlockFilterType-vector with a set of the same type to make sure that only unique filter types get inserted.