Skip to content
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.

Sign up for GitHub

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

[1.0-beta3 -> main] P2P: Prevent syncing from running ahead of chain head #290

Merged
merged 11 commits into from
Jun 14, 2024
Merged

[1.0-beta3 -> main] P2P: Prevent syncing from running ahead of chain head #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f336558
Update version to 1.0.0-beta3.0
heifner Jun 12, 2024
8c0b8a6
Merge pull request #280 from AntelopeIO/bump-v-beta3
heifner Jun 13, 2024
2890684
GH-278 Use chain_head instead of fork_db head for syncing so we do no…
heifner Jun 13, 2024
5e262cc
GH-278 Fix update_chain_info
heifner Jun 13, 2024
7685b90
GH-278 Consistently use fhead in logs for fork head. Also fix one use…
heifner Jun 13, 2024
9c5b945
GH-278 Rename handshake head_num to fork_head_num and head_id to fork…
heifner Jun 13, 2024
169d422
Merge pull request #282 from AntelopeIO/GH-278-p2p-sync-beta2
heifner Jun 13, 2024
6249740
Merge remote-tracking branch 'spring/release/1.0-beta2' into GH-278-p…
heifner Jun 13, 2024
d76aeac
Merge pull request #286 from AntelopeIO/GH-278-p2p-sync-beta3
heifner Jun 14, 2024
957ffc4
Merge remote-tracking branch 'spring/release/1.0-beta3' into GH-278-p…
heifner Jun 14, 2024
497bf82
Revert to dev
heifner Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ namespace eosio {
string p2p_address;
uint32_t last_irreversible_block_num = 0;
block_id_type last_irreversible_block_id;
uint32_t head_num = 0;
block_id_type head_id;
uint32_t fork_head_num = 0;
block_id_type fork_head_id;
string os;
string agent;
int16_t generation = 0;
Expand Down Expand Up @@ -155,7 +155,7 @@ FC_REFLECT( eosio::handshake_message,
(network_version)(chain_id)(node_id)(key)
(time)(token)(sig)(p2p_address)
(last_irreversible_block_num)(last_irreversible_block_id)
(head_num)(head_id)
(fork_head_num)(fork_head_id)
(os)(agent)(generation) )
FC_REFLECT( eosio::go_away_message, (reason)(node_id) )
FC_REFLECT( eosio::time_message, (org)(rec)(xmt)(dst) )
Expand Down
Loading
Loading