feat(ethexe): Added separate type for network announces #4957
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-offchain-tx # Conflicts: # ethexe/service/src/lib.rs
ecol-master
requested changes
Nov 13, 2025
…x' into laz/ethexe/3-blocks/network-announce # Conflicts: # ethexe/consensus/src/validator/producer.rs # ethexe/consensus/src/validator/subordinate.rs # ethexe/consensus/src/validator/tx_pool.rs # ethexe/db/src/database.rs # ethexe/network/src/db_sync/responses.rs # ethexe/processor/src/handling/mod.rs # ethexe/processor/src/lib.rs
…x' into laz/ethexe/3-blocks/network-announce # Conflicts: # ethexe/processor/src/lib.rs
…/network-announce # Conflicts: # core/src/rpc.rs # ethexe/common/src/db.rs # ethexe/common/src/injected.rs # ethexe/common/src/primitives.rs # ethexe/consensus/src/connect/mod.rs # ethexe/consensus/src/lib.rs # ethexe/consensus/src/validator/producer.rs # ethexe/consensus/src/validator/subordinate.rs # ethexe/consensus/src/validator/tx_pool.rs # ethexe/db/src/database.rs # ethexe/db/src/verifier.rs # ethexe/processor/src/handling/mod.rs # ethexe/processor/src/lib.rs # ethexe/rpc/Cargo.toml # ethexe/rpc/src/test_utils.rs # ethexe/service/src/lib.rs # ethexe/service/src/tests/mod.rs
…/network-announce # Conflicts: # ethexe/common/src/network.rs # ethexe/consensus/src/connect/mod.rs # ethexe/consensus/src/validator/producer.rs # ethexe/consensus/src/validator/subordinate.rs # ethexe/consensus/src/validator/tx_pool.rs # ethexe/network/src/db_sync/responses.rs # ethexe/processor/src/tests.rs # ethexe/service/src/lib.rs # ethexe/service/src/tests/mod.rs
…/network-announce
…/network-announce
…/network-announce # Conflicts: # ethexe/network/src/validator/topic.rs # ethexe/service/src/fast_sync.rs # ethexe/service/src/tests/mod.rs
…/network-announce # Conflicts: # ethexe/common/src/injected.rs # ethexe/consensus/src/tx_validation.rs # ethexe/consensus/src/validator/producer.rs # ethexe/consensus/src/validator/tx_pool.rs # ethexe/network/src/validator/topic.rs # ethexe/service/src/tests/mod.rs
Lazark0x
added
A0-pleasereview
ecol-master
reviewed
Dec 22, 2025
| } | ||
| } | ||
|
|
||
| impl NetworkAnnounce { |
Member
There was a problem hiding this comment.
Can you pls add comments to differences in methods announce_hash and to_hash?
Or maybe should remove announce_hash method to avoid possible future errors connected with hashing
| std = [ | ||
| "nonempty/std", | ||
| "gear-core/std", | ||
| "sp-core/std", |
Member
There was a problem hiding this comment.
already exists, pls remove this line
| } | ||
| } | ||
|
|
||
| impl ToDigest for NetworkAnnounce { |
Member
There was a problem hiding this comment.
hmm, I am not sure about this implementation. And I am not sure, that we need it
| let tx_hash = tx.data().to_hash(); | ||
| for tx_hash in announce.injected_transactions.iter() { | ||
| let Some(tx) = self.ctx.core.db.injected_transaction(*tx_hash) else { | ||
| tracing::warn!(?tx_hash, "Not found injected transaction body"); |
Member
There was a problem hiding this comment.
pls use here
tracing::warn!(%tx_hash, "Not found injected transaction body");| let Some(promise) = self.ctx.core.db.promise(tx_hash) else { | ||
| tracing::warn!(tx_hash = ?tx_hash, "Not found promise for injected transaction"); | ||
| let Some(promise) = self.ctx.core.db.promise(tx.data().to_hash()) else { | ||
| tracing::warn!( |
Member
There was a problem hiding this comment.
pls use here:
tracing::warn!(tx_hash = %tx.data().to_hash(), "Not found promise for injected transaction");| let mut outdated_txs = vec![]; | ||
|
|
||
| for (reference_block, tx_hash) in self.inner.iter() { | ||
| let Some(tx) = self.db.injected_transaction(*tx_hash) else { |
Member
There was a problem hiding this comment.
Pls remove this. You will get full tx body in TxValidityChecker, so it is a unnecessary db query.
| match tx_checker.check_tx_validity(&tx)? { | ||
| match tx_checker.check_tx_validity(tx_hash)? { | ||
| TxValidity::Valid => { | ||
| tracing::trace!(tx_hash = ?tx_hash, tx = ?tx.data(), "tx is valid, including to announce"); |
Member
There was a problem hiding this comment.
remove pls here tx = ?tx.data(), we don't need to log here a full tx data, the hash is enough
| mem::take(chain), | ||
| self.commitment_delay_limit, | ||
| announces.into_iter().map(|a| (a.to_hash(), a)).collect(), | ||
| announces |
Member
There was a problem hiding this comment.
Do we set injected transactions in database when receive result from db_sync?
| .1 | ||
| .into_iter() | ||
| .map(|a| (a.to_hash(), a)) | ||
| .map(|a| { |
Member
There was a problem hiding this comment.
And here I am not sure now that we save transactions to database
| AnnounceNotFound(HashOf<Announce>), | ||
| AnnounceIsNotComputed(HashOf<Announce>), | ||
| AnnounceIsNotIncluded(HashOf<Announce>), | ||
| AnnounceOffChainTransactionsNotEmpty(HashOf<Announce>), |
Member
There was a problem hiding this comment.
a good one
I can no understand why we have this error variant
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.