Skip to content

Implement timestamp_searcher in blockprod #1747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ImplOfAnImpl merged 7 commits into from
May 16, 2024
Merged

Implement timestamp_searcher in blockprod #1747

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a524e70
Implement timestamp_searcher in blockprod; allow to call it from the …
ImplOfAnImpl May 7, 2024
e480095
Fix compilation after rebasing; apply review comments.
ImplOfAnImpl May 9, 2024
661a008
Add (copy-paste) documentation for "find_timestamps_for_staking" in t…
ImplOfAnImpl May 9, 2024
40e8d1d
Fix rpc docs tests
ImplOfAnImpl May 9, 2024
b380d33
Pass a pool id to collect_timestamp_search_data instead of PoSTimesta…
ImplOfAnImpl May 9, 2024
b7d7181
Tests for timestamp_searcher; some cleanup
ImplOfAnImpl May 14, 2024
42a5d0a
Apply review comments
ImplOfAnImpl May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions blockprod/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ async-trait.workspace = true
hex.workspace = true
futures.workspace = true
jsonrpsee = { workspace = true, features = ["macros"] }
itertools.workspace = true
mockall.workspace = true
parity-scale-codec.workspace = true
rayon.workspace = true
slave-pool.workspace = true
serde = { workspace = true, features = ["derive"] }
thiserror.workspace = true
Expand Down
33 changes: 29 additions & 4 deletions blockprod/src/detail/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// limitations under the License.

pub mod job_manager;
pub mod timestamp_searcher;
pub mod utils;

use std::{
Expand All @@ -38,7 +39,7 @@ use common::{
};
use consensus::{
generate_consensus_data_and_reward, FinalizeBlockInputData, GenerateBlockInputData,
PoSFinalizeBlockInputData, PoSGenerateBlockInputData,
PoSFinalizeBlockInputData, PoSGenerateBlockInputData, PoSTimestampSearchInputData,
};
use crypto::ephemeral_e2e::{self, EndToEndPrivateKey};
use logging::log;
Expand All @@ -61,9 +62,13 @@ use crate::{
BlockProductionError,
};

use self::utils::{
get_best_block_index, get_pool_balances_at_height, get_pool_staker_balance,
get_pool_total_balance, get_sealed_epoch_randomness, make_ancestor_getter, timestamp_add_secs,
use self::{
timestamp_searcher::TimestampSearchData,
utils::{
get_best_block_index, get_pool_balances_at_height, get_pool_staker_balance,
get_pool_total_balance, get_sealed_epoch_randomness, make_ancestor_getter,
timestamp_add_secs,
},
};

pub const JOBKEY_DEFAULT_LEN: usize = 32;
Expand Down Expand Up @@ -583,6 +588,26 @@ impl BlockProduction {
pub fn e2e_private_key(&self) -> &ephemeral_e2e::EndToEndPrivateKey {
&self.e2e_encryption_key
}

pub async fn collect_timestamp_search_data(
&self,
secret_input_data: PoSTimestampSearchInputData,
Copy link
Contributor Author

@ImplOfAnImpl ImplOfAnImpl May 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: I've just realised that collect_timestamp_search_data doesn't really need the vrf key, it only needs the pool id (passing the whole PoSTimestampSearchInputData here is an artifact of a previous implementation). So, e2e is not needed for this function and I've removed it.

min_height: BlockHeight,
max_height: Option<BlockHeight>,
seconds_to_check_for_height: u64,
check_all_timestamps_between_blocks: bool,
) -> Result<TimestampSearchData, BlockProductionError> {
timestamp_searcher::collect_timestamp_search_data(
&self.chainstate_handle,
Arc::clone(&self.chain_config),
secret_input_data,
min_height,
max_height,
seconds_to_check_for_height,
check_all_timestamps_between_blocks,
)
.await
}
}

fn generate_finalize_block_data(
Expand Down
Loading