shred: expose chained merkle root #435
Merged
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
AshwinSekar
commented
Mar 26, 2024
ledger/src/shred.rs
Outdated
| } | ||
| } | ||
| }; | ||
| (allow_dead $vis:vis fn $name:ident(&self $(, $arg:ident : $ty:ty)?) $(-> $out:ty)?) => { |
Author
There was a problem hiding this comment.
temporarily adding this for clippy checks, will remove in #102
There was a problem hiding this comment.
Instead of adding a new variant for the macro, can you just add #[allow(dead_code)] in line 313?
behzadnouri
reviewed
Mar 27, 2024
ledger/src/shred.rs
Outdated
| } | ||
| } | ||
| }; | ||
| (allow_dead $vis:vis fn $name:ident(&self $(, $arg:ident : $ty:ty)?) $(-> $out:ty)?) => { |
There was a problem hiding this comment.
Instead of adding a new variant for the macro, can you just add #[allow(dead_code)] in line 313?
ledger/src/shred.rs
Outdated
| chained: true, | ||
| resigned, | ||
| } => merkle::ShredData::get_chained_merkle_root_offset(proof_size, resigned).ok(), | ||
| _ => None, |
There was a problem hiding this comment.
_ => will silently ignore new variants added to the enum.
Can you please use the explicit:
ShredVariant::MerkleCode { proof_size:_, chained: false, resigned:_ } => None,
ShredVariant::MerkleData { proof_size:_, chained: false, resigned:_ } => None,so that we get compile errors when new variants are added?
ledger/src/shred/merkle.rs
Outdated
| Self::get_chained_merkle_root_offset(proof_size, resigned) | ||
| } | ||
|
|
||
| pub(crate) fn get_chained_merkle_root_offset( |
There was a problem hiding this comment.
shouldn't these be pub(super) as well?
similarly the other one below?
Author
There was a problem hiding this comment.
ah ya good call, still get confused on how module hierarchy works sometimes.
shred.rs declares mod merkle, and the mod layout is able to access ShredData/ShredCode::get_merkle_root as a parent module? 😕 . i would've assumed they are siblings.
/- shred_code
/- shred_data
ledger - shred - layout
AshwinSekar
force-pushed
the
shred-chained-merkle-root
branch
from
2578849 to
8fe3ce6
Compare
behzadnouri
approved these changes
Mar 27, 2024
|
Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis. |
mergify bot
pushed a commit
that referenced
this pull request
Mar 27, 2024
* shred: expose chained merkle root * pr feedback: macro, pub(super), _=> none (cherry picked from commit cfd5b71)
mergify bot
added a commit
that referenced
this pull request
Mar 28, 2024
shred: expose chained merkle root (#435) * shred: expose chained merkle root * pr feedback: macro, pub(super), _=> none (cherry picked from commit cfd5b71) Co-authored-by: Ashwin Sekar <[email protected]>
anwayde
pushed a commit
to firedancer-io/agave
that referenced
this pull request
Jul 23, 2024
…nza-xyz#459) shred: expose chained merkle root (anza-xyz#435) * shred: expose chained merkle root * pr feedback: macro, pub(super), _=> none (cherry picked from commit cfd5b71) Co-authored-by: Ashwin Sekar <[email protected]>
OliverNChalk
pushed a commit
to OliverNChalk/agave
that referenced
this pull request
Nov 11, 2025
This change includes all of the following changes as well: --- Author: kirill lykov <[email protected]> Date: Tue May 28 20:20:39 2024 +0200 Add transaction bench client (anza-xyz#339) New client application that sends transactions using TPU protocol. First, this client creates accounts necessary for the transaction generation. Second, it generates transactions executing specified program and sends them to the upcoming leaders. Contrary to other clients, it doesn't use the `TpuClient` and the `ConnectionCache` to interact with validators, but uses an alternative client network layer implementation. --- Author: Alex Peng <[email protected]> Date: Tue Jun 4 02:31:16 2024 -0500 transaction-bench: fix underflow in ensure_authority_balance (anza-xyz#341) --- Author: kirill lykov <[email protected]> Date: Fri Jul 26 10:02:39 2024 +0200 add 3 tests for client network component (anza-xyz#365) This PR is the first in a series of PR introducing integration tests for client network component. It introduces the following changes: * add first basic integration test * add test_connection_denied_until_allowed * add test for connection pruning * retry connecting when pruned * Introduce IoErrorWithPartialEq to check that QuicError is as expected --- Author: kirill lykov <[email protected]> Date: Mon Aug 5 18:30:09 2024 +0200 Handle error with connection properly (anza-xyz#383) When one of the connections fails to open, we stop the whole client. It doesn't work on testnet because there most of the nodes drop TPU traffic despite of saying through gossip that it is allowed (need to ping foundation on that). --- Author: kirill lykov <[email protected]> Date: Thu Aug 8 22:25:54 2024 +0200 Read/write for AccountsFile to use on testnet (anza-xyz#381) Only the `transaction-bench/src/network/` and `transaction-bench/tests` parts of this change was merge in. Illia Bobyr: Migrated to quinn 0.11 and refactored the tests a bit. --- Author: kirill lykov <[email protected]> Date: Sat Aug 17 15:10:19 2024 +0200 Handle instruction error in client-test-program (anza-xyz#411) Due to upstream changes errors are not propagated properly anymore when calling try_from_slice. This PR fixes the problem exactly the same way as in anza-xyz#387 --- Author: kirill lykov <[email protected]> Date: Tue Aug 20 10:01:36 2024 +0200 Add structure to collect statistics about send txs erros (anza-xyz#367) There is no way to check why certain packets have not been delivered. By propagating this information to the caller, we can use it not only in the client code but also in tests. This change Introduces a structure which accumulates relevant counters per node IP and returns this information to the client code. Illia Bobyr: Migrated to quinn 0.11 and refactored a bit. Refactored-by: Illia Bobyr <[email protected]> --- Author: kirill lykov <[email protected]> Date: Mon Aug 26 18:37:07 2024 +0200 Add rate limiting test to client (anza-xyz#368) This PR introduces integration test to check that when rate-limiting has happen we increment correct counters on client side. --- Author: kirill lykov <[email protected]> Date: Tue Aug 27 16:34:57 2024 +0200 Improve stream sending (anza-xyz#372) * stop using multistream connection * add throttling test * remove stream's finish call. It will be called when stream is dropped anyways, but if we call finish explicitly we will wait for ACK, so the behavior will be like if we had RW=1 tx. This change makes a x1000 difference on a connection with high latency. Illia Bobyr: Migrated to quinn 0.11, added cancellation in order to support clean shutdown, and refactored the tests a bit. Refactored-by: Illia Bobyr <[email protected]> --- Author: kirill lykov <[email protected]> Date: Thu Sep 5 18:54:01 2024 +0200 use testing_utilities (anza-xyz#427) We use modified copy-pasted code from streamer to setup server/client in integration tests for network component. Later original code was updated to be reusable. This PR removes old copy-pasted code and uses modified streamer's testing_utilities code. --- Author: kirill lykov <[email protected]> Date: Tue Sep 10 12:06:08 2024 +0200 Move leader updater to network and add documentation (anza-xyz#426) --- Author: kirill lykov <[email protected]> Date: Tue Sep 10 16:30:34 2024 +0200 Add documentaiton to network code (anza-xyz#425) --- Author: kirill lykov <[email protected]> Date: Tue Sep 10 20:58:04 2024 +0200 Don't ignore `test_no_host` (anza-xyz#435) --- Author: kirill lykov <[email protected]> Date: Wed Sep 11 20:34:09 2024 +0200 Address Illia's comments (anza-xyz#438)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Split from #102
Expose the chained merkle root from shred layout and impl for use in blockstore.
Contributes to solana-labs#34897