From 510bbe6a0a294475b80b095dab78aaad552d50d7 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Mon, 29 May 2023 10:51:17 +0200 Subject: [PATCH 1/6] Big-endian z & y precompile inputs (EIPs/pull/7020) --- silkworm/core/crypto/kzg.cpp | 2 +- silkworm/core/execution/precompile_test.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/silkworm/core/crypto/kzg.cpp b/silkworm/core/crypto/kzg.cpp index e67fdb5055..3d6e01ad24 100644 --- a/silkworm/core/crypto/kzg.cpp +++ b/silkworm/core/crypto/kzg.cpp @@ -173,7 +173,7 @@ static bool pairings_verify( */ static bool bytes_to_bls_field(Fr* out, std::span b) { blst_scalar tmp; - blst_scalar_from_lendian(&tmp, b.data()); + blst_scalar_from_bendian(&tmp, b.data()); if (!blst_scalar_fr_check(&tmp)) { return false; } diff --git a/silkworm/core/execution/precompile_test.cpp b/silkworm/core/execution/precompile_test.cpp index 5d32ed9ae9..152f8c035e 100644 --- a/silkworm/core/execution/precompile_test.cpp +++ b/silkworm/core/execution/precompile_test.cpp @@ -263,8 +263,8 @@ TEST_CASE("POINT_EVALUATION") { Bytes in{ *from_hex( "013c03613f6fc558fb7e61e75602241ed9a2f04e36d8670aadd286e71b5ca9cc" - "4200000000000000000000000000000000000000000000000000000000000000" - "31e5a2356cbc2ef6a733eae8d54bf48719ae3d990017ca787c419c7d369f8e3c" + "0000000000000000000000000000000000000000000000000000000000000042" + "3c8e9f367d9c417c78ca1700993dae1987f44bd5e8ea33a7f62ebc6c35a2e531" "83fac17c3f237fc51f90e2c660eb202a438bc2025baded5cd193c1a018c5885bc9281ba704d5566082e851235c7be763" "b2a99adff965e0a121ee972ebc472d02944a74f5c6243e14052e105124b70bf65faf85ad3a494325e269fad097842cba")}; std::optional out{point_evaluation_run(in)}; From a7e479a9b1b1436d7848aa20be3acfb0bc100540 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Tue, 30 May 2023 13:37:58 +0200 Subject: [PATCH 2/6] RLP encoding of EIP-4844 transactions --- silkworm/core/types/transaction.cpp | 41 ++++++++++++++++++++---- silkworm/core/types/transaction.hpp | 2 +- silkworm/core/types/transaction_test.cpp | 31 ++++++++++++++++++ 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/silkworm/core/types/transaction.cpp b/silkworm/core/types/transaction.cpp index b69944610d..8e197f4c05 100644 --- a/silkworm/core/types/transaction.cpp +++ b/silkworm/core/types/transaction.cpp @@ -71,7 +71,7 @@ namespace rlp { } h.payload_length += length(txn.nonce); - if (txn.type == TransactionType::kEip1559) { + if (txn.type == TransactionType::kEip1559 || txn.type == TransactionType::kEip4844) { h.payload_length += length(txn.max_priority_fee_per_gas); } h.payload_length += length(txn.max_fee_per_gas); @@ -81,8 +81,12 @@ namespace rlp { h.payload_length += length(txn.data); if (txn.type != TransactionType::kLegacy) { - SILKWORM_ASSERT(txn.type == TransactionType::kEip2930 || txn.type == TransactionType::kEip1559); h.payload_length += length(txn.access_list); + if (txn.type == TransactionType::kEip4844) { + SILKWORM_ASSERT(txn.max_fee_per_data_gas); + h.payload_length += length(*txn.max_fee_per_data_gas); + h.payload_length += length(txn.blob_versioned_hashes); + } } return h; @@ -134,8 +138,6 @@ namespace rlp { } static void eip2718_encode_for_signing(Bytes& to, const UnsignedTransaction& txn, const Header h, bool wrap_into_array) { - SILKWORM_ASSERT(txn.type == TransactionType::kEip2930 || txn.type == TransactionType::kEip1559); - if (wrap_into_array) { auto rlp_len{static_cast(length_of_length(h.payload_length) + h.payload_length)}; encode_header(to, {false, rlp_len + 1}); @@ -148,7 +150,7 @@ namespace rlp { encode(to, txn.chain_id.value_or(0)); encode(to, txn.nonce); - if (txn.type == TransactionType::kEip1559) { + if (txn.type != TransactionType::kEip2930) { encode(to, txn.max_priority_fee_per_gas); } encode(to, txn.max_fee_per_gas); @@ -161,6 +163,12 @@ namespace rlp { encode(to, txn.value); encode(to, txn.data); encode(to, txn.access_list); + + if (txn.type == TransactionType::kEip4844) { + SILKWORM_ASSERT(txn.max_fee_per_data_gas); + encode(to, *txn.max_fee_per_data_gas); + encode(to, txn.blob_versioned_hashes); + } } void encode(Bytes& to, const Transaction& txn, bool wrap_eip2718_into_string) { @@ -210,7 +218,9 @@ namespace rlp { } static DecodingResult eip2718_decode(ByteView& from, Transaction& to) noexcept { - if (to.type != TransactionType::kEip2930 && to.type != TransactionType::kEip1559) { + if (to.type != TransactionType::kEip2930 && + to.type != TransactionType::kEip1559 && + to.type != TransactionType::kEip4844) { return tl::unexpected{DecodingError::kUnsupportedTransactionType}; } @@ -252,7 +262,21 @@ namespace rlp { } } - return decode_items(from, to.value, to.data, to.access_list, to.odd_y_parity, to.r, to.s); + if (DecodingResult res{decode_items(from, to.value, to.data, to.access_list)}; !res) { + return res; + } + + if (to.type == TransactionType::kEip4844) { + to.max_fee_per_data_gas = 0; + if (DecodingResult res{decode_items(from, *to.max_fee_per_data_gas, to.blob_versioned_hashes)}; !res) { + return res; + } + } else { + to.max_fee_per_data_gas = std::nullopt; + to.blob_versioned_hashes.clear(); + } + + return decode_items(from, to.odd_y_parity, to.r, to.s); } DecodingResult decode_transaction(ByteView& from, Transaction& to, Eip2718Wrapping allowed, @@ -282,6 +306,9 @@ namespace rlp { if (h->list) { // Legacy transaction to.type = TransactionType::kLegacy; to.access_list.clear(); + to.max_fee_per_data_gas = std::nullopt; + to.blob_versioned_hashes.clear(); + const uint64_t leftover{from.length() - h->payload_length}; if (mode != Leftover::kAllow && leftover) { return tl::unexpected{DecodingError::kInputTooLong}; diff --git a/silkworm/core/types/transaction.hpp b/silkworm/core/types/transaction.hpp index 2c63d37267..fae2ed31ef 100644 --- a/silkworm/core/types/transaction.hpp +++ b/silkworm/core/types/transaction.hpp @@ -60,7 +60,7 @@ struct UnsignedTransaction { std::vector access_list{}; // EIP-2930 // EIP-4844: Shard Blob Transactions - std::optional max_fee_per_data_gas{std::nullopt}; + std::optional max_fee_per_data_gas{std::nullopt}; // must be non-null for EIP-4844 transactions std::vector blob_versioned_hashes{}; //! \brief Maximum possible cost of normal and data (EIP-4844) gas diff --git a/silkworm/core/types/transaction_test.cpp b/silkworm/core/types/transaction_test.cpp index 3af083659a..30fa671cb9 100644 --- a/silkworm/core/types/transaction_test.cpp +++ b/silkworm/core/types/transaction_test.cpp @@ -149,6 +149,37 @@ TEST_CASE("EIP-1559 Transaction RLP") { CHECK(decoded == txn); } +TEST_CASE("EIP-4844 Transaction RLP") { + Transaction txn{ + {.type = TransactionType::kEip4844, + .chain_id = 5, + .nonce = 7, + .max_priority_fee_per_gas = 10000000000, + .max_fee_per_gas = 30000000000, + .gas_limit = 5748100, + .to = 0x811a752c8cd697e3cb27279c330ed1ada745a8d7_address, + .data = *from_hex("04f7"), + .access_list = access_list, + .max_fee_per_data_gas = 123, + .blob_versioned_hashes = { + 0xc6bdd1de713471bd6cfa62dd8b5a5b42969ed09e26212d3377f3f8426d8ec210_bytes32, + 0x8aaeccaf3873d07cef005aca28c39f8a9f8bdb1ec8d79ffc25afc0a4fa2ab736_bytes32, + }}, + true, // odd_y_parity + intx::from_string("0x36b241b061a36a32ab7fe86c7aa9eb592dd59018cd0443adc0903590c16b02b0"), // r + intx::from_string("0x5edcc541b4741c5cc6dd347c5ed9577ef293a62787b4510465fadbfe39ee4094"), // s + }; + + Bytes encoded{}; + rlp::encode(encoded, txn); + + Transaction decoded; + ByteView view{encoded}; + REQUIRE(rlp::decode(view, decoded)); + CHECK(view.empty()); + CHECK(decoded == txn); +} + TEST_CASE("Recover sender 1") { // https://etherscan.io/tx/0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060 // Block 46147 From a79984b37e221252cc1297d758e3f236bea7c0c2 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Tue, 30 May 2023 18:42:44 +0200 Subject: [PATCH 3/6] Make max_fee_per_data_gas non-optional --- silkworm/core/protocol/validation.cpp | 1 - silkworm/core/types/transaction.cpp | 21 +++++++-------------- silkworm/core/types/transaction.hpp | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/silkworm/core/protocol/validation.cpp b/silkworm/core/protocol/validation.cpp index 5ead04a378..fa74223fe6 100644 --- a/silkworm/core/protocol/validation.cpp +++ b/silkworm/core/protocol/validation.cpp @@ -96,7 +96,6 @@ ValidationResult pre_validate_transaction(const Transaction& txn, const evmc_rev return ValidationResult::kWrongBlobCommitmentVersion; } } - SILKWORM_ASSERT(txn.max_fee_per_data_gas); SILKWORM_ASSERT(data_gas_price); if (txn.max_fee_per_data_gas < data_gas_price) { return ValidationResult::kMaxFeePerDataGasTooLow; diff --git a/silkworm/core/types/transaction.cpp b/silkworm/core/types/transaction.cpp index 8e197f4c05..f158b07b27 100644 --- a/silkworm/core/types/transaction.cpp +++ b/silkworm/core/types/transaction.cpp @@ -83,8 +83,7 @@ namespace rlp { if (txn.type != TransactionType::kLegacy) { h.payload_length += length(txn.access_list); if (txn.type == TransactionType::kEip4844) { - SILKWORM_ASSERT(txn.max_fee_per_data_gas); - h.payload_length += length(*txn.max_fee_per_data_gas); + h.payload_length += length(txn.max_fee_per_data_gas); h.payload_length += length(txn.blob_versioned_hashes); } } @@ -165,8 +164,7 @@ namespace rlp { encode(to, txn.access_list); if (txn.type == TransactionType::kEip4844) { - SILKWORM_ASSERT(txn.max_fee_per_data_gas); - encode(to, *txn.max_fee_per_data_gas); + encode(to, txn.max_fee_per_data_gas); encode(to, txn.blob_versioned_hashes); } } @@ -266,14 +264,11 @@ namespace rlp { return res; } - if (to.type == TransactionType::kEip4844) { + if (to.type != TransactionType::kEip4844) { to.max_fee_per_data_gas = 0; - if (DecodingResult res{decode_items(from, *to.max_fee_per_data_gas, to.blob_versioned_hashes)}; !res) { - return res; - } - } else { - to.max_fee_per_data_gas = std::nullopt; to.blob_versioned_hashes.clear(); + } else if (DecodingResult res{decode_items(from, to.max_fee_per_data_gas, to.blob_versioned_hashes)}; !res) { + return res; } return decode_items(from, to.odd_y_parity, to.r, to.s); @@ -306,7 +301,7 @@ namespace rlp { if (h->list) { // Legacy transaction to.type = TransactionType::kLegacy; to.access_list.clear(); - to.max_fee_per_data_gas = std::nullopt; + to.max_fee_per_data_gas = 0; to.blob_versioned_hashes.clear(); const uint64_t leftover{from.length() - h->payload_length}; @@ -417,9 +412,7 @@ intx::uint512 UnsignedTransaction::maximum_gas_cost() const { // See https://github.com/ethereum/EIPs/pull/3594 intx::uint512 max_gas_cost{intx::umul(intx::uint256{gas_limit}, max_fee_per_gas)}; // and https://eips.ethereum.org/EIPS/eip-4844#gas-accounting - if (max_fee_per_data_gas) { - max_gas_cost += intx::umul(intx::uint256{total_data_gas()}, *max_fee_per_data_gas); - } + max_gas_cost += intx::umul(intx::uint256{total_data_gas()}, max_fee_per_data_gas); return max_gas_cost; } diff --git a/silkworm/core/types/transaction.hpp b/silkworm/core/types/transaction.hpp index fae2ed31ef..23b5bb27b8 100644 --- a/silkworm/core/types/transaction.hpp +++ b/silkworm/core/types/transaction.hpp @@ -60,7 +60,7 @@ struct UnsignedTransaction { std::vector access_list{}; // EIP-2930 // EIP-4844: Shard Blob Transactions - std::optional max_fee_per_data_gas{std::nullopt}; // must be non-null for EIP-4844 transactions + intx::uint256 max_fee_per_data_gas{0}; std::vector blob_versioned_hashes{}; //! \brief Maximum possible cost of normal and data (EIP-4844) gas From db3b3afff01dfdd5f3e80b11345a4eb75625fdda Mon Sep 17 00:00:00 2001 From: yperbasis Date: Tue, 30 May 2023 20:37:25 +0200 Subject: [PATCH 4/6] Update EIP-4844: add data_gas_used to header --- silkworm/core/protocol/base_rule_set.cpp | 29 +- silkworm/core/protocol/validation.cpp | 12 +- silkworm/core/protocol/validation.hpp | 4 +- silkworm/core/types/block.cpp | 32 +- silkworm/core/types/block.hpp | 5 +- silkworm/core/types/block_test.cpp | 29 +- .../3.21.4/execution/execution.pb.cc | 220 ++++--- .../3.21.4/execution/execution.pb.h | 165 +++--- .../3.21.4/remote/ethbackend.grpc.pb.cc | 34 +- .../3.21.4/remote/ethbackend.grpc.pb.h | 132 ++--- .../interfaces/3.21.4/remote/ethbackend.pb.cc | 555 +++++++----------- .../interfaces/3.21.4/remote/ethbackend.pb.h | 333 ++++------- .../3.21.4/remote/ethbackend_mock.grpc.pb.h | 6 +- silkworm/interfaces/3.21.4/types/types.pb.cc | 284 +++++---- silkworm/interfaces/3.21.4/types/types.pb.h | 517 ++++++++-------- silkworm/interfaces/proto | 2 +- silkworm/node/stagedsync/remote_client.cpp | 10 +- 17 files changed, 1088 insertions(+), 1281 deletions(-) diff --git a/silkworm/core/protocol/base_rule_set.cpp b/silkworm/core/protocol/base_rule_set.cpp index 52aa4e781f..67b829c4c0 100644 --- a/silkworm/core/protocol/base_rule_set.cpp +++ b/silkworm/core/protocol/base_rule_set.cpp @@ -48,21 +48,18 @@ ValidationResult BaseRuleSet::pre_validate_block_body(const Block& block, const return ValidationResult::kWrongWithdrawalsRoot; } - size_t total_blobs{0}; - for (const Transaction& tx : block.transactions) { - total_blobs += tx.blob_versioned_hashes.size(); - } - if (total_blobs > kMaxDataGasPerBlock / kDataGasPerBlob) { - return ValidationResult::kTooManyBlobs; - } - - const std::optional parent{get_parent_header(state, header)}; - if (!parent) { - return ValidationResult::kUnknownParent; + std::optional data_gas_used{std::nullopt}; + if (rev >= EVMC_CANCUN) { + data_gas_used = 0; + for (const Transaction& tx : block.transactions) { + *data_gas_used += tx.total_data_gas(); + } + if (data_gas_used > kMaxDataGasPerBlock) { + return ValidationResult::kTooManyBlobs; + } } - - if (header.excess_data_gas != calc_excess_data_gas(*parent, total_blobs, rev)) { - return ValidationResult::kWrongExcessDataGas; + if (header.data_gas_used != data_gas_used) { + return ValidationResult::kWrongDataGasUsed; } if (block.ommers.empty()) { @@ -191,6 +188,10 @@ ValidationResult BaseRuleSet::validate_block_header(const BlockHeader& header, c return ValidationResult::kMissingWithdrawals; } + if (header.excess_data_gas != calc_excess_data_gas(*parent, rev)) { + return ValidationResult::kWrongExcessDataGas; + } + return validate_seal(header); } diff --git a/silkworm/core/protocol/validation.cpp b/silkworm/core/protocol/validation.cpp index fa74223fe6..fc577d1f9d 100644 --- a/silkworm/core/protocol/validation.cpp +++ b/silkworm/core/protocol/validation.cpp @@ -33,8 +33,8 @@ bool transaction_type_is_supported(TransactionType type, evmc_revision rev) { EVMC_LONDON, // kEip1559 EVMC_CANCUN, // kEip4844 }; - const auto n{static_cast(type)}; - return n < std::size(kMinRevisionByType) && rev >= kMinRevisionByType[n]; + const auto i{static_cast(type)}; + return i < std::size(kMinRevisionByType) && rev >= kMinRevisionByType[i]; } ValidationResult pre_validate_transaction(const Transaction& txn, const evmc_revision rev, const uint64_t chain_id, @@ -160,15 +160,13 @@ std::optional expected_base_fee_per_gas(const BlockHeader& parent } } -std::optional calc_excess_data_gas(const BlockHeader& parent, - std::size_t num_blobs, - const evmc_revision rev) { +std::optional calc_excess_data_gas(const BlockHeader& parent, const evmc_revision rev) { if (rev < EVMC_CANCUN) { return std::nullopt; } - const uint64_t consumed_data_gas{num_blobs * kDataGasPerBlob}; - const intx::uint256 parent_excess_data_gas{parent.excess_data_gas.value_or(0)}; + const uint64_t parent_excess_data_gas{parent.excess_data_gas.value_or(0)}; + const uint64_t consumed_data_gas{parent.data_gas_used.value_or(0)}; if (parent_excess_data_gas + consumed_data_gas < kTargetDataGasPerBlock) { return 0; diff --git a/silkworm/core/protocol/validation.hpp b/silkworm/core/protocol/validation.hpp index a4a9963ee0..1f613ba941 100644 --- a/silkworm/core/protocol/validation.hpp +++ b/silkworm/core/protocol/validation.hpp @@ -90,6 +90,7 @@ enum class [[nodiscard]] ValidationResult{ kWrongWithdrawalsRoot, // EIP-4844: Shard Blob Transactions + kWrongDataGasUsed, kWrongExcessDataGas, kNoBlobs, kTooManyBlobs, @@ -114,8 +115,7 @@ namespace protocol { std::optional expected_base_fee_per_gas(const BlockHeader& parent, const evmc_revision); //! \see EIP-4844: Shard Blob Transactions - std::optional calc_excess_data_gas(const BlockHeader& parent, std::size_t num_blobs, - const evmc_revision); + std::optional calc_excess_data_gas(const BlockHeader& parent, const evmc_revision); //! \brief Calculate the transaction root of a block body evmc::bytes32 compute_transaction_root(const BlockBody& body); diff --git a/silkworm/core/types/block.cpp b/silkworm/core/types/block.cpp index 040c60753f..da7f29f1d7 100644 --- a/silkworm/core/types/block.cpp +++ b/silkworm/core/types/block.cpp @@ -103,6 +103,9 @@ namespace rlp { if (header.withdrawals_root) { rlp_head.payload_length += kHashLength + 1; } + if (header.data_gas_used) { + rlp_head.payload_length += length(*header.data_gas_used); + } if (header.excess_data_gas) { rlp_head.payload_length += length(*header.excess_data_gas); } @@ -145,6 +148,9 @@ namespace rlp { if (header.withdrawals_root) { encode(to, static_cast(*header.withdrawals_root)); } + if (header.data_gas_used) { + encode(to, *header.data_gas_used); + } if (header.excess_data_gas) { encode(to, *header.excess_data_gas); } @@ -183,31 +189,33 @@ namespace rlp { return res; } - to.base_fee_per_gas = std::nullopt; if (from.length() > leftover) { - intx::uint256 base_fee_per_gas; - if (DecodingResult res{decode(from, base_fee_per_gas, Leftover::kAllow)}; !res) { + to.base_fee_per_gas = 0; + if (DecodingResult res{decode(from, *to.base_fee_per_gas, Leftover::kAllow)}; !res) { return res; } - to.base_fee_per_gas = base_fee_per_gas; + } else { + to.base_fee_per_gas = std::nullopt; } - to.withdrawals_root = std::nullopt; if (from.length() > leftover) { - evmc::bytes32 withdrawals_root; - if (DecodingResult res{decode(from, withdrawals_root, Leftover::kAllow)}; !res) { + to.withdrawals_root = evmc::bytes32{}; + if (DecodingResult res{decode(from, *to.withdrawals_root, Leftover::kAllow)}; !res) { return res; } - to.withdrawals_root = withdrawals_root; + } else { + to.withdrawals_root = std::nullopt; } - to.excess_data_gas = std::nullopt; if (from.length() > leftover) { - intx::uint256 excess_data_gas; - if (DecodingResult res{decode(from, excess_data_gas, Leftover::kAllow)}; !res) { + to.data_gas_used = 0; + to.excess_data_gas = 0; + if (DecodingResult res{decode_items(from, *to.data_gas_used, *to.excess_data_gas)}; !res) { return res; } - to.excess_data_gas = excess_data_gas; + } else { + to.data_gas_used = std::nullopt; + to.excess_data_gas = std::nullopt; } if (from.length() != leftover) { diff --git a/silkworm/core/types/block.hpp b/silkworm/core/types/block.hpp index cba1a74f7a..2878a502e4 100644 --- a/silkworm/core/types/block.hpp +++ b/silkworm/core/types/block.hpp @@ -72,7 +72,10 @@ struct BlockHeader { std::optional base_fee_per_gas{std::nullopt}; // EIP-1559 std::optional withdrawals_root{std::nullopt}; // EIP-4895 - std::optional excess_data_gas{std::nullopt}; // EIP-4844 + + // EIP-4844: Shard Blob Transactions + std::optional data_gas_used{std::nullopt}; + std::optional excess_data_gas{std::nullopt}; [[nodiscard]] evmc::bytes32 hash(bool for_sealing = false, bool exclude_extra_data_sig = false) const; diff --git a/silkworm/core/types/block_test.cpp b/silkworm/core/types/block_test.cpp index 994a928ebd..003b5c7e32 100644 --- a/silkworm/core/types/block_test.cpp +++ b/silkworm/core/types/block_test.cpp @@ -173,9 +173,32 @@ TEST_CASE("EIP-2718 Block RLP") { } TEST_CASE("EIP-1559 Header RLP") { - BlockHeader h; - h.number = 13'500'000; - h.base_fee_per_gas = 2'700'000'000; + BlockHeader h{ + .number = 13'500'000, + .base_fee_per_gas = 2'700'000'000, + }; + + Bytes rlp; + rlp::encode(rlp, h); + + ByteView view{rlp}; + BlockHeader decoded; + REQUIRE(rlp::decode(view, decoded)); + + CHECK(view.empty()); + CHECK(decoded == h); +} + +TEST_CASE("EIP-4844 Header RLP") { + BlockHeader h{ + .ommers_hash = kEmptyListHash, + .number = 17'000'000, + .prev_randao = 0xd01681d2b3acdebff0288a02a1648b3910500961982d5ecdbef064af7c34090b_bytes32, + .base_fee_per_gas = 2'700'000'000, + .withdrawals_root = 0xbac9348581b0ee244d6eb61076b63c4e4afa70430c804ab0e6a0ab69d9a9d323_bytes32, + .data_gas_used = 456, + .excess_data_gas = 789633, + }; Bytes rlp; rlp::encode(rlp, h); diff --git a/silkworm/interfaces/3.21.4/execution/execution.pb.cc b/silkworm/interfaces/3.21.4/execution/execution.pb.cc index 554d4acaef..119ce30dc3 100644 --- a/silkworm/interfaces/3.21.4/execution/execution.pb.cc +++ b/silkworm/interfaces/3.21.4/execution/execution.pb.cc @@ -81,12 +81,13 @@ PROTOBUF_CONSTEXPR Header::Header( , /*decltype(_impl_.transaction_hash_)*/nullptr , /*decltype(_impl_.base_fee_per_gas_)*/nullptr , /*decltype(_impl_.withdrawal_hash_)*/nullptr - , /*decltype(_impl_.excess_data_gas_)*/nullptr , /*decltype(_impl_.block_number_)*/uint64_t{0u} , /*decltype(_impl_.gas_limit_)*/uint64_t{0u} , /*decltype(_impl_.gas_used_)*/uint64_t{0u} , /*decltype(_impl_.timestamp_)*/uint64_t{0u} - , /*decltype(_impl_.nonce_)*/uint64_t{0u}} {} + , /*decltype(_impl_.nonce_)*/uint64_t{0u} + , /*decltype(_impl_.data_gas_used_)*/uint64_t{0u} + , /*decltype(_impl_.excess_data_gas_)*/uint64_t{0u}} {} struct HeaderDefaultTypeInternal { PROTOBUF_CONSTEXPR HeaderDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -264,6 +265,7 @@ const uint32_t TableStruct_execution_2fexecution_2eproto::offsets[] PROTOBUF_SEC PROTOBUF_FIELD_OFFSET(::execution::Header, _impl_.transaction_hash_), PROTOBUF_FIELD_OFFSET(::execution::Header, _impl_.base_fee_per_gas_), PROTOBUF_FIELD_OFFSET(::execution::Header, _impl_.withdrawal_hash_), + PROTOBUF_FIELD_OFFSET(::execution::Header, _impl_.data_gas_used_), PROTOBUF_FIELD_OFFSET(::execution::Header, _impl_.excess_data_gas_), ~0u, ~0u, @@ -284,6 +286,7 @@ const uint32_t TableStruct_execution_2fexecution_2eproto::offsets[] PROTOBUF_SEC 0, 1, 2, + 3, ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::execution::BlockBody, _internal_metadata_), ~0u, // no _extensions_ @@ -354,15 +357,15 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode { 0, -1, -1, sizeof(::execution::ForkChoiceReceipt)}, { 8, 17, -1, sizeof(::execution::ValidationReceipt)}, { 20, -1, -1, sizeof(::execution::IsCanonicalResponse)}, - { 27, 52, -1, sizeof(::execution::Header)}, - { 71, -1, -1, sizeof(::execution::BlockBody)}, - { 82, 89, -1, sizeof(::execution::GetHeaderResponse)}, - { 90, 97, -1, sizeof(::execution::GetBodyResponse)}, - { 98, 105, -1, sizeof(::execution::GetHeaderHashNumberResponse)}, - { 106, 114, -1, sizeof(::execution::GetSegmentRequest)}, - { 116, -1, -1, sizeof(::execution::InsertHeadersRequest)}, - { 123, -1, -1, sizeof(::execution::InsertBodiesRequest)}, - { 130, -1, -1, sizeof(::execution::EmptyMessage)}, + { 27, 53, -1, sizeof(::execution::Header)}, + { 73, -1, -1, sizeof(::execution::BlockBody)}, + { 84, 91, -1, sizeof(::execution::GetHeaderResponse)}, + { 92, 99, -1, sizeof(::execution::GetBodyResponse)}, + { 100, 107, -1, sizeof(::execution::GetHeaderHashNumberResponse)}, + { 108, 116, -1, sizeof(::execution::GetSegmentRequest)}, + { 118, -1, -1, sizeof(::execution::InsertHeadersRequest)}, + { 125, -1, -1, sizeof(::execution::InsertBodiesRequest)}, + { 132, -1, -1, sizeof(::execution::EmptyMessage)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -389,7 +392,7 @@ const char descriptor_table_protodef_execution_2fexecution_2eproto[] PROTOBUF_SE "idationStatus\022&\n\021latest_valid_hash\030\002 \001(\013" "2\013.types.H256\022&\n\014missing_hash\030\003 \001(\0132\013.ty" "pes.H256H\000\210\001\001B\017\n\r_missing_hash\"(\n\023IsCano" - "nicalResponse\022\021\n\tcanonical\030\001 \001(\010\"\213\005\n\006Hea" + "nicalResponse\022\021\n\tcanonical\030\001 \001(\010\"\254\005\n\006Hea" "der\022 \n\013parent_hash\030\001 \001(\0132\013.types.H256\022\035\n" "\010coinbase\030\002 \001(\0132\013.types.H160\022\037\n\nstate_ro" "ot\030\003 \001(\0132\013.types.H256\022!\n\014receipt_root\030\004 " @@ -403,51 +406,52 @@ const char descriptor_table_protodef_execution_2fexecution_2eproto[] PROTOBUF_SE "\001(\0132\013.types.H256\022%\n\020transaction_hash\030\020 \001" "(\0132\013.types.H256\022*\n\020base_fee_per_gas\030\021 \001(" "\0132\013.types.H256H\000\210\001\001\022)\n\017withdrawal_hash\030\022" - " \001(\0132\013.types.H256H\001\210\001\001\022)\n\017excess_data_ga" - "s\030\023 \001(\0132\013.types.H256H\002\210\001\001B\023\n\021_base_fee_p" - "er_gasB\022\n\020_withdrawal_hashB\022\n\020_excess_da" - "ta_gas\"\243\001\n\tBlockBody\022\037\n\nblock_hash\030\001 \001(\013" - "2\013.types.H256\022\024\n\014block_number\030\002 \001(\004\022\024\n\014t" - "ransactions\030\003 \003(\014\022!\n\006uncles\030\004 \003(\0132\021.exec" - "ution.Header\022&\n\013withdrawals\030\005 \003(\0132\021.type" - "s.Withdrawal\"F\n\021GetHeaderResponse\022&\n\006hea" - "der\030\001 \001(\0132\021.execution.HeaderH\000\210\001\001B\t\n\007_he" - "ader\"C\n\017GetBodyResponse\022\'\n\004body\030\001 \001(\0132\024." - "execution.BlockBodyH\000\210\001\001B\007\n\005_body\"I\n\033Get" - "HeaderHashNumberResponse\022\031\n\014block_number" - "\030\001 \001(\004H\000\210\001\001B\017\n\r_block_number\"t\n\021GetSegme" - "ntRequest\022\031\n\014block_number\030\001 \001(\004H\000\210\001\001\022$\n\n" - "block_hash\030\002 \001(\0132\013.types.H256H\001\210\001\001B\017\n\r_b" - "lock_numberB\r\n\013_block_hash\":\n\024InsertHead" - "ersRequest\022\"\n\007headers\030\001 \003(\0132\021.execution." - "Header\";\n\023InsertBodiesRequest\022$\n\006bodies\030" - "\001 \003(\0132\024.execution.BlockBody\"\016\n\014EmptyMess" - "age*U\n\020ValidationStatus\022\013\n\007Success\020\000\022\020\n\014" - "InvalidChain\020\001\022\016\n\nTooFarAway\020\002\022\022\n\016Missin" - "gSegment\020\0032\367\004\n\tExecution\022I\n\rInsertHeader" - "s\022\037.execution.InsertHeadersRequest\032\027.exe" - "cution.EmptyMessage\022G\n\014InsertBodies\022\036.ex" - "ecution.InsertBodiesRequest\032\027.execution." - "EmptyMessage\022:\n\rValidateChain\022\013.types.H2" - "56\032\034.execution.ValidationReceipt\022=\n\020Upda" - "teForkChoice\022\013.types.H256\032\034.execution.Fo" - "rkChoiceReceipt\022A\n\rAssembleBlock\022\027.execu" - "tion.EmptyMessage\032\027.types.ExecutionPaylo" - "ad\022G\n\tGetHeader\022\034.execution.GetSegmentRe" - "quest\032\034.execution.GetHeaderResponse\022C\n\007G" - "etBody\022\034.execution.GetSegmentRequest\032\032.e" - "xecution.GetBodyResponse\022>\n\017IsCanonicalH" - "ash\022\013.types.H256\032\036.execution.IsCanonical" - "Response\022J\n\023GetHeaderHashNumber\022\013.types." - "H256\032&.execution.GetHeaderHashNumberResp" - "onseB\027Z\025./execution;executionb\006proto3" + " \001(\0132\013.types.H256H\001\210\001\001\022\032\n\rdata_gas_used\030" + "\023 \001(\004H\002\210\001\001\022\034\n\017excess_data_gas\030\024 \001(\004H\003\210\001\001" + "B\023\n\021_base_fee_per_gasB\022\n\020_withdrawal_has" + "hB\020\n\016_data_gas_usedB\022\n\020_excess_data_gas\"" + "\243\001\n\tBlockBody\022\037\n\nblock_hash\030\001 \001(\0132\013.type" + "s.H256\022\024\n\014block_number\030\002 \001(\004\022\024\n\014transact" + "ions\030\003 \003(\014\022!\n\006uncles\030\004 \003(\0132\021.execution.H" + "eader\022&\n\013withdrawals\030\005 \003(\0132\021.types.Withd" + "rawal\"F\n\021GetHeaderResponse\022&\n\006header\030\001 \001" + "(\0132\021.execution.HeaderH\000\210\001\001B\t\n\007_header\"C\n" + "\017GetBodyResponse\022\'\n\004body\030\001 \001(\0132\024.executi" + "on.BlockBodyH\000\210\001\001B\007\n\005_body\"I\n\033GetHeaderH" + "ashNumberResponse\022\031\n\014block_number\030\001 \001(\004H" + "\000\210\001\001B\017\n\r_block_number\"t\n\021GetSegmentReque" + "st\022\031\n\014block_number\030\001 \001(\004H\000\210\001\001\022$\n\nblock_h" + "ash\030\002 \001(\0132\013.types.H256H\001\210\001\001B\017\n\r_block_nu" + "mberB\r\n\013_block_hash\":\n\024InsertHeadersRequ" + "est\022\"\n\007headers\030\001 \003(\0132\021.execution.Header\"" + ";\n\023InsertBodiesRequest\022$\n\006bodies\030\001 \003(\0132\024" + ".execution.BlockBody\"\016\n\014EmptyMessage*U\n\020" + "ValidationStatus\022\013\n\007Success\020\000\022\020\n\014Invalid" + "Chain\020\001\022\016\n\nTooFarAway\020\002\022\022\n\016MissingSegmen" + "t\020\0032\367\004\n\tExecution\022I\n\rInsertHeaders\022\037.exe" + "cution.InsertHeadersRequest\032\027.execution." + "EmptyMessage\022G\n\014InsertBodies\022\036.execution" + ".InsertBodiesRequest\032\027.execution.EmptyMe" + "ssage\022:\n\rValidateChain\022\013.types.H256\032\034.ex" + "ecution.ValidationReceipt\022=\n\020UpdateForkC" + "hoice\022\013.types.H256\032\034.execution.ForkChoic" + "eReceipt\022A\n\rAssembleBlock\022\027.execution.Em" + "ptyMessage\032\027.types.ExecutionPayload\022G\n\tG" + "etHeader\022\034.execution.GetSegmentRequest\032\034" + ".execution.GetHeaderResponse\022C\n\007GetBody\022" + "\034.execution.GetSegmentRequest\032\032.executio" + "n.GetBodyResponse\022>\n\017IsCanonicalHash\022\013.t" + "ypes.H256\032\036.execution.IsCanonicalRespons" + "e\022J\n\023GetHeaderHashNumber\022\013.types.H256\032&." + "execution.GetHeaderHashNumberResponseB\027Z" + "\025./execution;executionb\006proto3" ; static const ::_pbi::DescriptorTable* const descriptor_table_execution_2fexecution_2eproto_deps[1] = { &::descriptor_table_types_2ftypes_2eproto, }; static ::_pbi::once_flag descriptor_table_execution_2fexecution_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_execution_2fexecution_2eproto = { - false, false, 2397, descriptor_table_protodef_execution_2fexecution_2eproto, + false, false, 2430, descriptor_table_protodef_execution_2fexecution_2eproto, "execution/execution.proto", &descriptor_table_execution_2fexecution_2eproto_once, descriptor_table_execution_2fexecution_2eproto_deps, 1, 12, schemas, file_default_instances, TableStruct_execution_2fexecution_2eproto::offsets, @@ -1199,10 +1203,12 @@ class Header::_Internal { static void set_has_withdrawal_hash(HasBits* has_bits) { (*has_bits)[0] |= 2u; } - static const ::types::H256& excess_data_gas(const Header* msg); - static void set_has_excess_data_gas(HasBits* has_bits) { + static void set_has_data_gas_used(HasBits* has_bits) { (*has_bits)[0] |= 4u; } + static void set_has_excess_data_gas(HasBits* has_bits) { + (*has_bits)[0] |= 8u; + } }; const ::types::H256& @@ -1253,10 +1259,6 @@ const ::types::H256& Header::_Internal::withdrawal_hash(const Header* msg) { return *msg->_impl_.withdrawal_hash_; } -const ::types::H256& -Header::_Internal::excess_data_gas(const Header* msg) { - return *msg->_impl_.excess_data_gas_; -} void Header::clear_parent_hash() { if (GetArenaForAllocation() == nullptr && _impl_.parent_hash_ != nullptr) { delete _impl_.parent_hash_; @@ -1325,10 +1327,6 @@ void Header::clear_withdrawal_hash() { if (_impl_.withdrawal_hash_ != nullptr) _impl_.withdrawal_hash_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; } -void Header::clear_excess_data_gas() { - if (_impl_.excess_data_gas_ != nullptr) _impl_.excess_data_gas_->Clear(); - _impl_._has_bits_[0] &= ~0x00000004u; -} Header::Header(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { @@ -1354,12 +1352,13 @@ Header::Header(const Header& from) , decltype(_impl_.transaction_hash_){nullptr} , decltype(_impl_.base_fee_per_gas_){nullptr} , decltype(_impl_.withdrawal_hash_){nullptr} - , decltype(_impl_.excess_data_gas_){nullptr} , decltype(_impl_.block_number_){} , decltype(_impl_.gas_limit_){} , decltype(_impl_.gas_used_){} , decltype(_impl_.timestamp_){} - , decltype(_impl_.nonce_){}}; + , decltype(_impl_.nonce_){} + , decltype(_impl_.data_gas_used_){} + , decltype(_impl_.excess_data_gas_){}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.extra_data_.InitDefault(); @@ -1406,12 +1405,9 @@ Header::Header(const Header& from) if (from._internal_has_withdrawal_hash()) { _this->_impl_.withdrawal_hash_ = new ::types::H256(*from._impl_.withdrawal_hash_); } - if (from._internal_has_excess_data_gas()) { - _this->_impl_.excess_data_gas_ = new ::types::H256(*from._impl_.excess_data_gas_); - } ::memcpy(&_impl_.block_number_, &from._impl_.block_number_, - static_cast(reinterpret_cast(&_impl_.nonce_) - - reinterpret_cast(&_impl_.block_number_)) + sizeof(_impl_.nonce_)); + static_cast(reinterpret_cast(&_impl_.excess_data_gas_) - + reinterpret_cast(&_impl_.block_number_)) + sizeof(_impl_.excess_data_gas_)); // @@protoc_insertion_point(copy_constructor:execution.Header) } @@ -1435,12 +1431,13 @@ inline void Header::SharedCtor( , decltype(_impl_.transaction_hash_){nullptr} , decltype(_impl_.base_fee_per_gas_){nullptr} , decltype(_impl_.withdrawal_hash_){nullptr} - , decltype(_impl_.excess_data_gas_){nullptr} , decltype(_impl_.block_number_){uint64_t{0u}} , decltype(_impl_.gas_limit_){uint64_t{0u}} , decltype(_impl_.gas_used_){uint64_t{0u}} , decltype(_impl_.timestamp_){uint64_t{0u}} , decltype(_impl_.nonce_){uint64_t{0u}} + , decltype(_impl_.data_gas_used_){uint64_t{0u}} + , decltype(_impl_.excess_data_gas_){uint64_t{0u}} }; _impl_.extra_data_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING @@ -1472,7 +1469,6 @@ inline void Header::SharedDtor() { if (this != internal_default_instance()) delete _impl_.transaction_hash_; if (this != internal_default_instance()) delete _impl_.base_fee_per_gas_; if (this != internal_default_instance()) delete _impl_.withdrawal_hash_; - if (this != internal_default_instance()) delete _impl_.excess_data_gas_; } void Header::SetCachedSize(int size) const { @@ -1527,7 +1523,7 @@ void Header::Clear() { } _impl_.transaction_hash_ = nullptr; cached_has_bits = _impl_._has_bits_[0]; - if (cached_has_bits & 0x00000007u) { + if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { GOOGLE_DCHECK(_impl_.base_fee_per_gas_ != nullptr); _impl_.base_fee_per_gas_->Clear(); @@ -1536,14 +1532,15 @@ void Header::Clear() { GOOGLE_DCHECK(_impl_.withdrawal_hash_ != nullptr); _impl_.withdrawal_hash_->Clear(); } - if (cached_has_bits & 0x00000004u) { - GOOGLE_DCHECK(_impl_.excess_data_gas_ != nullptr); - _impl_.excess_data_gas_->Clear(); - } } ::memset(&_impl_.block_number_, 0, static_cast( reinterpret_cast(&_impl_.nonce_) - reinterpret_cast(&_impl_.block_number_)) + sizeof(_impl_.nonce_)); + if (cached_has_bits & 0x0000000cu) { + ::memset(&_impl_.data_gas_used_, 0, static_cast( + reinterpret_cast(&_impl_.excess_data_gas_) - + reinterpret_cast(&_impl_.data_gas_used_)) + sizeof(_impl_.excess_data_gas_)); + } _impl_._has_bits_.Clear(); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -1700,10 +1697,20 @@ const char* Header::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } else goto handle_unusual; continue; - // optional .types.H256 excess_data_gas = 19; + // optional uint64 data_gas_used = 19; case 19: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 154)) { - ptr = ctx->ParseMessage(_internal_mutable_excess_data_gas(), ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 152)) { + _Internal::set_has_data_gas_used(&has_bits); + _impl_.data_gas_used_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else + goto handle_unusual; + continue; + // optional uint64 excess_data_gas = 20; + case 20: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 160)) { + _Internal::set_has_excess_data_gas(&has_bits); + _impl_.excess_data_gas_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; @@ -1858,11 +1865,16 @@ uint8_t* Header::_InternalSerialize( _Internal::withdrawal_hash(this).GetCachedSize(), target, stream); } - // optional .types.H256 excess_data_gas = 19; + // optional uint64 data_gas_used = 19; + if (_internal_has_data_gas_used()) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray(19, this->_internal_data_gas_used(), target); + } + + // optional uint64 excess_data_gas = 20; if (_internal_has_excess_data_gas()) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessage(19, _Internal::excess_data_gas(this), - _Internal::excess_data_gas(this).GetCachedSize(), target, stream); + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray(20, this->_internal_excess_data_gas(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -1959,7 +1971,7 @@ size_t Header::ByteSizeLong() const { } cached_has_bits = _impl_._has_bits_[0]; - if (cached_has_bits & 0x00000007u) { + if (cached_has_bits & 0x00000003u) { // optional .types.H256 base_fee_per_gas = 17; if (cached_has_bits & 0x00000001u) { total_size += 2 + @@ -1974,13 +1986,6 @@ size_t Header::ByteSizeLong() const { *_impl_.withdrawal_hash_); } - // optional .types.H256 excess_data_gas = 19; - if (cached_has_bits & 0x00000004u) { - total_size += 2 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( - *_impl_.excess_data_gas_); - } - } // uint64 block_number = 7; if (this->_internal_block_number() != 0) { @@ -2007,6 +2012,22 @@ size_t Header::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_nonce()); } + if (cached_has_bits & 0x0000000cu) { + // optional uint64 data_gas_used = 19; + if (cached_has_bits & 0x00000004u) { + total_size += 2 + + ::_pbi::WireFormatLite::UInt64Size( + this->_internal_data_gas_used()); + } + + // optional uint64 excess_data_gas = 20; + if (cached_has_bits & 0x00000008u) { + total_size += 2 + + ::_pbi::WireFormatLite::UInt64Size( + this->_internal_excess_data_gas()); + } + + } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -2069,7 +2090,7 @@ void Header::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBU from._internal_transaction_hash()); } cached_has_bits = from._impl_._has_bits_[0]; - if (cached_has_bits & 0x00000007u) { + if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { _this->_internal_mutable_base_fee_per_gas()->::types::H256::MergeFrom( from._internal_base_fee_per_gas()); @@ -2078,10 +2099,6 @@ void Header::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBU _this->_internal_mutable_withdrawal_hash()->::types::H256::MergeFrom( from._internal_withdrawal_hash()); } - if (cached_has_bits & 0x00000004u) { - _this->_internal_mutable_excess_data_gas()->::types::H256::MergeFrom( - from._internal_excess_data_gas()); - } } if (from._internal_block_number() != 0) { _this->_internal_set_block_number(from._internal_block_number()); @@ -2098,6 +2115,15 @@ void Header::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBU if (from._internal_nonce() != 0) { _this->_internal_set_nonce(from._internal_nonce()); } + if (cached_has_bits & 0x0000000cu) { + if (cached_has_bits & 0x00000004u) { + _this->_impl_.data_gas_used_ = from._impl_.data_gas_used_; + } + if (cached_has_bits & 0x00000008u) { + _this->_impl_.excess_data_gas_ = from._impl_.excess_data_gas_; + } + _this->_impl_._has_bits_[0] |= cached_has_bits; + } _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -2123,8 +2149,8 @@ void Header::InternalSwap(Header* other) { &other->_impl_.extra_data_, rhs_arena ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(Header, _impl_.nonce_) - + sizeof(Header::_impl_.nonce_) + PROTOBUF_FIELD_OFFSET(Header, _impl_.excess_data_gas_) + + sizeof(Header::_impl_.excess_data_gas_) - PROTOBUF_FIELD_OFFSET(Header, _impl_.parent_hash_)>( reinterpret_cast(&_impl_.parent_hash_), reinterpret_cast(&other->_impl_.parent_hash_)); diff --git a/silkworm/interfaces/3.21.4/execution/execution.pb.h b/silkworm/interfaces/3.21.4/execution/execution.pb.h index ff16960e5a..4077d21465 100644 --- a/silkworm/interfaces/3.21.4/execution/execution.pb.h +++ b/silkworm/interfaces/3.21.4/execution/execution.pb.h @@ -769,12 +769,13 @@ class Header final : kTransactionHashFieldNumber = 16, kBaseFeePerGasFieldNumber = 17, kWithdrawalHashFieldNumber = 18, - kExcessDataGasFieldNumber = 19, kBlockNumberFieldNumber = 7, kGasLimitFieldNumber = 8, kGasUsedFieldNumber = 9, kTimestampFieldNumber = 10, kNonceFieldNumber = 11, + kDataGasUsedFieldNumber = 19, + kExcessDataGasFieldNumber = 20, }; // bytes extra_data = 12; void clear_extra_data(); @@ -1006,24 +1007,6 @@ class Header final : ::types::H256* withdrawal_hash); ::types::H256* unsafe_arena_release_withdrawal_hash(); - // optional .types.H256 excess_data_gas = 19; - bool has_excess_data_gas() const; - private: - bool _internal_has_excess_data_gas() const; - public: - void clear_excess_data_gas(); - const ::types::H256& excess_data_gas() const; - PROTOBUF_NODISCARD ::types::H256* release_excess_data_gas(); - ::types::H256* mutable_excess_data_gas(); - void set_allocated_excess_data_gas(::types::H256* excess_data_gas); - private: - const ::types::H256& _internal_excess_data_gas() const; - ::types::H256* _internal_mutable_excess_data_gas(); - public: - void unsafe_arena_set_allocated_excess_data_gas( - ::types::H256* excess_data_gas); - ::types::H256* unsafe_arena_release_excess_data_gas(); - // uint64 block_number = 7; void clear_block_number(); uint64_t block_number() const; @@ -1069,6 +1052,32 @@ class Header final : void _internal_set_nonce(uint64_t value); public: + // optional uint64 data_gas_used = 19; + bool has_data_gas_used() const; + private: + bool _internal_has_data_gas_used() const; + public: + void clear_data_gas_used(); + uint64_t data_gas_used() const; + void set_data_gas_used(uint64_t value); + private: + uint64_t _internal_data_gas_used() const; + void _internal_set_data_gas_used(uint64_t value); + public: + + // optional uint64 excess_data_gas = 20; + bool has_excess_data_gas() const; + private: + bool _internal_has_excess_data_gas() const; + public: + void clear_excess_data_gas(); + uint64_t excess_data_gas() const; + void set_excess_data_gas(uint64_t value); + private: + uint64_t _internal_excess_data_gas() const; + void _internal_set_excess_data_gas(uint64_t value); + public: + // @@protoc_insertion_point(class_scope:execution.Header) private: class _Internal; @@ -1092,12 +1101,13 @@ class Header final : ::types::H256* transaction_hash_; ::types::H256* base_fee_per_gas_; ::types::H256* withdrawal_hash_; - ::types::H256* excess_data_gas_; uint64_t block_number_; uint64_t gas_limit_; uint64_t gas_used_; uint64_t timestamp_; uint64_t nonce_; + uint64_t data_gas_used_; + uint64_t excess_data_gas_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_execution_2fexecution_2eproto; @@ -3924,91 +3934,60 @@ inline void Header::set_allocated_withdrawal_hash(::types::H256* withdrawal_hash // @@protoc_insertion_point(field_set_allocated:execution.Header.withdrawal_hash) } -// optional .types.H256 excess_data_gas = 19; -inline bool Header::_internal_has_excess_data_gas() const { +// optional uint64 data_gas_used = 19; +inline bool Header::_internal_has_data_gas_used() const { bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0; - PROTOBUF_ASSUME(!value || _impl_.excess_data_gas_ != nullptr); return value; } -inline bool Header::has_excess_data_gas() const { - return _internal_has_excess_data_gas(); +inline bool Header::has_data_gas_used() const { + return _internal_has_data_gas_used(); } -inline const ::types::H256& Header::_internal_excess_data_gas() const { - const ::types::H256* p = _impl_.excess_data_gas_; - return p != nullptr ? *p : reinterpret_cast( - ::types::_H256_default_instance_); +inline void Header::clear_data_gas_used() { + _impl_.data_gas_used_ = uint64_t{0u}; + _impl_._has_bits_[0] &= ~0x00000004u; } -inline const ::types::H256& Header::excess_data_gas() const { - // @@protoc_insertion_point(field_get:execution.Header.excess_data_gas) - return _internal_excess_data_gas(); +inline uint64_t Header::_internal_data_gas_used() const { + return _impl_.data_gas_used_; } -inline void Header::unsafe_arena_set_allocated_excess_data_gas( - ::types::H256* excess_data_gas) { - if (GetArenaForAllocation() == nullptr) { - delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.excess_data_gas_); - } - _impl_.excess_data_gas_ = excess_data_gas; - if (excess_data_gas) { - _impl_._has_bits_[0] |= 0x00000004u; - } else { - _impl_._has_bits_[0] &= ~0x00000004u; - } - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:execution.Header.excess_data_gas) +inline uint64_t Header::data_gas_used() const { + // @@protoc_insertion_point(field_get:execution.Header.data_gas_used) + return _internal_data_gas_used(); } -inline ::types::H256* Header::release_excess_data_gas() { - _impl_._has_bits_[0] &= ~0x00000004u; - ::types::H256* temp = _impl_.excess_data_gas_; - _impl_.excess_data_gas_ = nullptr; -#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - if (GetArenaForAllocation() == nullptr) { delete old; } -#else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - } -#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE - return temp; +inline void Header::_internal_set_data_gas_used(uint64_t value) { + _impl_._has_bits_[0] |= 0x00000004u; + _impl_.data_gas_used_ = value; } -inline ::types::H256* Header::unsafe_arena_release_excess_data_gas() { - // @@protoc_insertion_point(field_release:execution.Header.excess_data_gas) - _impl_._has_bits_[0] &= ~0x00000004u; - ::types::H256* temp = _impl_.excess_data_gas_; - _impl_.excess_data_gas_ = nullptr; - return temp; +inline void Header::set_data_gas_used(uint64_t value) { + _internal_set_data_gas_used(value); + // @@protoc_insertion_point(field_set:execution.Header.data_gas_used) } -inline ::types::H256* Header::_internal_mutable_excess_data_gas() { - _impl_._has_bits_[0] |= 0x00000004u; - if (_impl_.excess_data_gas_ == nullptr) { - auto* p = CreateMaybeMessage<::types::H256>(GetArenaForAllocation()); - _impl_.excess_data_gas_ = p; - } + +// optional uint64 excess_data_gas = 20; +inline bool Header::_internal_has_excess_data_gas() const { + bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0; + return value; +} +inline bool Header::has_excess_data_gas() const { + return _internal_has_excess_data_gas(); +} +inline void Header::clear_excess_data_gas() { + _impl_.excess_data_gas_ = uint64_t{0u}; + _impl_._has_bits_[0] &= ~0x00000008u; +} +inline uint64_t Header::_internal_excess_data_gas() const { return _impl_.excess_data_gas_; } -inline ::types::H256* Header::mutable_excess_data_gas() { - ::types::H256* _msg = _internal_mutable_excess_data_gas(); - // @@protoc_insertion_point(field_mutable:execution.Header.excess_data_gas) - return _msg; +inline uint64_t Header::excess_data_gas() const { + // @@protoc_insertion_point(field_get:execution.Header.excess_data_gas) + return _internal_excess_data_gas(); } -inline void Header::set_allocated_excess_data_gas(::types::H256* excess_data_gas) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); - if (message_arena == nullptr) { - delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.excess_data_gas_); - } - if (excess_data_gas) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena( - reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(excess_data_gas)); - if (message_arena != submessage_arena) { - excess_data_gas = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( - message_arena, excess_data_gas, submessage_arena); - } - _impl_._has_bits_[0] |= 0x00000004u; - } else { - _impl_._has_bits_[0] &= ~0x00000004u; - } - _impl_.excess_data_gas_ = excess_data_gas; - // @@protoc_insertion_point(field_set_allocated:execution.Header.excess_data_gas) +inline void Header::_internal_set_excess_data_gas(uint64_t value) { + _impl_._has_bits_[0] |= 0x00000008u; + _impl_.excess_data_gas_ = value; +} +inline void Header::set_excess_data_gas(uint64_t value) { + _internal_set_excess_data_gas(value); + // @@protoc_insertion_point(field_set:execution.Header.excess_data_gas) } // ------------------------------------------------------------------- diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.cc b/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.cc index 6ed22463a9..9898e84030 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.cc +++ b/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.cc @@ -30,7 +30,7 @@ static const char* ETHBACKEND_method_names[] = { "/remote.ETHBACKEND/EngineGetPayload", "/remote.ETHBACKEND/EngineGetPayloadBodiesByHashV1", "/remote.ETHBACKEND/EngineGetPayloadBodiesByRangeV1", - "/remote.ETHBACKEND/EngineGetBlobsBundleV1", + "/remote.ETHBACKEND/EngineGetPayloadWithBlobs", "/remote.ETHBACKEND/Version", "/remote.ETHBACKEND/ProtocolVersion", "/remote.ETHBACKEND/ClientVersion", @@ -58,7 +58,7 @@ ETHBACKEND::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel , rpcmethod_EngineGetPayload_(ETHBACKEND_method_names[5], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_EngineGetPayloadBodiesByHashV1_(ETHBACKEND_method_names[6], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_EngineGetPayloadBodiesByRangeV1_(ETHBACKEND_method_names[7], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_EngineGetBlobsBundleV1_(ETHBACKEND_method_names[8], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_EngineGetPayloadWithBlobs_(ETHBACKEND_method_names[8], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_Version_(ETHBACKEND_method_names[9], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_ProtocolVersion_(ETHBACKEND_method_names[10], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_ClientVersion_(ETHBACKEND_method_names[11], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) @@ -255,25 +255,25 @@ ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>* return result; } -::grpc::Status ETHBACKEND::Stub::EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::types::BlobsBundleV1* response) { - return ::grpc::internal::BlockingUnaryCall< ::remote::EngineGetBlobsBundleRequest, ::types::BlobsBundleV1, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_EngineGetBlobsBundleV1_, context, request, response); +::grpc::Status ETHBACKEND::Stub::EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response) { + return ::grpc::internal::BlockingUnaryCall< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_EngineGetPayloadWithBlobs_, context, request, response); } -void ETHBACKEND::Stub::async::EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response, std::function f) { - ::grpc::internal::CallbackUnaryCall< ::remote::EngineGetBlobsBundleRequest, ::types::BlobsBundleV1, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_EngineGetBlobsBundleV1_, context, request, response, std::move(f)); +void ETHBACKEND::Stub::async::EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, std::function f) { + ::grpc::internal::CallbackUnaryCall< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_EngineGetPayloadWithBlobs_, context, request, response, std::move(f)); } -void ETHBACKEND::Stub::async::EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response, ::grpc::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_EngineGetBlobsBundleV1_, context, request, response, reactor); +void ETHBACKEND::Stub::async::EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, ::grpc::ClientUnaryReactor* reactor) { + ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_EngineGetPayloadWithBlobs_, context, request, response, reactor); } -::grpc::ClientAsyncResponseReader< ::types::BlobsBundleV1>* ETHBACKEND::Stub::PrepareAsyncEngineGetBlobsBundleV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::types::BlobsBundleV1, ::remote::EngineGetBlobsBundleRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_EngineGetBlobsBundleV1_, context, request); +::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>* ETHBACKEND::Stub::PrepareAsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { + return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::remote::EngineGetPayloadResponse, ::remote::EngineGetPayloadRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_EngineGetPayloadWithBlobs_, context, request); } -::grpc::ClientAsyncResponseReader< ::types::BlobsBundleV1>* ETHBACKEND::Stub::AsyncEngineGetBlobsBundleV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) { +::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>* ETHBACKEND::Stub::AsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { auto* result = - this->PrepareAsyncEngineGetBlobsBundleV1Raw(context, request, cq); + this->PrepareAsyncEngineGetPayloadWithBlobsRaw(context, request, cq); result->StartCall(); return result; } @@ -578,12 +578,12 @@ ETHBACKEND::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( ETHBACKEND_method_names[8], ::grpc::internal::RpcMethod::NORMAL_RPC, - new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::remote::EngineGetBlobsBundleRequest, ::types::BlobsBundleV1, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( + new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, ::grpc::ServerContext* ctx, - const ::remote::EngineGetBlobsBundleRequest* req, - ::types::BlobsBundleV1* resp) { - return service->EngineGetBlobsBundleV1(ctx, req, resp); + const ::remote::EngineGetPayloadRequest* req, + ::remote::EngineGetPayloadResponse* resp) { + return service->EngineGetPayloadWithBlobs(ctx, req, resp); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( ETHBACKEND_method_names[9], @@ -746,7 +746,7 @@ ::grpc::Status ETHBACKEND::Service::EngineGetPayloadBodiesByRangeV1(::grpc::Serv return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } -::grpc::Status ETHBACKEND::Service::EngineGetBlobsBundleV1(::grpc::ServerContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response) { +::grpc::Status ETHBACKEND::Service::EngineGetPayloadWithBlobs(::grpc::ServerContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response) { (void) context; (void) request; (void) response; diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.h b/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.h index b7e11c2f15..30dab8a00f 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.h +++ b/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.h @@ -98,13 +98,13 @@ class ETHBACKEND final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>> PrepareAsyncEngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>>(PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw(context, request, cq)); } - // Fetch the blobs bundle using its ID. - virtual ::grpc::Status EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::types::BlobsBundleV1* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::types::BlobsBundleV1>> AsyncEngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::types::BlobsBundleV1>>(AsyncEngineGetBlobsBundleV1Raw(context, request, cq)); + // Fetch the payload along with its blobs bundle using its ID. + virtual ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response) = 0; + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>> AsyncEngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>>(AsyncEngineGetPayloadWithBlobsRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::types::BlobsBundleV1>> PrepareAsyncEngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::types::BlobsBundleV1>>(PrepareAsyncEngineGetBlobsBundleV1Raw(context, request, cq)); + std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>> PrepareAsyncEngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>>(PrepareAsyncEngineGetPayloadWithBlobsRaw(context, request, cq)); } // End of Engine API requests // ------------------------------------------------------------------------ @@ -220,9 +220,9 @@ class ETHBACKEND final { virtual void EngineGetPayloadBodiesByHashV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, ::grpc::ClientUnaryReactor* reactor) = 0; virtual void EngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, std::function) = 0; virtual void EngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, ::grpc::ClientUnaryReactor* reactor) = 0; - // Fetch the blobs bundle using its ID. - virtual void EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response, std::function) = 0; - virtual void EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response, ::grpc::ClientUnaryReactor* reactor) = 0; + // Fetch the payload along with its blobs bundle using its ID. + virtual void EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, std::function) = 0; + virtual void EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0; // End of Engine API requests // ------------------------------------------------------------------------ // @@ -276,8 +276,8 @@ class ETHBACKEND final { virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>* PrepareAsyncEngineGetPayloadBodiesByHashV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>* AsyncEngineGetPayloadBodiesByRangeV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>* PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::types::BlobsBundleV1>* AsyncEngineGetBlobsBundleV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::types::BlobsBundleV1>* PrepareAsyncEngineGetBlobsBundleV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>* AsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) = 0; + virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>* PrepareAsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::types::VersionReply>* AsyncVersionRaw(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::types::VersionReply>* PrepareAsyncVersionRaw(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::ProtocolVersionReply>* AsyncProtocolVersionRaw(::grpc::ClientContext* context, const ::remote::ProtocolVersionRequest& request, ::grpc::CompletionQueue* cq) = 0; @@ -360,12 +360,12 @@ class ETHBACKEND final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>> PrepareAsyncEngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>>(PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw(context, request, cq)); } - ::grpc::Status EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::types::BlobsBundleV1* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::types::BlobsBundleV1>> AsyncEngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::types::BlobsBundleV1>>(AsyncEngineGetBlobsBundleV1Raw(context, request, cq)); + ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response) override; + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>> AsyncEngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>>(AsyncEngineGetPayloadWithBlobsRaw(context, request, cq)); } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::types::BlobsBundleV1>> PrepareAsyncEngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::types::BlobsBundleV1>>(PrepareAsyncEngineGetBlobsBundleV1Raw(context, request, cq)); + std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>> PrepareAsyncEngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { + return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>>(PrepareAsyncEngineGetPayloadWithBlobsRaw(context, request, cq)); } ::grpc::Status Version(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::types::VersionReply* response) override; std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::types::VersionReply>> AsyncVersion(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) { @@ -460,8 +460,8 @@ class ETHBACKEND final { void EngineGetPayloadBodiesByHashV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, ::grpc::ClientUnaryReactor* reactor) override; void EngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, std::function) override; void EngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, ::grpc::ClientUnaryReactor* reactor) override; - void EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response, std::function) override; - void EngineGetBlobsBundleV1(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response, ::grpc::ClientUnaryReactor* reactor) override; + void EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, std::function) override; + void EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, ::grpc::ClientUnaryReactor* reactor) override; void Version(::grpc::ClientContext* context, const ::google::protobuf::Empty* request, ::types::VersionReply* response, std::function) override; void Version(::grpc::ClientContext* context, const ::google::protobuf::Empty* request, ::types::VersionReply* response, ::grpc::ClientUnaryReactor* reactor) override; void ProtocolVersion(::grpc::ClientContext* context, const ::remote::ProtocolVersionRequest* request, ::remote::ProtocolVersionReply* response, std::function) override; @@ -507,8 +507,8 @@ class ETHBACKEND final { ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>* PrepareAsyncEngineGetPayloadBodiesByHashV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>* AsyncEngineGetPayloadBodiesByRangeV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>* PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::types::BlobsBundleV1>* AsyncEngineGetBlobsBundleV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::types::BlobsBundleV1>* PrepareAsyncEngineGetBlobsBundleV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>* AsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) override; + ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>* PrepareAsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::types::VersionReply>* AsyncVersionRaw(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::types::VersionReply>* PrepareAsyncVersionRaw(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::remote::ProtocolVersionReply>* AsyncProtocolVersionRaw(::grpc::ClientContext* context, const ::remote::ProtocolVersionRequest& request, ::grpc::CompletionQueue* cq) override; @@ -539,7 +539,7 @@ class ETHBACKEND final { const ::grpc::internal::RpcMethod rpcmethod_EngineGetPayload_; const ::grpc::internal::RpcMethod rpcmethod_EngineGetPayloadBodiesByHashV1_; const ::grpc::internal::RpcMethod rpcmethod_EngineGetPayloadBodiesByRangeV1_; - const ::grpc::internal::RpcMethod rpcmethod_EngineGetBlobsBundleV1_; + const ::grpc::internal::RpcMethod rpcmethod_EngineGetPayloadWithBlobs_; const ::grpc::internal::RpcMethod rpcmethod_Version_; const ::grpc::internal::RpcMethod rpcmethod_ProtocolVersion_; const ::grpc::internal::RpcMethod rpcmethod_ClientVersion_; @@ -572,8 +572,8 @@ class ETHBACKEND final { virtual ::grpc::Status EngineGetPayload(::grpc::ServerContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response); virtual ::grpc::Status EngineGetPayloadBodiesByHashV1(::grpc::ServerContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response); virtual ::grpc::Status EngineGetPayloadBodiesByRangeV1(::grpc::ServerContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response); - // Fetch the blobs bundle using its ID. - virtual ::grpc::Status EngineGetBlobsBundleV1(::grpc::ServerContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response); + // Fetch the payload along with its blobs bundle using its ID. + virtual ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response); // End of Engine API requests // ------------------------------------------------------------------------ // @@ -760,22 +760,22 @@ class ETHBACKEND final { } }; template - class WithAsyncMethod_EngineGetBlobsBundleV1 : public BaseClass { + class WithAsyncMethod_EngineGetPayloadWithBlobs : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: - WithAsyncMethod_EngineGetBlobsBundleV1() { + WithAsyncMethod_EngineGetPayloadWithBlobs() { ::grpc::Service::MarkMethodAsync(8); } - ~WithAsyncMethod_EngineGetBlobsBundleV1() override { + ~WithAsyncMethod_EngineGetPayloadWithBlobs() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EngineGetBlobsBundleV1(::grpc::ServerContext* /*context*/, const ::remote::EngineGetBlobsBundleRequest* /*request*/, ::types::BlobsBundleV1* /*response*/) override { + ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestEngineGetBlobsBundleV1(::grpc::ServerContext* context, ::remote::EngineGetBlobsBundleRequest* request, ::grpc::ServerAsyncResponseWriter< ::types::BlobsBundleV1>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestEngineGetPayloadWithBlobs(::grpc::ServerContext* context, ::remote::EngineGetPayloadRequest* request, ::grpc::ServerAsyncResponseWriter< ::remote::EngineGetPayloadResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); } }; @@ -979,7 +979,7 @@ class ETHBACKEND final { ::grpc::Service::RequestAsyncUnary(18, context, request, response, new_call_cq, notification_cq, tag); } }; - typedef WithAsyncMethod_Etherbase > > > > > > > > > > > > > > > > > > AsyncService; + typedef WithAsyncMethod_Etherbase > > > > > > > > > > > > > > > > > > AsyncService; template class WithCallbackMethod_Etherbase : public BaseClass { private: @@ -1197,31 +1197,31 @@ class ETHBACKEND final { ::grpc::CallbackServerContext* /*context*/, const ::remote::EngineGetPayloadBodiesByRangeV1Request* /*request*/, ::remote::EngineGetPayloadBodiesV1Response* /*response*/) { return nullptr; } }; template - class WithCallbackMethod_EngineGetBlobsBundleV1 : public BaseClass { + class WithCallbackMethod_EngineGetPayloadWithBlobs : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: - WithCallbackMethod_EngineGetBlobsBundleV1() { + WithCallbackMethod_EngineGetPayloadWithBlobs() { ::grpc::Service::MarkMethodCallback(8, - new ::grpc::internal::CallbackUnaryHandler< ::remote::EngineGetBlobsBundleRequest, ::types::BlobsBundleV1>( + new ::grpc::internal::CallbackUnaryHandler< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>( [this]( - ::grpc::CallbackServerContext* context, const ::remote::EngineGetBlobsBundleRequest* request, ::types::BlobsBundleV1* response) { return this->EngineGetBlobsBundleV1(context, request, response); }));} - void SetMessageAllocatorFor_EngineGetBlobsBundleV1( - ::grpc::MessageAllocator< ::remote::EngineGetBlobsBundleRequest, ::types::BlobsBundleV1>* allocator) { + ::grpc::CallbackServerContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response) { return this->EngineGetPayloadWithBlobs(context, request, response); }));} + void SetMessageAllocatorFor_EngineGetPayloadWithBlobs( + ::grpc::MessageAllocator< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>* allocator) { ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(8); - static_cast<::grpc::internal::CallbackUnaryHandler< ::remote::EngineGetBlobsBundleRequest, ::types::BlobsBundleV1>*>(handler) + static_cast<::grpc::internal::CallbackUnaryHandler< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>*>(handler) ->SetMessageAllocator(allocator); } - ~WithCallbackMethod_EngineGetBlobsBundleV1() override { + ~WithCallbackMethod_EngineGetPayloadWithBlobs() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EngineGetBlobsBundleV1(::grpc::ServerContext* /*context*/, const ::remote::EngineGetBlobsBundleRequest* /*request*/, ::types::BlobsBundleV1* /*response*/) override { + ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual ::grpc::ServerUnaryReactor* EngineGetBlobsBundleV1( - ::grpc::CallbackServerContext* /*context*/, const ::remote::EngineGetBlobsBundleRequest* /*request*/, ::types::BlobsBundleV1* /*response*/) { return nullptr; } + virtual ::grpc::ServerUnaryReactor* EngineGetPayloadWithBlobs( + ::grpc::CallbackServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) { return nullptr; } }; template class WithCallbackMethod_Version : public BaseClass { @@ -1484,7 +1484,7 @@ class ETHBACKEND final { virtual ::grpc::ServerUnaryReactor* PendingBlock( ::grpc::CallbackServerContext* /*context*/, const ::google::protobuf::Empty* /*request*/, ::remote::PendingBlockReply* /*response*/) { return nullptr; } }; - typedef WithCallbackMethod_Etherbase > > > > > > > > > > > > > > > > > > CallbackService; + typedef WithCallbackMethod_Etherbase > > > > > > > > > > > > > > > > > > CallbackService; typedef CallbackService ExperimentalCallbackService; template class WithGenericMethod_Etherbase : public BaseClass { @@ -1623,18 +1623,18 @@ class ETHBACKEND final { } }; template - class WithGenericMethod_EngineGetBlobsBundleV1 : public BaseClass { + class WithGenericMethod_EngineGetPayloadWithBlobs : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: - WithGenericMethod_EngineGetBlobsBundleV1() { + WithGenericMethod_EngineGetPayloadWithBlobs() { ::grpc::Service::MarkMethodGeneric(8); } - ~WithGenericMethod_EngineGetBlobsBundleV1() override { + ~WithGenericMethod_EngineGetPayloadWithBlobs() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EngineGetBlobsBundleV1(::grpc::ServerContext* /*context*/, const ::remote::EngineGetBlobsBundleRequest* /*request*/, ::types::BlobsBundleV1* /*response*/) override { + ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } @@ -1970,22 +1970,22 @@ class ETHBACKEND final { } }; template - class WithRawMethod_EngineGetBlobsBundleV1 : public BaseClass { + class WithRawMethod_EngineGetPayloadWithBlobs : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: - WithRawMethod_EngineGetBlobsBundleV1() { + WithRawMethod_EngineGetPayloadWithBlobs() { ::grpc::Service::MarkMethodRaw(8); } - ~WithRawMethod_EngineGetBlobsBundleV1() override { + ~WithRawMethod_EngineGetPayloadWithBlobs() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EngineGetBlobsBundleV1(::grpc::ServerContext* /*context*/, const ::remote::EngineGetBlobsBundleRequest* /*request*/, ::types::BlobsBundleV1* /*response*/) override { + ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - void RequestEngineGetBlobsBundleV1(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { + void RequestEngineGetPayloadWithBlobs(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); } }; @@ -2366,25 +2366,25 @@ class ETHBACKEND final { ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/) { return nullptr; } }; template - class WithRawCallbackMethod_EngineGetBlobsBundleV1 : public BaseClass { + class WithRawCallbackMethod_EngineGetPayloadWithBlobs : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: - WithRawCallbackMethod_EngineGetBlobsBundleV1() { + WithRawCallbackMethod_EngineGetPayloadWithBlobs() { ::grpc::Service::MarkMethodRawCallback(8, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( - ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->EngineGetBlobsBundleV1(context, request, response); })); + ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->EngineGetPayloadWithBlobs(context, request, response); })); } - ~WithRawCallbackMethod_EngineGetBlobsBundleV1() override { + ~WithRawCallbackMethod_EngineGetPayloadWithBlobs() override { BaseClassMustBeDerivedFromService(this); } // disable synchronous version of this method - ::grpc::Status EngineGetBlobsBundleV1(::grpc::ServerContext* /*context*/, const ::remote::EngineGetBlobsBundleRequest* /*request*/, ::types::BlobsBundleV1* /*response*/) override { + ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } - virtual ::grpc::ServerUnaryReactor* EngineGetBlobsBundleV1( + virtual ::grpc::ServerUnaryReactor* EngineGetPayloadWithBlobs( ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/) { return nullptr; } }; template @@ -2825,31 +2825,31 @@ class ETHBACKEND final { virtual ::grpc::Status StreamedEngineGetPayloadBodiesByRangeV1(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::remote::EngineGetPayloadBodiesByRangeV1Request,::remote::EngineGetPayloadBodiesV1Response>* server_unary_streamer) = 0; }; template - class WithStreamedUnaryMethod_EngineGetBlobsBundleV1 : public BaseClass { + class WithStreamedUnaryMethod_EngineGetPayloadWithBlobs : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: - WithStreamedUnaryMethod_EngineGetBlobsBundleV1() { + WithStreamedUnaryMethod_EngineGetPayloadWithBlobs() { ::grpc::Service::MarkMethodStreamed(8, new ::grpc::internal::StreamedUnaryHandler< - ::remote::EngineGetBlobsBundleRequest, ::types::BlobsBundleV1>( + ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>( [this](::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< - ::remote::EngineGetBlobsBundleRequest, ::types::BlobsBundleV1>* streamer) { - return this->StreamedEngineGetBlobsBundleV1(context, + ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>* streamer) { + return this->StreamedEngineGetPayloadWithBlobs(context, streamer); })); } - ~WithStreamedUnaryMethod_EngineGetBlobsBundleV1() override { + ~WithStreamedUnaryMethod_EngineGetPayloadWithBlobs() override { BaseClassMustBeDerivedFromService(this); } // disable regular version of this method - ::grpc::Status EngineGetBlobsBundleV1(::grpc::ServerContext* /*context*/, const ::remote::EngineGetBlobsBundleRequest* /*request*/, ::types::BlobsBundleV1* /*response*/) override { + ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { abort(); return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } // replace default version of method with streamed unary - virtual ::grpc::Status StreamedEngineGetBlobsBundleV1(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::remote::EngineGetBlobsBundleRequest,::types::BlobsBundleV1>* server_unary_streamer) = 0; + virtual ::grpc::Status StreamedEngineGetPayloadWithBlobs(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::remote::EngineGetPayloadRequest,::remote::EngineGetPayloadResponse>* server_unary_streamer) = 0; }; template class WithStreamedUnaryMethod_Version : public BaseClass { @@ -3067,7 +3067,7 @@ class ETHBACKEND final { // replace default version of method with streamed unary virtual ::grpc::Status StreamedPendingBlock(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::google::protobuf::Empty,::remote::PendingBlockReply>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_Etherbase > > > > > > > > > > > > > > > > StreamedUnaryService; + typedef WithStreamedUnaryMethod_Etherbase > > > > > > > > > > > > > > > > StreamedUnaryService; template class WithSplitStreamingMethod_Subscribe : public BaseClass { private: @@ -3096,7 +3096,7 @@ class ETHBACKEND final { virtual ::grpc::Status StreamedSubscribe(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::remote::SubscribeRequest,::remote::SubscribeReply>* server_split_streamer) = 0; }; typedef WithSplitStreamingMethod_Subscribe SplitStreamedService; - typedef WithStreamedUnaryMethod_Etherbase > > > > > > > > > > > > > > > > > StreamedService; + typedef WithStreamedUnaryMethod_Etherbase > > > > > > > > > > > > > > > > > StreamedService; }; } // namespace remote diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend.pb.cc b/silkworm/interfaces/3.21.4/remote/ethbackend.pb.cc index 631fed5913..c7bb8cd8d9 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend.pb.cc +++ b/silkworm/interfaces/3.21.4/remote/ethbackend.pb.cc @@ -106,19 +106,6 @@ struct EngineGetPayloadRequestDefaultTypeInternal { }; }; PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EngineGetPayloadRequestDefaultTypeInternal _EngineGetPayloadRequest_default_instance_; -PROTOBUF_CONSTEXPR EngineGetBlobsBundleRequest::EngineGetBlobsBundleRequest( - ::_pbi::ConstantInitialized): _impl_{ - /*decltype(_impl_.payload_id_)*/uint64_t{0u} - , /*decltype(_impl_._cached_size_)*/{}} {} -struct EngineGetBlobsBundleRequestDefaultTypeInternal { - PROTOBUF_CONSTEXPR EngineGetBlobsBundleRequestDefaultTypeInternal() - : _instance(::_pbi::ConstantInitialized{}) {} - ~EngineGetBlobsBundleRequestDefaultTypeInternal() {} - union { - EngineGetBlobsBundleRequest _instance; - }; -}; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EngineGetBlobsBundleRequestDefaultTypeInternal _EngineGetBlobsBundleRequest_default_instance_; PROTOBUF_CONSTEXPR EnginePayloadStatus::EnginePayloadStatus( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.validation_error_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} @@ -198,6 +185,7 @@ PROTOBUF_CONSTEXPR EngineGetPayloadResponse::EngineGetPayloadResponse( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.execution_payload_)*/nullptr , /*decltype(_impl_.block_value_)*/nullptr + , /*decltype(_impl_.blobs_bundle_)*/nullptr , /*decltype(_impl_._cached_size_)*/{}} {} struct EngineGetPayloadResponseDefaultTypeInternal { PROTOBUF_CONSTEXPR EngineGetPayloadResponseDefaultTypeInternal() @@ -467,7 +455,7 @@ struct EngineGetPayloadBodiesV1ResponseDefaultTypeInternal { }; PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EngineGetPayloadBodiesV1ResponseDefaultTypeInternal _EngineGetPayloadBodiesV1Response_default_instance_; } // namespace remote -static ::_pb::Metadata file_level_metadata_remote_2fethbackend_2eproto[33]; +static ::_pb::Metadata file_level_metadata_remote_2fethbackend_2eproto[32]; static const ::_pb::EnumDescriptor* file_level_enum_descriptors_remote_2fethbackend_2eproto[2]; static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_remote_2fethbackend_2eproto = nullptr; @@ -519,13 +507,6 @@ const uint32_t TableStruct_remote_2fethbackend_2eproto::offsets[] PROTOBUF_SECTI ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::remote::EngineGetPayloadRequest, _impl_.payload_id_), ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::remote::EngineGetBlobsBundleRequest, _internal_metadata_), - ~0u, // no _extensions_ - ~0u, // no _oneof_case_ - ~0u, // no _weak_field_map_ - ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::remote::EngineGetBlobsBundleRequest, _impl_.payload_id_), - ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::remote::EnginePayloadStatus, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ @@ -578,6 +559,7 @@ const uint32_t TableStruct_remote_2fethbackend_2eproto::offsets[] PROTOBUF_SECTI ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::remote::EngineGetPayloadResponse, _impl_.execution_payload_), PROTOBUF_FIELD_OFFSET(::remote::EngineGetPayloadResponse, _impl_.block_value_), + PROTOBUF_FIELD_OFFSET(::remote::EngineGetPayloadResponse, _impl_.blobs_bundle_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::remote::ProtocolVersionRequest, _internal_metadata_), ~0u, // no _extensions_ @@ -733,32 +715,31 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode { 26, -1, -1, sizeof(::remote::NetPeerCountRequest)}, { 32, -1, -1, sizeof(::remote::NetPeerCountReply)}, { 39, -1, -1, sizeof(::remote::EngineGetPayloadRequest)}, - { 46, -1, -1, sizeof(::remote::EngineGetBlobsBundleRequest)}, - { 53, -1, -1, sizeof(::remote::EnginePayloadStatus)}, - { 62, -1, -1, sizeof(::remote::EnginePayloadAttributes)}, - { 73, -1, -1, sizeof(::remote::EngineForkChoiceState)}, - { 82, -1, -1, sizeof(::remote::EngineForkChoiceUpdatedRequest)}, - { 90, -1, -1, sizeof(::remote::EngineForkChoiceUpdatedResponse)}, - { 98, -1, -1, sizeof(::remote::EngineGetPayloadResponse)}, - { 106, -1, -1, sizeof(::remote::ProtocolVersionRequest)}, - { 112, -1, -1, sizeof(::remote::ProtocolVersionReply)}, - { 119, -1, -1, sizeof(::remote::ClientVersionRequest)}, - { 125, -1, -1, sizeof(::remote::ClientVersionReply)}, - { 132, -1, -1, sizeof(::remote::SubscribeRequest)}, - { 139, -1, -1, sizeof(::remote::SubscribeReply)}, - { 147, -1, -1, sizeof(::remote::LogsFilterRequest)}, - { 157, -1, -1, sizeof(::remote::SubscribeLogsReply)}, - { 172, -1, -1, sizeof(::remote::BlockRequest)}, - { 180, -1, -1, sizeof(::remote::BlockReply)}, - { 188, -1, -1, sizeof(::remote::TxnLookupRequest)}, - { 195, -1, -1, sizeof(::remote::TxnLookupReply)}, - { 202, -1, -1, sizeof(::remote::NodesInfoRequest)}, - { 209, -1, -1, sizeof(::remote::NodesInfoReply)}, - { 216, -1, -1, sizeof(::remote::PeersReply)}, - { 223, -1, -1, sizeof(::remote::PendingBlockReply)}, - { 230, -1, -1, sizeof(::remote::EngineGetPayloadBodiesByHashV1Request)}, - { 237, -1, -1, sizeof(::remote::EngineGetPayloadBodiesByRangeV1Request)}, - { 245, -1, -1, sizeof(::remote::EngineGetPayloadBodiesV1Response)}, + { 46, -1, -1, sizeof(::remote::EnginePayloadStatus)}, + { 55, -1, -1, sizeof(::remote::EnginePayloadAttributes)}, + { 66, -1, -1, sizeof(::remote::EngineForkChoiceState)}, + { 75, -1, -1, sizeof(::remote::EngineForkChoiceUpdatedRequest)}, + { 83, -1, -1, sizeof(::remote::EngineForkChoiceUpdatedResponse)}, + { 91, -1, -1, sizeof(::remote::EngineGetPayloadResponse)}, + { 100, -1, -1, sizeof(::remote::ProtocolVersionRequest)}, + { 106, -1, -1, sizeof(::remote::ProtocolVersionReply)}, + { 113, -1, -1, sizeof(::remote::ClientVersionRequest)}, + { 119, -1, -1, sizeof(::remote::ClientVersionReply)}, + { 126, -1, -1, sizeof(::remote::SubscribeRequest)}, + { 133, -1, -1, sizeof(::remote::SubscribeReply)}, + { 141, -1, -1, sizeof(::remote::LogsFilterRequest)}, + { 151, -1, -1, sizeof(::remote::SubscribeLogsReply)}, + { 166, -1, -1, sizeof(::remote::BlockRequest)}, + { 174, -1, -1, sizeof(::remote::BlockReply)}, + { 182, -1, -1, sizeof(::remote::TxnLookupRequest)}, + { 189, -1, -1, sizeof(::remote::TxnLookupReply)}, + { 196, -1, -1, sizeof(::remote::NodesInfoRequest)}, + { 203, -1, -1, sizeof(::remote::NodesInfoReply)}, + { 210, -1, -1, sizeof(::remote::PeersReply)}, + { 217, -1, -1, sizeof(::remote::PendingBlockReply)}, + { 224, -1, -1, sizeof(::remote::EngineGetPayloadBodiesByHashV1Request)}, + { 231, -1, -1, sizeof(::remote::EngineGetPayloadBodiesByRangeV1Request)}, + { 239, -1, -1, sizeof(::remote::EngineGetPayloadBodiesV1Response)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -769,7 +750,6 @@ static const ::_pb::Message* const file_default_instances[] = { &::remote::_NetPeerCountRequest_default_instance_._instance, &::remote::_NetPeerCountReply_default_instance_._instance, &::remote::_EngineGetPayloadRequest_default_instance_._instance, - &::remote::_EngineGetBlobsBundleRequest_default_instance_._instance, &::remote::_EnginePayloadStatus_default_instance_._instance, &::remote::_EnginePayloadAttributes_default_instance_._instance, &::remote::_EngineForkChoiceState_default_instance_._instance, @@ -805,102 +785,102 @@ const char descriptor_table_protodef_remote_2fethbackend_2eproto[] PROTOBUF_SECT "ionRequest\"\035\n\017NetVersionReply\022\n\n\002id\030\001 \001(" "\004\"\025\n\023NetPeerCountRequest\"\"\n\021NetPeerCount" "Reply\022\r\n\005count\030\001 \001(\004\"-\n\027EngineGetPayload" - "Request\022\022\n\npayload_id\030\001 \001(\004\"1\n\033EngineGet" - "BlobsBundleRequest\022\022\n\npayload_id\030\001 \001(\004\"}" - "\n\023EnginePayloadStatus\022$\n\006status\030\001 \001(\0162\024." - "remote.EngineStatus\022&\n\021latest_valid_hash" - "\030\002 \001(\0132\013.types.H256\022\030\n\020validation_error\030" - "\003 \001(\t\"\265\001\n\027EnginePayloadAttributes\022\017\n\007ver" - "sion\030\001 \001(\r\022\021\n\ttimestamp\030\002 \001(\004\022 \n\013prev_ra" - "ndao\030\003 \001(\0132\013.types.H256\022,\n\027suggested_fee" - "_recipient\030\004 \001(\0132\013.types.H160\022&\n\013withdra" - "wals\030\005 \003(\0132\021.types.Withdrawal\"\216\001\n\025Engine" - "ForkChoiceState\022$\n\017head_block_hash\030\001 \001(\013" - "2\013.types.H256\022$\n\017safe_block_hash\030\002 \001(\0132\013" - ".types.H256\022)\n\024finalized_block_hash\030\003 \001(" - "\0132\013.types.H256\"\226\001\n\036EngineForkChoiceUpdat" - "edRequest\0227\n\020forkchoice_state\030\001 \001(\0132\035.re" - "mote.EngineForkChoiceState\022;\n\022payload_at" - "tributes\030\002 \001(\0132\037.remote.EnginePayloadAtt" - "ributes\"j\n\037EngineForkChoiceUpdatedRespon" - "se\0223\n\016payload_status\030\001 \001(\0132\033.remote.Engi" - "nePayloadStatus\022\022\n\npayload_id\030\002 \001(\004\"p\n\030E" - "ngineGetPayloadResponse\0222\n\021execution_pay" - "load\030\001 \001(\0132\027.types.ExecutionPayload\022 \n\013b" - "lock_value\030\002 \001(\0132\013.types.H256\"\030\n\026Protoco" - "lVersionRequest\"\"\n\024ProtocolVersionReply\022" - "\n\n\002id\030\001 \001(\004\"\026\n\024ClientVersionRequest\"\'\n\022C" - "lientVersionReply\022\021\n\tnode_name\030\001 \001(\t\"/\n\020" - "SubscribeRequest\022\033\n\004type\030\001 \001(\0162\r.remote." - "Event\";\n\016SubscribeReply\022\033\n\004type\030\001 \001(\0162\r." - "remote.Event\022\014\n\004data\030\002 \001(\014\"{\n\021LogsFilter" - "Request\022\025\n\rall_addresses\030\001 \001(\010\022\036\n\taddres" - "ses\030\002 \003(\0132\013.types.H160\022\022\n\nall_topics\030\003 \001" - "(\010\022\033\n\006topics\030\004 \003(\0132\013.types.H256\"\372\001\n\022Subs" - "cribeLogsReply\022\034\n\007address\030\001 \001(\0132\013.types." - "H160\022\037\n\nblock_hash\030\002 \001(\0132\013.types.H256\022\024\n" - "\014block_number\030\003 \001(\004\022\014\n\004data\030\004 \001(\014\022\021\n\tlog" - "_index\030\005 \001(\004\022\033\n\006topics\030\006 \003(\0132\013.types.H25" - "6\022%\n\020transaction_hash\030\007 \001(\0132\013.types.H256" - "\022\031\n\021transaction_index\030\010 \001(\004\022\017\n\007removed\030\t" - " \001(\010\"E\n\014BlockRequest\022\024\n\014block_height\030\002 \001" - "(\004\022\037\n\nblock_hash\030\003 \001(\0132\013.types.H256\"0\n\nB" - "lockReply\022\021\n\tblock_rlp\030\001 \001(\014\022\017\n\007senders\030" - "\002 \001(\014\"1\n\020TxnLookupRequest\022\035\n\010txn_hash\030\001 " - "\001(\0132\013.types.H256\"&\n\016TxnLookupReply\022\024\n\014bl" - "ock_number\030\001 \001(\004\"!\n\020NodesInfoRequest\022\r\n\005" - "limit\030\001 \001(\r\":\n\016NodesInfoReply\022(\n\nnodes_i" - "nfo\030\001 \003(\0132\024.types.NodeInfoReply\",\n\nPeers" - "Reply\022\036\n\005peers\030\001 \003(\0132\017.types.PeerInfo\"&\n" - "\021PendingBlockReply\022\021\n\tblock_rlp\030\001 \001(\014\"D\n" - "%EngineGetPayloadBodiesByHashV1Request\022\033" - "\n\006hashes\030\001 \003(\0132\013.types.H256\"F\n&EngineGet" - "PayloadBodiesByRangeV1Request\022\r\n\005start\030\001" - " \001(\004\022\r\n\005count\030\002 \001(\004\"Q\n EngineGetPayloadB" - "odiesV1Response\022-\n\006bodies\030\001 \003(\0132\035.types." - "ExecutionPayloadBodyV1*J\n\005Event\022\n\n\006HEADE" - "R\020\000\022\020\n\014PENDING_LOGS\020\001\022\021\n\rPENDING_BLOCK\020\002" - "\022\020\n\014NEW_SNAPSHOT\020\003*Y\n\014EngineStatus\022\t\n\005VA" - "LID\020\000\022\013\n\007INVALID\020\001\022\013\n\007SYNCING\020\002\022\014\n\010ACCEP" - "TED\020\003\022\026\n\022INVALID_BLOCK_HASH\020\0042\270\013\n\nETHBAC" - "KEND\022=\n\tEtherbase\022\030.remote.EtherbaseRequ" - "est\032\026.remote.EtherbaseReply\022@\n\nNetVersio" - "n\022\031.remote.NetVersionRequest\032\027.remote.Ne" - "tVersionReply\022F\n\014NetPeerCount\022\033.remote.N" - "etPeerCountRequest\032\031.remote.NetPeerCount" - "Reply\022H\n\020EngineNewPayload\022\027.types.Execut" - "ionPayload\032\033.remote.EnginePayloadStatus\022" - "j\n\027EngineForkChoiceUpdated\022&.remote.Engi" - "neForkChoiceUpdatedRequest\032\'.remote.Engi" - "neForkChoiceUpdatedResponse\022U\n\020EngineGet" - "Payload\022\037.remote.EngineGetPayloadRequest" - "\032 .remote.EngineGetPayloadResponse\022y\n\036En" - "gineGetPayloadBodiesByHashV1\022-.remote.En" - "gineGetPayloadBodiesByHashV1Request\032(.re" - "mote.EngineGetPayloadBodiesV1Response\022{\n" - "\037EngineGetPayloadBodiesByRangeV1\022..remot" - "e.EngineGetPayloadBodiesByRangeV1Request" - "\032(.remote.EngineGetPayloadBodiesV1Respon" - "se\022S\n\026EngineGetBlobsBundleV1\022#.remote.En" - "gineGetBlobsBundleRequest\032\024.types.BlobsB" - "undleV1\0226\n\007Version\022\026.google.protobuf.Emp" - "ty\032\023.types.VersionReply\022O\n\017ProtocolVersi" - "on\022\036.remote.ProtocolVersionRequest\032\034.rem" - "ote.ProtocolVersionReply\022I\n\rClientVersio" - "n\022\034.remote.ClientVersionRequest\032\032.remote" - ".ClientVersionReply\022\?\n\tSubscribe\022\030.remot" - "e.SubscribeRequest\032\026.remote.SubscribeRep" - "ly0\001\022J\n\rSubscribeLogs\022\031.remote.LogsFilte" - "rRequest\032\032.remote.SubscribeLogsReply(\0010\001" - "\0221\n\005Block\022\024.remote.BlockRequest\032\022.remote" - ".BlockReply\022=\n\tTxnLookup\022\030.remote.TxnLoo" - "kupRequest\032\026.remote.TxnLookupReply\022<\n\010No" - "deInfo\022\030.remote.NodesInfoRequest\032\026.remot" - "e.NodesInfoReply\0223\n\005Peers\022\026.google.proto" - "buf.Empty\032\022.remote.PeersReply\022A\n\014Pending" - "Block\022\026.google.protobuf.Empty\032\031.remote.P" - "endingBlockReplyB\021Z\017./remote;remoteb\006pro" - "to3" + "Request\022\022\n\npayload_id\030\001 \001(\004\"}\n\023EnginePay" + "loadStatus\022$\n\006status\030\001 \001(\0162\024.remote.Engi" + "neStatus\022&\n\021latest_valid_hash\030\002 \001(\0132\013.ty" + "pes.H256\022\030\n\020validation_error\030\003 \001(\t\"\265\001\n\027E" + "nginePayloadAttributes\022\017\n\007version\030\001 \001(\r\022" + "\021\n\ttimestamp\030\002 \001(\004\022 \n\013prev_randao\030\003 \001(\0132" + "\013.types.H256\022,\n\027suggested_fee_recipient\030" + "\004 \001(\0132\013.types.H160\022&\n\013withdrawals\030\005 \003(\0132" + "\021.types.Withdrawal\"\216\001\n\025EngineForkChoiceS" + "tate\022$\n\017head_block_hash\030\001 \001(\0132\013.types.H2" + "56\022$\n\017safe_block_hash\030\002 \001(\0132\013.types.H256" + "\022)\n\024finalized_block_hash\030\003 \001(\0132\013.types.H" + "256\"\226\001\n\036EngineForkChoiceUpdatedRequest\0227" + "\n\020forkchoice_state\030\001 \001(\0132\035.remote.Engine" + "ForkChoiceState\022;\n\022payload_attributes\030\002 " + "\001(\0132\037.remote.EnginePayloadAttributes\"j\n\037" + "EngineForkChoiceUpdatedResponse\0223\n\016paylo" + "ad_status\030\001 \001(\0132\033.remote.EnginePayloadSt" + "atus\022\022\n\npayload_id\030\002 \001(\004\"\234\001\n\030EngineGetPa" + "yloadResponse\0222\n\021execution_payload\030\001 \001(\013" + "2\027.types.ExecutionPayload\022 \n\013block_value" + "\030\002 \001(\0132\013.types.H256\022*\n\014blobs_bundle\030\003 \001(" + "\0132\024.types.BlobsBundleV1\"\030\n\026ProtocolVersi" + "onRequest\"\"\n\024ProtocolVersionReply\022\n\n\002id\030" + "\001 \001(\004\"\026\n\024ClientVersionRequest\"\'\n\022ClientV" + "ersionReply\022\021\n\tnode_name\030\001 \001(\t\"/\n\020Subscr" + "ibeRequest\022\033\n\004type\030\001 \001(\0162\r.remote.Event\"" + ";\n\016SubscribeReply\022\033\n\004type\030\001 \001(\0162\r.remote" + ".Event\022\014\n\004data\030\002 \001(\014\"{\n\021LogsFilterReques" + "t\022\025\n\rall_addresses\030\001 \001(\010\022\036\n\taddresses\030\002 " + "\003(\0132\013.types.H160\022\022\n\nall_topics\030\003 \001(\010\022\033\n\006" + "topics\030\004 \003(\0132\013.types.H256\"\372\001\n\022SubscribeL" + "ogsReply\022\034\n\007address\030\001 \001(\0132\013.types.H160\022\037" + "\n\nblock_hash\030\002 \001(\0132\013.types.H256\022\024\n\014block" + "_number\030\003 \001(\004\022\014\n\004data\030\004 \001(\014\022\021\n\tlog_index" + "\030\005 \001(\004\022\033\n\006topics\030\006 \003(\0132\013.types.H256\022%\n\020t" + "ransaction_hash\030\007 \001(\0132\013.types.H256\022\031\n\021tr" + "ansaction_index\030\010 \001(\004\022\017\n\007removed\030\t \001(\010\"E" + "\n\014BlockRequest\022\024\n\014block_height\030\002 \001(\004\022\037\n\n" + "block_hash\030\003 \001(\0132\013.types.H256\"0\n\nBlockRe" + "ply\022\021\n\tblock_rlp\030\001 \001(\014\022\017\n\007senders\030\002 \001(\014\"" + "1\n\020TxnLookupRequest\022\035\n\010txn_hash\030\001 \001(\0132\013." + "types.H256\"&\n\016TxnLookupReply\022\024\n\014block_nu" + "mber\030\001 \001(\004\"!\n\020NodesInfoRequest\022\r\n\005limit\030" + "\001 \001(\r\":\n\016NodesInfoReply\022(\n\nnodes_info\030\001 " + "\003(\0132\024.types.NodeInfoReply\",\n\nPeersReply\022" + "\036\n\005peers\030\001 \003(\0132\017.types.PeerInfo\"&\n\021Pendi" + "ngBlockReply\022\021\n\tblock_rlp\030\001 \001(\014\"D\n%Engin" + "eGetPayloadBodiesByHashV1Request\022\033\n\006hash" + "es\030\001 \003(\0132\013.types.H256\"F\n&EngineGetPayloa" + "dBodiesByRangeV1Request\022\r\n\005start\030\001 \001(\004\022\r" + "\n\005count\030\002 \001(\004\"Q\n EngineGetPayloadBodiesV" + "1Response\022-\n\006bodies\030\001 \003(\0132\035.types.Execut" + "ionPayloadBodyV1*J\n\005Event\022\n\n\006HEADER\020\000\022\020\n" + "\014PENDING_LOGS\020\001\022\021\n\rPENDING_BLOCK\020\002\022\020\n\014NE" + "W_SNAPSHOT\020\003*Y\n\014EngineStatus\022\t\n\005VALID\020\000\022" + "\013\n\007INVALID\020\001\022\013\n\007SYNCING\020\002\022\014\n\010ACCEPTED\020\003\022" + "\026\n\022INVALID_BLOCK_HASH\020\0042\303\013\n\nETHBACKEND\022=" + "\n\tEtherbase\022\030.remote.EtherbaseRequest\032\026." + "remote.EtherbaseReply\022@\n\nNetVersion\022\031.re" + "mote.NetVersionRequest\032\027.remote.NetVersi" + "onReply\022F\n\014NetPeerCount\022\033.remote.NetPeer" + "CountRequest\032\031.remote.NetPeerCountReply\022" + "H\n\020EngineNewPayload\022\027.types.ExecutionPay" + "load\032\033.remote.EnginePayloadStatus\022j\n\027Eng" + "ineForkChoiceUpdated\022&.remote.EngineFork" + "ChoiceUpdatedRequest\032\'.remote.EngineFork" + "ChoiceUpdatedResponse\022U\n\020EngineGetPayloa" + "d\022\037.remote.EngineGetPayloadRequest\032 .rem" + "ote.EngineGetPayloadResponse\022y\n\036EngineGe" + "tPayloadBodiesByHashV1\022-.remote.EngineGe" + "tPayloadBodiesByHashV1Request\032(.remote.E" + "ngineGetPayloadBodiesV1Response\022{\n\037Engin" + "eGetPayloadBodiesByRangeV1\022..remote.Engi" + "neGetPayloadBodiesByRangeV1Request\032(.rem" + "ote.EngineGetPayloadBodiesV1Response\022^\n\031" + "EngineGetPayloadWithBlobs\022\037.remote.Engin" + "eGetPayloadRequest\032 .remote.EngineGetPay" + "loadResponse\0226\n\007Version\022\026.google.protobu" + "f.Empty\032\023.types.VersionReply\022O\n\017Protocol" + "Version\022\036.remote.ProtocolVersionRequest\032" + "\034.remote.ProtocolVersionReply\022I\n\rClientV" + "ersion\022\034.remote.ClientVersionRequest\032\032.r" + "emote.ClientVersionReply\022\?\n\tSubscribe\022\030." + "remote.SubscribeRequest\032\026.remote.Subscri" + "beReply0\001\022J\n\rSubscribeLogs\022\031.remote.Logs" + "FilterRequest\032\032.remote.SubscribeLogsRepl" + "y(\0010\001\0221\n\005Block\022\024.remote.BlockRequest\032\022.r" + "emote.BlockReply\022=\n\tTxnLookup\022\030.remote.T" + "xnLookupRequest\032\026.remote.TxnLookupReply\022" + "<\n\010NodeInfo\022\030.remote.NodesInfoRequest\032\026." + "remote.NodesInfoReply\0223\n\005Peers\022\026.google." + "protobuf.Empty\032\022.remote.PeersReply\022A\n\014Pe" + "ndingBlock\022\026.google.protobuf.Empty\032\031.rem" + "ote.PendingBlockReplyB\021Z\017./remote;remote" + "b\006proto3" ; static const ::_pbi::DescriptorTable* const descriptor_table_remote_2fethbackend_2eproto_deps[2] = { &::descriptor_table_google_2fprotobuf_2fempty_2eproto, @@ -908,9 +888,9 @@ static const ::_pbi::DescriptorTable* const descriptor_table_remote_2fethbackend }; static ::_pbi::once_flag descriptor_table_remote_2fethbackend_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_remote_2fethbackend_2eproto = { - false, false, 4083, descriptor_table_protodef_remote_2fethbackend_2eproto, + false, false, 4088, descriptor_table_protodef_remote_2fethbackend_2eproto, "remote/ethbackend.proto", - &descriptor_table_remote_2fethbackend_2eproto_once, descriptor_table_remote_2fethbackend_2eproto_deps, 2, 33, + &descriptor_table_remote_2fethbackend_2eproto_once, descriptor_table_remote_2fethbackend_2eproto_deps, 2, 32, schemas, file_default_instances, TableStruct_remote_2fethbackend_2eproto::offsets, file_level_metadata_remote_2fethbackend_2eproto, file_level_enum_descriptors_remote_2fethbackend_2eproto, file_level_service_descriptors_remote_2fethbackend_2eproto, @@ -1811,184 +1791,6 @@ ::PROTOBUF_NAMESPACE_ID::Metadata EngineGetPayloadRequest::GetMetadata() const { // =================================================================== -class EngineGetBlobsBundleRequest::_Internal { - public: -}; - -EngineGetBlobsBundleRequest::EngineGetBlobsBundleRequest(::PROTOBUF_NAMESPACE_ID::Arena* arena, - bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(arena, is_message_owned); - // @@protoc_insertion_point(arena_constructor:remote.EngineGetBlobsBundleRequest) -} -EngineGetBlobsBundleRequest::EngineGetBlobsBundleRequest(const EngineGetBlobsBundleRequest& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { - EngineGetBlobsBundleRequest* const _this = this; (void)_this; - new (&_impl_) Impl_{ - decltype(_impl_.payload_id_){} - , /*decltype(_impl_._cached_size_)*/{}}; - - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - _this->_impl_.payload_id_ = from._impl_.payload_id_; - // @@protoc_insertion_point(copy_constructor:remote.EngineGetBlobsBundleRequest) -} - -inline void EngineGetBlobsBundleRequest::SharedCtor( - ::_pb::Arena* arena, bool is_message_owned) { - (void)arena; - (void)is_message_owned; - new (&_impl_) Impl_{ - decltype(_impl_.payload_id_){uint64_t{0u}} - , /*decltype(_impl_._cached_size_)*/{} - }; -} - -EngineGetBlobsBundleRequest::~EngineGetBlobsBundleRequest() { - // @@protoc_insertion_point(destructor:remote.EngineGetBlobsBundleRequest) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { - (void)arena; - return; - } - SharedDtor(); -} - -inline void EngineGetBlobsBundleRequest::SharedDtor() { - GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); -} - -void EngineGetBlobsBundleRequest::SetCachedSize(int size) const { - _impl_._cached_size_.Set(size); -} - -void EngineGetBlobsBundleRequest::Clear() { -// @@protoc_insertion_point(message_clear_start:remote.EngineGetBlobsBundleRequest) - uint32_t cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - _impl_.payload_id_ = uint64_t{0u}; - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); -} - -const char* EngineGetBlobsBundleRequest::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - uint32_t tag; - ptr = ::_pbi::ReadTag(ptr, &tag); - switch (tag >> 3) { - // uint64 payload_id = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 8)) { - _impl_.payload_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); - CHK_(ptr); - } else - goto handle_unusual; - continue; - default: - goto handle_unusual; - } // switch - handle_unusual: - if ((tag == 0) || ((tag & 7) == 4)) { - CHK_(ptr); - ctx->SetLastTag(tag); - goto message_done; - } - ptr = UnknownFieldParse( - tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), - ptr, ctx); - CHK_(ptr != nullptr); - } // while -message_done: - return ptr; -failure: - ptr = nullptr; - goto message_done; -#undef CHK_ -} - -uint8_t* EngineGetBlobsBundleRequest::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:remote.EngineGetBlobsBundleRequest) - uint32_t cached_has_bits = 0; - (void) cached_has_bits; - - // uint64 payload_id = 1; - if (this->_internal_payload_id() != 0) { - target = stream->EnsureSpace(target); - target = ::_pbi::WireFormatLite::WriteUInt64ToArray(1, this->_internal_payload_id(), target); - } - - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); - } - // @@protoc_insertion_point(serialize_to_array_end:remote.EngineGetBlobsBundleRequest) - return target; -} - -size_t EngineGetBlobsBundleRequest::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:remote.EngineGetBlobsBundleRequest) - size_t total_size = 0; - - uint32_t cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - // uint64 payload_id = 1; - if (this->_internal_payload_id() != 0) { - total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_payload_id()); - } - - return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); -} - -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EngineGetBlobsBundleRequest::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, - EngineGetBlobsBundleRequest::MergeImpl -}; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EngineGetBlobsBundleRequest::GetClassData() const { return &_class_data_; } - - -void EngineGetBlobsBundleRequest::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { - auto* const _this = static_cast(&to_msg); - auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:remote.EngineGetBlobsBundleRequest) - GOOGLE_DCHECK_NE(&from, _this); - uint32_t cached_has_bits = 0; - (void) cached_has_bits; - - if (from._internal_payload_id() != 0) { - _this->_internal_set_payload_id(from._internal_payload_id()); - } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); -} - -void EngineGetBlobsBundleRequest::CopyFrom(const EngineGetBlobsBundleRequest& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:remote.EngineGetBlobsBundleRequest) - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool EngineGetBlobsBundleRequest::IsInitialized() const { - return true; -} - -void EngineGetBlobsBundleRequest::InternalSwap(EngineGetBlobsBundleRequest* other) { - using std::swap; - _internal_metadata_.InternalSwap(&other->_internal_metadata_); - swap(_impl_.payload_id_, other->_impl_.payload_id_); -} - -::PROTOBUF_NAMESPACE_ID::Metadata EngineGetBlobsBundleRequest::GetMetadata() const { - return ::_pbi::AssignDescriptors( - &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[7]); -} - -// =================================================================== - class EnginePayloadStatus::_Internal { public: static const ::types::H256& latest_valid_hash(const EnginePayloadStatus* msg); @@ -2269,7 +2071,7 @@ void EnginePayloadStatus::InternalSwap(EnginePayloadStatus* other) { ::PROTOBUF_NAMESPACE_ID::Metadata EnginePayloadStatus::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[8]); + file_level_metadata_remote_2fethbackend_2eproto[7]); } // =================================================================== @@ -2611,7 +2413,7 @@ void EnginePayloadAttributes::InternalSwap(EnginePayloadAttributes* other) { ::PROTOBUF_NAMESPACE_ID::Metadata EnginePayloadAttributes::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[9]); + file_level_metadata_remote_2fethbackend_2eproto[8]); } // =================================================================== @@ -2909,7 +2711,7 @@ void EngineForkChoiceState::InternalSwap(EngineForkChoiceState* other) { ::PROTOBUF_NAMESPACE_ID::Metadata EngineForkChoiceState::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[10]); + file_level_metadata_remote_2fethbackend_2eproto[9]); } // =================================================================== @@ -3148,7 +2950,7 @@ void EngineForkChoiceUpdatedRequest::InternalSwap(EngineForkChoiceUpdatedRequest ::PROTOBUF_NAMESPACE_ID::Metadata EngineForkChoiceUpdatedRequest::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[11]); + file_level_metadata_remote_2fethbackend_2eproto[10]); } // =================================================================== @@ -3372,7 +3174,7 @@ void EngineForkChoiceUpdatedResponse::InternalSwap(EngineForkChoiceUpdatedRespon ::PROTOBUF_NAMESPACE_ID::Metadata EngineForkChoiceUpdatedResponse::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[12]); + file_level_metadata_remote_2fethbackend_2eproto[11]); } // =================================================================== @@ -3381,6 +3183,7 @@ class EngineGetPayloadResponse::_Internal { public: static const ::types::ExecutionPayload& execution_payload(const EngineGetPayloadResponse* msg); static const ::types::H256& block_value(const EngineGetPayloadResponse* msg); + static const ::types::BlobsBundleV1& blobs_bundle(const EngineGetPayloadResponse* msg); }; const ::types::ExecutionPayload& @@ -3391,6 +3194,10 @@ const ::types::H256& EngineGetPayloadResponse::_Internal::block_value(const EngineGetPayloadResponse* msg) { return *msg->_impl_.block_value_; } +const ::types::BlobsBundleV1& +EngineGetPayloadResponse::_Internal::blobs_bundle(const EngineGetPayloadResponse* msg) { + return *msg->_impl_.blobs_bundle_; +} void EngineGetPayloadResponse::clear_execution_payload() { if (GetArenaForAllocation() == nullptr && _impl_.execution_payload_ != nullptr) { delete _impl_.execution_payload_; @@ -3403,6 +3210,12 @@ void EngineGetPayloadResponse::clear_block_value() { } _impl_.block_value_ = nullptr; } +void EngineGetPayloadResponse::clear_blobs_bundle() { + if (GetArenaForAllocation() == nullptr && _impl_.blobs_bundle_ != nullptr) { + delete _impl_.blobs_bundle_; + } + _impl_.blobs_bundle_ = nullptr; +} EngineGetPayloadResponse::EngineGetPayloadResponse(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { @@ -3415,6 +3228,7 @@ EngineGetPayloadResponse::EngineGetPayloadResponse(const EngineGetPayloadRespons new (&_impl_) Impl_{ decltype(_impl_.execution_payload_){nullptr} , decltype(_impl_.block_value_){nullptr} + , decltype(_impl_.blobs_bundle_){nullptr} , /*decltype(_impl_._cached_size_)*/{}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); @@ -3424,6 +3238,9 @@ EngineGetPayloadResponse::EngineGetPayloadResponse(const EngineGetPayloadRespons if (from._internal_has_block_value()) { _this->_impl_.block_value_ = new ::types::H256(*from._impl_.block_value_); } + if (from._internal_has_blobs_bundle()) { + _this->_impl_.blobs_bundle_ = new ::types::BlobsBundleV1(*from._impl_.blobs_bundle_); + } // @@protoc_insertion_point(copy_constructor:remote.EngineGetPayloadResponse) } @@ -3434,6 +3251,7 @@ inline void EngineGetPayloadResponse::SharedCtor( new (&_impl_) Impl_{ decltype(_impl_.execution_payload_){nullptr} , decltype(_impl_.block_value_){nullptr} + , decltype(_impl_.blobs_bundle_){nullptr} , /*decltype(_impl_._cached_size_)*/{} }; } @@ -3451,6 +3269,7 @@ inline void EngineGetPayloadResponse::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); if (this != internal_default_instance()) delete _impl_.execution_payload_; if (this != internal_default_instance()) delete _impl_.block_value_; + if (this != internal_default_instance()) delete _impl_.blobs_bundle_; } void EngineGetPayloadResponse::SetCachedSize(int size) const { @@ -3471,6 +3290,10 @@ void EngineGetPayloadResponse::Clear() { delete _impl_.block_value_; } _impl_.block_value_ = nullptr; + if (GetArenaForAllocation() == nullptr && _impl_.blobs_bundle_ != nullptr) { + delete _impl_.blobs_bundle_; + } + _impl_.blobs_bundle_ = nullptr; _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -3496,6 +3319,14 @@ const char* EngineGetPayloadResponse::_InternalParse(const char* ptr, ::_pbi::Pa } else goto handle_unusual; continue; + // .types.BlobsBundleV1 blobs_bundle = 3; + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { + ptr = ctx->ParseMessage(_internal_mutable_blobs_bundle(), ptr); + CHK_(ptr); + } else + goto handle_unusual; + continue; default: goto handle_unusual; } // switch @@ -3539,6 +3370,13 @@ uint8_t* EngineGetPayloadResponse::_InternalSerialize( _Internal::block_value(this).GetCachedSize(), target, stream); } + // .types.BlobsBundleV1 blobs_bundle = 3; + if (this->_internal_has_blobs_bundle()) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessage(3, _Internal::blobs_bundle(this), + _Internal::blobs_bundle(this).GetCachedSize(), target, stream); + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); @@ -3569,6 +3407,13 @@ size_t EngineGetPayloadResponse::ByteSizeLong() const { *_impl_.block_value_); } + // .types.BlobsBundleV1 blobs_bundle = 3; + if (this->_internal_has_blobs_bundle()) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + *_impl_.blobs_bundle_); + } + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -3595,6 +3440,10 @@ void EngineGetPayloadResponse::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_ms _this->_internal_mutable_block_value()->::types::H256::MergeFrom( from._internal_block_value()); } + if (from._internal_has_blobs_bundle()) { + _this->_internal_mutable_blobs_bundle()->::types::BlobsBundleV1::MergeFrom( + from._internal_blobs_bundle()); + } _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -3613,8 +3462,8 @@ void EngineGetPayloadResponse::InternalSwap(EngineGetPayloadResponse* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(EngineGetPayloadResponse, _impl_.block_value_) - + sizeof(EngineGetPayloadResponse::_impl_.block_value_) + PROTOBUF_FIELD_OFFSET(EngineGetPayloadResponse, _impl_.blobs_bundle_) + + sizeof(EngineGetPayloadResponse::_impl_.blobs_bundle_) - PROTOBUF_FIELD_OFFSET(EngineGetPayloadResponse, _impl_.execution_payload_)>( reinterpret_cast(&_impl_.execution_payload_), reinterpret_cast(&other->_impl_.execution_payload_)); @@ -3623,7 +3472,7 @@ void EngineGetPayloadResponse::InternalSwap(EngineGetPayloadResponse* other) { ::PROTOBUF_NAMESPACE_ID::Metadata EngineGetPayloadResponse::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[13]); + file_level_metadata_remote_2fethbackend_2eproto[12]); } // =================================================================== @@ -3663,7 +3512,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ProtocolVersionRequest::GetCla ::PROTOBUF_NAMESPACE_ID::Metadata ProtocolVersionRequest::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[14]); + file_level_metadata_remote_2fethbackend_2eproto[13]); } // =================================================================== @@ -3841,7 +3690,7 @@ void ProtocolVersionReply::InternalSwap(ProtocolVersionReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata ProtocolVersionReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[15]); + file_level_metadata_remote_2fethbackend_2eproto[14]); } // =================================================================== @@ -3881,7 +3730,7 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ClientVersionRequest::GetClass ::PROTOBUF_NAMESPACE_ID::Metadata ClientVersionRequest::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[16]); + file_level_metadata_remote_2fethbackend_2eproto[15]); } // =================================================================== @@ -4084,7 +3933,7 @@ void ClientVersionReply::InternalSwap(ClientVersionReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata ClientVersionReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[17]); + file_level_metadata_remote_2fethbackend_2eproto[16]); } // =================================================================== @@ -4265,7 +4114,7 @@ void SubscribeRequest::InternalSwap(SubscribeRequest* other) { ::PROTOBUF_NAMESPACE_ID::Metadata SubscribeRequest::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[18]); + file_level_metadata_remote_2fethbackend_2eproto[17]); } // =================================================================== @@ -4493,7 +4342,7 @@ void SubscribeReply::InternalSwap(SubscribeReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata SubscribeReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[19]); + file_level_metadata_remote_2fethbackend_2eproto[18]); } // =================================================================== @@ -4778,7 +4627,7 @@ void LogsFilterRequest::InternalSwap(LogsFilterRequest* other) { ::PROTOBUF_NAMESPACE_ID::Metadata LogsFilterRequest::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[20]); + file_level_metadata_remote_2fethbackend_2eproto[19]); } // =================================================================== @@ -5262,7 +5111,7 @@ void SubscribeLogsReply::InternalSwap(SubscribeLogsReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata SubscribeLogsReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[21]); + file_level_metadata_remote_2fethbackend_2eproto[20]); } // =================================================================== @@ -5492,7 +5341,7 @@ void BlockRequest::InternalSwap(BlockRequest* other) { ::PROTOBUF_NAMESPACE_ID::Metadata BlockRequest::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[22]); + file_level_metadata_remote_2fethbackend_2eproto[21]); } // =================================================================== @@ -5735,7 +5584,7 @@ void BlockReply::InternalSwap(BlockReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata BlockReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[23]); + file_level_metadata_remote_2fethbackend_2eproto[22]); } // =================================================================== @@ -5934,7 +5783,7 @@ void TxnLookupRequest::InternalSwap(TxnLookupRequest* other) { ::PROTOBUF_NAMESPACE_ID::Metadata TxnLookupRequest::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[24]); + file_level_metadata_remote_2fethbackend_2eproto[23]); } // =================================================================== @@ -6112,7 +5961,7 @@ void TxnLookupReply::InternalSwap(TxnLookupReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata TxnLookupReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[25]); + file_level_metadata_remote_2fethbackend_2eproto[24]); } // =================================================================== @@ -6290,7 +6139,7 @@ void NodesInfoRequest::InternalSwap(NodesInfoRequest* other) { ::PROTOBUF_NAMESPACE_ID::Metadata NodesInfoRequest::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[26]); + file_level_metadata_remote_2fethbackend_2eproto[25]); } // =================================================================== @@ -6478,7 +6327,7 @@ void NodesInfoReply::InternalSwap(NodesInfoReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata NodesInfoReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[27]); + file_level_metadata_remote_2fethbackend_2eproto[26]); } // =================================================================== @@ -6666,7 +6515,7 @@ void PeersReply::InternalSwap(PeersReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata PeersReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[28]); + file_level_metadata_remote_2fethbackend_2eproto[27]); } // =================================================================== @@ -6864,7 +6713,7 @@ void PendingBlockReply::InternalSwap(PendingBlockReply* other) { ::PROTOBUF_NAMESPACE_ID::Metadata PendingBlockReply::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[29]); + file_level_metadata_remote_2fethbackend_2eproto[28]); } // =================================================================== @@ -7052,7 +6901,7 @@ void EngineGetPayloadBodiesByHashV1Request::InternalSwap(EngineGetPayloadBodiesB ::PROTOBUF_NAMESPACE_ID::Metadata EngineGetPayloadBodiesByHashV1Request::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[30]); + file_level_metadata_remote_2fethbackend_2eproto[29]); } // =================================================================== @@ -7263,7 +7112,7 @@ void EngineGetPayloadBodiesByRangeV1Request::InternalSwap(EngineGetPayloadBodies ::PROTOBUF_NAMESPACE_ID::Metadata EngineGetPayloadBodiesByRangeV1Request::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[31]); + file_level_metadata_remote_2fethbackend_2eproto[30]); } // =================================================================== @@ -7451,7 +7300,7 @@ void EngineGetPayloadBodiesV1Response::InternalSwap(EngineGetPayloadBodiesV1Resp ::PROTOBUF_NAMESPACE_ID::Metadata EngineGetPayloadBodiesV1Response::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_remote_2fethbackend_2eproto_getter, &descriptor_table_remote_2fethbackend_2eproto_once, - file_level_metadata_remote_2fethbackend_2eproto[32]); + file_level_metadata_remote_2fethbackend_2eproto[31]); } // @@protoc_insertion_point(namespace_scope) @@ -7485,10 +7334,6 @@ template<> PROTOBUF_NOINLINE ::remote::EngineGetPayloadRequest* Arena::CreateMaybeMessage< ::remote::EngineGetPayloadRequest >(Arena* arena) { return Arena::CreateMessageInternal< ::remote::EngineGetPayloadRequest >(arena); } -template<> PROTOBUF_NOINLINE ::remote::EngineGetBlobsBundleRequest* -Arena::CreateMaybeMessage< ::remote::EngineGetBlobsBundleRequest >(Arena* arena) { - return Arena::CreateMessageInternal< ::remote::EngineGetBlobsBundleRequest >(arena); -} template<> PROTOBUF_NOINLINE ::remote::EnginePayloadStatus* Arena::CreateMaybeMessage< ::remote::EnginePayloadStatus >(Arena* arena) { return Arena::CreateMessageInternal< ::remote::EnginePayloadStatus >(arena); diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend.pb.h b/silkworm/interfaces/3.21.4/remote/ethbackend.pb.h index 5e006e8241..35097a0760 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend.pb.h +++ b/silkworm/interfaces/3.21.4/remote/ethbackend.pb.h @@ -70,9 +70,6 @@ extern EngineForkChoiceUpdatedRequestDefaultTypeInternal _EngineForkChoiceUpdate class EngineForkChoiceUpdatedResponse; struct EngineForkChoiceUpdatedResponseDefaultTypeInternal; extern EngineForkChoiceUpdatedResponseDefaultTypeInternal _EngineForkChoiceUpdatedResponse_default_instance_; -class EngineGetBlobsBundleRequest; -struct EngineGetBlobsBundleRequestDefaultTypeInternal; -extern EngineGetBlobsBundleRequestDefaultTypeInternal _EngineGetBlobsBundleRequest_default_instance_; class EngineGetPayloadBodiesByHashV1Request; struct EngineGetPayloadBodiesByHashV1RequestDefaultTypeInternal; extern EngineGetPayloadBodiesByHashV1RequestDefaultTypeInternal _EngineGetPayloadBodiesByHashV1Request_default_instance_; @@ -157,7 +154,6 @@ template<> ::remote::ClientVersionRequest* Arena::CreateMaybeMessage<::remote::C template<> ::remote::EngineForkChoiceState* Arena::CreateMaybeMessage<::remote::EngineForkChoiceState>(Arena*); template<> ::remote::EngineForkChoiceUpdatedRequest* Arena::CreateMaybeMessage<::remote::EngineForkChoiceUpdatedRequest>(Arena*); template<> ::remote::EngineForkChoiceUpdatedResponse* Arena::CreateMaybeMessage<::remote::EngineForkChoiceUpdatedResponse>(Arena*); -template<> ::remote::EngineGetBlobsBundleRequest* Arena::CreateMaybeMessage<::remote::EngineGetBlobsBundleRequest>(Arena*); template<> ::remote::EngineGetPayloadBodiesByHashV1Request* Arena::CreateMaybeMessage<::remote::EngineGetPayloadBodiesByHashV1Request>(Arena*); template<> ::remote::EngineGetPayloadBodiesByRangeV1Request* Arena::CreateMaybeMessage<::remote::EngineGetPayloadBodiesByRangeV1Request>(Arena*); template<> ::remote::EngineGetPayloadBodiesV1Response* Arena::CreateMaybeMessage<::remote::EngineGetPayloadBodiesV1Response>(Arena*); @@ -1198,154 +1194,6 @@ class EngineGetPayloadRequest final : }; // ------------------------------------------------------------------- -class EngineGetBlobsBundleRequest final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:remote.EngineGetBlobsBundleRequest) */ { - public: - inline EngineGetBlobsBundleRequest() : EngineGetBlobsBundleRequest(nullptr) {} - ~EngineGetBlobsBundleRequest() override; - explicit PROTOBUF_CONSTEXPR EngineGetBlobsBundleRequest(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); - - EngineGetBlobsBundleRequest(const EngineGetBlobsBundleRequest& from); - EngineGetBlobsBundleRequest(EngineGetBlobsBundleRequest&& from) noexcept - : EngineGetBlobsBundleRequest() { - *this = ::std::move(from); - } - - inline EngineGetBlobsBundleRequest& operator=(const EngineGetBlobsBundleRequest& from) { - CopyFrom(from); - return *this; - } - inline EngineGetBlobsBundleRequest& operator=(EngineGetBlobsBundleRequest&& from) noexcept { - if (this == &from) return *this; - if (GetOwningArena() == from.GetOwningArena() - #ifdef PROTOBUF_FORCE_COPY_IN_MOVE - && GetOwningArena() != nullptr - #endif // !PROTOBUF_FORCE_COPY_IN_MOVE - ) { - InternalSwap(&from); - } else { - CopyFrom(from); - } - return *this; - } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return default_instance().GetMetadata().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return default_instance().GetMetadata().reflection; - } - static const EngineGetBlobsBundleRequest& default_instance() { - return *internal_default_instance(); - } - static inline const EngineGetBlobsBundleRequest* internal_default_instance() { - return reinterpret_cast( - &_EngineGetBlobsBundleRequest_default_instance_); - } - static constexpr int kIndexInFileMessages = - 7; - - friend void swap(EngineGetBlobsBundleRequest& a, EngineGetBlobsBundleRequest& b) { - a.Swap(&b); - } - inline void Swap(EngineGetBlobsBundleRequest* other) { - if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP - InternalSwap(other); - } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); - } - } - void UnsafeArenaSwap(EngineGetBlobsBundleRequest* other) { - if (other == this) return; - GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); - InternalSwap(other); - } - - // implements Message ---------------------------------------------- - - EngineGetBlobsBundleRequest* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { - return CreateMaybeMessage(arena); - } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; - void CopyFrom(const EngineGetBlobsBundleRequest& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom( const EngineGetBlobsBundleRequest& from) { - EngineGetBlobsBundleRequest::MergeImpl(*this, from); - } - private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); - public: - PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; - bool IsInitialized() const final; - - size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; - int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - - private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); - void SharedDtor(); - void SetCachedSize(int size) const final; - void InternalSwap(EngineGetBlobsBundleRequest* other); - - private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "remote.EngineGetBlobsBundleRequest"; - } - protected: - explicit EngineGetBlobsBundleRequest(::PROTOBUF_NAMESPACE_ID::Arena* arena, - bool is_message_owned = false); - public: - - static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; - - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - enum : int { - kPayloadIdFieldNumber = 1, - }; - // uint64 payload_id = 1; - void clear_payload_id(); - uint64_t payload_id() const; - void set_payload_id(uint64_t value); - private: - uint64_t _internal_payload_id() const; - void _internal_set_payload_id(uint64_t value); - public: - - // @@protoc_insertion_point(class_scope:remote.EngineGetBlobsBundleRequest) - private: - class _Internal; - - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; - struct Impl_ { - uint64_t payload_id_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - }; - union { Impl_ _impl_; }; - friend struct ::TableStruct_remote_2fethbackend_2eproto; -}; -// ------------------------------------------------------------------- - class EnginePayloadStatus final : public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:remote.EnginePayloadStatus) */ { public: @@ -1394,7 +1242,7 @@ class EnginePayloadStatus final : &_EnginePayloadStatus_default_instance_); } static constexpr int kIndexInFileMessages = - 8; + 7; friend void swap(EnginePayloadStatus& a, EnginePayloadStatus& b) { a.Swap(&b); @@ -1578,7 +1426,7 @@ class EnginePayloadAttributes final : &_EnginePayloadAttributes_default_instance_); } static constexpr int kIndexInFileMessages = - 9; + 8; friend void swap(EnginePayloadAttributes& a, EnginePayloadAttributes& b) { a.Swap(&b); @@ -1797,7 +1645,7 @@ class EngineForkChoiceState final : &_EngineForkChoiceState_default_instance_); } static constexpr int kIndexInFileMessages = - 10; + 9; friend void swap(EngineForkChoiceState& a, EngineForkChoiceState& b) { a.Swap(&b); @@ -1994,7 +1842,7 @@ class EngineForkChoiceUpdatedRequest final : &_EngineForkChoiceUpdatedRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 11; + 10; friend void swap(EngineForkChoiceUpdatedRequest& a, EngineForkChoiceUpdatedRequest& b) { a.Swap(&b); @@ -2171,7 +2019,7 @@ class EngineForkChoiceUpdatedResponse final : &_EngineForkChoiceUpdatedResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 12; + 11; friend void swap(EngineForkChoiceUpdatedResponse& a, EngineForkChoiceUpdatedResponse& b) { a.Swap(&b); @@ -2339,7 +2187,7 @@ class EngineGetPayloadResponse final : &_EngineGetPayloadResponse_default_instance_); } static constexpr int kIndexInFileMessages = - 13; + 12; friend void swap(EngineGetPayloadResponse& a, EngineGetPayloadResponse& b) { a.Swap(&b); @@ -2414,6 +2262,7 @@ class EngineGetPayloadResponse final : enum : int { kExecutionPayloadFieldNumber = 1, kBlockValueFieldNumber = 2, + kBlobsBundleFieldNumber = 3, }; // .types.ExecutionPayload execution_payload = 1; bool has_execution_payload() const; @@ -2451,6 +2300,24 @@ class EngineGetPayloadResponse final : ::types::H256* block_value); ::types::H256* unsafe_arena_release_block_value(); + // .types.BlobsBundleV1 blobs_bundle = 3; + bool has_blobs_bundle() const; + private: + bool _internal_has_blobs_bundle() const; + public: + void clear_blobs_bundle(); + const ::types::BlobsBundleV1& blobs_bundle() const; + PROTOBUF_NODISCARD ::types::BlobsBundleV1* release_blobs_bundle(); + ::types::BlobsBundleV1* mutable_blobs_bundle(); + void set_allocated_blobs_bundle(::types::BlobsBundleV1* blobs_bundle); + private: + const ::types::BlobsBundleV1& _internal_blobs_bundle() const; + ::types::BlobsBundleV1* _internal_mutable_blobs_bundle(); + public: + void unsafe_arena_set_allocated_blobs_bundle( + ::types::BlobsBundleV1* blobs_bundle); + ::types::BlobsBundleV1* unsafe_arena_release_blobs_bundle(); + // @@protoc_insertion_point(class_scope:remote.EngineGetPayloadResponse) private: class _Internal; @@ -2461,6 +2328,7 @@ class EngineGetPayloadResponse final : struct Impl_ { ::types::ExecutionPayload* execution_payload_; ::types::H256* block_value_; + ::types::BlobsBundleV1* blobs_bundle_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; @@ -2515,7 +2383,7 @@ class ProtocolVersionRequest final : &_ProtocolVersionRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 14; + 13; friend void swap(ProtocolVersionRequest& a, ProtocolVersionRequest& b) { a.Swap(&b); @@ -2634,7 +2502,7 @@ class ProtocolVersionReply final : &_ProtocolVersionReply_default_instance_); } static constexpr int kIndexInFileMessages = - 15; + 14; friend void swap(ProtocolVersionReply& a, ProtocolVersionReply& b) { a.Swap(&b); @@ -2781,7 +2649,7 @@ class ClientVersionRequest final : &_ClientVersionRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 16; + 15; friend void swap(ClientVersionRequest& a, ClientVersionRequest& b) { a.Swap(&b); @@ -2900,7 +2768,7 @@ class ClientVersionReply final : &_ClientVersionReply_default_instance_); } static constexpr int kIndexInFileMessages = - 17; + 16; friend void swap(ClientVersionReply& a, ClientVersionReply& b) { a.Swap(&b); @@ -3053,7 +2921,7 @@ class SubscribeRequest final : &_SubscribeRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 18; + 17; friend void swap(SubscribeRequest& a, SubscribeRequest& b) { a.Swap(&b); @@ -3201,7 +3069,7 @@ class SubscribeReply final : &_SubscribeReply_default_instance_); } static constexpr int kIndexInFileMessages = - 19; + 18; friend void swap(SubscribeReply& a, SubscribeReply& b) { a.Swap(&b); @@ -3365,7 +3233,7 @@ class LogsFilterRequest final : &_LogsFilterRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 20; + 19; friend void swap(LogsFilterRequest& a, LogsFilterRequest& b) { a.Swap(&b); @@ -3564,7 +3432,7 @@ class SubscribeLogsReply final : &_SubscribeLogsReply_default_instance_); } static constexpr int kIndexInFileMessages = - 21; + 20; friend void swap(SubscribeLogsReply& a, SubscribeLogsReply& b) { a.Swap(&b); @@ -3841,7 +3709,7 @@ class BlockRequest final : &_BlockRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 22; + 21; friend void swap(BlockRequest& a, BlockRequest& b) { a.Swap(&b); @@ -4009,7 +3877,7 @@ class BlockReply final : &_BlockReply_default_instance_); } static constexpr int kIndexInFileMessages = - 23; + 22; friend void swap(BlockReply& a, BlockReply& b) { a.Swap(&b); @@ -4178,7 +4046,7 @@ class TxnLookupRequest final : &_TxnLookupRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 24; + 23; friend void swap(TxnLookupRequest& a, TxnLookupRequest& b) { a.Swap(&b); @@ -4335,7 +4203,7 @@ class TxnLookupReply final : &_TxnLookupReply_default_instance_); } static constexpr int kIndexInFileMessages = - 25; + 24; friend void swap(TxnLookupReply& a, TxnLookupReply& b) { a.Swap(&b); @@ -4483,7 +4351,7 @@ class NodesInfoRequest final : &_NodesInfoRequest_default_instance_); } static constexpr int kIndexInFileMessages = - 26; + 25; friend void swap(NodesInfoRequest& a, NodesInfoRequest& b) { a.Swap(&b); @@ -4631,7 +4499,7 @@ class NodesInfoReply final : &_NodesInfoReply_default_instance_); } static constexpr int kIndexInFileMessages = - 27; + 26; friend void swap(NodesInfoReply& a, NodesInfoReply& b) { a.Swap(&b); @@ -4788,7 +4656,7 @@ class PeersReply final : &_PeersReply_default_instance_); } static constexpr int kIndexInFileMessages = - 28; + 27; friend void swap(PeersReply& a, PeersReply& b) { a.Swap(&b); @@ -4945,7 +4813,7 @@ class PendingBlockReply final : &_PendingBlockReply_default_instance_); } static constexpr int kIndexInFileMessages = - 29; + 28; friend void swap(PendingBlockReply& a, PendingBlockReply& b) { a.Swap(&b); @@ -5098,7 +4966,7 @@ class EngineGetPayloadBodiesByHashV1Request final : &_EngineGetPayloadBodiesByHashV1Request_default_instance_); } static constexpr int kIndexInFileMessages = - 30; + 29; friend void swap(EngineGetPayloadBodiesByHashV1Request& a, EngineGetPayloadBodiesByHashV1Request& b) { a.Swap(&b); @@ -5255,7 +5123,7 @@ class EngineGetPayloadBodiesByRangeV1Request final : &_EngineGetPayloadBodiesByRangeV1Request_default_instance_); } static constexpr int kIndexInFileMessages = - 31; + 30; friend void swap(EngineGetPayloadBodiesByRangeV1Request& a, EngineGetPayloadBodiesByRangeV1Request& b) { a.Swap(&b); @@ -5414,7 +5282,7 @@ class EngineGetPayloadBodiesV1Response final : &_EngineGetPayloadBodiesV1Response_default_instance_); } static constexpr int kIndexInFileMessages = - 32; + 31; friend void swap(EngineGetPayloadBodiesV1Response& a, EngineGetPayloadBodiesV1Response& b) { a.Swap(&b); @@ -5703,30 +5571,6 @@ inline void EngineGetPayloadRequest::set_payload_id(uint64_t value) { // ------------------------------------------------------------------- -// EngineGetBlobsBundleRequest - -// uint64 payload_id = 1; -inline void EngineGetBlobsBundleRequest::clear_payload_id() { - _impl_.payload_id_ = uint64_t{0u}; -} -inline uint64_t EngineGetBlobsBundleRequest::_internal_payload_id() const { - return _impl_.payload_id_; -} -inline uint64_t EngineGetBlobsBundleRequest::payload_id() const { - // @@protoc_insertion_point(field_get:remote.EngineGetBlobsBundleRequest.payload_id) - return _internal_payload_id(); -} -inline void EngineGetBlobsBundleRequest::_internal_set_payload_id(uint64_t value) { - - _impl_.payload_id_ = value; -} -inline void EngineGetBlobsBundleRequest::set_payload_id(uint64_t value) { - _internal_set_payload_id(value); - // @@protoc_insertion_point(field_set:remote.EngineGetBlobsBundleRequest.payload_id) -} - -// ------------------------------------------------------------------- - // EnginePayloadStatus // .remote.EngineStatus status = 1; @@ -6866,6 +6710,91 @@ inline void EngineGetPayloadResponse::set_allocated_block_value(::types::H256* b // @@protoc_insertion_point(field_set_allocated:remote.EngineGetPayloadResponse.block_value) } +// .types.BlobsBundleV1 blobs_bundle = 3; +inline bool EngineGetPayloadResponse::_internal_has_blobs_bundle() const { + return this != internal_default_instance() && _impl_.blobs_bundle_ != nullptr; +} +inline bool EngineGetPayloadResponse::has_blobs_bundle() const { + return _internal_has_blobs_bundle(); +} +inline const ::types::BlobsBundleV1& EngineGetPayloadResponse::_internal_blobs_bundle() const { + const ::types::BlobsBundleV1* p = _impl_.blobs_bundle_; + return p != nullptr ? *p : reinterpret_cast( + ::types::_BlobsBundleV1_default_instance_); +} +inline const ::types::BlobsBundleV1& EngineGetPayloadResponse::blobs_bundle() const { + // @@protoc_insertion_point(field_get:remote.EngineGetPayloadResponse.blobs_bundle) + return _internal_blobs_bundle(); +} +inline void EngineGetPayloadResponse::unsafe_arena_set_allocated_blobs_bundle( + ::types::BlobsBundleV1* blobs_bundle) { + if (GetArenaForAllocation() == nullptr) { + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.blobs_bundle_); + } + _impl_.blobs_bundle_ = blobs_bundle; + if (blobs_bundle) { + + } else { + + } + // @@protoc_insertion_point(field_unsafe_arena_set_allocated:remote.EngineGetPayloadResponse.blobs_bundle) +} +inline ::types::BlobsBundleV1* EngineGetPayloadResponse::release_blobs_bundle() { + + ::types::BlobsBundleV1* temp = _impl_.blobs_bundle_; + _impl_.blobs_bundle_ = nullptr; +#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + if (GetArenaForAllocation() == nullptr) { delete old; } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE + if (GetArenaForAllocation() != nullptr) { + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + } +#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE + return temp; +} +inline ::types::BlobsBundleV1* EngineGetPayloadResponse::unsafe_arena_release_blobs_bundle() { + // @@protoc_insertion_point(field_release:remote.EngineGetPayloadResponse.blobs_bundle) + + ::types::BlobsBundleV1* temp = _impl_.blobs_bundle_; + _impl_.blobs_bundle_ = nullptr; + return temp; +} +inline ::types::BlobsBundleV1* EngineGetPayloadResponse::_internal_mutable_blobs_bundle() { + + if (_impl_.blobs_bundle_ == nullptr) { + auto* p = CreateMaybeMessage<::types::BlobsBundleV1>(GetArenaForAllocation()); + _impl_.blobs_bundle_ = p; + } + return _impl_.blobs_bundle_; +} +inline ::types::BlobsBundleV1* EngineGetPayloadResponse::mutable_blobs_bundle() { + ::types::BlobsBundleV1* _msg = _internal_mutable_blobs_bundle(); + // @@protoc_insertion_point(field_mutable:remote.EngineGetPayloadResponse.blobs_bundle) + return _msg; +} +inline void EngineGetPayloadResponse::set_allocated_blobs_bundle(::types::BlobsBundleV1* blobs_bundle) { + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.blobs_bundle_); + } + if (blobs_bundle) { + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena( + reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(blobs_bundle)); + if (message_arena != submessage_arena) { + blobs_bundle = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + message_arena, blobs_bundle, submessage_arena); + } + + } else { + + } + _impl_.blobs_bundle_ = blobs_bundle; + // @@protoc_insertion_point(field_set_allocated:remote.EngineGetPayloadResponse.blobs_bundle) +} + // ------------------------------------------------------------------- // ProtocolVersionRequest @@ -8271,8 +8200,6 @@ EngineGetPayloadBodiesV1Response::bodies() const { // ------------------------------------------------------------------- -// ------------------------------------------------------------------- - // @@protoc_insertion_point(namespace_scope) diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend_mock.grpc.pb.h b/silkworm/interfaces/3.21.4/remote/ethbackend_mock.grpc.pb.h index 5e1ef46cfa..9bf3b07d99 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend_mock.grpc.pb.h +++ b/silkworm/interfaces/3.21.4/remote/ethbackend_mock.grpc.pb.h @@ -36,9 +36,9 @@ class MockETHBACKENDStub : public ETHBACKEND::StubInterface { MOCK_METHOD3(EngineGetPayloadBodiesByRangeV1, ::grpc::Status(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::remote::EngineGetPayloadBodiesV1Response* response)); MOCK_METHOD3(AsyncEngineGetPayloadBodiesByRangeV1Raw, ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>*(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq)); MOCK_METHOD3(PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw, ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>*(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq)); - MOCK_METHOD3(EngineGetBlobsBundleV1, ::grpc::Status(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::types::BlobsBundleV1* response)); - MOCK_METHOD3(AsyncEngineGetBlobsBundleV1Raw, ::grpc::ClientAsyncResponseReaderInterface< ::types::BlobsBundleV1>*(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq)); - MOCK_METHOD3(PrepareAsyncEngineGetBlobsBundleV1Raw, ::grpc::ClientAsyncResponseReaderInterface< ::types::BlobsBundleV1>*(::grpc::ClientContext* context, const ::remote::EngineGetBlobsBundleRequest& request, ::grpc::CompletionQueue* cq)); + MOCK_METHOD3(EngineGetPayloadWithBlobs, ::grpc::Status(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response)); + MOCK_METHOD3(AsyncEngineGetPayloadWithBlobsRaw, ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>*(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq)); + MOCK_METHOD3(PrepareAsyncEngineGetPayloadWithBlobsRaw, ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>*(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq)); MOCK_METHOD3(Version, ::grpc::Status(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::types::VersionReply* response)); MOCK_METHOD3(AsyncVersionRaw, ::grpc::ClientAsyncResponseReaderInterface< ::types::VersionReply>*(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq)); MOCK_METHOD3(PrepareAsyncVersionRaw, ::grpc::ClientAsyncResponseReaderInterface< ::types::VersionReply>*(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq)); diff --git a/silkworm/interfaces/3.21.4/types/types.pb.cc b/silkworm/interfaces/3.21.4/types/types.pb.cc index 9e1bdba2f8..be84c909cd 100644 --- a/silkworm/interfaces/3.21.4/types/types.pb.cc +++ b/silkworm/interfaces/3.21.4/types/types.pb.cc @@ -135,11 +135,12 @@ PROTOBUF_CONSTEXPR ExecutionPayload::ExecutionPayload( , /*decltype(_impl_.prev_randao_)*/nullptr , /*decltype(_impl_.base_fee_per_gas_)*/nullptr , /*decltype(_impl_.block_hash_)*/nullptr - , /*decltype(_impl_.excess_data_gas_)*/nullptr , /*decltype(_impl_.block_number_)*/uint64_t{0u} , /*decltype(_impl_.gas_limit_)*/uint64_t{0u} , /*decltype(_impl_.gas_used_)*/uint64_t{0u} , /*decltype(_impl_.timestamp_)*/uint64_t{0u} + , /*decltype(_impl_.data_gas_used_)*/uint64_t{0u} + , /*decltype(_impl_.excess_data_gas_)*/uint64_t{0u} , /*decltype(_impl_.version_)*/0u} {} struct ExecutionPayloadDefaultTypeInternal { PROTOBUF_CONSTEXPR ExecutionPayloadDefaultTypeInternal() @@ -168,9 +169,9 @@ struct WithdrawalDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 WithdrawalDefaultTypeInternal _Withdrawal_default_instance_; PROTOBUF_CONSTEXPR BlobsBundleV1::BlobsBundleV1( ::_pbi::ConstantInitialized): _impl_{ - /*decltype(_impl_.kzgs_)*/{} + /*decltype(_impl_.commitments_)*/{} , /*decltype(_impl_.blobs_)*/{} - , /*decltype(_impl_.block_hash_)*/nullptr + , /*decltype(_impl_.proofs_)*/{} , /*decltype(_impl_._cached_size_)*/{}} {} struct BlobsBundleV1DefaultTypeInternal { PROTOBUF_CONSTEXPR BlobsBundleV1DefaultTypeInternal() @@ -335,6 +336,7 @@ const uint32_t TableStruct_types_2ftypes_2eproto::offsets[] PROTOBUF_SECTION_VAR PROTOBUF_FIELD_OFFSET(::types::ExecutionPayload, _impl_.block_hash_), PROTOBUF_FIELD_OFFSET(::types::ExecutionPayload, _impl_.transactions_), PROTOBUF_FIELD_OFFSET(::types::ExecutionPayload, _impl_.withdrawals_), + PROTOBUF_FIELD_OFFSET(::types::ExecutionPayload, _impl_.data_gas_used_), PROTOBUF_FIELD_OFFSET(::types::ExecutionPayload, _impl_.excess_data_gas_), ~0u, ~0u, @@ -353,6 +355,7 @@ const uint32_t TableStruct_types_2ftypes_2eproto::offsets[] PROTOBUF_SECTION_VAR ~0u, ~0u, 0, + 1, ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::types::Withdrawal, _internal_metadata_), ~0u, // no _extensions_ @@ -369,9 +372,9 @@ const uint32_t TableStruct_types_2ftypes_2eproto::offsets[] PROTOBUF_SECTION_VAR ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::types::BlobsBundleV1, _impl_.block_hash_), - PROTOBUF_FIELD_OFFSET(::types::BlobsBundleV1, _impl_.kzgs_), + PROTOBUF_FIELD_OFFSET(::types::BlobsBundleV1, _impl_.commitments_), PROTOBUF_FIELD_OFFSET(::types::BlobsBundleV1, _impl_.blobs_), + PROTOBUF_FIELD_OFFSET(::types::BlobsBundleV1, _impl_.proofs_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::types::NodeInfoPorts, _internal_metadata_), ~0u, // no _extensions_ @@ -426,13 +429,13 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode { 32, -1, -1, sizeof(::types::H1024)}, { 40, -1, -1, sizeof(::types::H2048)}, { 48, -1, -1, sizeof(::types::VersionReply)}, - { 57, 80, -1, sizeof(::types::ExecutionPayload)}, - { 97, -1, -1, sizeof(::types::Withdrawal)}, - { 107, -1, -1, sizeof(::types::BlobsBundleV1)}, - { 116, -1, -1, sizeof(::types::NodeInfoPorts)}, - { 124, -1, -1, sizeof(::types::NodeInfoReply)}, - { 137, -1, -1, sizeof(::types::PeerInfo)}, - { 153, -1, -1, sizeof(::types::ExecutionPayloadBodyV1)}, + { 57, 81, -1, sizeof(::types::ExecutionPayload)}, + { 99, -1, -1, sizeof(::types::Withdrawal)}, + { 109, -1, -1, sizeof(::types::BlobsBundleV1)}, + { 118, -1, -1, sizeof(::types::NodeInfoPorts)}, + { 126, -1, -1, sizeof(::types::NodeInfoReply)}, + { 139, -1, -1, sizeof(::types::PeerInfo)}, + { 155, -1, -1, sizeof(::types::ExecutionPayloadBodyV1)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -463,7 +466,7 @@ const char descriptor_table_protodef_types_2ftypes_2eproto[] PROTOBUF_SECTION_VA "es.H512\022\027\n\002lo\030\002 \001(\0132\013.types.H512\";\n\005H204" "8\022\030\n\002hi\030\001 \001(\0132\014.types.H1024\022\030\n\002lo\030\002 \001(\0132" "\014.types.H1024\";\n\014VersionReply\022\r\n\005major\030\001" - " \001(\r\022\r\n\005minor\030\002 \001(\r\022\r\n\005patch\030\003 \001(\r\"\223\004\n\020E" + " \001(\r\022\r\n\005minor\030\002 \001(\r\022\r\n\005patch\030\003 \001(\r\"\264\004\n\020E" "xecutionPayload\022\017\n\007version\030\001 \001(\r\022 \n\013pare" "nt_hash\030\002 \001(\0132\013.types.H256\022\035\n\010coinbase\030\003" " \001(\0132\013.types.H160\022\037\n\nstate_root\030\004 \001(\0132\013." @@ -475,38 +478,39 @@ const char descriptor_table_protodef_types_2ftypes_2eproto[] PROTOBUF_SECTION_VA "_data\030\014 \001(\014\022%\n\020base_fee_per_gas\030\r \001(\0132\013." "types.H256\022\037\n\nblock_hash\030\016 \001(\0132\013.types.H" "256\022\024\n\014transactions\030\017 \003(\014\022&\n\013withdrawals" - "\030\020 \003(\0132\021.types.Withdrawal\022)\n\017excess_data" - "_gas\030\021 \001(\0132\013.types.H256H\000\210\001\001B\022\n\020_excess_" - "data_gas\"b\n\nWithdrawal\022\r\n\005index\030\001 \001(\004\022\027\n" - "\017validator_index\030\002 \001(\004\022\034\n\007address\030\003 \001(\0132" - "\013.types.H160\022\016\n\006amount\030\004 \001(\004\"M\n\rBlobsBun" - "dleV1\022\037\n\nblock_hash\030\001 \001(\0132\013.types.H256\022\014" - "\n\004kzgs\030\002 \003(\014\022\r\n\005blobs\030\003 \003(\014\"4\n\rNodeInfoP" - "orts\022\021\n\tdiscovery\030\001 \001(\r\022\020\n\010listener\030\002 \001(" - "\r\"\224\001\n\rNodeInfoReply\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030" - "\002 \001(\t\022\r\n\005enode\030\003 \001(\t\022\013\n\003enr\030\004 \001(\t\022#\n\005por" - "ts\030\005 \001(\0132\024.types.NodeInfoPorts\022\025\n\rlisten" - "er_addr\030\006 \001(\t\022\021\n\tprotocols\030\007 \001(\014\"\313\001\n\010Pee" - "rInfo\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\r\n\005enode" - "\030\003 \001(\t\022\013\n\003enr\030\004 \001(\t\022\014\n\004caps\030\005 \003(\t\022\027\n\017con" - "n_local_addr\030\006 \001(\t\022\030\n\020conn_remote_addr\030\007" - " \001(\t\022\027\n\017conn_is_inbound\030\010 \001(\010\022\027\n\017conn_is" - "_trusted\030\t \001(\010\022\026\n\016conn_is_static\030\n \001(\010\"V" - "\n\026ExecutionPayloadBodyV1\022\024\n\014transactions" - "\030\001 \003(\014\022&\n\013withdrawals\030\002 \003(\0132\021.types.With" - "drawal:=\n\025service_major_version\022\034.google" - ".protobuf.FileOptions\030\321\206\003 \001(\r:=\n\025service" - "_minor_version\022\034.google.protobuf.FileOpt" - "ions\030\322\206\003 \001(\r:=\n\025service_patch_version\022\034." - "google.protobuf.FileOptions\030\323\206\003 \001(\rB\017Z\r." - "/types;typesb\006proto3" + "\030\020 \003(\0132\021.types.Withdrawal\022\032\n\rdata_gas_us" + "ed\030\021 \001(\004H\000\210\001\001\022\034\n\017excess_data_gas\030\022 \001(\004H\001" + "\210\001\001B\020\n\016_data_gas_usedB\022\n\020_excess_data_ga" + "s\"b\n\nWithdrawal\022\r\n\005index\030\001 \001(\004\022\027\n\017valida" + "tor_index\030\002 \001(\004\022\034\n\007address\030\003 \001(\0132\013.types" + ".H160\022\016\n\006amount\030\004 \001(\004\"C\n\rBlobsBundleV1\022\023" + "\n\013commitments\030\001 \003(\014\022\r\n\005blobs\030\002 \003(\014\022\016\n\006pr" + "oofs\030\003 \003(\014\"4\n\rNodeInfoPorts\022\021\n\tdiscovery" + "\030\001 \001(\r\022\020\n\010listener\030\002 \001(\r\"\224\001\n\rNodeInfoRep" + "ly\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\r\n\005enode\030\003 " + "\001(\t\022\013\n\003enr\030\004 \001(\t\022#\n\005ports\030\005 \001(\0132\024.types." + "NodeInfoPorts\022\025\n\rlistener_addr\030\006 \001(\t\022\021\n\t" + "protocols\030\007 \001(\014\"\313\001\n\010PeerInfo\022\n\n\002id\030\001 \001(\t" + "\022\014\n\004name\030\002 \001(\t\022\r\n\005enode\030\003 \001(\t\022\013\n\003enr\030\004 \001" + "(\t\022\014\n\004caps\030\005 \003(\t\022\027\n\017conn_local_addr\030\006 \001(" + "\t\022\030\n\020conn_remote_addr\030\007 \001(\t\022\027\n\017conn_is_i" + "nbound\030\010 \001(\010\022\027\n\017conn_is_trusted\030\t \001(\010\022\026\n" + "\016conn_is_static\030\n \001(\010\"V\n\026ExecutionPayloa" + "dBodyV1\022\024\n\014transactions\030\001 \003(\014\022&\n\013withdra" + "wals\030\002 \003(\0132\021.types.Withdrawal:=\n\025service" + "_major_version\022\034.google.protobuf.FileOpt" + "ions\030\321\206\003 \001(\r:=\n\025service_minor_version\022\034." + "google.protobuf.FileOptions\030\322\206\003 \001(\r:=\n\025s" + "ervice_patch_version\022\034.google.protobuf.F" + "ileOptions\030\323\206\003 \001(\rB\017Z\r./types;typesb\006pro" + "to3" ; static const ::_pbi::DescriptorTable* const descriptor_table_types_2ftypes_2eproto_deps[1] = { &::descriptor_table_google_2fprotobuf_2fdescriptor_2eproto, }; static ::_pbi::once_flag descriptor_table_types_2ftypes_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_types_2ftypes_2eproto = { - false, false, 1860, descriptor_table_protodef_types_2ftypes_2eproto, + false, false, 1883, descriptor_table_protodef_types_2ftypes_2eproto, "types/types.proto", &descriptor_table_types_2ftypes_2eproto_once, descriptor_table_types_2ftypes_2eproto_deps, 1, 14, schemas, file_default_instances, TableStruct_types_2ftypes_2eproto::offsets, @@ -2160,10 +2164,12 @@ class ExecutionPayload::_Internal { static const ::types::H256& prev_randao(const ExecutionPayload* msg); static const ::types::H256& base_fee_per_gas(const ExecutionPayload* msg); static const ::types::H256& block_hash(const ExecutionPayload* msg); - static const ::types::H256& excess_data_gas(const ExecutionPayload* msg); - static void set_has_excess_data_gas(HasBits* has_bits) { + static void set_has_data_gas_used(HasBits* has_bits) { (*has_bits)[0] |= 1u; } + static void set_has_excess_data_gas(HasBits* has_bits) { + (*has_bits)[0] |= 2u; + } }; const ::types::H256& @@ -2198,10 +2204,6 @@ const ::types::H256& ExecutionPayload::_Internal::block_hash(const ExecutionPayload* msg) { return *msg->_impl_.block_hash_; } -const ::types::H256& -ExecutionPayload::_Internal::excess_data_gas(const ExecutionPayload* msg) { - return *msg->_impl_.excess_data_gas_; -} ExecutionPayload::ExecutionPayload(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { @@ -2225,11 +2227,12 @@ ExecutionPayload::ExecutionPayload(const ExecutionPayload& from) , decltype(_impl_.prev_randao_){nullptr} , decltype(_impl_.base_fee_per_gas_){nullptr} , decltype(_impl_.block_hash_){nullptr} - , decltype(_impl_.excess_data_gas_){nullptr} , decltype(_impl_.block_number_){} , decltype(_impl_.gas_limit_){} , decltype(_impl_.gas_used_){} , decltype(_impl_.timestamp_){} + , decltype(_impl_.data_gas_used_){} + , decltype(_impl_.excess_data_gas_){} , decltype(_impl_.version_){}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); @@ -2265,9 +2268,6 @@ ExecutionPayload::ExecutionPayload(const ExecutionPayload& from) if (from._internal_has_block_hash()) { _this->_impl_.block_hash_ = new ::types::H256(*from._impl_.block_hash_); } - if (from._internal_has_excess_data_gas()) { - _this->_impl_.excess_data_gas_ = new ::types::H256(*from._impl_.excess_data_gas_); - } ::memcpy(&_impl_.block_number_, &from._impl_.block_number_, static_cast(reinterpret_cast(&_impl_.version_) - reinterpret_cast(&_impl_.block_number_)) + sizeof(_impl_.version_)); @@ -2292,11 +2292,12 @@ inline void ExecutionPayload::SharedCtor( , decltype(_impl_.prev_randao_){nullptr} , decltype(_impl_.base_fee_per_gas_){nullptr} , decltype(_impl_.block_hash_){nullptr} - , decltype(_impl_.excess_data_gas_){nullptr} , decltype(_impl_.block_number_){uint64_t{0u}} , decltype(_impl_.gas_limit_){uint64_t{0u}} , decltype(_impl_.gas_used_){uint64_t{0u}} , decltype(_impl_.timestamp_){uint64_t{0u}} + , decltype(_impl_.data_gas_used_){uint64_t{0u}} + , decltype(_impl_.excess_data_gas_){uint64_t{0u}} , decltype(_impl_.version_){0u} }; _impl_.extra_data_.InitDefault(); @@ -2327,7 +2328,6 @@ inline void ExecutionPayload::SharedDtor() { if (this != internal_default_instance()) delete _impl_.prev_randao_; if (this != internal_default_instance()) delete _impl_.base_fee_per_gas_; if (this != internal_default_instance()) delete _impl_.block_hash_; - if (this != internal_default_instance()) delete _impl_.excess_data_gas_; } void ExecutionPayload::SetCachedSize(int size) const { @@ -2375,14 +2375,16 @@ void ExecutionPayload::Clear() { delete _impl_.block_hash_; } _impl_.block_hash_ = nullptr; + ::memset(&_impl_.block_number_, 0, static_cast( + reinterpret_cast(&_impl_.timestamp_) - + reinterpret_cast(&_impl_.block_number_)) + sizeof(_impl_.timestamp_)); cached_has_bits = _impl_._has_bits_[0]; - if (cached_has_bits & 0x00000001u) { - GOOGLE_DCHECK(_impl_.excess_data_gas_ != nullptr); - _impl_.excess_data_gas_->Clear(); + if (cached_has_bits & 0x00000003u) { + ::memset(&_impl_.data_gas_used_, 0, static_cast( + reinterpret_cast(&_impl_.excess_data_gas_) - + reinterpret_cast(&_impl_.data_gas_used_)) + sizeof(_impl_.excess_data_gas_)); } - ::memset(&_impl_.block_number_, 0, static_cast( - reinterpret_cast(&_impl_.version_) - - reinterpret_cast(&_impl_.block_number_)) + sizeof(_impl_.version_)); + _impl_.version_ = 0u; _impl_._has_bits_.Clear(); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -2534,10 +2536,20 @@ const char* ExecutionPayload::_InternalParse(const char* ptr, ::_pbi::ParseConte } else goto handle_unusual; continue; - // optional .types.H256 excess_data_gas = 17; + // optional uint64 data_gas_used = 17; case 17: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 138)) { - ptr = ctx->ParseMessage(_internal_mutable_excess_data_gas(), ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 136)) { + _Internal::set_has_data_gas_used(&has_bits); + _impl_.data_gas_used_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else + goto handle_unusual; + continue; + // optional uint64 excess_data_gas = 18; + case 18: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 144)) { + _Internal::set_has_excess_data_gas(&has_bits); + _impl_.excess_data_gas_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; @@ -2678,11 +2690,16 @@ uint8_t* ExecutionPayload::_InternalSerialize( InternalWriteMessage(16, repfield, repfield.GetCachedSize(), target, stream); } - // optional .types.H256 excess_data_gas = 17; + // optional uint64 data_gas_used = 17; + if (_internal_has_data_gas_used()) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray(17, this->_internal_data_gas_used(), target); + } + + // optional uint64 excess_data_gas = 18; if (_internal_has_excess_data_gas()) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessage(17, _Internal::excess_data_gas(this), - _Internal::excess_data_gas(this).GetCachedSize(), target, stream); + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray(18, this->_internal_excess_data_gas(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -2779,14 +2796,6 @@ size_t ExecutionPayload::ByteSizeLong() const { *_impl_.block_hash_); } - // optional .types.H256 excess_data_gas = 17; - cached_has_bits = _impl_._has_bits_[0]; - if (cached_has_bits & 0x00000001u) { - total_size += 2 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( - *_impl_.excess_data_gas_); - } - // uint64 block_number = 8; if (this->_internal_block_number() != 0) { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_block_number()); @@ -2807,6 +2816,23 @@ size_t ExecutionPayload::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_timestamp()); } + cached_has_bits = _impl_._has_bits_[0]; + if (cached_has_bits & 0x00000003u) { + // optional uint64 data_gas_used = 17; + if (cached_has_bits & 0x00000001u) { + total_size += 2 + + ::_pbi::WireFormatLite::UInt64Size( + this->_internal_data_gas_used()); + } + + // optional uint64 excess_data_gas = 18; + if (cached_has_bits & 0x00000002u) { + total_size += 2 + + ::_pbi::WireFormatLite::UInt64Size( + this->_internal_excess_data_gas()); + } + + } // uint32 version = 1; if (this->_internal_version() != 0) { total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_version()); @@ -2867,10 +2893,6 @@ void ExecutionPayload::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const _this->_internal_mutable_block_hash()->::types::H256::MergeFrom( from._internal_block_hash()); } - if (from._internal_has_excess_data_gas()) { - _this->_internal_mutable_excess_data_gas()->::types::H256::MergeFrom( - from._internal_excess_data_gas()); - } if (from._internal_block_number() != 0) { _this->_internal_set_block_number(from._internal_block_number()); } @@ -2883,6 +2905,16 @@ void ExecutionPayload::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const if (from._internal_timestamp() != 0) { _this->_internal_set_timestamp(from._internal_timestamp()); } + cached_has_bits = from._impl_._has_bits_[0]; + if (cached_has_bits & 0x00000003u) { + if (cached_has_bits & 0x00000001u) { + _this->_impl_.data_gas_used_ = from._impl_.data_gas_used_; + } + if (cached_has_bits & 0x00000002u) { + _this->_impl_.excess_data_gas_ = from._impl_.excess_data_gas_; + } + _this->_impl_._has_bits_[0] |= cached_has_bits; + } if (from._internal_version() != 0) { _this->_internal_set_version(from._internal_version()); } @@ -3206,13 +3238,8 @@ ::PROTOBUF_NAMESPACE_ID::Metadata Withdrawal::GetMetadata() const { class BlobsBundleV1::_Internal { public: - static const ::types::H256& block_hash(const BlobsBundleV1* msg); }; -const ::types::H256& -BlobsBundleV1::_Internal::block_hash(const BlobsBundleV1* msg) { - return *msg->_impl_.block_hash_; -} BlobsBundleV1::BlobsBundleV1(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { @@ -3223,15 +3250,12 @@ BlobsBundleV1::BlobsBundleV1(const BlobsBundleV1& from) : ::PROTOBUF_NAMESPACE_ID::Message() { BlobsBundleV1* const _this = this; (void)_this; new (&_impl_) Impl_{ - decltype(_impl_.kzgs_){from._impl_.kzgs_} + decltype(_impl_.commitments_){from._impl_.commitments_} , decltype(_impl_.blobs_){from._impl_.blobs_} - , decltype(_impl_.block_hash_){nullptr} + , decltype(_impl_.proofs_){from._impl_.proofs_} , /*decltype(_impl_._cached_size_)*/{}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - if (from._internal_has_block_hash()) { - _this->_impl_.block_hash_ = new ::types::H256(*from._impl_.block_hash_); - } // @@protoc_insertion_point(copy_constructor:types.BlobsBundleV1) } @@ -3240,9 +3264,9 @@ inline void BlobsBundleV1::SharedCtor( (void)arena; (void)is_message_owned; new (&_impl_) Impl_{ - decltype(_impl_.kzgs_){arena} + decltype(_impl_.commitments_){arena} , decltype(_impl_.blobs_){arena} - , decltype(_impl_.block_hash_){nullptr} + , decltype(_impl_.proofs_){arena} , /*decltype(_impl_._cached_size_)*/{} }; } @@ -3258,9 +3282,9 @@ BlobsBundleV1::~BlobsBundleV1() { inline void BlobsBundleV1::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); - _impl_.kzgs_.~RepeatedPtrField(); + _impl_.commitments_.~RepeatedPtrField(); _impl_.blobs_.~RepeatedPtrField(); - if (this != internal_default_instance()) delete _impl_.block_hash_; + _impl_.proofs_.~RepeatedPtrField(); } void BlobsBundleV1::SetCachedSize(int size) const { @@ -3273,12 +3297,9 @@ void BlobsBundleV1::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.kzgs_.Clear(); + _impl_.commitments_.Clear(); _impl_.blobs_.Clear(); - if (GetArenaForAllocation() == nullptr && _impl_.block_hash_ != nullptr) { - delete _impl_.block_hash_; - } - _impl_.block_hash_ = nullptr; + _impl_.proofs_.Clear(); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -3288,21 +3309,27 @@ const char* BlobsBundleV1::_InternalParse(const char* ptr, ::_pbi::ParseContext* uint32_t tag; ptr = ::_pbi::ReadTag(ptr, &tag); switch (tag >> 3) { - // .types.H256 block_hash = 1; + // repeated bytes commitments = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { - ptr = ctx->ParseMessage(_internal_mutable_block_hash(), ptr); - CHK_(ptr); + ptr -= 1; + do { + ptr += 1; + auto str = _internal_add_commitments(); + ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr)); } else goto handle_unusual; continue; - // repeated bytes kzgs = 2; + // repeated bytes blobs = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { ptr -= 1; do { ptr += 1; - auto str = _internal_add_kzgs(); + auto str = _internal_add_blobs(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; @@ -3310,13 +3337,13 @@ const char* BlobsBundleV1::_InternalParse(const char* ptr, ::_pbi::ParseContext* } else goto handle_unusual; continue; - // repeated bytes blobs = 3; + // repeated bytes proofs = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { ptr -= 1; do { ptr += 1; - auto str = _internal_add_blobs(); + auto str = _internal_add_proofs(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; @@ -3353,22 +3380,21 @@ uint8_t* BlobsBundleV1::_InternalSerialize( uint32_t cached_has_bits = 0; (void) cached_has_bits; - // .types.H256 block_hash = 1; - if (this->_internal_has_block_hash()) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessage(1, _Internal::block_hash(this), - _Internal::block_hash(this).GetCachedSize(), target, stream); + // repeated bytes commitments = 1; + for (int i = 0, n = this->_internal_commitments_size(); i < n; i++) { + const auto& s = this->_internal_commitments(i); + target = stream->WriteBytes(1, s, target); } - // repeated bytes kzgs = 2; - for (int i = 0, n = this->_internal_kzgs_size(); i < n; i++) { - const auto& s = this->_internal_kzgs(i); + // repeated bytes blobs = 2; + for (int i = 0, n = this->_internal_blobs_size(); i < n; i++) { + const auto& s = this->_internal_blobs(i); target = stream->WriteBytes(2, s, target); } - // repeated bytes blobs = 3; - for (int i = 0, n = this->_internal_blobs_size(); i < n; i++) { - const auto& s = this->_internal_blobs(i); + // repeated bytes proofs = 3; + for (int i = 0, n = this->_internal_proofs_size(); i < n; i++) { + const auto& s = this->_internal_proofs(i); target = stream->WriteBytes(3, s, target); } @@ -3388,15 +3414,15 @@ size_t BlobsBundleV1::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // repeated bytes kzgs = 2; + // repeated bytes commitments = 1; total_size += 1 * - ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.kzgs_.size()); - for (int i = 0, n = _impl_.kzgs_.size(); i < n; i++) { + ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.commitments_.size()); + for (int i = 0, n = _impl_.commitments_.size(); i < n; i++) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize( - _impl_.kzgs_.Get(i)); + _impl_.commitments_.Get(i)); } - // repeated bytes blobs = 3; + // repeated bytes blobs = 2; total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.blobs_.size()); for (int i = 0, n = _impl_.blobs_.size(); i < n; i++) { @@ -3404,11 +3430,12 @@ size_t BlobsBundleV1::ByteSizeLong() const { _impl_.blobs_.Get(i)); } - // .types.H256 block_hash = 1; - if (this->_internal_has_block_hash()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( - *_impl_.block_hash_); + // repeated bytes proofs = 3; + total_size += 1 * + ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.proofs_.size()); + for (int i = 0, n = _impl_.proofs_.size(); i < n; i++) { + total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize( + _impl_.proofs_.Get(i)); } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); @@ -3429,12 +3456,9 @@ void BlobsBundleV1::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const :: uint32_t cached_has_bits = 0; (void) cached_has_bits; - _this->_impl_.kzgs_.MergeFrom(from._impl_.kzgs_); + _this->_impl_.commitments_.MergeFrom(from._impl_.commitments_); _this->_impl_.blobs_.MergeFrom(from._impl_.blobs_); - if (from._internal_has_block_hash()) { - _this->_internal_mutable_block_hash()->::types::H256::MergeFrom( - from._internal_block_hash()); - } + _this->_impl_.proofs_.MergeFrom(from._impl_.proofs_); _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -3452,9 +3476,9 @@ bool BlobsBundleV1::IsInitialized() const { void BlobsBundleV1::InternalSwap(BlobsBundleV1* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - _impl_.kzgs_.InternalSwap(&other->_impl_.kzgs_); + _impl_.commitments_.InternalSwap(&other->_impl_.commitments_); _impl_.blobs_.InternalSwap(&other->_impl_.blobs_); - swap(_impl_.block_hash_, other->_impl_.block_hash_); + _impl_.proofs_.InternalSwap(&other->_impl_.proofs_); } ::PROTOBUF_NAMESPACE_ID::Metadata BlobsBundleV1::GetMetadata() const { diff --git a/silkworm/interfaces/3.21.4/types/types.pb.h b/silkworm/interfaces/3.21.4/types/types.pb.h index 4582ea90a4..0ce4c2187d 100644 --- a/silkworm/interfaces/3.21.4/types/types.pb.h +++ b/silkworm/interfaces/3.21.4/types/types.pb.h @@ -1446,11 +1446,12 @@ class ExecutionPayload final : kPrevRandaoFieldNumber = 7, kBaseFeePerGasFieldNumber = 13, kBlockHashFieldNumber = 14, - kExcessDataGasFieldNumber = 17, kBlockNumberFieldNumber = 8, kGasLimitFieldNumber = 9, kGasUsedFieldNumber = 10, kTimestampFieldNumber = 11, + kDataGasUsedFieldNumber = 17, + kExcessDataGasFieldNumber = 18, kVersionFieldNumber = 1, }; // repeated bytes transactions = 15; @@ -1653,24 +1654,6 @@ class ExecutionPayload final : ::types::H256* block_hash); ::types::H256* unsafe_arena_release_block_hash(); - // optional .types.H256 excess_data_gas = 17; - bool has_excess_data_gas() const; - private: - bool _internal_has_excess_data_gas() const; - public: - void clear_excess_data_gas(); - const ::types::H256& excess_data_gas() const; - PROTOBUF_NODISCARD ::types::H256* release_excess_data_gas(); - ::types::H256* mutable_excess_data_gas(); - void set_allocated_excess_data_gas(::types::H256* excess_data_gas); - private: - const ::types::H256& _internal_excess_data_gas() const; - ::types::H256* _internal_mutable_excess_data_gas(); - public: - void unsafe_arena_set_allocated_excess_data_gas( - ::types::H256* excess_data_gas); - ::types::H256* unsafe_arena_release_excess_data_gas(); - // uint64 block_number = 8; void clear_block_number(); uint64_t block_number() const; @@ -1707,6 +1690,32 @@ class ExecutionPayload final : void _internal_set_timestamp(uint64_t value); public: + // optional uint64 data_gas_used = 17; + bool has_data_gas_used() const; + private: + bool _internal_has_data_gas_used() const; + public: + void clear_data_gas_used(); + uint64_t data_gas_used() const; + void set_data_gas_used(uint64_t value); + private: + uint64_t _internal_data_gas_used() const; + void _internal_set_data_gas_used(uint64_t value); + public: + + // optional uint64 excess_data_gas = 18; + bool has_excess_data_gas() const; + private: + bool _internal_has_excess_data_gas() const; + public: + void clear_excess_data_gas(); + uint64_t excess_data_gas() const; + void set_excess_data_gas(uint64_t value); + private: + uint64_t _internal_excess_data_gas() const; + void _internal_set_excess_data_gas(uint64_t value); + public: + // uint32 version = 1; void clear_version(); uint32_t version() const; @@ -1737,11 +1746,12 @@ class ExecutionPayload final : ::types::H256* prev_randao_; ::types::H256* base_fee_per_gas_; ::types::H256* block_hash_; - ::types::H256* excess_data_gas_; uint64_t block_number_; uint64_t gas_limit_; uint64_t gas_used_; uint64_t timestamp_; + uint64_t data_gas_used_; + uint64_t excess_data_gas_; uint32_t version_; }; union { Impl_ _impl_; }; @@ -2060,35 +2070,35 @@ class BlobsBundleV1 final : // accessors ------------------------------------------------------- enum : int { - kKzgsFieldNumber = 2, - kBlobsFieldNumber = 3, - kBlockHashFieldNumber = 1, + kCommitmentsFieldNumber = 1, + kBlobsFieldNumber = 2, + kProofsFieldNumber = 3, }; - // repeated bytes kzgs = 2; - int kzgs_size() const; + // repeated bytes commitments = 1; + int commitments_size() const; private: - int _internal_kzgs_size() const; + int _internal_commitments_size() const; public: - void clear_kzgs(); - const std::string& kzgs(int index) const; - std::string* mutable_kzgs(int index); - void set_kzgs(int index, const std::string& value); - void set_kzgs(int index, std::string&& value); - void set_kzgs(int index, const char* value); - void set_kzgs(int index, const void* value, size_t size); - std::string* add_kzgs(); - void add_kzgs(const std::string& value); - void add_kzgs(std::string&& value); - void add_kzgs(const char* value); - void add_kzgs(const void* value, size_t size); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& kzgs() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* mutable_kzgs(); - private: - const std::string& _internal_kzgs(int index) const; - std::string* _internal_add_kzgs(); + void clear_commitments(); + const std::string& commitments(int index) const; + std::string* mutable_commitments(int index); + void set_commitments(int index, const std::string& value); + void set_commitments(int index, std::string&& value); + void set_commitments(int index, const char* value); + void set_commitments(int index, const void* value, size_t size); + std::string* add_commitments(); + void add_commitments(const std::string& value); + void add_commitments(std::string&& value); + void add_commitments(const char* value); + void add_commitments(const void* value, size_t size); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& commitments() const; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* mutable_commitments(); + private: + const std::string& _internal_commitments(int index) const; + std::string* _internal_add_commitments(); public: - // repeated bytes blobs = 3; + // repeated bytes blobs = 2; int blobs_size() const; private: int _internal_blobs_size() const; @@ -2112,23 +2122,29 @@ class BlobsBundleV1 final : std::string* _internal_add_blobs(); public: - // .types.H256 block_hash = 1; - bool has_block_hash() const; + // repeated bytes proofs = 3; + int proofs_size() const; private: - bool _internal_has_block_hash() const; + int _internal_proofs_size() const; public: - void clear_block_hash(); - const ::types::H256& block_hash() const; - PROTOBUF_NODISCARD ::types::H256* release_block_hash(); - ::types::H256* mutable_block_hash(); - void set_allocated_block_hash(::types::H256* block_hash); - private: - const ::types::H256& _internal_block_hash() const; - ::types::H256* _internal_mutable_block_hash(); + void clear_proofs(); + const std::string& proofs(int index) const; + std::string* mutable_proofs(int index); + void set_proofs(int index, const std::string& value); + void set_proofs(int index, std::string&& value); + void set_proofs(int index, const char* value); + void set_proofs(int index, const void* value, size_t size); + std::string* add_proofs(); + void add_proofs(const std::string& value); + void add_proofs(std::string&& value); + void add_proofs(const char* value); + void add_proofs(const void* value, size_t size); + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& proofs() const; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* mutable_proofs(); + private: + const std::string& _internal_proofs(int index) const; + std::string* _internal_add_proofs(); public: - void unsafe_arena_set_allocated_block_hash( - ::types::H256* block_hash); - ::types::H256* unsafe_arena_release_block_hash(); // @@protoc_insertion_point(class_scope:types.BlobsBundleV1) private: @@ -2138,9 +2154,9 @@ class BlobsBundleV1 final : typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField kzgs_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField commitments_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField blobs_; - ::types::H256* block_hash_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField proofs_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; @@ -4999,94 +5015,60 @@ ExecutionPayload::withdrawals() const { return _impl_.withdrawals_; } -// optional .types.H256 excess_data_gas = 17; -inline bool ExecutionPayload::_internal_has_excess_data_gas() const { +// optional uint64 data_gas_used = 17; +inline bool ExecutionPayload::_internal_has_data_gas_used() const { bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0; - PROTOBUF_ASSUME(!value || _impl_.excess_data_gas_ != nullptr); return value; } -inline bool ExecutionPayload::has_excess_data_gas() const { - return _internal_has_excess_data_gas(); +inline bool ExecutionPayload::has_data_gas_used() const { + return _internal_has_data_gas_used(); } -inline void ExecutionPayload::clear_excess_data_gas() { - if (_impl_.excess_data_gas_ != nullptr) _impl_.excess_data_gas_->Clear(); +inline void ExecutionPayload::clear_data_gas_used() { + _impl_.data_gas_used_ = uint64_t{0u}; _impl_._has_bits_[0] &= ~0x00000001u; } -inline const ::types::H256& ExecutionPayload::_internal_excess_data_gas() const { - const ::types::H256* p = _impl_.excess_data_gas_; - return p != nullptr ? *p : reinterpret_cast( - ::types::_H256_default_instance_); +inline uint64_t ExecutionPayload::_internal_data_gas_used() const { + return _impl_.data_gas_used_; } -inline const ::types::H256& ExecutionPayload::excess_data_gas() const { - // @@protoc_insertion_point(field_get:types.ExecutionPayload.excess_data_gas) - return _internal_excess_data_gas(); +inline uint64_t ExecutionPayload::data_gas_used() const { + // @@protoc_insertion_point(field_get:types.ExecutionPayload.data_gas_used) + return _internal_data_gas_used(); } -inline void ExecutionPayload::unsafe_arena_set_allocated_excess_data_gas( - ::types::H256* excess_data_gas) { - if (GetArenaForAllocation() == nullptr) { - delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.excess_data_gas_); - } - _impl_.excess_data_gas_ = excess_data_gas; - if (excess_data_gas) { - _impl_._has_bits_[0] |= 0x00000001u; - } else { - _impl_._has_bits_[0] &= ~0x00000001u; - } - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:types.ExecutionPayload.excess_data_gas) +inline void ExecutionPayload::_internal_set_data_gas_used(uint64_t value) { + _impl_._has_bits_[0] |= 0x00000001u; + _impl_.data_gas_used_ = value; } -inline ::types::H256* ExecutionPayload::release_excess_data_gas() { - _impl_._has_bits_[0] &= ~0x00000001u; - ::types::H256* temp = _impl_.excess_data_gas_; - _impl_.excess_data_gas_ = nullptr; -#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - if (GetArenaForAllocation() == nullptr) { delete old; } -#else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - } -#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE - return temp; +inline void ExecutionPayload::set_data_gas_used(uint64_t value) { + _internal_set_data_gas_used(value); + // @@protoc_insertion_point(field_set:types.ExecutionPayload.data_gas_used) } -inline ::types::H256* ExecutionPayload::unsafe_arena_release_excess_data_gas() { - // @@protoc_insertion_point(field_release:types.ExecutionPayload.excess_data_gas) - _impl_._has_bits_[0] &= ~0x00000001u; - ::types::H256* temp = _impl_.excess_data_gas_; - _impl_.excess_data_gas_ = nullptr; - return temp; + +// optional uint64 excess_data_gas = 18; +inline bool ExecutionPayload::_internal_has_excess_data_gas() const { + bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0; + return value; } -inline ::types::H256* ExecutionPayload::_internal_mutable_excess_data_gas() { - _impl_._has_bits_[0] |= 0x00000001u; - if (_impl_.excess_data_gas_ == nullptr) { - auto* p = CreateMaybeMessage<::types::H256>(GetArenaForAllocation()); - _impl_.excess_data_gas_ = p; - } +inline bool ExecutionPayload::has_excess_data_gas() const { + return _internal_has_excess_data_gas(); +} +inline void ExecutionPayload::clear_excess_data_gas() { + _impl_.excess_data_gas_ = uint64_t{0u}; + _impl_._has_bits_[0] &= ~0x00000002u; +} +inline uint64_t ExecutionPayload::_internal_excess_data_gas() const { return _impl_.excess_data_gas_; } -inline ::types::H256* ExecutionPayload::mutable_excess_data_gas() { - ::types::H256* _msg = _internal_mutable_excess_data_gas(); - // @@protoc_insertion_point(field_mutable:types.ExecutionPayload.excess_data_gas) - return _msg; +inline uint64_t ExecutionPayload::excess_data_gas() const { + // @@protoc_insertion_point(field_get:types.ExecutionPayload.excess_data_gas) + return _internal_excess_data_gas(); } -inline void ExecutionPayload::set_allocated_excess_data_gas(::types::H256* excess_data_gas) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); - if (message_arena == nullptr) { - delete _impl_.excess_data_gas_; - } - if (excess_data_gas) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(excess_data_gas); - if (message_arena != submessage_arena) { - excess_data_gas = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( - message_arena, excess_data_gas, submessage_arena); - } - _impl_._has_bits_[0] |= 0x00000001u; - } else { - _impl_._has_bits_[0] &= ~0x00000001u; - } - _impl_.excess_data_gas_ = excess_data_gas; - // @@protoc_insertion_point(field_set_allocated:types.ExecutionPayload.excess_data_gas) +inline void ExecutionPayload::_internal_set_excess_data_gas(uint64_t value) { + _impl_._has_bits_[0] |= 0x00000002u; + _impl_.excess_data_gas_ = value; +} +inline void ExecutionPayload::set_excess_data_gas(uint64_t value) { + _internal_set_excess_data_gas(value); + // @@protoc_insertion_point(field_set:types.ExecutionPayload.excess_data_gas) } // ------------------------------------------------------------------- @@ -5247,172 +5229,82 @@ inline void Withdrawal::set_amount(uint64_t value) { // BlobsBundleV1 -// .types.H256 block_hash = 1; -inline bool BlobsBundleV1::_internal_has_block_hash() const { - return this != internal_default_instance() && _impl_.block_hash_ != nullptr; -} -inline bool BlobsBundleV1::has_block_hash() const { - return _internal_has_block_hash(); -} -inline void BlobsBundleV1::clear_block_hash() { - if (GetArenaForAllocation() == nullptr && _impl_.block_hash_ != nullptr) { - delete _impl_.block_hash_; - } - _impl_.block_hash_ = nullptr; -} -inline const ::types::H256& BlobsBundleV1::_internal_block_hash() const { - const ::types::H256* p = _impl_.block_hash_; - return p != nullptr ? *p : reinterpret_cast( - ::types::_H256_default_instance_); -} -inline const ::types::H256& BlobsBundleV1::block_hash() const { - // @@protoc_insertion_point(field_get:types.BlobsBundleV1.block_hash) - return _internal_block_hash(); -} -inline void BlobsBundleV1::unsafe_arena_set_allocated_block_hash( - ::types::H256* block_hash) { - if (GetArenaForAllocation() == nullptr) { - delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.block_hash_); - } - _impl_.block_hash_ = block_hash; - if (block_hash) { - - } else { - - } - // @@protoc_insertion_point(field_unsafe_arena_set_allocated:types.BlobsBundleV1.block_hash) -} -inline ::types::H256* BlobsBundleV1::release_block_hash() { - - ::types::H256* temp = _impl_.block_hash_; - _impl_.block_hash_ = nullptr; -#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - if (GetArenaForAllocation() == nullptr) { delete old; } -#else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - } -#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE - return temp; -} -inline ::types::H256* BlobsBundleV1::unsafe_arena_release_block_hash() { - // @@protoc_insertion_point(field_release:types.BlobsBundleV1.block_hash) - - ::types::H256* temp = _impl_.block_hash_; - _impl_.block_hash_ = nullptr; - return temp; -} -inline ::types::H256* BlobsBundleV1::_internal_mutable_block_hash() { - - if (_impl_.block_hash_ == nullptr) { - auto* p = CreateMaybeMessage<::types::H256>(GetArenaForAllocation()); - _impl_.block_hash_ = p; - } - return _impl_.block_hash_; -} -inline ::types::H256* BlobsBundleV1::mutable_block_hash() { - ::types::H256* _msg = _internal_mutable_block_hash(); - // @@protoc_insertion_point(field_mutable:types.BlobsBundleV1.block_hash) - return _msg; -} -inline void BlobsBundleV1::set_allocated_block_hash(::types::H256* block_hash) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); - if (message_arena == nullptr) { - delete _impl_.block_hash_; - } - if (block_hash) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(block_hash); - if (message_arena != submessage_arena) { - block_hash = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( - message_arena, block_hash, submessage_arena); - } - - } else { - - } - _impl_.block_hash_ = block_hash; - // @@protoc_insertion_point(field_set_allocated:types.BlobsBundleV1.block_hash) -} - -// repeated bytes kzgs = 2; -inline int BlobsBundleV1::_internal_kzgs_size() const { - return _impl_.kzgs_.size(); +// repeated bytes commitments = 1; +inline int BlobsBundleV1::_internal_commitments_size() const { + return _impl_.commitments_.size(); } -inline int BlobsBundleV1::kzgs_size() const { - return _internal_kzgs_size(); +inline int BlobsBundleV1::commitments_size() const { + return _internal_commitments_size(); } -inline void BlobsBundleV1::clear_kzgs() { - _impl_.kzgs_.Clear(); +inline void BlobsBundleV1::clear_commitments() { + _impl_.commitments_.Clear(); } -inline std::string* BlobsBundleV1::add_kzgs() { - std::string* _s = _internal_add_kzgs(); - // @@protoc_insertion_point(field_add_mutable:types.BlobsBundleV1.kzgs) +inline std::string* BlobsBundleV1::add_commitments() { + std::string* _s = _internal_add_commitments(); + // @@protoc_insertion_point(field_add_mutable:types.BlobsBundleV1.commitments) return _s; } -inline const std::string& BlobsBundleV1::_internal_kzgs(int index) const { - return _impl_.kzgs_.Get(index); +inline const std::string& BlobsBundleV1::_internal_commitments(int index) const { + return _impl_.commitments_.Get(index); } -inline const std::string& BlobsBundleV1::kzgs(int index) const { - // @@protoc_insertion_point(field_get:types.BlobsBundleV1.kzgs) - return _internal_kzgs(index); +inline const std::string& BlobsBundleV1::commitments(int index) const { + // @@protoc_insertion_point(field_get:types.BlobsBundleV1.commitments) + return _internal_commitments(index); } -inline std::string* BlobsBundleV1::mutable_kzgs(int index) { - // @@protoc_insertion_point(field_mutable:types.BlobsBundleV1.kzgs) - return _impl_.kzgs_.Mutable(index); +inline std::string* BlobsBundleV1::mutable_commitments(int index) { + // @@protoc_insertion_point(field_mutable:types.BlobsBundleV1.commitments) + return _impl_.commitments_.Mutable(index); } -inline void BlobsBundleV1::set_kzgs(int index, const std::string& value) { - _impl_.kzgs_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set:types.BlobsBundleV1.kzgs) +inline void BlobsBundleV1::set_commitments(int index, const std::string& value) { + _impl_.commitments_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set:types.BlobsBundleV1.commitments) } -inline void BlobsBundleV1::set_kzgs(int index, std::string&& value) { - _impl_.kzgs_.Mutable(index)->assign(std::move(value)); - // @@protoc_insertion_point(field_set:types.BlobsBundleV1.kzgs) +inline void BlobsBundleV1::set_commitments(int index, std::string&& value) { + _impl_.commitments_.Mutable(index)->assign(std::move(value)); + // @@protoc_insertion_point(field_set:types.BlobsBundleV1.commitments) } -inline void BlobsBundleV1::set_kzgs(int index, const char* value) { +inline void BlobsBundleV1::set_commitments(int index, const char* value) { GOOGLE_DCHECK(value != nullptr); - _impl_.kzgs_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:types.BlobsBundleV1.kzgs) + _impl_.commitments_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:types.BlobsBundleV1.commitments) } -inline void BlobsBundleV1::set_kzgs(int index, const void* value, size_t size) { - _impl_.kzgs_.Mutable(index)->assign( +inline void BlobsBundleV1::set_commitments(int index, const void* value, size_t size) { + _impl_.commitments_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:types.BlobsBundleV1.kzgs) + // @@protoc_insertion_point(field_set_pointer:types.BlobsBundleV1.commitments) } -inline std::string* BlobsBundleV1::_internal_add_kzgs() { - return _impl_.kzgs_.Add(); +inline std::string* BlobsBundleV1::_internal_add_commitments() { + return _impl_.commitments_.Add(); } -inline void BlobsBundleV1::add_kzgs(const std::string& value) { - _impl_.kzgs_.Add()->assign(value); - // @@protoc_insertion_point(field_add:types.BlobsBundleV1.kzgs) +inline void BlobsBundleV1::add_commitments(const std::string& value) { + _impl_.commitments_.Add()->assign(value); + // @@protoc_insertion_point(field_add:types.BlobsBundleV1.commitments) } -inline void BlobsBundleV1::add_kzgs(std::string&& value) { - _impl_.kzgs_.Add(std::move(value)); - // @@protoc_insertion_point(field_add:types.BlobsBundleV1.kzgs) +inline void BlobsBundleV1::add_commitments(std::string&& value) { + _impl_.commitments_.Add(std::move(value)); + // @@protoc_insertion_point(field_add:types.BlobsBundleV1.commitments) } -inline void BlobsBundleV1::add_kzgs(const char* value) { +inline void BlobsBundleV1::add_commitments(const char* value) { GOOGLE_DCHECK(value != nullptr); - _impl_.kzgs_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:types.BlobsBundleV1.kzgs) + _impl_.commitments_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:types.BlobsBundleV1.commitments) } -inline void BlobsBundleV1::add_kzgs(const void* value, size_t size) { - _impl_.kzgs_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:types.BlobsBundleV1.kzgs) +inline void BlobsBundleV1::add_commitments(const void* value, size_t size) { + _impl_.commitments_.Add()->assign(reinterpret_cast(value), size); + // @@protoc_insertion_point(field_add_pointer:types.BlobsBundleV1.commitments) } inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& -BlobsBundleV1::kzgs() const { - // @@protoc_insertion_point(field_list:types.BlobsBundleV1.kzgs) - return _impl_.kzgs_; +BlobsBundleV1::commitments() const { + // @@protoc_insertion_point(field_list:types.BlobsBundleV1.commitments) + return _impl_.commitments_; } inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* -BlobsBundleV1::mutable_kzgs() { - // @@protoc_insertion_point(field_mutable_list:types.BlobsBundleV1.kzgs) - return &_impl_.kzgs_; +BlobsBundleV1::mutable_commitments() { + // @@protoc_insertion_point(field_mutable_list:types.BlobsBundleV1.commitments) + return &_impl_.commitments_; } -// repeated bytes blobs = 3; +// repeated bytes blobs = 2; inline int BlobsBundleV1::_internal_blobs_size() const { return _impl_.blobs_.size(); } @@ -5487,6 +5379,81 @@ BlobsBundleV1::mutable_blobs() { return &_impl_.blobs_; } +// repeated bytes proofs = 3; +inline int BlobsBundleV1::_internal_proofs_size() const { + return _impl_.proofs_.size(); +} +inline int BlobsBundleV1::proofs_size() const { + return _internal_proofs_size(); +} +inline void BlobsBundleV1::clear_proofs() { + _impl_.proofs_.Clear(); +} +inline std::string* BlobsBundleV1::add_proofs() { + std::string* _s = _internal_add_proofs(); + // @@protoc_insertion_point(field_add_mutable:types.BlobsBundleV1.proofs) + return _s; +} +inline const std::string& BlobsBundleV1::_internal_proofs(int index) const { + return _impl_.proofs_.Get(index); +} +inline const std::string& BlobsBundleV1::proofs(int index) const { + // @@protoc_insertion_point(field_get:types.BlobsBundleV1.proofs) + return _internal_proofs(index); +} +inline std::string* BlobsBundleV1::mutable_proofs(int index) { + // @@protoc_insertion_point(field_mutable:types.BlobsBundleV1.proofs) + return _impl_.proofs_.Mutable(index); +} +inline void BlobsBundleV1::set_proofs(int index, const std::string& value) { + _impl_.proofs_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set:types.BlobsBundleV1.proofs) +} +inline void BlobsBundleV1::set_proofs(int index, std::string&& value) { + _impl_.proofs_.Mutable(index)->assign(std::move(value)); + // @@protoc_insertion_point(field_set:types.BlobsBundleV1.proofs) +} +inline void BlobsBundleV1::set_proofs(int index, const char* value) { + GOOGLE_DCHECK(value != nullptr); + _impl_.proofs_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:types.BlobsBundleV1.proofs) +} +inline void BlobsBundleV1::set_proofs(int index, const void* value, size_t size) { + _impl_.proofs_.Mutable(index)->assign( + reinterpret_cast(value), size); + // @@protoc_insertion_point(field_set_pointer:types.BlobsBundleV1.proofs) +} +inline std::string* BlobsBundleV1::_internal_add_proofs() { + return _impl_.proofs_.Add(); +} +inline void BlobsBundleV1::add_proofs(const std::string& value) { + _impl_.proofs_.Add()->assign(value); + // @@protoc_insertion_point(field_add:types.BlobsBundleV1.proofs) +} +inline void BlobsBundleV1::add_proofs(std::string&& value) { + _impl_.proofs_.Add(std::move(value)); + // @@protoc_insertion_point(field_add:types.BlobsBundleV1.proofs) +} +inline void BlobsBundleV1::add_proofs(const char* value) { + GOOGLE_DCHECK(value != nullptr); + _impl_.proofs_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:types.BlobsBundleV1.proofs) +} +inline void BlobsBundleV1::add_proofs(const void* value, size_t size) { + _impl_.proofs_.Add()->assign(reinterpret_cast(value), size); + // @@protoc_insertion_point(field_add_pointer:types.BlobsBundleV1.proofs) +} +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& +BlobsBundleV1::proofs() const { + // @@protoc_insertion_point(field_list:types.BlobsBundleV1.proofs) + return _impl_.proofs_; +} +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* +BlobsBundleV1::mutable_proofs() { + // @@protoc_insertion_point(field_mutable_list:types.BlobsBundleV1.proofs) + return &_impl_.proofs_; +} + // ------------------------------------------------------------------- // NodeInfoPorts diff --git a/silkworm/interfaces/proto b/silkworm/interfaces/proto index 6b2058cdcf..2e68a94fae 160000 --- a/silkworm/interfaces/proto +++ b/silkworm/interfaces/proto @@ -1 +1 @@ -Subproject commit 6b2058cdcfbff176ccd5be195967b5b4664f7c40 +Subproject commit 2e68a94faedac306b2e6c2ddc3cb0ce6d94ea2e8 diff --git a/silkworm/node/stagedsync/remote_client.cpp b/silkworm/node/stagedsync/remote_client.cpp index 07ea55ac30..153211b72b 100644 --- a/silkworm/node/stagedsync/remote_client.cpp +++ b/silkworm/node/stagedsync/remote_client.cpp @@ -52,8 +52,11 @@ static void serialize_header(const BlockHeader& bh, ::execution::Header* header) if (bh.withdrawals_root) { header->set_allocated_withdrawal_hash(rpc::H256_from_bytes32(*bh.withdrawals_root).release()); } + if (bh.data_gas_used) { + header->set_data_gas_used(*bh.data_gas_used); + } if (bh.excess_data_gas) { - header->set_allocated_excess_data_gas(rpc::H256_from_uint256(*bh.excess_data_gas).release()); + header->set_excess_data_gas(*bh.excess_data_gas); } } @@ -80,8 +83,11 @@ static void deserialize_header(const ::execution::Header& received_header, Block if (received_header.has_withdrawal_hash()) { header.withdrawals_root = rpc::bytes32_from_H256(received_header.withdrawal_hash()); } + if (received_header.has_data_gas_used()) { + header.data_gas_used = received_header.data_gas_used(); + } if (received_header.has_excess_data_gas()) { - header.excess_data_gas = rpc::uint256_from_H256(received_header.excess_data_gas()); + header.excess_data_gas = received_header.excess_data_gas(); } } From 7f45b179e379aca116697b68c96238875943cc08 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Thu, 1 Jun 2023 16:42:09 +0200 Subject: [PATCH 5/6] Add tests fro field clearing --- silkworm/core/types/transaction_test.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/silkworm/core/types/transaction_test.cpp b/silkworm/core/types/transaction_test.cpp index 30fa671cb9..92ea603a17 100644 --- a/silkworm/core/types/transaction_test.cpp +++ b/silkworm/core/types/transaction_test.cpp @@ -57,9 +57,13 @@ TEST_CASE("Legacy Transaction RLP") { CHECK(view.empty()); CHECK(decoded == txn); - // check that access_list and from is cleared + // Check that non-legacy fields (access_list, max_fee_per_data_gas, blob_versioned_hashes) and from are cleared + decoded.max_priority_fee_per_gas = 17; + decoded.max_fee_per_gas = 31; decoded.access_list = access_list; - decoded.from.emplace(0x811a752c8cd697e3cb27279c330ed1ada745a8d7_address); + decoded.max_fee_per_data_gas = 123; + decoded.blob_versioned_hashes.push_back(0xefc552d1df2a6a8e2643912171d040e4de0db43cd53b728c3e4d26952f710be8_bytes32); + decoded.from = 0x811a752c8cd697e3cb27279c330ed1ada745a8d7_address; view = encoded; REQUIRE(rlp::decode(view, decoded)); CHECK(view.empty()); @@ -120,6 +124,17 @@ TEST_CASE("EIP-2930 Transaction RLP") { REQUIRE(rlp::decode_transaction(view, decoded, rlp::Eip2718Wrapping::kBoth)); CHECK(view.empty()); CHECK(decoded == txn); + + // Check that post-EIP-2930 fields (max_fee_per_data_gas, blob_versioned_hashes) and from are cleared + decoded.max_priority_fee_per_gas = 17; + decoded.max_fee_per_gas = 31; + decoded.max_fee_per_data_gas = 123; + decoded.blob_versioned_hashes.push_back(0xefc552d1df2a6a8e2643912171d040e4de0db43cd53b728c3e4d26952f710be8_bytes32); + decoded.from = 0x811a752c8cd697e3cb27279c330ed1ada745a8d7_address; + view = encoded_wrapped; + REQUIRE(rlp::decode(view, decoded)); + CHECK(decoded == txn); + CHECK(!decoded.from); } TEST_CASE("EIP-1559 Transaction RLP") { From d99c47047f5ccb5c08f08b422f3c0cb7cc0cf505 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 2 Jun 2023 12:49:17 +0200 Subject: [PATCH 6/6] Pick up interfaces/pull/173 --- .../3.21.4/remote/ethbackend.grpc.pb.cc | 80 +--- .../3.21.4/remote/ethbackend.grpc.pb.h | 348 +++++------------- .../interfaces/3.21.4/remote/ethbackend.pb.cc | 43 +-- .../3.21.4/remote/ethbackend_mock.grpc.pb.h | 3 - silkworm/interfaces/proto | 2 +- 5 files changed, 134 insertions(+), 342 deletions(-) diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.cc b/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.cc index 9898e84030..57ed89a64d 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.cc +++ b/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.cc @@ -30,7 +30,6 @@ static const char* ETHBACKEND_method_names[] = { "/remote.ETHBACKEND/EngineGetPayload", "/remote.ETHBACKEND/EngineGetPayloadBodiesByHashV1", "/remote.ETHBACKEND/EngineGetPayloadBodiesByRangeV1", - "/remote.ETHBACKEND/EngineGetPayloadWithBlobs", "/remote.ETHBACKEND/Version", "/remote.ETHBACKEND/ProtocolVersion", "/remote.ETHBACKEND/ClientVersion", @@ -58,17 +57,16 @@ ETHBACKEND::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel , rpcmethod_EngineGetPayload_(ETHBACKEND_method_names[5], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_EngineGetPayloadBodiesByHashV1_(ETHBACKEND_method_names[6], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) , rpcmethod_EngineGetPayloadBodiesByRangeV1_(ETHBACKEND_method_names[7], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_EngineGetPayloadWithBlobs_(ETHBACKEND_method_names[8], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_Version_(ETHBACKEND_method_names[9], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ProtocolVersion_(ETHBACKEND_method_names[10], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_ClientVersion_(ETHBACKEND_method_names[11], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_Subscribe_(ETHBACKEND_method_names[12], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel) - , rpcmethod_SubscribeLogs_(ETHBACKEND_method_names[13], options.suffix_for_stats(),::grpc::internal::RpcMethod::BIDI_STREAMING, channel) - , rpcmethod_Block_(ETHBACKEND_method_names[14], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_TxnLookup_(ETHBACKEND_method_names[15], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_NodeInfo_(ETHBACKEND_method_names[16], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_Peers_(ETHBACKEND_method_names[17], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) - , rpcmethod_PendingBlock_(ETHBACKEND_method_names[18], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_Version_(ETHBACKEND_method_names[8], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ProtocolVersion_(ETHBACKEND_method_names[9], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_ClientVersion_(ETHBACKEND_method_names[10], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_Subscribe_(ETHBACKEND_method_names[11], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel) + , rpcmethod_SubscribeLogs_(ETHBACKEND_method_names[12], options.suffix_for_stats(),::grpc::internal::RpcMethod::BIDI_STREAMING, channel) + , rpcmethod_Block_(ETHBACKEND_method_names[13], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_TxnLookup_(ETHBACKEND_method_names[14], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_NodeInfo_(ETHBACKEND_method_names[15], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_Peers_(ETHBACKEND_method_names[16], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) + , rpcmethod_PendingBlock_(ETHBACKEND_method_names[17], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel) {} ::grpc::Status ETHBACKEND::Stub::Etherbase(::grpc::ClientContext* context, const ::remote::EtherbaseRequest& request, ::remote::EtherbaseReply* response) { @@ -255,29 +253,6 @@ ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>* return result; } -::grpc::Status ETHBACKEND::Stub::EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response) { - return ::grpc::internal::BlockingUnaryCall< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_EngineGetPayloadWithBlobs_, context, request, response); -} - -void ETHBACKEND::Stub::async::EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, std::function f) { - ::grpc::internal::CallbackUnaryCall< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_EngineGetPayloadWithBlobs_, context, request, response, std::move(f)); -} - -void ETHBACKEND::Stub::async::EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, ::grpc::ClientUnaryReactor* reactor) { - ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_EngineGetPayloadWithBlobs_, context, request, response, reactor); -} - -::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>* ETHBACKEND::Stub::PrepareAsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { - return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::remote::EngineGetPayloadResponse, ::remote::EngineGetPayloadRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_EngineGetPayloadWithBlobs_, context, request); -} - -::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>* ETHBACKEND::Stub::AsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { - auto* result = - this->PrepareAsyncEngineGetPayloadWithBlobsRaw(context, request, cq); - result->StartCall(); - return result; -} - ::grpc::Status ETHBACKEND::Stub::Version(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::types::VersionReply* response) { return ::grpc::internal::BlockingUnaryCall< ::google::protobuf::Empty, ::types::VersionReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Version_, context, request, response); } @@ -578,16 +553,6 @@ ETHBACKEND::Service::Service() { AddMethod(new ::grpc::internal::RpcServiceMethod( ETHBACKEND_method_names[8], ::grpc::internal::RpcMethod::NORMAL_RPC, - new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( - [](ETHBACKEND::Service* service, - ::grpc::ServerContext* ctx, - const ::remote::EngineGetPayloadRequest* req, - ::remote::EngineGetPayloadResponse* resp) { - return service->EngineGetPayloadWithBlobs(ctx, req, resp); - }, this))); - AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[9], - ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::google::protobuf::Empty, ::types::VersionReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, ::grpc::ServerContext* ctx, @@ -596,7 +561,7 @@ ETHBACKEND::Service::Service() { return service->Version(ctx, req, resp); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[10], + ETHBACKEND_method_names[9], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::remote::ProtocolVersionRequest, ::remote::ProtocolVersionReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, @@ -606,7 +571,7 @@ ETHBACKEND::Service::Service() { return service->ProtocolVersion(ctx, req, resp); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[11], + ETHBACKEND_method_names[10], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::remote::ClientVersionRequest, ::remote::ClientVersionReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, @@ -616,7 +581,7 @@ ETHBACKEND::Service::Service() { return service->ClientVersion(ctx, req, resp); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[12], + ETHBACKEND_method_names[11], ::grpc::internal::RpcMethod::SERVER_STREAMING, new ::grpc::internal::ServerStreamingHandler< ETHBACKEND::Service, ::remote::SubscribeRequest, ::remote::SubscribeReply>( [](ETHBACKEND::Service* service, @@ -626,7 +591,7 @@ ETHBACKEND::Service::Service() { return service->Subscribe(ctx, req, writer); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[13], + ETHBACKEND_method_names[12], ::grpc::internal::RpcMethod::BIDI_STREAMING, new ::grpc::internal::BidiStreamingHandler< ETHBACKEND::Service, ::remote::LogsFilterRequest, ::remote::SubscribeLogsReply>( [](ETHBACKEND::Service* service, @@ -636,7 +601,7 @@ ETHBACKEND::Service::Service() { return service->SubscribeLogs(ctx, stream); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[14], + ETHBACKEND_method_names[13], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::remote::BlockRequest, ::remote::BlockReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, @@ -646,7 +611,7 @@ ETHBACKEND::Service::Service() { return service->Block(ctx, req, resp); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[15], + ETHBACKEND_method_names[14], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::remote::TxnLookupRequest, ::remote::TxnLookupReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, @@ -656,7 +621,7 @@ ETHBACKEND::Service::Service() { return service->TxnLookup(ctx, req, resp); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[16], + ETHBACKEND_method_names[15], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::remote::NodesInfoRequest, ::remote::NodesInfoReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, @@ -666,7 +631,7 @@ ETHBACKEND::Service::Service() { return service->NodeInfo(ctx, req, resp); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[17], + ETHBACKEND_method_names[16], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::google::protobuf::Empty, ::remote::PeersReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, @@ -676,7 +641,7 @@ ETHBACKEND::Service::Service() { return service->Peers(ctx, req, resp); }, this))); AddMethod(new ::grpc::internal::RpcServiceMethod( - ETHBACKEND_method_names[18], + ETHBACKEND_method_names[17], ::grpc::internal::RpcMethod::NORMAL_RPC, new ::grpc::internal::RpcMethodHandler< ETHBACKEND::Service, ::google::protobuf::Empty, ::remote::PendingBlockReply, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>( [](ETHBACKEND::Service* service, @@ -746,13 +711,6 @@ ::grpc::Status ETHBACKEND::Service::EngineGetPayloadBodiesByRangeV1(::grpc::Serv return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } -::grpc::Status ETHBACKEND::Service::EngineGetPayloadWithBlobs(::grpc::ServerContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response) { - (void) context; - (void) request; - (void) response; - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); -} - ::grpc::Status ETHBACKEND::Service::Version(::grpc::ServerContext* context, const ::google::protobuf::Empty* request, ::types::VersionReply* response) { (void) context; (void) request; diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.h b/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.h index 30dab8a00f..294ad42470 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.h +++ b/silkworm/interfaces/3.21.4/remote/ethbackend.grpc.pb.h @@ -76,7 +76,7 @@ class ETHBACKEND final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineForkChoiceUpdatedResponse>> PrepareAsyncEngineForkChoiceUpdated(::grpc::ClientContext* context, const ::remote::EngineForkChoiceUpdatedRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineForkChoiceUpdatedResponse>>(PrepareAsyncEngineForkChoiceUpdatedRaw(context, request, cq)); } - // Fetch Execution Payload using its ID. + // Fetch the payload along with its blobs by ID. virtual ::grpc::Status EngineGetPayload(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response) = 0; std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>> AsyncEngineGetPayload(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>>(AsyncEngineGetPayloadRaw(context, request, cq)); @@ -98,14 +98,6 @@ class ETHBACKEND final { std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>> PrepareAsyncEngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>>(PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw(context, request, cq)); } - // Fetch the payload along with its blobs bundle using its ID. - virtual ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response) = 0; - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>> AsyncEngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>>(AsyncEngineGetPayloadWithBlobsRaw(context, request, cq)); - } - std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>> PrepareAsyncEngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>>(PrepareAsyncEngineGetPayloadWithBlobsRaw(context, request, cq)); - } // End of Engine API requests // ------------------------------------------------------------------------ // @@ -213,16 +205,13 @@ class ETHBACKEND final { // Update fork choice virtual void EngineForkChoiceUpdated(::grpc::ClientContext* context, const ::remote::EngineForkChoiceUpdatedRequest* request, ::remote::EngineForkChoiceUpdatedResponse* response, std::function) = 0; virtual void EngineForkChoiceUpdated(::grpc::ClientContext* context, const ::remote::EngineForkChoiceUpdatedRequest* request, ::remote::EngineForkChoiceUpdatedResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0; - // Fetch Execution Payload using its ID. + // Fetch the payload along with its blobs by ID. virtual void EngineGetPayload(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, std::function) = 0; virtual void EngineGetPayload(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0; virtual void EngineGetPayloadBodiesByHashV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, std::function) = 0; virtual void EngineGetPayloadBodiesByHashV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, ::grpc::ClientUnaryReactor* reactor) = 0; virtual void EngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, std::function) = 0; virtual void EngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, ::grpc::ClientUnaryReactor* reactor) = 0; - // Fetch the payload along with its blobs bundle using its ID. - virtual void EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, std::function) = 0; - virtual void EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0; // End of Engine API requests // ------------------------------------------------------------------------ // @@ -276,8 +265,6 @@ class ETHBACKEND final { virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>* PrepareAsyncEngineGetPayloadBodiesByHashV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>* AsyncEngineGetPayloadBodiesByRangeV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>* PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>* AsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) = 0; - virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>* PrepareAsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::types::VersionReply>* AsyncVersionRaw(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::types::VersionReply>* PrepareAsyncVersionRaw(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) = 0; virtual ::grpc::ClientAsyncResponseReaderInterface< ::remote::ProtocolVersionReply>* AsyncProtocolVersionRaw(::grpc::ClientContext* context, const ::remote::ProtocolVersionRequest& request, ::grpc::CompletionQueue* cq) = 0; @@ -360,13 +347,6 @@ class ETHBACKEND final { std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>> PrepareAsyncEngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>>(PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw(context, request, cq)); } - ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response) override; - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>> AsyncEngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>>(AsyncEngineGetPayloadWithBlobsRaw(context, request, cq)); - } - std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>> PrepareAsyncEngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) { - return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>>(PrepareAsyncEngineGetPayloadWithBlobsRaw(context, request, cq)); - } ::grpc::Status Version(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::types::VersionReply* response) override; std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::types::VersionReply>> AsyncVersion(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) { return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::types::VersionReply>>(AsyncVersionRaw(context, request, cq)); @@ -460,8 +440,6 @@ class ETHBACKEND final { void EngineGetPayloadBodiesByHashV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, ::grpc::ClientUnaryReactor* reactor) override; void EngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, std::function) override; void EngineGetPayloadBodiesByRangeV1(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response, ::grpc::ClientUnaryReactor* reactor) override; - void EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, std::function) override; - void EngineGetPayloadWithBlobs(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response, ::grpc::ClientUnaryReactor* reactor) override; void Version(::grpc::ClientContext* context, const ::google::protobuf::Empty* request, ::types::VersionReply* response, std::function) override; void Version(::grpc::ClientContext* context, const ::google::protobuf::Empty* request, ::types::VersionReply* response, ::grpc::ClientUnaryReactor* reactor) override; void ProtocolVersion(::grpc::ClientContext* context, const ::remote::ProtocolVersionRequest* request, ::remote::ProtocolVersionReply* response, std::function) override; @@ -507,8 +485,6 @@ class ETHBACKEND final { ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>* PrepareAsyncEngineGetPayloadBodiesByHashV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>* AsyncEngineGetPayloadBodiesByRangeV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadBodiesV1Response>* PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>* AsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) override; - ::grpc::ClientAsyncResponseReader< ::remote::EngineGetPayloadResponse>* PrepareAsyncEngineGetPayloadWithBlobsRaw(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::types::VersionReply>* AsyncVersionRaw(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::types::VersionReply>* PrepareAsyncVersionRaw(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq) override; ::grpc::ClientAsyncResponseReader< ::remote::ProtocolVersionReply>* AsyncProtocolVersionRaw(::grpc::ClientContext* context, const ::remote::ProtocolVersionRequest& request, ::grpc::CompletionQueue* cq) override; @@ -539,7 +515,6 @@ class ETHBACKEND final { const ::grpc::internal::RpcMethod rpcmethod_EngineGetPayload_; const ::grpc::internal::RpcMethod rpcmethod_EngineGetPayloadBodiesByHashV1_; const ::grpc::internal::RpcMethod rpcmethod_EngineGetPayloadBodiesByRangeV1_; - const ::grpc::internal::RpcMethod rpcmethod_EngineGetPayloadWithBlobs_; const ::grpc::internal::RpcMethod rpcmethod_Version_; const ::grpc::internal::RpcMethod rpcmethod_ProtocolVersion_; const ::grpc::internal::RpcMethod rpcmethod_ClientVersion_; @@ -568,12 +543,10 @@ class ETHBACKEND final { virtual ::grpc::Status EngineNewPayload(::grpc::ServerContext* context, const ::types::ExecutionPayload* request, ::remote::EnginePayloadStatus* response); // Update fork choice virtual ::grpc::Status EngineForkChoiceUpdated(::grpc::ServerContext* context, const ::remote::EngineForkChoiceUpdatedRequest* request, ::remote::EngineForkChoiceUpdatedResponse* response); - // Fetch Execution Payload using its ID. + // Fetch the payload along with its blobs by ID. virtual ::grpc::Status EngineGetPayload(::grpc::ServerContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response); virtual ::grpc::Status EngineGetPayloadBodiesByHashV1(::grpc::ServerContext* context, const ::remote::EngineGetPayloadBodiesByHashV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response); virtual ::grpc::Status EngineGetPayloadBodiesByRangeV1(::grpc::ServerContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request* request, ::remote::EngineGetPayloadBodiesV1Response* response); - // Fetch the payload along with its blobs bundle using its ID. - virtual ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response); // End of Engine API requests // ------------------------------------------------------------------------ // @@ -760,32 +733,12 @@ class ETHBACKEND final { } }; template - class WithAsyncMethod_EngineGetPayloadWithBlobs : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} - public: - WithAsyncMethod_EngineGetPayloadWithBlobs() { - ::grpc::Service::MarkMethodAsync(8); - } - ~WithAsyncMethod_EngineGetPayloadWithBlobs() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - void RequestEngineGetPayloadWithBlobs(::grpc::ServerContext* context, ::remote::EngineGetPayloadRequest* request, ::grpc::ServerAsyncResponseWriter< ::remote::EngineGetPayloadResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); - } - }; - template class WithAsyncMethod_Version : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_Version() { - ::grpc::Service::MarkMethodAsync(9); + ::grpc::Service::MarkMethodAsync(8); } ~WithAsyncMethod_Version() override { BaseClassMustBeDerivedFromService(this); @@ -796,7 +749,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestVersion(::grpc::ServerContext* context, ::google::protobuf::Empty* request, ::grpc::ServerAsyncResponseWriter< ::types::VersionReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -805,7 +758,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_ProtocolVersion() { - ::grpc::Service::MarkMethodAsync(10); + ::grpc::Service::MarkMethodAsync(9); } ~WithAsyncMethod_ProtocolVersion() override { BaseClassMustBeDerivedFromService(this); @@ -816,7 +769,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestProtocolVersion(::grpc::ServerContext* context, ::remote::ProtocolVersionRequest* request, ::grpc::ServerAsyncResponseWriter< ::remote::ProtocolVersionReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -825,7 +778,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_ClientVersion() { - ::grpc::Service::MarkMethodAsync(11); + ::grpc::Service::MarkMethodAsync(10); } ~WithAsyncMethod_ClientVersion() override { BaseClassMustBeDerivedFromService(this); @@ -836,7 +789,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestClientVersion(::grpc::ServerContext* context, ::remote::ClientVersionRequest* request, ::grpc::ServerAsyncResponseWriter< ::remote::ClientVersionReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(11, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -845,7 +798,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_Subscribe() { - ::grpc::Service::MarkMethodAsync(12); + ::grpc::Service::MarkMethodAsync(11); } ~WithAsyncMethod_Subscribe() override { BaseClassMustBeDerivedFromService(this); @@ -856,7 +809,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestSubscribe(::grpc::ServerContext* context, ::remote::SubscribeRequest* request, ::grpc::ServerAsyncWriter< ::remote::SubscribeReply>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncServerStreaming(12, context, request, writer, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncServerStreaming(11, context, request, writer, new_call_cq, notification_cq, tag); } }; template @@ -865,7 +818,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_SubscribeLogs() { - ::grpc::Service::MarkMethodAsync(13); + ::grpc::Service::MarkMethodAsync(12); } ~WithAsyncMethod_SubscribeLogs() override { BaseClassMustBeDerivedFromService(this); @@ -876,7 +829,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestSubscribeLogs(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::remote::SubscribeLogsReply, ::remote::LogsFilterRequest>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncBidiStreaming(13, context, stream, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncBidiStreaming(12, context, stream, new_call_cq, notification_cq, tag); } }; template @@ -885,7 +838,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_Block() { - ::grpc::Service::MarkMethodAsync(14); + ::grpc::Service::MarkMethodAsync(13); } ~WithAsyncMethod_Block() override { BaseClassMustBeDerivedFromService(this); @@ -896,7 +849,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestBlock(::grpc::ServerContext* context, ::remote::BlockRequest* request, ::grpc::ServerAsyncResponseWriter< ::remote::BlockReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(14, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(13, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -905,7 +858,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_TxnLookup() { - ::grpc::Service::MarkMethodAsync(15); + ::grpc::Service::MarkMethodAsync(14); } ~WithAsyncMethod_TxnLookup() override { BaseClassMustBeDerivedFromService(this); @@ -916,7 +869,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestTxnLookup(::grpc::ServerContext* context, ::remote::TxnLookupRequest* request, ::grpc::ServerAsyncResponseWriter< ::remote::TxnLookupReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(15, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(14, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -925,7 +878,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_NodeInfo() { - ::grpc::Service::MarkMethodAsync(16); + ::grpc::Service::MarkMethodAsync(15); } ~WithAsyncMethod_NodeInfo() override { BaseClassMustBeDerivedFromService(this); @@ -936,7 +889,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestNodeInfo(::grpc::ServerContext* context, ::remote::NodesInfoRequest* request, ::grpc::ServerAsyncResponseWriter< ::remote::NodesInfoReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(16, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(15, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -945,7 +898,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_Peers() { - ::grpc::Service::MarkMethodAsync(17); + ::grpc::Service::MarkMethodAsync(16); } ~WithAsyncMethod_Peers() override { BaseClassMustBeDerivedFromService(this); @@ -956,7 +909,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestPeers(::grpc::ServerContext* context, ::google::protobuf::Empty* request, ::grpc::ServerAsyncResponseWriter< ::remote::PeersReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(17, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(16, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -965,7 +918,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithAsyncMethod_PendingBlock() { - ::grpc::Service::MarkMethodAsync(18); + ::grpc::Service::MarkMethodAsync(17); } ~WithAsyncMethod_PendingBlock() override { BaseClassMustBeDerivedFromService(this); @@ -976,10 +929,10 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestPendingBlock(::grpc::ServerContext* context, ::google::protobuf::Empty* request, ::grpc::ServerAsyncResponseWriter< ::remote::PendingBlockReply>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(18, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(17, context, request, response, new_call_cq, notification_cq, tag); } }; - typedef WithAsyncMethod_Etherbase > > > > > > > > > > > > > > > > > > AsyncService; + typedef WithAsyncMethod_Etherbase > > > > > > > > > > > > > > > > > AsyncService; template class WithCallbackMethod_Etherbase : public BaseClass { private: @@ -1197,45 +1150,18 @@ class ETHBACKEND final { ::grpc::CallbackServerContext* /*context*/, const ::remote::EngineGetPayloadBodiesByRangeV1Request* /*request*/, ::remote::EngineGetPayloadBodiesV1Response* /*response*/) { return nullptr; } }; template - class WithCallbackMethod_EngineGetPayloadWithBlobs : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} - public: - WithCallbackMethod_EngineGetPayloadWithBlobs() { - ::grpc::Service::MarkMethodCallback(8, - new ::grpc::internal::CallbackUnaryHandler< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>( - [this]( - ::grpc::CallbackServerContext* context, const ::remote::EngineGetPayloadRequest* request, ::remote::EngineGetPayloadResponse* response) { return this->EngineGetPayloadWithBlobs(context, request, response); }));} - void SetMessageAllocatorFor_EngineGetPayloadWithBlobs( - ::grpc::MessageAllocator< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(8); - static_cast<::grpc::internal::CallbackUnaryHandler< ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>*>(handler) - ->SetMessageAllocator(allocator); - } - ~WithCallbackMethod_EngineGetPayloadWithBlobs() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - virtual ::grpc::ServerUnaryReactor* EngineGetPayloadWithBlobs( - ::grpc::CallbackServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) { return nullptr; } - }; - template class WithCallbackMethod_Version : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_Version() { - ::grpc::Service::MarkMethodCallback(9, + ::grpc::Service::MarkMethodCallback(8, new ::grpc::internal::CallbackUnaryHandler< ::google::protobuf::Empty, ::types::VersionReply>( [this]( ::grpc::CallbackServerContext* context, const ::google::protobuf::Empty* request, ::types::VersionReply* response) { return this->Version(context, request, response); }));} void SetMessageAllocatorFor_Version( ::grpc::MessageAllocator< ::google::protobuf::Empty, ::types::VersionReply>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(9); + ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(8); static_cast<::grpc::internal::CallbackUnaryHandler< ::google::protobuf::Empty, ::types::VersionReply>*>(handler) ->SetMessageAllocator(allocator); } @@ -1256,13 +1182,13 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_ProtocolVersion() { - ::grpc::Service::MarkMethodCallback(10, + ::grpc::Service::MarkMethodCallback(9, new ::grpc::internal::CallbackUnaryHandler< ::remote::ProtocolVersionRequest, ::remote::ProtocolVersionReply>( [this]( ::grpc::CallbackServerContext* context, const ::remote::ProtocolVersionRequest* request, ::remote::ProtocolVersionReply* response) { return this->ProtocolVersion(context, request, response); }));} void SetMessageAllocatorFor_ProtocolVersion( ::grpc::MessageAllocator< ::remote::ProtocolVersionRequest, ::remote::ProtocolVersionReply>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(10); + ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(9); static_cast<::grpc::internal::CallbackUnaryHandler< ::remote::ProtocolVersionRequest, ::remote::ProtocolVersionReply>*>(handler) ->SetMessageAllocator(allocator); } @@ -1283,13 +1209,13 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_ClientVersion() { - ::grpc::Service::MarkMethodCallback(11, + ::grpc::Service::MarkMethodCallback(10, new ::grpc::internal::CallbackUnaryHandler< ::remote::ClientVersionRequest, ::remote::ClientVersionReply>( [this]( ::grpc::CallbackServerContext* context, const ::remote::ClientVersionRequest* request, ::remote::ClientVersionReply* response) { return this->ClientVersion(context, request, response); }));} void SetMessageAllocatorFor_ClientVersion( ::grpc::MessageAllocator< ::remote::ClientVersionRequest, ::remote::ClientVersionReply>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(11); + ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(10); static_cast<::grpc::internal::CallbackUnaryHandler< ::remote::ClientVersionRequest, ::remote::ClientVersionReply>*>(handler) ->SetMessageAllocator(allocator); } @@ -1310,7 +1236,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_Subscribe() { - ::grpc::Service::MarkMethodCallback(12, + ::grpc::Service::MarkMethodCallback(11, new ::grpc::internal::CallbackServerStreamingHandler< ::remote::SubscribeRequest, ::remote::SubscribeReply>( [this]( ::grpc::CallbackServerContext* context, const ::remote::SubscribeRequest* request) { return this->Subscribe(context, request); })); @@ -1332,7 +1258,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_SubscribeLogs() { - ::grpc::Service::MarkMethodCallback(13, + ::grpc::Service::MarkMethodCallback(12, new ::grpc::internal::CallbackBidiHandler< ::remote::LogsFilterRequest, ::remote::SubscribeLogsReply>( [this]( ::grpc::CallbackServerContext* context) { return this->SubscribeLogs(context); })); @@ -1355,13 +1281,13 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_Block() { - ::grpc::Service::MarkMethodCallback(14, + ::grpc::Service::MarkMethodCallback(13, new ::grpc::internal::CallbackUnaryHandler< ::remote::BlockRequest, ::remote::BlockReply>( [this]( ::grpc::CallbackServerContext* context, const ::remote::BlockRequest* request, ::remote::BlockReply* response) { return this->Block(context, request, response); }));} void SetMessageAllocatorFor_Block( ::grpc::MessageAllocator< ::remote::BlockRequest, ::remote::BlockReply>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(14); + ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(13); static_cast<::grpc::internal::CallbackUnaryHandler< ::remote::BlockRequest, ::remote::BlockReply>*>(handler) ->SetMessageAllocator(allocator); } @@ -1382,13 +1308,13 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_TxnLookup() { - ::grpc::Service::MarkMethodCallback(15, + ::grpc::Service::MarkMethodCallback(14, new ::grpc::internal::CallbackUnaryHandler< ::remote::TxnLookupRequest, ::remote::TxnLookupReply>( [this]( ::grpc::CallbackServerContext* context, const ::remote::TxnLookupRequest* request, ::remote::TxnLookupReply* response) { return this->TxnLookup(context, request, response); }));} void SetMessageAllocatorFor_TxnLookup( ::grpc::MessageAllocator< ::remote::TxnLookupRequest, ::remote::TxnLookupReply>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(15); + ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(14); static_cast<::grpc::internal::CallbackUnaryHandler< ::remote::TxnLookupRequest, ::remote::TxnLookupReply>*>(handler) ->SetMessageAllocator(allocator); } @@ -1409,13 +1335,13 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_NodeInfo() { - ::grpc::Service::MarkMethodCallback(16, + ::grpc::Service::MarkMethodCallback(15, new ::grpc::internal::CallbackUnaryHandler< ::remote::NodesInfoRequest, ::remote::NodesInfoReply>( [this]( ::grpc::CallbackServerContext* context, const ::remote::NodesInfoRequest* request, ::remote::NodesInfoReply* response) { return this->NodeInfo(context, request, response); }));} void SetMessageAllocatorFor_NodeInfo( ::grpc::MessageAllocator< ::remote::NodesInfoRequest, ::remote::NodesInfoReply>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(16); + ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(15); static_cast<::grpc::internal::CallbackUnaryHandler< ::remote::NodesInfoRequest, ::remote::NodesInfoReply>*>(handler) ->SetMessageAllocator(allocator); } @@ -1436,13 +1362,13 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_Peers() { - ::grpc::Service::MarkMethodCallback(17, + ::grpc::Service::MarkMethodCallback(16, new ::grpc::internal::CallbackUnaryHandler< ::google::protobuf::Empty, ::remote::PeersReply>( [this]( ::grpc::CallbackServerContext* context, const ::google::protobuf::Empty* request, ::remote::PeersReply* response) { return this->Peers(context, request, response); }));} void SetMessageAllocatorFor_Peers( ::grpc::MessageAllocator< ::google::protobuf::Empty, ::remote::PeersReply>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(17); + ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(16); static_cast<::grpc::internal::CallbackUnaryHandler< ::google::protobuf::Empty, ::remote::PeersReply>*>(handler) ->SetMessageAllocator(allocator); } @@ -1463,13 +1389,13 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithCallbackMethod_PendingBlock() { - ::grpc::Service::MarkMethodCallback(18, + ::grpc::Service::MarkMethodCallback(17, new ::grpc::internal::CallbackUnaryHandler< ::google::protobuf::Empty, ::remote::PendingBlockReply>( [this]( ::grpc::CallbackServerContext* context, const ::google::protobuf::Empty* request, ::remote::PendingBlockReply* response) { return this->PendingBlock(context, request, response); }));} void SetMessageAllocatorFor_PendingBlock( ::grpc::MessageAllocator< ::google::protobuf::Empty, ::remote::PendingBlockReply>* allocator) { - ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(18); + ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(17); static_cast<::grpc::internal::CallbackUnaryHandler< ::google::protobuf::Empty, ::remote::PendingBlockReply>*>(handler) ->SetMessageAllocator(allocator); } @@ -1484,7 +1410,7 @@ class ETHBACKEND final { virtual ::grpc::ServerUnaryReactor* PendingBlock( ::grpc::CallbackServerContext* /*context*/, const ::google::protobuf::Empty* /*request*/, ::remote::PendingBlockReply* /*response*/) { return nullptr; } }; - typedef WithCallbackMethod_Etherbase > > > > > > > > > > > > > > > > > > CallbackService; + typedef WithCallbackMethod_Etherbase > > > > > > > > > > > > > > > > > CallbackService; typedef CallbackService ExperimentalCallbackService; template class WithGenericMethod_Etherbase : public BaseClass { @@ -1623,29 +1549,12 @@ class ETHBACKEND final { } }; template - class WithGenericMethod_EngineGetPayloadWithBlobs : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} - public: - WithGenericMethod_EngineGetPayloadWithBlobs() { - ::grpc::Service::MarkMethodGeneric(8); - } - ~WithGenericMethod_EngineGetPayloadWithBlobs() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - }; - template class WithGenericMethod_Version : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_Version() { - ::grpc::Service::MarkMethodGeneric(9); + ::grpc::Service::MarkMethodGeneric(8); } ~WithGenericMethod_Version() override { BaseClassMustBeDerivedFromService(this); @@ -1662,7 +1571,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_ProtocolVersion() { - ::grpc::Service::MarkMethodGeneric(10); + ::grpc::Service::MarkMethodGeneric(9); } ~WithGenericMethod_ProtocolVersion() override { BaseClassMustBeDerivedFromService(this); @@ -1679,7 +1588,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_ClientVersion() { - ::grpc::Service::MarkMethodGeneric(11); + ::grpc::Service::MarkMethodGeneric(10); } ~WithGenericMethod_ClientVersion() override { BaseClassMustBeDerivedFromService(this); @@ -1696,7 +1605,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_Subscribe() { - ::grpc::Service::MarkMethodGeneric(12); + ::grpc::Service::MarkMethodGeneric(11); } ~WithGenericMethod_Subscribe() override { BaseClassMustBeDerivedFromService(this); @@ -1713,7 +1622,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_SubscribeLogs() { - ::grpc::Service::MarkMethodGeneric(13); + ::grpc::Service::MarkMethodGeneric(12); } ~WithGenericMethod_SubscribeLogs() override { BaseClassMustBeDerivedFromService(this); @@ -1730,7 +1639,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_Block() { - ::grpc::Service::MarkMethodGeneric(14); + ::grpc::Service::MarkMethodGeneric(13); } ~WithGenericMethod_Block() override { BaseClassMustBeDerivedFromService(this); @@ -1747,7 +1656,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_TxnLookup() { - ::grpc::Service::MarkMethodGeneric(15); + ::grpc::Service::MarkMethodGeneric(14); } ~WithGenericMethod_TxnLookup() override { BaseClassMustBeDerivedFromService(this); @@ -1764,7 +1673,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_NodeInfo() { - ::grpc::Service::MarkMethodGeneric(16); + ::grpc::Service::MarkMethodGeneric(15); } ~WithGenericMethod_NodeInfo() override { BaseClassMustBeDerivedFromService(this); @@ -1781,7 +1690,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_Peers() { - ::grpc::Service::MarkMethodGeneric(17); + ::grpc::Service::MarkMethodGeneric(16); } ~WithGenericMethod_Peers() override { BaseClassMustBeDerivedFromService(this); @@ -1798,7 +1707,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithGenericMethod_PendingBlock() { - ::grpc::Service::MarkMethodGeneric(18); + ::grpc::Service::MarkMethodGeneric(17); } ~WithGenericMethod_PendingBlock() override { BaseClassMustBeDerivedFromService(this); @@ -1970,32 +1879,12 @@ class ETHBACKEND final { } }; template - class WithRawMethod_EngineGetPayloadWithBlobs : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} - public: - WithRawMethod_EngineGetPayloadWithBlobs() { - ::grpc::Service::MarkMethodRaw(8); - } - ~WithRawMethod_EngineGetPayloadWithBlobs() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - void RequestEngineGetPayloadWithBlobs(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); - } - }; - template class WithRawMethod_Version : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_Version() { - ::grpc::Service::MarkMethodRaw(9); + ::grpc::Service::MarkMethodRaw(8); } ~WithRawMethod_Version() override { BaseClassMustBeDerivedFromService(this); @@ -2006,7 +1895,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestVersion(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2015,7 +1904,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_ProtocolVersion() { - ::grpc::Service::MarkMethodRaw(10); + ::grpc::Service::MarkMethodRaw(9); } ~WithRawMethod_ProtocolVersion() override { BaseClassMustBeDerivedFromService(this); @@ -2026,7 +1915,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestProtocolVersion(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2035,7 +1924,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_ClientVersion() { - ::grpc::Service::MarkMethodRaw(11); + ::grpc::Service::MarkMethodRaw(10); } ~WithRawMethod_ClientVersion() override { BaseClassMustBeDerivedFromService(this); @@ -2046,7 +1935,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestClientVersion(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(11, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2055,7 +1944,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_Subscribe() { - ::grpc::Service::MarkMethodRaw(12); + ::grpc::Service::MarkMethodRaw(11); } ~WithRawMethod_Subscribe() override { BaseClassMustBeDerivedFromService(this); @@ -2066,7 +1955,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestSubscribe(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncWriter< ::grpc::ByteBuffer>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncServerStreaming(12, context, request, writer, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncServerStreaming(11, context, request, writer, new_call_cq, notification_cq, tag); } }; template @@ -2075,7 +1964,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_SubscribeLogs() { - ::grpc::Service::MarkMethodRaw(13); + ::grpc::Service::MarkMethodRaw(12); } ~WithRawMethod_SubscribeLogs() override { BaseClassMustBeDerivedFromService(this); @@ -2086,7 +1975,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestSubscribeLogs(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::grpc::ByteBuffer, ::grpc::ByteBuffer>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncBidiStreaming(13, context, stream, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncBidiStreaming(12, context, stream, new_call_cq, notification_cq, tag); } }; template @@ -2095,7 +1984,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_Block() { - ::grpc::Service::MarkMethodRaw(14); + ::grpc::Service::MarkMethodRaw(13); } ~WithRawMethod_Block() override { BaseClassMustBeDerivedFromService(this); @@ -2106,7 +1995,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestBlock(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(14, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(13, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2115,7 +2004,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_TxnLookup() { - ::grpc::Service::MarkMethodRaw(15); + ::grpc::Service::MarkMethodRaw(14); } ~WithRawMethod_TxnLookup() override { BaseClassMustBeDerivedFromService(this); @@ -2126,7 +2015,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestTxnLookup(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(15, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(14, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2135,7 +2024,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_NodeInfo() { - ::grpc::Service::MarkMethodRaw(16); + ::grpc::Service::MarkMethodRaw(15); } ~WithRawMethod_NodeInfo() override { BaseClassMustBeDerivedFromService(this); @@ -2146,7 +2035,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestNodeInfo(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(16, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(15, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2155,7 +2044,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_Peers() { - ::grpc::Service::MarkMethodRaw(17); + ::grpc::Service::MarkMethodRaw(16); } ~WithRawMethod_Peers() override { BaseClassMustBeDerivedFromService(this); @@ -2166,7 +2055,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestPeers(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(17, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(16, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2175,7 +2064,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawMethod_PendingBlock() { - ::grpc::Service::MarkMethodRaw(18); + ::grpc::Service::MarkMethodRaw(17); } ~WithRawMethod_PendingBlock() override { BaseClassMustBeDerivedFromService(this); @@ -2186,7 +2075,7 @@ class ETHBACKEND final { return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); } void RequestPendingBlock(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) { - ::grpc::Service::RequestAsyncUnary(18, context, request, response, new_call_cq, notification_cq, tag); + ::grpc::Service::RequestAsyncUnary(17, context, request, response, new_call_cq, notification_cq, tag); } }; template @@ -2366,34 +2255,12 @@ class ETHBACKEND final { ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/) { return nullptr; } }; template - class WithRawCallbackMethod_EngineGetPayloadWithBlobs : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} - public: - WithRawCallbackMethod_EngineGetPayloadWithBlobs() { - ::grpc::Service::MarkMethodRawCallback(8, - new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( - [this]( - ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->EngineGetPayloadWithBlobs(context, request, response); })); - } - ~WithRawCallbackMethod_EngineGetPayloadWithBlobs() override { - BaseClassMustBeDerivedFromService(this); - } - // disable synchronous version of this method - ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - virtual ::grpc::ServerUnaryReactor* EngineGetPayloadWithBlobs( - ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/) { return nullptr; } - }; - template class WithRawCallbackMethod_Version : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_Version() { - ::grpc::Service::MarkMethodRawCallback(9, + ::grpc::Service::MarkMethodRawCallback(8, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Version(context, request, response); })); @@ -2415,7 +2282,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_ProtocolVersion() { - ::grpc::Service::MarkMethodRawCallback(10, + ::grpc::Service::MarkMethodRawCallback(9, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ProtocolVersion(context, request, response); })); @@ -2437,7 +2304,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_ClientVersion() { - ::grpc::Service::MarkMethodRawCallback(11, + ::grpc::Service::MarkMethodRawCallback(10, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ClientVersion(context, request, response); })); @@ -2459,7 +2326,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_Subscribe() { - ::grpc::Service::MarkMethodRawCallback(12, + ::grpc::Service::MarkMethodRawCallback(11, new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const::grpc::ByteBuffer* request) { return this->Subscribe(context, request); })); @@ -2481,7 +2348,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_SubscribeLogs() { - ::grpc::Service::MarkMethodRawCallback(13, + ::grpc::Service::MarkMethodRawCallback(12, new ::grpc::internal::CallbackBidiHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context) { return this->SubscribeLogs(context); })); @@ -2504,7 +2371,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_Block() { - ::grpc::Service::MarkMethodRawCallback(14, + ::grpc::Service::MarkMethodRawCallback(13, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Block(context, request, response); })); @@ -2526,7 +2393,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_TxnLookup() { - ::grpc::Service::MarkMethodRawCallback(15, + ::grpc::Service::MarkMethodRawCallback(14, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->TxnLookup(context, request, response); })); @@ -2548,7 +2415,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_NodeInfo() { - ::grpc::Service::MarkMethodRawCallback(16, + ::grpc::Service::MarkMethodRawCallback(15, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->NodeInfo(context, request, response); })); @@ -2570,7 +2437,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_Peers() { - ::grpc::Service::MarkMethodRawCallback(17, + ::grpc::Service::MarkMethodRawCallback(16, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Peers(context, request, response); })); @@ -2592,7 +2459,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithRawCallbackMethod_PendingBlock() { - ::grpc::Service::MarkMethodRawCallback(18, + ::grpc::Service::MarkMethodRawCallback(17, new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( [this]( ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->PendingBlock(context, request, response); })); @@ -2825,39 +2692,12 @@ class ETHBACKEND final { virtual ::grpc::Status StreamedEngineGetPayloadBodiesByRangeV1(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::remote::EngineGetPayloadBodiesByRangeV1Request,::remote::EngineGetPayloadBodiesV1Response>* server_unary_streamer) = 0; }; template - class WithStreamedUnaryMethod_EngineGetPayloadWithBlobs : public BaseClass { - private: - void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} - public: - WithStreamedUnaryMethod_EngineGetPayloadWithBlobs() { - ::grpc::Service::MarkMethodStreamed(8, - new ::grpc::internal::StreamedUnaryHandler< - ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>( - [this](::grpc::ServerContext* context, - ::grpc::ServerUnaryStreamer< - ::remote::EngineGetPayloadRequest, ::remote::EngineGetPayloadResponse>* streamer) { - return this->StreamedEngineGetPayloadWithBlobs(context, - streamer); - })); - } - ~WithStreamedUnaryMethod_EngineGetPayloadWithBlobs() override { - BaseClassMustBeDerivedFromService(this); - } - // disable regular version of this method - ::grpc::Status EngineGetPayloadWithBlobs(::grpc::ServerContext* /*context*/, const ::remote::EngineGetPayloadRequest* /*request*/, ::remote::EngineGetPayloadResponse* /*response*/) override { - abort(); - return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); - } - // replace default version of method with streamed unary - virtual ::grpc::Status StreamedEngineGetPayloadWithBlobs(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::remote::EngineGetPayloadRequest,::remote::EngineGetPayloadResponse>* server_unary_streamer) = 0; - }; - template class WithStreamedUnaryMethod_Version : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithStreamedUnaryMethod_Version() { - ::grpc::Service::MarkMethodStreamed(9, + ::grpc::Service::MarkMethodStreamed(8, new ::grpc::internal::StreamedUnaryHandler< ::google::protobuf::Empty, ::types::VersionReply>( [this](::grpc::ServerContext* context, @@ -2884,7 +2724,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithStreamedUnaryMethod_ProtocolVersion() { - ::grpc::Service::MarkMethodStreamed(10, + ::grpc::Service::MarkMethodStreamed(9, new ::grpc::internal::StreamedUnaryHandler< ::remote::ProtocolVersionRequest, ::remote::ProtocolVersionReply>( [this](::grpc::ServerContext* context, @@ -2911,7 +2751,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithStreamedUnaryMethod_ClientVersion() { - ::grpc::Service::MarkMethodStreamed(11, + ::grpc::Service::MarkMethodStreamed(10, new ::grpc::internal::StreamedUnaryHandler< ::remote::ClientVersionRequest, ::remote::ClientVersionReply>( [this](::grpc::ServerContext* context, @@ -2938,7 +2778,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithStreamedUnaryMethod_Block() { - ::grpc::Service::MarkMethodStreamed(14, + ::grpc::Service::MarkMethodStreamed(13, new ::grpc::internal::StreamedUnaryHandler< ::remote::BlockRequest, ::remote::BlockReply>( [this](::grpc::ServerContext* context, @@ -2965,7 +2805,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithStreamedUnaryMethod_TxnLookup() { - ::grpc::Service::MarkMethodStreamed(15, + ::grpc::Service::MarkMethodStreamed(14, new ::grpc::internal::StreamedUnaryHandler< ::remote::TxnLookupRequest, ::remote::TxnLookupReply>( [this](::grpc::ServerContext* context, @@ -2992,7 +2832,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithStreamedUnaryMethod_NodeInfo() { - ::grpc::Service::MarkMethodStreamed(16, + ::grpc::Service::MarkMethodStreamed(15, new ::grpc::internal::StreamedUnaryHandler< ::remote::NodesInfoRequest, ::remote::NodesInfoReply>( [this](::grpc::ServerContext* context, @@ -3019,7 +2859,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithStreamedUnaryMethod_Peers() { - ::grpc::Service::MarkMethodStreamed(17, + ::grpc::Service::MarkMethodStreamed(16, new ::grpc::internal::StreamedUnaryHandler< ::google::protobuf::Empty, ::remote::PeersReply>( [this](::grpc::ServerContext* context, @@ -3046,7 +2886,7 @@ class ETHBACKEND final { void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithStreamedUnaryMethod_PendingBlock() { - ::grpc::Service::MarkMethodStreamed(18, + ::grpc::Service::MarkMethodStreamed(17, new ::grpc::internal::StreamedUnaryHandler< ::google::protobuf::Empty, ::remote::PendingBlockReply>( [this](::grpc::ServerContext* context, @@ -3067,14 +2907,14 @@ class ETHBACKEND final { // replace default version of method with streamed unary virtual ::grpc::Status StreamedPendingBlock(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::google::protobuf::Empty,::remote::PendingBlockReply>* server_unary_streamer) = 0; }; - typedef WithStreamedUnaryMethod_Etherbase > > > > > > > > > > > > > > > > StreamedUnaryService; + typedef WithStreamedUnaryMethod_Etherbase > > > > > > > > > > > > > > > StreamedUnaryService; template class WithSplitStreamingMethod_Subscribe : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service* /*service*/) {} public: WithSplitStreamingMethod_Subscribe() { - ::grpc::Service::MarkMethodStreamed(12, + ::grpc::Service::MarkMethodStreamed(11, new ::grpc::internal::SplitServerStreamingHandler< ::remote::SubscribeRequest, ::remote::SubscribeReply>( [this](::grpc::ServerContext* context, @@ -3096,7 +2936,7 @@ class ETHBACKEND final { virtual ::grpc::Status StreamedSubscribe(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::remote::SubscribeRequest,::remote::SubscribeReply>* server_split_streamer) = 0; }; typedef WithSplitStreamingMethod_Subscribe SplitStreamedService; - typedef WithStreamedUnaryMethod_Etherbase > > > > > > > > > > > > > > > > > StreamedService; + typedef WithStreamedUnaryMethod_Etherbase > > > > > > > > > > > > > > > > StreamedService; }; } // namespace remote diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend.pb.cc b/silkworm/interfaces/3.21.4/remote/ethbackend.pb.cc index c7bb8cd8d9..cef189c0b9 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend.pb.cc +++ b/silkworm/interfaces/3.21.4/remote/ethbackend.pb.cc @@ -842,7 +842,7 @@ const char descriptor_table_protodef_remote_2fethbackend_2eproto[] PROTOBUF_SECT "\014PENDING_LOGS\020\001\022\021\n\rPENDING_BLOCK\020\002\022\020\n\014NE" "W_SNAPSHOT\020\003*Y\n\014EngineStatus\022\t\n\005VALID\020\000\022" "\013\n\007INVALID\020\001\022\013\n\007SYNCING\020\002\022\014\n\010ACCEPTED\020\003\022" - "\026\n\022INVALID_BLOCK_HASH\020\0042\303\013\n\nETHBACKEND\022=" + "\026\n\022INVALID_BLOCK_HASH\020\0042\343\n\n\nETHBACKEND\022=" "\n\tEtherbase\022\030.remote.EtherbaseRequest\032\026." "remote.EtherbaseReply\022@\n\nNetVersion\022\031.re" "mote.NetVersionRequest\032\027.remote.NetVersi" @@ -860,27 +860,24 @@ const char descriptor_table_protodef_remote_2fethbackend_2eproto[] PROTOBUF_SECT "ngineGetPayloadBodiesV1Response\022{\n\037Engin" "eGetPayloadBodiesByRangeV1\022..remote.Engi" "neGetPayloadBodiesByRangeV1Request\032(.rem" - "ote.EngineGetPayloadBodiesV1Response\022^\n\031" - "EngineGetPayloadWithBlobs\022\037.remote.Engin" - "eGetPayloadRequest\032 .remote.EngineGetPay" - "loadResponse\0226\n\007Version\022\026.google.protobu" - "f.Empty\032\023.types.VersionReply\022O\n\017Protocol" - "Version\022\036.remote.ProtocolVersionRequest\032" - "\034.remote.ProtocolVersionReply\022I\n\rClientV" - "ersion\022\034.remote.ClientVersionRequest\032\032.r" - "emote.ClientVersionReply\022\?\n\tSubscribe\022\030." - "remote.SubscribeRequest\032\026.remote.Subscri" - "beReply0\001\022J\n\rSubscribeLogs\022\031.remote.Logs" - "FilterRequest\032\032.remote.SubscribeLogsRepl" - "y(\0010\001\0221\n\005Block\022\024.remote.BlockRequest\032\022.r" - "emote.BlockReply\022=\n\tTxnLookup\022\030.remote.T" - "xnLookupRequest\032\026.remote.TxnLookupReply\022" - "<\n\010NodeInfo\022\030.remote.NodesInfoRequest\032\026." - "remote.NodesInfoReply\0223\n\005Peers\022\026.google." - "protobuf.Empty\032\022.remote.PeersReply\022A\n\014Pe" - "ndingBlock\022\026.google.protobuf.Empty\032\031.rem" - "ote.PendingBlockReplyB\021Z\017./remote;remote" - "b\006proto3" + "ote.EngineGetPayloadBodiesV1Response\0226\n\007" + "Version\022\026.google.protobuf.Empty\032\023.types." + "VersionReply\022O\n\017ProtocolVersion\022\036.remote" + ".ProtocolVersionRequest\032\034.remote.Protoco" + "lVersionReply\022I\n\rClientVersion\022\034.remote." + "ClientVersionRequest\032\032.remote.ClientVers" + "ionReply\022\?\n\tSubscribe\022\030.remote.Subscribe" + "Request\032\026.remote.SubscribeReply0\001\022J\n\rSub" + "scribeLogs\022\031.remote.LogsFilterRequest\032\032." + "remote.SubscribeLogsReply(\0010\001\0221\n\005Block\022\024" + ".remote.BlockRequest\032\022.remote.BlockReply" + "\022=\n\tTxnLookup\022\030.remote.TxnLookupRequest\032" + "\026.remote.TxnLookupReply\022<\n\010NodeInfo\022\030.re" + "mote.NodesInfoRequest\032\026.remote.NodesInfo" + "Reply\0223\n\005Peers\022\026.google.protobuf.Empty\032\022" + ".remote.PeersReply\022A\n\014PendingBlock\022\026.goo" + "gle.protobuf.Empty\032\031.remote.PendingBlock" + "ReplyB\021Z\017./remote;remoteb\006proto3" ; static const ::_pbi::DescriptorTable* const descriptor_table_remote_2fethbackend_2eproto_deps[2] = { &::descriptor_table_google_2fprotobuf_2fempty_2eproto, @@ -888,7 +885,7 @@ static const ::_pbi::DescriptorTable* const descriptor_table_remote_2fethbackend }; static ::_pbi::once_flag descriptor_table_remote_2fethbackend_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_remote_2fethbackend_2eproto = { - false, false, 4088, descriptor_table_protodef_remote_2fethbackend_2eproto, + false, false, 3992, descriptor_table_protodef_remote_2fethbackend_2eproto, "remote/ethbackend.proto", &descriptor_table_remote_2fethbackend_2eproto_once, descriptor_table_remote_2fethbackend_2eproto_deps, 2, 32, schemas, file_default_instances, TableStruct_remote_2fethbackend_2eproto::offsets, diff --git a/silkworm/interfaces/3.21.4/remote/ethbackend_mock.grpc.pb.h b/silkworm/interfaces/3.21.4/remote/ethbackend_mock.grpc.pb.h index 9bf3b07d99..eeccbd9e5c 100644 --- a/silkworm/interfaces/3.21.4/remote/ethbackend_mock.grpc.pb.h +++ b/silkworm/interfaces/3.21.4/remote/ethbackend_mock.grpc.pb.h @@ -36,9 +36,6 @@ class MockETHBACKENDStub : public ETHBACKEND::StubInterface { MOCK_METHOD3(EngineGetPayloadBodiesByRangeV1, ::grpc::Status(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::remote::EngineGetPayloadBodiesV1Response* response)); MOCK_METHOD3(AsyncEngineGetPayloadBodiesByRangeV1Raw, ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>*(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq)); MOCK_METHOD3(PrepareAsyncEngineGetPayloadBodiesByRangeV1Raw, ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadBodiesV1Response>*(::grpc::ClientContext* context, const ::remote::EngineGetPayloadBodiesByRangeV1Request& request, ::grpc::CompletionQueue* cq)); - MOCK_METHOD3(EngineGetPayloadWithBlobs, ::grpc::Status(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::remote::EngineGetPayloadResponse* response)); - MOCK_METHOD3(AsyncEngineGetPayloadWithBlobsRaw, ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>*(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq)); - MOCK_METHOD3(PrepareAsyncEngineGetPayloadWithBlobsRaw, ::grpc::ClientAsyncResponseReaderInterface< ::remote::EngineGetPayloadResponse>*(::grpc::ClientContext* context, const ::remote::EngineGetPayloadRequest& request, ::grpc::CompletionQueue* cq)); MOCK_METHOD3(Version, ::grpc::Status(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::types::VersionReply* response)); MOCK_METHOD3(AsyncVersionRaw, ::grpc::ClientAsyncResponseReaderInterface< ::types::VersionReply>*(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq)); MOCK_METHOD3(PrepareAsyncVersionRaw, ::grpc::ClientAsyncResponseReaderInterface< ::types::VersionReply>*(::grpc::ClientContext* context, const ::google::protobuf::Empty& request, ::grpc::CompletionQueue* cq)); diff --git a/silkworm/interfaces/proto b/silkworm/interfaces/proto index 2e68a94fae..cdc6e215fb 160000 --- a/silkworm/interfaces/proto +++ b/silkworm/interfaces/proto @@ -1 +1 @@ -Subproject commit 2e68a94faedac306b2e6c2ddc3cb0ce6d94ea2e8 +Subproject commit cdc6e215fb3ed422ebe7afe3bafe70986ccf4d25