aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-16Give more errors for specific failure conditionsAndrew Chow
Some failure conditions implicitly fail by failing some other check. But the error messages are more helpful if they say explicitly what actually caused the failure, so add those as failure conditions and errors.
2019-08-16Return an error from descriptor Parse that gives more information about what ↵Andrew Chow
failed
2019-08-17Merge #15986: Add checksum to getdescriptorinfoMeshCollider
26d3fad1093dfc697048313be7a96c9adf723654 Add unmodified-but-with-checksum to getdescriptorinfo (Pieter Wuille) 104b3a5069c937383e6f88f2f3fb804ef61b208f Factor out checksum checking from descriptor parsing (Pieter Wuille) Pull request description: ACKs for top commit: achow101: Code Review ACK 26d3fad1093dfc697048313be7a96c9adf723654 meshcollider: re-Code Review ACK 26d3fad1093dfc697048313be7a96c9adf723654 Sjors: ACK 26d3fad1093dfc697048313be7a96c9adf723654 Tree-SHA512: b7a7f89b64a184927d6f9a0c183a087609983f0c5d5593f78e12db4714e930a4af655db9da4b0c407ea2e24d3b926cef6e1f2a15de502d0d1290a6e046826b99
2019-08-16Merge #16618: [Fix] Allow connection of a noban banned peerMarcoFalke
d117f4541d4717e83c9396273e92960723622030 Add test for setban (nicolas.dorier) dc7529abf0197dccb876dc4a93cbdd2ad9f03e5c [Fix] Allow connection of a noban banned peer (nicolas.dorier) Pull request description: Reported by @MarcoFalke on https://github.com/bitcoin/bitcoin/pull/16248#discussion_r314026195 The bug would mean that if the peer connecting to you is banned, but whitelisted without specific permissions, it would not be able to connect to the node. The solution is just to move the same line below. ACKs for top commit: Sjors: Agree inline is more clear. utACK d117f45 MarcoFalke: ACK d117f4541d4717e83c9396273e92960723622030 Tree-SHA512: 0fed39acb1e8db67bb0bf4c4de3ad034ae776f38d55bd661f1ae0e1a4c6becaf1824ab46ed8279f2f31df3f4b29ff56461d8b167d3e9cece62cfe58b5a912811
2019-08-16Merge #16633: travis: Fix test_runner.py timeoutsMarcoFalke
faba46da07cd8383d0bc841d37ea9cacba60e354 ci: Set --ansi in test_runner (MarcoFalke) Pull request description: Fixup to: * tests: Use colors and dots in test_runner.py output only if standard output is a terminal #16561 ACKs for top commit: practicalswift: ACK faba46da07cd8383d0bc841d37ea9cacba60e354 -- diff looks correct fanquake: ACK faba46da07cd8383d0bc841d37ea9cacba60e354 - assuming Travis is all green. Tree-SHA512: 50bf6ec8e7a2987d77821816289fd87458e63237d419a149e5e04027387d2c4b3c23db58977585fda30fbc4b13686a7def0d9e00096b9a8469dea2916fd30565
2019-08-16ci: Set --ansi in test_runnerMarcoFalke
2019-08-16Merge #16620: util: Move ResolveErrMsg to util/errorMarcoFalke
fa27c55b0593c769b6ad87de0b59df3816d73548 util: Move ResolveErrMsg to util/error (MarcoFalke) Pull request description: Pull request https://github.com/bitcoin/bitcoin/pull/16248#discussion_r314035862 duplicated the body of this util function. The whole point of the util function is to be shared, so do that here as a fixup to #16248 ACKs for top commit: Sjors: utACK fa27c55 ryanofsky: utACK fa27c55b0593c769b6ad87de0b59df3816d73548 Tree-SHA512: e2b25ae05082fe9d0ee94bdc7d51f801bd9f78e8fc2b141e9a313e008dbb8a77653fe876e111c802c676859c6b76c37a673d1f8cfbe7ad25607a5ffcffde19fd
2019-08-16Merge #16612: qt: Remove menu iconsJonas Schnelli
390874c722c5af0b37cb94151ffb49986eab5f7d qt: Remove menu icons (Wladimir J. van der Laan) Pull request description: Remove the icons from the application menu. Why remove? - They are inconsistently applied, some actions had icons, some newer ones don't. Good luck coming up with a sensible icon for everything - Menu icons don't seem to have a place in modern UI: for example, GNOME, MacOS have stopped showing these a long time ago (see https://github.com/bitcoin/bitcoin/pull/16584#issuecomment-521195090) - Less bikeshedding opportunity about "what should the icon for this be" Removed icons: ``` /icons/quit res/icons/quit.png /icons/about res/icons/about.png /icons/about_qt res/icons/about_qt.png /icons/options res/icons/configure.png /icons/key res/icons/key.png /icons/verify res/icons/verify.png (also .svg) /icons/debugwindow res/icons/debugwindow.png /icons/open res/icons/open.png /icons/info res/icons/info.png /icons/filesave res/icons/filesave.png ``` I checked that these icons are used nowhere else. Removed from the menu not removed from the repository, because still referenced by other parts of the code: ``` /icons/lock_closed /icons/edit /icons/address-book /icons/send ``` ACKs for top commit: practicalswift: ACK 390874c722c5af0b37cb94151ffb49986eab5f7d -- diff looks correct l2a5b1: ACK 390874c722c5af0b37cb94151ffb49986eab5f7d - Bitcoin Core has a very simple application menu. As long as the menu items describe their actions clearly and unambiguously then the icons alongside the label are redundant and offer very little value, if anything at all. kallewoof: ACK 390874c722c5af0b37cb94151ffb49986eab5f7d jonasschnelli: utACK 390874c722c5af0b37cb94151ffb49986eab5f7d Tree-SHA512: dd1c52bed3bc6fb9359d5ea1b229a023dafaf813ae640775cbb433b9886bbc11a7d6a4306bac350b26d45fca9b495e4468630f2a32e185570e05f16a3ce45b47
2019-08-16Add test for setbannicolas.dorier
2019-08-16Merge #16383: rpcwallet: default include_watchonly to true for watchonly walletsfanquake
72eaab073bc747425fe551777154b13a6c4c37c9 tests: functional watch-only wallet tests (William Casarin) 72ffbdc5799c1707ecad674d701b43fb80b031d0 doc: add release note for include_watchonly default changes (William Casarin) 003a3c73c0450aa18ac2ab2ca47def2b8c53a7df rpcwallet: document include_watchonly default for watchonly wallets (William Casarin) a50d9e6c0b8e8144d3deec58ec2e3449ba081151 rpcwallet: default include_watchonly to true for watchonly wallets (William Casarin) Pull request description: Right now it's a bit annoying to deal with watchonly wallets, many rpc commands have an `include_watchonly` argument that needs to be explicitly set. Wallets created with `createwallet` can have a `disable_private_keys` parameter, for those wallets we already know that they are watchonly, so there's no reason to have to explicitly ask for it for every command. Instead we check this wallet flag when the `include_watchonly` parameter isn't set. ACKs for top commit: achow101: Code review ACK 72eaab073bc747425fe551777154b13a6c4c37c9 Sjors: ACK 72eaab073bc747425fe551777154b13a6c4c37c9 promag: ACK 72eaab073bc747425fe551777154b13a6c4c37c9, code review only, didn't look closely to the test. kallewoof: ACK 72eaab073bc747425fe551777154b13a6c4c37c9 fanquake: ACK 72eaab073bc747425fe551777154b13a6c4c37c9 - I've looked over the changes, they make sense to me. Compiled and ran the tests etc. Tree-SHA512: d3646b55e97f386594d7efc994f0712f3888475c6a5dc7f131ac9f8c49bf5d4677182b88f42b34152abe1ad101ecadd152b4c20e9d3c1267190db36f77ab8bd7
2019-08-16Merge #16587: doc: Improve versionbits.h documentationfanquake
6576a8765f67716aa6b87a2f0296fbac5956bec0 doc: Improve versionbits.h documentation (Antoine Riard) Pull request description: While reviewing burying of BIP 9 deployments, seen that versionbits.h wasn't that much documented. This is an attempt to improve it. It can be useful, given after burying this code isn't going to be used anymore and isn't straightforward at first sight. ACKs for top commit: jnewbery: ACK 6576a8765f67716aa6b87a2f0296fbac5956bec0 ajtowns: ACK 6576a8765f67716aa6b87a2f0296fbac5956bec0 fanquake: ACK 6576a8765f67716aa6b87a2f0296fbac5956bec0 Tree-SHA512: 906463e0b22b988f89d77f798bf94d294f70467d29975088b87384764fb5d0dd1350be67562cc264656f61f1eada2cba20f99c0d797d1d7f90203c269e34c714
2019-08-16Merge #16626: doc: Fix spelling error chache -> cache.fanquake
f9d40ce7ebc56867292a45256bcb81784ca358ac Fix spelling error chache -> cache. (Nils Loewen) Pull request description: Fixes a spelling error in `.travis.yml`. ACKs for top commit: fanquake: ACK f9d40ce7ebc56867292a45256bcb81784ca358ac Tree-SHA512: f38542f4e1225f2670aeb8f663440f843aa5cdd4588313a88bdfb36531c3419112b55775f12368b80ebd3e0fa5b5491ae43b18ccab39b7908f98bc6b6c7ca396
2019-08-15Fix spelling error chache -> cache.Nils Loewen
2019-08-15Merge #16060: Bury bip9 deploymentsMarcoFalke
e78aaf41f43d0e2ad78fa6d8dad61032c8ef73d0 [docs] Add release notes for burying bip 9 soft fork deployments (John Newbery) 8319e738f9f118025b332e4fa804d4c31e4113f4 [tests] Add coverage for the content of getblockchaininfo.softforks (James O'Beirne) 0328dcdcfcb56dc8918697716d7686be048ad0b3 [Consensus] Bury segwit deployment (John Newbery) 1c93b9b31c2ab7358f9d55f52dd46340397c906d [Consensus] Bury CSV deployment height (John Newbery) 3862e473f0cb71a762c0306b171b591341d58142 [rpc] Tidy up reporting of buried and ongoing softforks (John Newbery) Pull request description: This hardcodes CSV and segwit activation heights, similar to the BIP 90 buried deployments for BIPs 34, 65 and 66. CSV and segwit have been active for over 18 months. Hardcoding the activation height is a code simplification, makes it easier to understand segwit activation status, and reduces technical debt. This was originally attempted by jl2012 in #11398 and again by me in #12360. ACKs for top commit: ajtowns: ACK e78aaf41f43d0e2ad78fa6d8dad61032c8ef73d0 ; checked diff to previous acked commit, checked tests still work ariard: ACK e78aaf4, check diff, run the tests again and successfully activated csv/segwit heights on mainnet as expected. MarcoFalke: ACK e78aaf41f43d0e2ad78fa6d8dad61032c8ef73d0 (still didn't check if the mainnet block heights are correct, but the code looks good now) Tree-SHA512: 7e951829106e21a81725f7d3e236eddbb59349189740907bb47e33f5dbf95c43753ac1231f47ae7bee85c8c81b2146afcdfdc11deb1503947f23093a9c399912
2019-08-15Merge #16582: test: Rework ci (Use travis only as fallback env)MarcoFalke
faeacf32691ada64c2321f30ff7537b6eaed0409 ci: Add note that this assumes a fresh git clone (MarcoFalke) fa6cbdc3c9ab42b7e55c666e83b4b8d5545bb745 ci: Use ./ci/ on non-travis host (MarcoFalke) fa31bc35eb8dd7e727e3e1eaf2c45017cd63bdcb ci: Remove dependence on travis, use it as fallback env (MarcoFalke) fa0aac0f43a108a88b03a346464ecda4ae2cf630 ci: Add retry (MarcoFalke) fafe78f6aedfc0ac865379c412a87670b6211021 ci: Rename .travis/ to ./ci/ (MarcoFalke) Pull request description: This moves the `.travis` folder to `ci` and removes dependence on travis, so that the test script can be run anywhere. Top commit has no ACKs. Tree-SHA512: 4d8c82f3eb4e9e047444b0e0f700485e929a3c4d27fc8777a95b8847f23ed507d2701cc92730198b14d1e753cbb558ffac883da558fc2ec72b8a12c4eaec9000
2019-08-15Merge #16443: refactor: have CCoins* data managed under CChainStateMarcoFalke
582d2cd74754d6b9a2394616a9c82a89d2d71976 Cover UTXO set access with lock annotations (James O'Beirne) 569353068568444a25b301bbd6513bb510157dc9 refactor: have CCoins* data managed under CChainState (James O'Beirne) fae6ab6aed3b9fdc9201bb19a307dfc3d9b89891 refactor: pcoinsTip -> CChainState::CoinsTip() (James O'Beirne) Pull request description: This is part of the [assumeutxo project](https://github.com/bitcoin/bitcoin/projects/11): Parent PR: #15606 Issue: #15605 Specification: https://github.com/jamesob/assumeutxo-docs/tree/2019-04-proposal/proposal --- This change encapsulates UTXO set data within CChainState instances, removing global data `pcoinsTip` and `pcoinsviewdb`. This is necessary if we want to maintain multiple chainstates with their own rendering of the UTXO set. We introduce a class CoinsViews which consolidates the construction of a CCoins* hierarchy. This commit could be broken into smaller pieces, but it would require more ephemeral diffs to, e.g., temporarily change CCoinsViewDB's constructor invocations. ACKs for top commit: Sjors: reACK 582d2cd74754d6b9a2394616a9c82a89d2d71976 MarcoFalke: ACK 582d2cd747 Tree-SHA512: ec9d904fe5dca8cd2dc4b7916daa5d8bab30856dd4645987300f905e0a19f9919fce4f9d1ff03eda982943ca73e6e9a746be6cf53b46510de36e8c81a1eafba1
2019-08-15Cover UTXO set access with lock annotationsJames O'Beirne
i.e. any CoinsViews members. Adds a lock acquisition to `gettxoutsetinfo` RPC to comply with added annotations. Co-authored-by: Russell Yanofsky <russ@yanofsky.org>
2019-08-15ci: Add note that this assumes a fresh git cloneMarcoFalke
2019-08-15ci: Use ./ci/ on non-travis hostMarcoFalke
2019-08-15ci: Remove dependence on travis, use it as fallback envMarcoFalke
2019-08-15ci: Add retryMarcoFalke
From: https://github.com/kadwanev/retry/tree/a1b1826bdb0a78189d5c70c858dc676f5133b1d7
2019-08-15ci: Rename .travis/ to ./ci/MarcoFalke
2019-08-15refactor: have CCoins* data managed under CChainStateJames O'Beirne
This change encapsulates UTXO set data within CChainState instances, removing global data `pcoinsTip` and `pcoinsviewdb`. This is necessary if we want to maintain multiple chainstates with their own rendering of the UTXO set. We introduce a class CoinsViews which consolidates the construction of a CCoins* hierarchy. Construction of its various pieces (db, coinscatcher, in-memory cache) is split up so that we avoid flushing bad state to disk if startup is interrupted. We also introduce `CChainState::CanFlushToDisk()` which tells us when it is safe to flush the chainstate based on this partial construction. This commit could be broken into smaller pieces, but it would require more ephemeral diffs to, e.g., temporarily change CCoinsViewDB's constructor invocations. Other changes: - A parameter has been added to the CCoinsViewDB constructor that allows the name of the corresponding leveldb directory to be specified. Thanks to Russell Yanofsky and Marco Falke for helpful feedback.
2019-08-15doc: Improve versionbits.h documentationAntoine Riard
2019-08-15Merge #16465: test: Test p2sh-witness and bech32 in wallet_import_rescanMarcoFalke
fa3c6575cac5e3841797980fe60b8368ae579dba lint: Add false positive to python dead code linter (MarcoFalke) fa25668e1c8982548f1c6f94780709c625811469 test: Test p2sh-witness and bech32 in wallet_import_rescan (MarcoFalke) fa79af298917d501cee26370fdf9d44d05133d15 test: Replace fragile "rng" with call to random() (MarcoFalke) fac3dcf7d052586548f2100a0d576618a85741f9 test: Generate one block for each send in wallet_import_rescan (MarcoFalke) Pull request description: This adds test coverage for segwit in the `wallet_import_rescan` test, among other cleanups. ACKs for top commit: jnewbery: ACK fa3c6575cac5e3841797980fe60b8368ae579dba Tree-SHA512: 877741763c62c1bf9d868864a1e3f0699857e8c028e9fcd65c7eeb73600c22cbe97b7b51093737743d9e87bcb991c1fe1086f673e18765aef0fcfe27951402f0
2019-08-15util: Move ResolveErrMsg to util/errorMarcoFalke
2019-08-15[Fix] Allow connection of a noban banned peernicolas.dorier
2019-08-15lint: Add false positive to python dead code linterMarcoFalke
2019-08-15Merge #16561: tests: Use colors and dots in test_runner.py output only if ↵MarcoFalke
standard output is a terminal 37f2784952cb6f598f82922f9ce71d40c9d74e26 tests: Use colors and dots in test_runner.py output only if standard output is a terminal -- allows for using the test runner output as input to other programs (practicalswift) Pull request description: Use colors and dots in `test_runner.py` output only if standard output is a terminal -- allows for using the test runner output as input to other programs. I found the need for this when parsing `test_runner.py` output while investigating intermittent functional test failures. Before: ``` $ test/functional/test_runner.py wallet_hd.py > output 2>&1 $ less output Temporary test directory at /tmp/test_runner_₿_🏃_20190807_074115 ESC[1mWARNING!ESC[0m There is already a bitcoind process running on this system. Tests may fail unexpectedly due to resource contention! Remaining jobs: [wallet_hd.py] .......................................^M ^M1/1 - ESC[1mwallet_hd.pyESC[0m passed, Duration: 20 s ESC[1mTEST | STATUS | DURATION ESC[0mESC[0;32mwallet_hd.py | ✓ Passed | 20 s ESC[0mESC[1m ALL | ✓ Passed | 20 s (accumulated) ESC[0mRuntime: 20 s ``` After: ``` $ test/functional/test_runner.py wallet_hd.py > output 2>&1 $ less output Temporary test directory at /tmp/test_runner_₿_🏃_20190807_074244 1/1 - wallet_hd.py passed, Duration: 20 s WARNING! There is already a bitcoind process running on this system. Tests may fail unexpectedly due to resource contention! Remaining jobs: [wallet_hd.py] TEST | STATUS | DURATION wallet_hd.py | ✓ Passed | 20 s ALL | ✓ Passed | 20 s (accumulated) Runtime: 20 s ``` ACKs for top commit: laanwj: ACK 37f2784952cb6f598f82922f9ce71d40c9d74e26 Tree-SHA512: f15d95f9e07de2954c326d63d7a4bcd2971faeaa00386600dec2fb915ec89475aeef1dbc968b2c12aa5e988d4b3ed1974d6da0b6a3f1e1a105cfd90e8cb97cf6
2019-08-15qt: Remove menu iconsWladimir J. van der Laan
2019-08-15tests: Use colors and dots in test_runner.py output only if standard output ↵practicalswift
is a terminal -- allows for using the test runner output as input to other programs
2019-08-15Merge #16578: Do not pass in command line arguments to QApplicationfanquake
a2714a5c69f0b0506689af04c3e785f71ee0915d Give QApplication dummy arguments (Andrew Chow) Pull request description: QApplication takes the command line arguments and parses them itself for some [built in command line arguments](https://doc.qt.io/qt-5/qapplication.html#QApplication) that it has. We don't want any of those built in arguments, so instead give it dummy arguments. To test, you can use the `-reverse` option. Without this patch, everything will appear right-to-left; things that were on the left side will be on the right and everything is right aligned. After this patch, `-reverse` will now give a startup error since we do not support this argument. ACKs for top commit: laanwj: ACK a2714a5c69f0b0506689af04c3e785f71ee0915d hebasto: ACK a2714a5c69f0b0506689af04c3e785f71ee0915d fanquake: ACK a2714a5c69f0b0506689af04c3e785f71ee0915d - Have tested that arguments like `-reverse` are no longer being passed through and result in an error. Tree-SHA512: 983bd948ca6999f895b6662b58c37e33af7ed61fdd600c6b4623febb87ec06a92c66e3b3300783530110cc711902793ef82d751d7f563696c4c3a8416b2b1f51
2019-08-15Merge #16615: doc: Fix typos in COPYRIGHTfanquake
36f7697cf6c129cabff2a698a52115829cd0d1fb doc: Fix typos in COPYRIGHT (Chuf) Pull request description: Fixed a couple of typos ACKs for top commit: promag: ACK 36f7697cf6c129cabff2a698a52115829cd0d1fb, correct name is already here: fanquake: ACK 36f7697cf6c129cabff2a698a52115829cd0d1fb Tree-SHA512: 9da498403667f6200669abc0a7fc110e6d2205b577743d412e18d7718016707181ca65f6660dda085c252808b77b1573dfab246ca9c3adfbe97f790d5bee9615
2019-08-14test: Test p2sh-witness and bech32 in wallet_import_rescanMarcoFalke
2019-08-14test: Replace fragile "rng" with call to random()MarcoFalke
2019-08-14test: Generate one block for each send in wallet_import_rescanMarcoFalke
This ... * ensures that enough coins are available/spendable, even when more variants are added * ensures that all mempool txs are mined, even when more variants are added * makes the test more specific to test that the confirmation height is properly reported and timestamps are correctly handled in the test logic * prepares the test for a future, where blocks are skipped for rescan if they are deemed irrelevant by a filter (c.f. BIP157)
2019-08-14Merge #16435: autoconf: Sane `--enable-debug` defaults.Jonas Schnelli
d6ac25bdd96589a71006e3ab3f303b091ffaa9e4 autoconf: Sane --enable-debug defaults. (Carl Dong) Pull request description: ``` Don't optimize even if variables adhere to as-if rule. This is a somewhat sane default for debugging. ``` ----- Fixes: #14830 This is more of a "do something dumb and have people correct you" kind of PR. The end goal is to have a configure flag that will allow for debugging without annoying "optimized out" messages, for developer experiences' sake. This is the minimal diff, but people have suggested `--enable-debug-slow` in the past. ACKs for top commit: jonasschnelli: Tested ACK d6ac25bdd96589a71006e3ab3f303b091ffaa9e4 Tree-SHA512: 7a5576ad1d33850aff1445ccb71b133f654b455da2d1daed2ed1b82ea773965790a62895aeeab74b23a25513ab96dddb670f9dbc593dd0b8c030694206a99ccf
2019-08-14[docs] Add release notes for burying bip 9 soft fork deploymentsJohn Newbery
2019-08-14[tests] Add coverage for the content of getblockchaininfo.softforksJames O'Beirne
2019-08-14[Consensus] Bury segwit deploymentJohn Newbery
Hardcode segwit deployment height to 481824 for mainnet.
2019-08-14[Consensus] Bury CSV deployment heightJohn Newbery
Hard code CSV deployment height to 419328 for mainnet.
2019-08-14doc: Fix typos in COPYRIGHTChuf
Fixed a couple of typos
2019-08-14Merge #16248: Make whitebind/whitelist permissions more flexibleWladimir J. van der Laan
c5b404e8f1973afe071a07c63ba1038eefe13f0f Add functional tests for flexible whitebind/list (nicolas.dorier) d541fa391844f658bd7035659b5b16695733dd56 Replace the use of fWhitelisted by permission checks (nicolas.dorier) ecd5cf7ea4c3644a30092100ffc399e30e193275 Do not disconnect peer for asking mempool if it has NO_BAN permission (nicolas.dorier) e5b26deaaa6842f7dd7c4537ede000f965ea0189 Make whitebind/whitelist permissions more flexible (nicolas.dorier) Pull request description: # Motivation In 0.19, bloom filter will be disabled by default. I tried to make [a PR](https://github.com/bitcoin/bitcoin/pull/16176) to enable bloom filter for whitelisted peers regardless of `-peerbloomfilters`. Bloom filter have non existent privacy and server can omit filter's matches. However, both problems are completely irrelevant when you connect to your own node. If you connect to your own node, bloom filters are the most bandwidth efficient way to synchronize your light client without the need of some middleware like Electrum. It is also a superior alternative to BIP157 as it does not require to maintain an additional index and it would work well on pruned nodes. When I attempted to allow bloom filters for whitelisted peer, my proposal has been NACKed in favor of [a more flexible approach](https://github.com/bitcoin/bitcoin/pull/16176#issuecomment-500762907) which should allow node operator to set fine grained permissions instead of a global `whitelisted` attribute. Doing so will also make follow up idea very easy to implement in a backward compatible way. # Implementation details The PR propose a new format for `--white{list,bind}`. I added a way to specify permissions granted to inbound connection matching `white{list,bind}`. The following permissions exists: * ForceRelay * Relay * NoBan * BloomFilter * Mempool Example: * `-whitelist=bloomfilter@127.0.0.1/32`. * `-whitebind=bloomfilter,relay,noban@127.0.0.1:10020`. If no permissions are specified, `NoBan | Mempool` is assumed. (making this PR backward compatible) When we receive an inbound connection, we calculate the effective permissions for this peer by fetching the permissions granted from `whitelist` and add to it the permissions granted from `whitebind`. To keep backward compatibility, if no permissions are specified in `white{list,bind}` (e.g. `--whitelist=127.0.0.1`) then parameters `-whitelistforcerelay` and `-whiterelay` will add the permissions `ForceRelay` and `Relay` to the inbound node. `-whitelistforcerelay` and `-whiterelay` are ignored if the permissions flags are explicitly set in `white{bind,list}`. # Follow up idea Based on this PR, other changes become quite easy to code in a trivially review-able, backward compatible way: * Changing `connect` at rpc and config file level to understand the permissions flags. * Changing the permissions of a peer at RPC level. ACKs for top commit: laanwj: re-ACK c5b404e8f1973afe071a07c63ba1038eefe13f0f Tree-SHA512: adfefb373d09e68cae401247c8fc64034e305694cdef104bdcdacb9f1704277bd53b18f52a2427a5cffdbc77bda410d221aed252bc2ece698ffbb9cf1b830577
2019-08-14Merge #16563: test: Add unit test for AddTimeDataWladimir J. van der Laan
7cd069d8ef900c6c6b904ddd6fbd64e14bd0f53e Add test for AddTimeData (Martin Zumsande) Pull request description: `AddTimeData()` has poor test coverage but interesting logic (including a bug turned into a feature). This PR adds a unit test for it. ACKs for top commit: laanwj: ACK 7cd069d8ef900c6c6b904ddd6fbd64e14bd0f53e, thanks for adding a test Tree-SHA512: 8228f9027e52ed534411d595c7e45cf4edeee9757f26f5141fbcfae3fc6f598a8cea7f734bb8f55238857a37ad2f2d518e859e1fe8c106c0712da976792ac132
2019-08-14Merge #16589: build: Remove unused src/obj-test folderMarcoFalke
fa4ee0ddf1b5150a9dcdd3bb711d5a06220ecebb build: Remove unused src/obj-test folder (MarcoFalke) Pull request description: I believe this is no longer used after we switched from a makefile to autotools ACKs for top commit: emilengler: Concept ACK https://github.com/bitcoin/bitcoin/pull/16589/commits/fa4ee0ddf1b5150a9dcdd3bb711d5a06220ecebb Tree-SHA512: cbedd3e65afc4de93b16500a0ff2e8778eb94e0224409d9a8d7cfc14cf22087471d260e63ba8d1322afdef5930d6c26fb64060e9e1b23876132cb9cdc35dce2c
2019-08-14Merge #16596: rpc: Fix getblocktemplate CLI examplefanquake
14f7eec3bdb15a9a75f8686c0a3e879aa8ceef47 rpc: Fix getblocktemplate CLI example (#16594) (Emil Engler) Pull request description: Fixes #16594. I didn't found any other syntax error in the code. Correct me if I'm wrong ACKs for top commit: fanquake: ACK 14f7eec3bdb15a9a75f8686c0a3e879aa8ceef47 Tree-SHA512: 2137df2de07df2df9ffbe9e4b4ebb100bb40a36234aba01a6f65b00026f578a7a9040ac99936b4052531d72435e6e04f771beb8d6be51a9b072f93e88f1ecc01
2019-08-14Merge #16609: descriptor: fix missed m_script_arg arg renaming in #14934MarcoFalke
396385657cf053ac6c947a5d0640c887f20ae5bb descriptor: fix missed m_script_arg arg renaming in #14934 (fanquake) Pull request description: Fixes a missed renaming from #14934. ACKs for top commit: Sjors: ACK 3963856 Tree-SHA512: da2972301b2b83556f1f3f3b72758bb69570422cdd57c65aa7657b4e3dcc597dde03e7f1cf8988e8c3b6737737b4c0bee4aefb329376e24e7dedc2cab73fcf88
2019-08-14descriptor: fix missed m_script_arg arg renaming in #14934fanquake
2019-08-14Merge #14934: Descriptor expansion cache clarificationsWladimir J. van der Laan
2e68ffaf205866e4cea71f64e79bbfb89e17280a [doc] descriptor: explain GetPubKey() usage with cached public key (Sjors Provoost) 2290269759ad10cc2e35958c7b0a63f3a7608621 scripted-diff: rename DescriptorImpl m_script_arg to m_subdescriptor_arg (Sjors Provoost) Pull request description: I found the name `m_script_arg` to be confusing while reviewing https://github.com/bitcoin/bitcoin/pull/14646#discussion_r240677238. @sipa let me know if `m_subdescriptor_arg` is completely wrong. I also added an explanation of why we call `GetPubKey` when we don't ask it for a public key. ACKs for top commit: laanwj: ACK 2e68ffaf205866e4cea71f64e79bbfb89e17280a Tree-SHA512: 06698e9a91cdda93c043a82732793f0ad3cd91daa2513565953e9fa048d5573322fb534e9d0ea9ab736e6366be5921e2b8699c4f4b3693edab48039aaae06f78
2019-08-14Merge #16605: Add missing contributor to 0.18.1 release notesWladimir J. van der Laan
862cbf39664fe6f139ab44ac06cf65f76d0a0a1d Add missing contributor to release notes (MeshCollider) Pull request description: The user contacted me on Twitter and pointed out that he had contributed in both the reporting of the bug #16012 as well as a number of PRs following it, so I think he deserves to be credited in the release notes (also changed to use my real name while I'm there) ACKs for top commit: laanwj: ACK 862cbf39664fe6f139ab44ac06cf65f76d0a0a1d Tree-SHA512: 94bbe168783243fd436b29b741be182fb0dcc247a6e8f52dafcd301ebc63f21e4e035677aa038db95e2e9d2062f5811f2dda1fd6d53966649773c69babb3f61b
generated by cgit v1.2.3 (git 2.26.2) at 2024-10-15 07:34:56 +0000