Byron Hambly
9044eee63e
Merge 06209574da into merged_master (Bitcoin PR bitcoin/bitcoin#23832 )
2023-06-15 10:50:26 +00:00
Byron Hambly
334188e09d
Merge 17fdbefd3f into merged_master (Bitcoin PR bitcoin/bitcoin#23970 )
2023-06-15 09:43:05 +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
bd0af938dc
Merge 3ec8f9f123 into merged_master (Bitcoin PR bitcoin/bitcoin#23801 )
2023-06-13 19:43:04 +00:00
Byron Hambly
a23bba068f
Merge 14ba286556 into merged_master (Bitcoin PR bitcoin/bitcoin#23695 )
2023-06-13 15:16:02 +00:00
Byron Hambly
413786c613
Merge 8c0bd871fc into merged_master (Bitcoin PR bitcoin/bitcoin#23785 )
2023-06-13 14:30:53 +00:00
Byron Hambly
8edcc34130
Merge 60b5795133 into merged_master (Bitcoin PR bitcoin/bitcoin#23758 )
2023-06-13 12:26:03 +00:00
Byron Hambly
54c9ee347d
Merge 9635760ce8 into merged_master (Bitcoin PR bitcoin/bitcoin#22777 )
2023-06-13 10:06:36 +00:00
Byron Hambly
70c69d94f6
Merge 9f7661c0c4 into merged_master (Bitcoin PR bitcoin/bitcoin#19499 )
2023-06-12 13:11:30 +00:00
Byron Hambly
b0b2f3deff
Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295 )
2023-06-06 09:10:04 +00:00
Byron Hambly
16ce576d1d
Merge e457513eb1 into merged_master (Bitcoin PR bitcoin/bitcoin#23631 )
2023-06-02 12:58:30 +00:00
James Dorfman
72a90148c8
Merge 8b1de78577 into merged_master (Bitcoin PR bitcoin/bitcoin#23413 )
2023-06-01 18:51:42 +00:00
James Dorfman
5aadbb7a9d
Merge 63c0d0e937 into merged_master (Bitcoin PR bitcoin/bitcoin#21327 )
...
I commented out a few new lines at the bottom of test/functional/p2p_ibd_txrelay.py
It tests that nodes process certain transactions, after IBD. These new assertions
from upstream are failing, but it may be because our IBD / tx sharing logic is different.
We should revisit this.
2023-06-01 05:27:06 +00:00
Byron Hambly
8250bf53d2
Merge 606e306277 into merged_master (Bitcoin PR bitcoin/bitcoin#22981 )
2023-05-26 13:47:21 +00:00
Byron Hambly
2da8f66309
Merge 38b2a0a3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23173 )
2023-05-24 11:45:57 +00:00
James Dorfman
df8f97d63b
Merge 1847ce2d49 into merged_master (Bitcoin PR bitcoin/bitcoin#23157 )
2023-05-16 09:04:56 +00:00
Byron Hambly
7925c2a451
Merge 224e90d9fd into merged_master (Bitcoin PR bitcoin/bitcoin#23336 )
2023-05-15 12:27:08 +00:00
Byron Hambly
06d3e29912
Merge 788909f3c7 into merged_master (Bitcoin PR bitcoin/bitcoin#23042 )
2023-05-14 11:08:09 +00:00
Byron Hambly
8299bec8a2
Merge c001da306b into merged_master (Bitcoin PR bitcoin/bitcoin#23325 )
2023-05-14 10:52:15 +00:00
Byron Hambly
c1a05187a3
Merge 8a083bc5b5 into merged_master (Bitcoin PR bitcoin/bitcoin#23218 )
2023-05-14 09:58:38 +00:00
Byron Hambly
9b7c9154fe
Merge c4fc899442 into merged_master (Bitcoin PR bitcoin/bitcoin#22950 )
2023-05-09 12:21:13 +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
4d68eaa81b
Merge 4e1de1fc59 into merged_master (Bitcoin PR bitcoin/bitcoin#22340 )
2023-04-28 13:51:41 +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
965ac7c53b
Merge 58e02395ba into merged_master (Bitcoin PR bitcoin/bitcoin#22955 )
2023-04-21 11:43:16 +00:00
Byron Hambly
6d32af1662
Merge 33707a2a88 into merged_master (Bitcoin PR bitcoin/bitcoin#22782 )
2023-04-11 08:18:04 +00:00
James Dorfman
cdbedba214
Merge dbcb5742c4 into merged_master (Bitcoin PR bitcoin/bitcoin#20541 )
2023-04-11 01:40:34 +00:00
Byron Hambly
a797e5e55a
Merge 4c87665707 into merged_master (Bitcoin PR bitcoin/bitcoin#22604 )
2023-04-09 07:26:48 +00:00
James Dorfman
815f4d545d
Merge dd981b5e84 into merged_master (Bitcoin PR bitcoin/bitcoin#22618 )
2023-04-06 20:54:28 +00:00
Byron Hambly
b9ff9a6259
Merge 513e1071a1 into merged_master (Bitcoin PR bitcoin/bitcoin#22616 )
2023-04-06 13:35:05 +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
05f9a1a7c2
Merge 06788c6705 into merged_master (Bitcoin PR bitcoin/bitcoin#21528 )
2023-04-04 11:04:30 +02:00
James Dorfman
c8526de70a
Merge 67b9416540 into merged_master (Bitcoin PR bitcoin/bitcoin#21562 )
2023-03-31 18:42:53 +00:00
Glenn Willen
4334fce793
Merge 61cefde7a7 into merged_master (Bitcoin PR bitcoin/bitcoin#22006 )
2023-03-28 00:12:41 +00:00
Glenn Willen
ac88de9825
Merge f372623807 into merged_master (Bitcoin PR bitcoin/bitcoin#22495 )
2023-03-27 23:56:34 +00: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
Pablo Greco
e7fea1d50b
Fix underflow when blocks are ahead of headers
2023-02-21 06:22:25 -03:00
Glenn Willen
e8475e7edd
Fix stuck IBD when discarding unwanted headers from peers.
...
When receiving unwanted headers from a peer, first check whether we have
recent "best known block" state for that peer. If not, accept one batch
of headers to refresh it. Otherwise, we can become stuck in a state where
we need blocks, but we don't know which peers have those blocks available.
This especially happens during startup, when we don't have this information
for any peers until we start processing header messages.
2023-01-24 22:05:36 -08:00
Glenn Willen
8cad8cda44
Further fixes from code review
2023-01-04 16:33:35 -08:00
Glenn Willen
29345e9e12
pgreco's startup crash fix
2022-12-12 09:53:44 -08:00
Glenn Willen
fba37b74b4
Move enough-headers check up, rejecting excess headers when received.
2022-12-12 09:53:44 -08:00
Glenn Willen
394e59d38d
Politely and safely refuse getheaders requests for headers we have trimmed.
2022-12-12 09:53:44 -08:00
Glenn Willen
7e6fe4a5ba
Don't let header syncing get too far ahead of block syncing
2022-12-12 09:53:44 -08:00
Glenn Willen
5cfd3812fc
Merge 24ab49d110 into merged_master (Elements PR ElementsProject/elements#1085 )
2022-04-21 15:36:43 -07:00
Glenn Willen
dea074b88a
Merge b707a6f00f into merged_master (Elements PR ElementsProject/elements#1069 )
2022-04-20 20:51:37 -07:00
MarcoFalke
06209574da
Merge bitcoin/bitcoin#23832 : Refactor: Changes time variables from int to chrono
...
fe86eb50c96111b0d7fa#23801 .
This PR aims to make the following changes to all the time variables in **net_processing.cpp** wherever possible.
- Convert all time variables to `std::chrono.`
- Use `chorno::literals` wherever possible.
- Use `auto` keywords wherever possible.
- Use `var{val}` convention of initialization.
This PR also minimizes the number of times, serialization of time `count_seconds(..)` occurs.
ACKs for top commit:
MarcoFalke:
re-ACK fe86eb50c9
2022-01-06 13:37:26 +01:00
MarcoFalke
fa9f4554ca
refactor: Remove pointless and confusing shift in RelayAddress
2022-01-04 17:07:29 +01:00
Shashwat
fe86eb50c9
Refactor: Uses c++ init convention for time variables
...
This commit does following changes to time variables in net_processing.h:
- Used {} initialization.
- Uses universal initializer auto.
- Uses chrono::literals
The reason for these changes is to make code simpler, and easier to
understand and rationalize.
2022-01-04 11:17:22 +05:30
Shashwat
6111b0d7fa
Refactor: Changes remaining time variable type from int to chrono
2022-01-04 11:17:22 +05:30
Hennadii Stepanov
f47dda2c58
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
Commits of previous years:
* 2020: fa0074e2d8aaaaad6ac9
2021-12-30 19:36:57 +02:00
