Support sync start from certain evm height #170

yarkinwho · 2023-12-26T02:42:01Z

Remove support for start from certain eos id functionality.

Resolve #151

ship-start-from-canonical-height.

elmato · 2024-01-08T22:08:43Z

src/engine_plugin.cpp

@@ -136,13 +136,16 @@ class engine_plugin_impl : std::enable_shared_from_this<engine_plugin_impl> {
         return silkworm::db::read_canonical_header(txn, head_num);
      }

-      std::optional<silkworm::Block> get_head_block() {
+      std::optional<silkworm::Block> get_head_block(uint64_t override_height) {


Maybe we should change this function name to something like get_canonical_block_at_height, and use a optional<uint64_t> as a parameter. If it has no value, then use current head

elmato · 2024-01-08T22:09:47Z

src/ship_receiver_plugin.cpp

@@ -29,21 +29,19 @@ class ship_receiver_plugin_impl : std::enable_shared_from_this<ship_receiver_plu
      using native_block_t = channels::native_block;
      static constexpr eosio::name pushtx = eosio::name("pushtx");

-      void init(std::string h, std::string p, eosio::name ca,
-                std::optional<eosio::checksum256> start_block_id, int64_t start_block_timestamp,
+      void init(std::string h, std::string p, eosio::name ca, uint64_t input_start_height,


We should also move to use std::optional<uint64_t> here for input_start_height

elmato · 2024-01-09T01:01:47Z

src/ship_receiver_plugin.hpp

@@ -21,7 +21,7 @@ class ship_receiver_plugin : public appbase::plugin<ship_receiver_plugin> {
      void plugin_startup();
      void plugin_shutdown();

-      std::optional<channels::native_block> get_start_from_block();
+      uint64_t get_start_from_canonical_height();


when overriding height when fetching header blocks.

yarkinwho · 2024-01-09T06:59:57Z

please note that the logic for get_head_block is also changed a little bit:

Now we will not try fetch canonical header at all if the override option is present. <- The overriding is meant to fix the db anyway, so we should give it a try.

elmato · 2024-01-11T15:28:44Z

src/engine_plugin.cpp

-      std::optional<silkworm::Block> get_head_block() {
-         auto header = get_head_canonical_header();
-         if(!header) return {};
+      std::optional<silkworm::Block> get_canonical_block_at_height(const std::optional<uint64_t>& override_height) {


override_height => height

Also for small types (uint64_t) we can pass std::optional by value.

std::optional<silkworm::Block> get_canonical_block_at_height(std::optional<uint64_t> height)

elmato · 2024-01-11T15:34:55Z

src/engine_plugin.cpp

-std::optional<silkworm::Block> engine_plugin::get_head_block() {
-   return my->get_head_block();
+std::optional<silkworm::Block> engine_plugin::get_canonical_block_at_height(const std::optional<uint64_t>& override_height) {
+   return my->get_canonical_block_at_height(override_height);


same as above

elmato · 2024-01-11T15:35:07Z

src/engine_plugin.hpp

@@ -22,7 +22,7 @@ class engine_plugin : public appbase::plugin<engine_plugin> {
      uint32_t    get_threads() const;
      std::string get_chain_data_dir() const;
      std::optional<silkworm::BlockHeader> get_head_canonical_header();
-      std::optional<silkworm::Block> get_head_block();
+      std::optional<silkworm::Block> get_canonical_block_at_height(const std::optional<uint64_t>& override_height);


same as above

elmato · 2024-01-11T15:35:28Z

src/ship_receiver_plugin.cpp

@@ -29,21 +29,19 @@ class ship_receiver_plugin_impl : std::enable_shared_from_this<ship_receiver_plu
      using native_block_t = channels::native_block;
      static constexpr eosio::name pushtx = eosio::name("pushtx");

-      void init(std::string h, std::string p, eosio::name ca,
-                std::optional<eosio::checksum256> start_block_id, int64_t start_block_timestamp,
+      void init(std::string h, std::string p, eosio::name ca, const std::optional<uint64_t>& input_start_height,


same as above

elmato · 2024-01-11T15:38:02Z

src/ship_receiver_plugin.cpp

+                        << "#" << *start_from_canonical_height;
+            }
+
+            auto head_block = appbase::app().get_plugin<engine_plugin>().get_canonical_block_at_height(start_from_canonical_height);


this is not head_block anymore, it could be a specific height or the head of the chain. We should change it to start_block or similar.

elmato · 2024-01-11T15:38:23Z

src/ship_receiver_plugin.cpp

-         nb.block_num = utils::to_block_num(*start_from_block_id);
-         return nb;
-      }
+   const std::optional<uint64_t>& get_start_from_canonical_height() {


std::optional<uint64_t>

elmato · 2024-01-11T15:39:04Z

src/ship_receiver_plugin.cpp

@@ -481,6 +468,7 @@ void ship_receiver_plugin::plugin_shutdown() {
   SILK_INFO << "Shutdown SHiP Receiver";
 }

-std::optional<channels::native_block> ship_receiver_plugin::get_start_from_block() {
-   return my->get_start_from_block();
+const std::optional<uint64_t>& ship_receiver_plugin::get_start_from_canonical_height() {


std::optional<uint64_t>

elmato · 2024-01-11T15:39:15Z

src/ship_receiver_plugin.hpp

@@ -21,7 +21,7 @@ class ship_receiver_plugin : public appbase::plugin<ship_receiver_plugin> {
      void plugin_startup();
      void plugin_shutdown();

-      std::optional<channels::native_block> get_start_from_block();
+      const std::optional<uint64_t>& get_start_from_canonical_height();


same as above

elmato · 2024-01-11T15:40:06Z

src/block_conversion_plugin.cpp

@@ -46,7 +46,8 @@ class block_conversion_plugin_impl : std::enable_shared_from_this<block_conversi
      }

      void load_head() {
-         auto head_block = appbase::app().get_plugin<engine_plugin>().get_head_block();
+         const std::optional<uint64_t>& start_from_canonical_height = appbase::app().get_plugin<ship_receiver_plugin>().get_start_from_canonical_height();


auto can be used here

yarkinwho added 2 commits December 26, 2023 10:28

Remove ship-start-from-block-id and add

be21aa1

ship-start-from-canonical-height.

Fix wrong type in options.

74d30d4

yarkinwho requested a review from elmato December 26, 2023 02:42

elmato reviewed Jan 9, 2024

View reviewed changes

Use optional<uint64_t> to hold start-from option. Also change some logic

ee93515

when overriding height when fetching header blocks.

yarkinwho requested a review from elmato January 9, 2024 07:00

elmato reviewed Jan 11, 2024

View reviewed changes

Pass std::optional<uint64_t> by value. Change some variable names.

d6d4074

elmato approved these changes Jan 11, 2024

View reviewed changes

yarkinwho merged commit 960c6e7 into main Jan 12, 2024
6 checks passed

yarkinwho deleted the yarkin/ship-start-from-new branch January 12, 2024 01:03

yarkinwho mentioned this pull request Jan 12, 2024

[0.7->main] Disable deprecated ship-start-from options #176

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support sync start from certain evm height #170

Support sync start from certain evm height #170

yarkinwho commented Dec 26, 2023

elmato Jan 8, 2024

yarkinwho Jan 9, 2024

elmato Jan 8, 2024

yarkinwho Jan 9, 2024

elmato Jan 9, 2024

yarkinwho Jan 9, 2024

yarkinwho commented Jan 9, 2024

elmato Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

elmato Jan 11, 2024

yarkinwho Jan 11, 2024

Support sync start from certain evm height #170

Support sync start from certain evm height #170

Conversation

yarkinwho commented Dec 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yarkinwho commented Jan 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment