Commit graph

2092 commits

Author SHA1 Message Date
Byron Hambly
51fbed170b Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409) 2023-07-02 13:45:31 +00:00
Byron Hambly
5ec7209e95 Merge cf22191fd8 into merged_master (Bitcoin PR bitcoin/bitcoin#24072) 2023-07-01 07:59:26 +00:00
Byron Hambly
04cea6bf40 Merge 8c0f02c69d into merged_master (Bitcoin PR bitcoin/bitcoin#24265) 2023-06-30 11:33:00 +00:00
Byron Hambly
08e52d10c8 Merge 515200298b into merged_master (Bitcoin PR bitcoin/bitcoin#24250) 2023-06-30 08:06:50 +00:00
Byron Hambly
4988afcbc2 Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744) 2023-06-30 07:38:29 +00:00
Byron Hambly
7878ba47b9 Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497) 2023-06-19 09:28:31 +00:00
Byron Hambly
a14e05aac7 Merge 3917dff732 into merged_master (Bitcoin PR bitcoin/bitcoin#23855) 2023-06-15 11:07:17 +00:00
Byron Hambly
47626b5a64 Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912) 2023-06-14 15:44:11 +00:00
James Dorfman
67a5234365 Merge a063647413 into merged_master (Bitcoin PR bitcoin/bitcoin#23280) 2023-06-12 17:58:49 +00:00
Byron Hambly
50957f3e4b Merge 26a1147ce5 into merged_master (Bitcoin PR bitcoin/bitcoin#23636) 2023-06-01 12:04:07 +00:00
Byron Hambly
32a72637f7 Merge 16d698cdcf into merged_master (Bitcoin PR bitcoin/bitcoin#23517) 2023-05-31 09:33:07 +00:00
Byron Hambly
3f0bf16b6a Merge 73ac195e29 into merged_master (Bitcoin PR bitcoin/bitcoin#23249) 2023-05-30 15:47:52 +00:00
Byron Hambly
c8c72768d0 Merge 7f0f853373 into merged_master (Bitcoin PR bitcoin/bitcoin#23005) 2023-05-25 08:59:33 +00:00
Byron Hambly
b951f8d198 Merge 8346004ac8 into merged_master (Bitcoin PR bitcoin/bitcoin#23077) 2023-05-17 12:13:27 +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
2b8eef42dd Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937) 2023-05-11 12:38:50 +00:00
Byron Hambly
498907a233 Merge 816e15ee81 into merged_master (Bitcoin PR bitcoin/bitcoin#22951) 2023-05-09 11:50:39 +00:00
Byron Hambly
cca3f919f8 Merge 9e530c6352 into merged_master (Bitcoin PR bitcoin/bitcoin#20487) 2023-05-09 11:22:04 +00:00
Byron Hambly
b708aecb74 Merge 571bb94dfb into merged_master (Bitcoin PR bitcoin/bitcoin#23123) 2023-04-28 13:31:37 +00:00
Byron Hambly
c234cf81a4 Merge dbbb7fbcc0 into merged_master (Bitcoin PR bitcoin/bitcoin#23130) 2023-04-28 12:10:18 +00:00
Byron Hambly
eea9829aa6 Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976) 2023-04-24 11:40:49 +00:00
Byron Hambly
91812b0e0d Merge 8b523f2e55 into merged_master (Bitcoin PR bitcoin/bitcoin#23094) 2023-04-24 10:53:02 +00:00
Byron Hambly
14a2c59839 Merge 632be5514c into merged_master (Bitcoin PR bitcoin/bitcoin#23061) 2023-04-24 10:40:48 +00:00
Byron Hambly
8d89f4e102 Merge 71bdf0bff1 into merged_master (Bitcoin PR bitcoin/bitcoin#22626) 2023-04-21 12:36:24 +00:00
Byron Hambly
8d6c4da78c Merge 528e08119f into merged_master (Bitcoin PR bitcoin/bitcoin#22219) 2023-04-21 09:23:54 +00:00
Byron Hambly
6382bb18e8 Merge 053a5fc7d9 into merged_master (Bitcoin PR bitcoin/bitcoin#22762) 2023-04-21 07:24:43 +00:00
James Dorfman
5a22e7ab80 Merge 5446070418 into merged_master (Bitcoin PR bitcoin/bitcoin#22911) 2023-04-21 06:10:28 +00:00
James Dorfman
20e85cd2e1 Merge 896649996b into merged_master (Bitcoin PR bitcoin/bitcoin#22915) 2023-04-21 02:20:33 +00:00
James Dorfman
0627d9aacb Merge a8fdfea77b into merged_master (Bitcoin PR bitcoin/bitcoin#22791) 2023-04-20 22:19:30 +00:00
James Dorfman
0d8968cf61 Merge 61a843e43b into merged_master (Bitcoin PR bitcoin/bitcoin#22220) 2023-04-11 03:23:21 +00:00
James Dorfman
818dfb4863 Merge 58b559fab0 into merged_master (Bitcoin PR bitcoin/bitcoin#20769) 2023-04-10 19:49:08 +00:00
Byron Hambly
8028581687 Merge 602c8eb8f0 into merged_master (Bitcoin PR bitcoin/bitcoin#22697) 2023-04-10 11:36:46 +00:00
Byron Hambly
6abf0bc3bc Merge 803ef70fd9 into merged_master (Bitcoin PR bitcoin/bitcoin#20233) 2023-04-09 07:15:39 +00:00
Byron Hambly
5f259e46c1 Merge 5b2d8661c9 into merged_master (Bitcoin PR bitcoin/bitcoin#22577) 2023-04-06 13:24:41 +00:00
Byron Hambly
d7c38ee168
Merge 10fbb37268 into merged_master (Bitcoin PR bitcoin/bitcoin#22098) 2023-04-04 19:29:03 +02:00
James Dorfman
17e6efe7fe Merge 5d83e7d714 into merged_master (Bitcoin PR bitcoin/bitcoin#21090)
We comment out a newly-added assert from the Bitcoin
side, because it's unclear how to replicate it
correctly in Elements.

Co-authored-by: Glenn Willen <gwillen@nerdnet.org>
2023-03-22 01:11:20 +00:00
James Dorfman
44df9bbb73 Merge 951850bebf into merged_master (Bitcoin PR #22371) 2023-03-16 14:23:27 +00:00
Pablo Greco
ae4a990985 Obscure mainchain rpc fields in the logs, just like the local ones 2023-01-30 16:49:14 -03:00
Glenn Willen
e62215628c Update documentation 2023-01-24 22:34:37 -08:00
Glenn Willen
8cad8cda44 Further fixes from code review 2023-01-04 16:33:35 -08:00
Glenn Willen
7c555578b7 Add a flag for header-trimming; clear P2P network feature bits when enabled. 2022-12-12 09:46:07 -08:00
Glenn Willen
83ad381f47
Merge pull request #1117 from andreabonel/elements-qt_sourcecode
Source code URL correction (in Help - About Elements Core) elements-qt
2022-07-11 09:25:16 -07:00
Andrea Bonel
9554211b8c Source code URL correction in Help-AboutElementsCore elements-qt 2022-05-20 13:47:20 -03:00
fanquake
4c3e3c5746
refactor: shift CopyrightHolders() and LicenseInfo() to clientversion.cpp 2022-02-22 15:36:19 +00:00
MarcoFalke
cf22191fd8
Merge bitcoin/bitcoin#24072: doc: fix wording of alertnotify to match behaviour
6981de4435 doc: fix wording of alertnotify (willcl-ark)

Pull request description:

  The documentation of the `alertnotify` startup option no longer matches the implementation.

  Currently the alert is only triggered by `DoWarning` (as part of `CChainstate::UpdateTip` when blocks containing unknown versionbits are detected on the network, indicating that there may be an upcoming softfork which you don't know about), but not when we see a "really long fork":

  2825c41a61/src/validation.cpp (L2418-L2433)

  I think it would be desirable in a follow-up PR to implement the logic to alert on a (really) long fork, but not to alert for "partition detection" (abnormally slow/fast blocks). `PartitionChecker` code was removed in ab8be98fdb

ACKs for top commit:
  josibake:
    ACK https://github.com/bitcoin/bitcoin/pull/24072/commits/6981de4435573ad44ee53fd5efc10894866ed2f9
  achow101:
    ACK 6981de4435

Tree-SHA512: ea124f53ca1db803ba93d649f4bc983484c47fb5fe7fa61a8eb32fcbc7425f67d8578e66a6ba70202e13868fe8add0103306dede3b1edd1d3261ffb9c1042b87
2022-02-21 08:16:31 +01:00
Hennadii Stepanov
15b632bf16
Use ArgsManager::GetPathArg() for "-datadir" option 2022-02-09 19:31:22 +02:00
laanwj
515200298b
Merge bitcoin/bitcoin#24250: Update translations for 0.23 string freeze
04255073bb qt: Update source translations (laanwj)
cf79c56e65 init: Remove confusing '(possible integer overflow?)' from error message (laanwj)
d570a63894 qt: Update transifex resource blob to 23.0 (laanwj)

Pull request description:

  - Update translations for 0.23 string freeze
  - Update transifex resource blob to 23.0

  This is necessary before a 23.0 resource can be created on Transifex.

ACKs for top commit:
  hebasto:
    ACK 04255073bb

Tree-SHA512: ff886e92721f070e3c135cfec229c41848a67c02355b88f2a5a507241b545f4209167d83b561420c2a82f49a5994170b01dcfb95bfc3fe6b9c832abcc6547b14
2022-02-04 09:25:36 +01:00
laanwj
cf79c56e65 init: Remove confusing '(possible integer overflow?)' from error message 2022-02-03 13:36:56 +01:00
Kiminuo
41d7166c8a
refactor: replace boost::filesystem with std::filesystem
Warning: Replacing fs::system_complete calls with fs::absolute calls
in this commit may cause minor changes in behaviour because fs::absolute
no longer strips trailing slashes; however these changes are believed to
be safe.

Co-authored-by: Russell Yanofsky <russ@yanofsky.org>
Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
2022-02-03 18:35:52 +08:00
willcl-ark
6981de4435
doc: fix wording of alertnotify
Since the removal of the PartitionChecker code in ab8be98fdb
the documentation of alertnotify no longer matches the implementation.

Instead simply document that alertnotify will be called when "an alert
is raised".
2022-01-28 07:48:58 +00:00