Skip to content
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.

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

[DONOTMERGE] move chain config to validated state #1492

Merged
merged 14 commits into from
Jun 17, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
point hotshot to main and others to daily-build
  • Loading branch information
imabdulbasit committed May 30, 2024
commit 35680985a99b81c88759129cdee46f03f726e608
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -3,4 +3,5 @@
"CARGO_TARGET_DIR": "target/vscode_rust_analyzer",
"RUSTFLAGS": " --cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\""
},
"rust-analyzer.cargo.features": "all",
}
45 changes: 25 additions & 20 deletions Cargo.lock

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

25 changes: 13 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -47,18 +47,19 @@ dotenvy = "0.15"
ethers = { version = "2.0", features = ["solc"] }
futures = "0.3"

hotshot = { git = "https://github.com/EspressoSystems/hotshot", branch = "abdul/pass-validated-state" }
hotshot = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
# Hotshot imports
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "abdul/pass-validated-state" }
hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "abdul/update-hotshot" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "abdul/update-hotshot" }
hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", branch = "abdul/pass-validated-state" }
hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "abdul/update-hotshot" }
hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", branch = "abdul/pass-validated-state" }
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "main" }
hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "daily-build" }
hotshot-contract-adapter = { version = "0.1.0", path = "contracts/rust/adapter" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "daily-build" }
hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "daily-build" }
hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" }
hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", branch = "abdul/pass-validated-state" }
hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", branch = "abdul/pass-validated-state" }
hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "abdul/pass-validated-state" }
hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }

# Push CDN imports
cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [
@@ -98,9 +99,9 @@ jf-relation = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4
jf-utils = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5" }
snafu = "0.8"
strum = { version = "0.26", features = ["derive"] }
surf-disco = "0.6"
surf-disco = "0.7"
tagged-base64 = "0.4"
tide-disco = "0.6"
tide-disco = "0.7"
time = "0.3"
tracing = "0.1"
bytesize = "1.3"
8 changes: 4 additions & 4 deletions builder/src/permissioned.rs
Original file line number Diff line number Diff line change
@@ -108,7 +108,7 @@ pub struct BuilderContext<
Ver: StaticVersionType + 'static,
> {
/// The consensus handle
pub hotshot_handle: Consensus<N, P>,
pub hotshot_handle: Arc<Consensus<N, P>>,

/// Index of this sequencer node
pub node_index: u64,
@@ -283,7 +283,7 @@ pub async fn init_node<P: SequencerPersistence, Ver: StaticVersionType + 'static
.await;

let ctx = BuilderContext::init(
hotshot_handle,
Arc::new(hotshot_handle),
state_signer,
node_index,
eth_key_pair,
@@ -463,7 +463,7 @@ impl<N: network::Type, P: SequencerPersistence, Ver: StaticVersionType + 'static
Duration::from_secs(60)
);

let hotshot_handle_clone = hotshot_handle.clone();
let hotshot_handle_clone = Arc::clone(&hotshot_handle);
// spawn the builder service
async_spawn(async move {
run_permissioned_standalone_builder_service(
@@ -492,7 +492,7 @@ impl<N: network::Type, P: SequencerPersistence, Ver: StaticVersionType + 'static
run_builder_api_service(hotshot_builder_api_url.clone(), proxy_global_state);

let ctx = Self {
hotshot_handle: hotshot_handle_clone,
hotshot_handle: Arc::clone(&hotshot_handle),
node_index,
state_signer: Arc::new(state_signer),
wait_for_orchestrator: None,
Loading