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

Jump to bottom

add to ship definitions status_request v1 (for finality_data range) #29

Merged
merged 2 commits into from
Jun 12, 2024
Merged

add to ship definitions status_request v1 (for finality_data range) #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8102037
add status_request v1 (for finality_data range)
spoonincode May 1, 2024
81b2233
get_status_result_v1 always has chain_id
spoonincode Jun 4, 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
27 changes: 22 additions & 5 deletions include/eosio/ship_protocol.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,42 @@ namespace eosio { namespace ship_protocol {

EOSIO_REFLECT(get_status_request_v0)

struct get_status_request_v1 {};

EOSIO_REFLECT(get_status_request_v1)

struct block_position {
uint32_t block_num = {};
eosio::checksum256 block_id = {};
};

EOSIO_REFLECT(block_position, block_num, block_id)

struct get_status_result_v0 {
struct get_status_result_base {
block_position head = {};
block_position last_irreversible = {};
uint32_t trace_begin_block = {};
uint32_t trace_end_block = {};
uint32_t chain_state_begin_block = {};
uint32_t chain_state_end_block = {};
};

EOSIO_REFLECT(get_status_result_base, head, last_irreversible, trace_begin_block, trace_end_block,
chain_state_begin_block, chain_state_end_block)

struct get_status_result_v0 : get_status_result_base {
might_not_exist<eosio::checksum256> chain_id;
};

EOSIO_REFLECT(get_status_result_v0, head, last_irreversible, trace_begin_block, trace_end_block,
chain_state_begin_block, chain_state_end_block, chain_id)
EOSIO_REFLECT(get_status_result_v0, base get_status_result_base, chain_id)

struct get_status_result_v1 : get_status_result_base {
eosio::checksum256 chain_id;
uint32_t finality_data_begin_block = {};
uint32_t finality_data_end_block = {};
};

EOSIO_REFLECT(get_status_result_v1, base get_status_result_base, chain_id, finality_data_begin_block, finality_data_end_block)

struct get_blocks_request_v0 {
uint32_t start_block_num = {};
Expand Down Expand Up @@ -126,7 +143,7 @@ namespace eosio { namespace ship_protocol {

EOSIO_REFLECT(get_blocks_ack_request_v0, num_messages)

using request = std::variant<get_status_request_v0, get_blocks_request_v0, get_blocks_ack_request_v0, get_blocks_request_v1>;
using request = std::variant<get_status_request_v0, get_blocks_request_v0, get_blocks_ack_request_v0, get_blocks_request_v1, get_status_request_v1>;

struct get_blocks_result_base {
block_position head = {};
Expand Down Expand Up @@ -374,7 +391,7 @@ namespace eosio { namespace ship_protocol {

EOSIO_REFLECT(signed_block, base signed_block_header, transactions, block_extensions)

using result = std::variant<get_status_result_v0, get_blocks_result_v0, get_blocks_result_v1>;
using result = std::variant<get_status_result_v0, get_blocks_result_v0, get_blocks_result_v1, get_status_result_v1>;

struct transaction_header {
eosio::time_point_sec expiration = {};
Expand Down