Byron Hambly
4d00218319
Merge 8303f11e10 into merged_master (Bitcoin PR bitcoin/bitcoin#27170 )
2025-04-09 12:38:49 +02:00
Byron Hambly
57e13e480e
Merge 68e484afbb into merged_master (Bitcoin PR bitcoin/bitcoin#26584 )
2025-04-05 17:47:02 +02:00
Byron Hambly
e9d751c3ea
Merge 329d7e379d into merged_master (Bitcoin PR bitcoin/bitcoin#26328 )
2025-04-01 21:20:57 +02:00
Byron Hambly
feb8f8cf2b
Merge 9887fc7898 into merged_master (Bitcoin PR bitcoin/bitcoin#26758 )
2025-04-01 21:20:49 +02:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
c66623d5d0
Merge 295f617988 into merged_master (Bitcoin PR bitcoin/bitcoin#26505 )
2025-03-03 12:10:21 +02:00
Byron Hambly
b83abdf89a
Merge UP TO e42ba134f4 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26448 )
...
1667577042 2022-11-04T16:50:42+01:00 e42ba134f4 Bitcoin Merge bitcoin/bitcoin#26448 : test: fix intermittent failure in p2p_sendtxrcncl.py
1667576919 2022-11-04T15:48:39+00:00 83cf055bef Bitcoin Merge bitcoin/bitcoin#26443 : doc: mention BIP86 in doc/bips.md
1667478613 2022-11-03T13:30:13+01:00 28653a596a Bitcoin Merge bitcoin/bitcoin#26445 : .python-version: bump patch version to 3.6.15
1667471345 2022-11-03T10:29:05+00:00 2a7c9984db Bitcoin Merge bitcoin/bitcoin#25248 : refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert()
1667397640 2022-11-02T15:00:40+01:00 5274f32437 Bitcoin Merge bitcoin/bitcoin#26417 : test: fix intermittent failure in feature_index_prune.py
1667372848 2022-11-02T08:07:28+01:00 39f026b1ec Bitcoin Merge bitcoin/bitcoin#26396 : net: Avoid SetTxRelay for feeler connections
1667316369 2022-11-01T16:26:09+01:00 bf0cb43990 Bitcoin Merge bitcoin/bitcoin#26437 : test: remove unused `CHANGE_{XPRV,XPUB}` constants
1667300957 2022-11-01T11:09:17+00:00 5668ccec1d Bitcoin Merge bitcoin/bitcoin#25548 : gui: Check for readlink buffer overflow and handle gracefully
1667297563 2022-11-01T10:12:43+00:00 c041d8f2c9 Bitcoin Merge bitcoin/bitcoin#26360 : build: remove threadinterrupt from libbitcoinkernel
1667297149 2022-11-01T10:05:49+00:00 27e76afe24 Bitcoin Merge bitcoin/bitcoin#26294 : build: move util/url to common/url
1667291397 2022-11-01T08:29:57+00:00 d08b63baa0 Bitcoin Merge bitcoin/bitcoin#26373 : Update minisketch subtree to latest upstream
1667230521 2022-10-31T15:35:21+00:00 43e813cab2 Bitcoin Merge bitcoin/bitcoin#26387 : p2p: TryLowWorkHeadersSync follow-ups
1667217075 2022-10-31T11:51:15+00:00 4766cd1981 Bitcoin Merge bitcoin/bitcoin#24051 : Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ
1667213203 2022-10-31T11:46:43+01:00 2856dee808 Bitcoin Merge bitcoin/bitcoin#26402 : doc: Fix typos
1667202170 2022-10-31T08:42:50+01:00 c75c0d8e11 Bitcoin Merge bitcoin/bitcoin#26424 : doc: correct deriveaddresses RPC name
1667034850 2022-10-29T11:14:10+02:00 4f270d2b63 Bitcoin Merge bitcoin/bitcoin#26404 : test: fix intermittent failure in rpc_getblockfrompeer.py
1667030363 2022-10-29T09:59:23+02:00 984a01589b Bitcoin Merge bitcoin/bitcoin#26408 : test: Remove spam from debug log
1666985837 2022-10-28T15:37:17-04:00 8b050762b1 Bitcoin Merge bitcoin/bitcoin#26409 : refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts
1666949533 2022-10-28T11:32:13+02:00 1bad29fe02 Bitcoin Merge bitcoin/bitcoin#26377 : test: Make `system_tests/run_command` test locale and platform agnostic
2025-02-27 13:40:17 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
1006327a13
Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707 )
2024-11-04 11:26:40 +02:00
Byron Hambly
a1f37eeae6
Merge e09ad284c7 into merged_master (Bitcoin PR bitcoin/bitcoin#24675 )
2024-10-25 11:37:05 +02:00
Byron Hambly
068f46b4f5
Merge 5c82ca3365 into merged_master (Bitcoin PR bitcoin/bitcoin#25493 )
2024-10-17 18:03:37 +02:00
James Dorfman
1e24510c7e
Merge b91055ea55 into merged_master (Bitcoin PR bitcoin/bitcoin#25251 )
2024-09-10 18:10:02 +00:00
James Dorfman
7ec702f8f0
Merge 44037a2912 into merged_master (Bitcoin PR bitcoin/bitcoin#25176 )
2024-09-06 05:45:13 +00:00
James Dorfman
e940df7e48
Merge 6407c0e8a3 into merged_master (Bitcoin PR bitcoin/bitcoin#25101 )
2024-08-13 06:33:14 +00:00
James Dorfman
06a6044137
Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153 )
2024-08-13 06:00:38 +00:00
James Dorfman
31df518140
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108 )
2024-08-13 04:20:55 +00:00
James Dorfman
0027999db1
Merge 002411dc53 into merged_master (Bitcoin PR bitcoin/bitcoin#25157 )
2024-08-13 04:12:31 +00:00
James Dorfman
cac4a07224
Merge dd9f61a184 into merged_master (Bitcoin PR bitcoin/bitcoin#25102 )
2024-08-09 21:19:15 +00:00
James Dorfman
1fda45d8e8
Merge 3bbc46ddaf into merged_master (Bitcoin PR bitcoin/bitcoin#24632 )
2024-07-30 05:26:33 +00:00
James Dorfman
5499524906
Merge d906329c28 into merged_master (Bitcoin PR bitcoin/bitcoin#24681 )
2024-07-29 19:05:12 +00:00
Byron Hambly
51fbed170b
Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409 )
2023-07-02 13:45:31 +00:00
Byron Hambly
d8cfd68e37
Merge 48a90c61e2 into merged_master (Bitcoin PR bitcoin/bitcoin#24370 )
2023-07-02 06:36:21 +00:00
Byron Hambly
545d29ca21
Merge 85ae549a46 into merged_master (Bitcoin PR bitcoin/bitcoin#24137 )
2023-07-02 05:40:27 +00:00
Byron Hambly
d66042de13
Merge 66636ca438 into merged_master (Bitcoin PR bitcoin/bitcoin#24360 )
2023-07-01 06:06:18 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
Byron Hambly
acd5824106
Merge caf8b26b52 into merged_master (Bitcoin PR bitcoin/bitcoin#23175 )
2023-05-26 09:24:30 +00:00
Byron Hambly
0486fef47e
Merge 3fc3641043 into merged_master (Bitcoin PR bitcoin/bitcoin#22766 )
2023-05-16 13:26:27 +00:00
Byron Hambly
177c708c84
Merge ee1294f155 into merged_master (Bitcoin PR bitcoin/bitcoin#23324 )
2023-05-14 09:41:42 +00:00
Byron Hambly
2b8eef42dd
Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937 )
2023-05-11 12:38:50 +00:00
Byron Hambly
eea9829aa6
Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976 )
2023-04-24 11:40:49 +00:00
James Dorfman
0508c357e9
Merge d809d8bf12 into merged_master (Bitcoin PR bitcoin/bitcoin#22959 )
2023-04-21 18:56:41 +00:00
Byron Hambly
d5914ae484
Merge 0de84b7328 into merged_master (Bitcoin PR bitcoin/bitcoin#22544 )
2023-04-21 12:12:15 +00:00
James Dorfman
62c3446ccb
Merge 1d0c57a05c into merged_master (Bitcoin PR bitcoin/bitcoin#22914 )
2023-04-21 05:15:56 +00:00
James Dorfman
24ea38c570
Merge 4bd56bc291 into merged_master (Bitcoin PR bitcoin/bitcoin#22894 )
2023-04-20 21:12:16 +00:00
Byron Hambly
d0a717ca58
Merge a70768d159 into merged_master (Bitcoin PR bitcoin/bitcoin#22501 )
2023-04-13 12:26:40 +00:00
Byron Hambly
e2ccc3a707
Merge cea38b491f into merged_master (Bitcoin PR bitcoin/bitcoin#22183 )
2023-04-11 06:15:07 +00:00
Byron Hambly
e43446ce3d
Merge ce0913148b into merged_master (Bitcoin PR bitcoin/bitcoin#22547 )
2023-04-09 05:27:10 +00:00
Glenn Willen
72a0ba0291
Merge cac38cdd02 into merged_master (Bitcoin PR bitcoin/bitcoin#21832 )
2023-03-21 03:59:44 +00:00
Ryan Ofsky
9a9d5da11f
refactor: Stop using gArgs global in system.cpp
...
Most of the code in util/system.cpp that was hardcoded to use the global
ArgsManager instance `gArgs` has been changed to work with explicit ArgsManager
instances (for example in https://github.com/bitcoin/bitcoin/pull/20092 ). But a
few hardcoded references to `gArgs` remain. This commit removes the last ones
so these functions aren't reading or writing global state.
2023-02-27 14:21:13 -05:00
Ryan Ofsky
b20b34f5b3
refactor: Use new GetConfigFilePath function
...
New function was introduced by willcl-ark <will@256k1.dev> in commit
56e370fbb9 from
https://github.com/bitcoin/bitcoin/pull/27073 and removes some duplicate code.
2023-02-27 14:14:58 -05:00
Matthew Zipkin
77192c9598
cli: include local ("unreachable") peers in -netinfo table
2023-02-02 13:14:48 -05:00
fanquake
329d7e379d
Merge bitcoin/bitcoin#26328 : doc: fix -netinfo relaytxes help
...
0f5fc4f656 doc: fix up -netinfo relaytxes help (Jon Atack)
Pull request description:
Addresses https://github.com/bitcoin/bitcoin/pull/26109#discussion_r995502563 by Marco Falke (thanks!)
ACKs for top commit:
mzumsande:
Code Review ACK 0f5fc4f656
Tree-SHA512: d7345d1a94b15c4ec1a2bb0be5c04c472411d90cefb4c16ed524933d2bfc36816bb7519c2e109b2e41ff451b039dd2ddaa6d5db917ad54745332f2a1d8b85570
2023-01-11 16:39:11 +00:00
Jon Atack
0f5fc4f656
doc: fix up -netinfo relaytxes help
...
Co-authored-by: "MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>"
2023-01-10 12:55:04 -08:00
Hennadii Stepanov
9567bfeab9
clang-tidy: Add performance-no-automatic-move check
...
https://clang.llvm.org/extra/clang-tidy/checks/performance/no-automatic-move.html
2022-12-27 15:25:51 +00:00
Hennadii Stepanov
306ccd4927
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
Commits of previous years:
- 2021: f47dda2c58
- 2020: fa0074e2d8
- 2019: aaaaad6ac9
2022-12-24 23:49:50 +00:00
@RandyMcMillan
cc597bd56d
src/bitcoin-cli.cpp: -getinfo help - grammar correction
2022-11-15 09:41:23 -05:00
fanquake
3a0b352c63
refactor: move url.h/cpp from lib util to lib common
2022-10-31 10:17:04 +00:00
Jon Atack
df660ddb1c
Update getpeerinfo/-netinfo/TxRelay#m_relay_txs relaytxes docs (for v24 backport)
...
to the current p2p behavior. We only initialize the Peer::TxRelay m_relay_txs
data structure if it isn't an outbound block-relay-only connection and fRelay=true
(the peer wishes to receive tx announcements) or we're offering NODE_BLOOM to this peer.
2022-09-22 16:45:32 +02:00
MacroFake
9eaef10801
Merge bitcoin/bitcoin#25707 : refactor: Make const references to avoid unnecessarily copying objects and enable two clang-tidy checks
...
ae7ae36d31 tidy: Enable two clang-tidy checks (Aurèle Oulès)
081b0e53e3 refactor: Make const refs vars where applicable (Aurèle Oulès)
Pull request description:
I added const references to some variables to avoid unnecessarily copying objects.
Also added two clang-tidy checks : [performance-for-range-copy](https://releases.llvm.org/11.1.0/tools/clang/tools/extra/docs/clang-tidy/checks/performance-for-range-copy.html ) and [performance-unnecessary-copy-initialization](https://releases.llvm.org/12.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/performance-unnecessary-copy-initialization.html ).
ACKs for top commit:
vasild:
ACK ae7ae36d31
MarcoFalke:
review ACK ae7ae36d31
Tree-SHA512: f6ac6b0cd0eee1e0c34d2f186484bc0f7ec6071451cccb33fa88a67d93d92b304e2fac378b88f087e94657745bca4e966dbc443759587400eb01b1f3061fde8c
2022-08-19 17:11:06 +02:00