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.

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

Jump to bottom

feat(wip): based sequencing #101

Merged
merged 9 commits into from
Jul 30, 2024
Merged

feat(wip): based sequencing #101

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2050fec
changing DA trait method names
distractedm1nd Jul 28, 2024
6f1266f
posting to DA layer
distractedm1nd Jul 28, 2024
cfd6ea1
main_loop
distractedm1nd Jul 29, 2024
c7ea2d8
unit tests
distractedm1nd Jul 30, 2024
2599c10
clippy
distractedm1nd Jul 30, 2024
178fa5a
renamings
distractedm1nd Jul 30, 2024
5d7d2f2
removing epoch_duration and main_loop
distractedm1nd Jul 30, 2024
5394ec5
removing TODO
distractedm1nd Jul 30, 2024
938df67
start_height
distractedm1nd Jul 30, 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
60 changes: 26 additions & 34 deletions src/cfg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::consts::{DA_RETRY_COUNT, DA_RETRY_INTERVAL};
use crate::error::{DataAvailabilityError, PrismError, PrismResult, GeneralError};
use crate::error::{DataAvailabilityError, GeneralError, PrismError, PrismResult};
use clap::{Parser, Subcommand};
use config::{builder::DefaultState, ConfigBuilder, File};
use dirs::home_dir;
Expand Down Expand Up @@ -31,18 +31,18 @@ pub struct CommandLineArgs {
#[arg(short = 'r', long)]
redis_client: Option<String>,

/// Celestia Namespace ID
#[arg(short = 'n', long)]
celestia_namespace_id: Option<String>,
/// Celestia Snark Namespace ID
#[arg(long)]
snark_namespace_id: Option<String>,

/// Celestia Operation Namespace ID
#[arg(long)]
operation_namespace_id: Option<String>,

// Height to start searching the DA layer for SNARKs on
#[arg(short = 's', long)]
celestia_start_height: Option<u64>,

/// Duration between epochs in seconds
#[arg(short, long)]
epoch_time: Option<u64>,

/// IP address for the webserver to listen on
#[arg(long)]
host: Option<String>,
Expand All @@ -69,7 +69,6 @@ pub struct Config {
pub celestia_config: Option<CelestiaConfig>,
pub da_layer: Option<DALayerOption>,
pub redis_config: Option<RedisConfig>,
pub epoch_time: Option<u64>,
pub verifying_key: Option<String>,
}

Expand Down Expand Up @@ -113,15 +112,17 @@ impl Default for RedisConfig {
pub struct CelestiaConfig {
pub connection_string: String,
pub start_height: u64,
pub namespace_id: String,
pub snark_namespace_id: String,
pub operation_namespace_id: Option<String>,
}

impl Default for CelestiaConfig {
fn default() -> Self {
CelestiaConfig {
connection_string: "ws://localhost:26658".to_string(),
start_height: 0,
namespace_id: "00000000000000de1008".to_string(),
snark_namespace_id: "00000000000000de1008".to_string(),
operation_namespace_id: Some("00000000000000de1009".to_string()),
}
}
}
Expand All @@ -133,7 +134,6 @@ impl Default for Config {
da_layer: Some(DALayerOption::default()),
celestia_config: Some(CelestiaConfig::default()),
redis_config: Some(RedisConfig::default()),
epoch_time: Some(60),
verifying_key: None,
}
}
Expand Down Expand Up @@ -174,9 +174,7 @@ pub fn load_config(args: CommandLineArgs) -> PrismResult<Config> {
fn get_config_path(args: &CommandLineArgs) -> PrismResult<String> {
args.config_path
.clone()
.or_else(|| {
home_dir().map(|path| format!("{}/.prism/config.toml", path.to_string_lossy()))
})
.or_else(|| home_dir().map(|path| format!("{}/.prism/config.toml", path.to_string_lossy())))
.ok_or_else(|| {
GeneralError::MissingArgumentError("could not determine config path".to_string()).into()
})
Expand Down Expand Up @@ -214,7 +212,6 @@ fn merge_configs(loaded: Config, default: Config) -> Config {
redis_config: loaded.redis_config.or(default.redis_config),
celestia_config: loaded.celestia_config.or(default.celestia_config),
da_layer: loaded.da_layer.or(default.da_layer),
epoch_time: loaded.epoch_time.or(default.epoch_time),
verifying_key: loaded.verifying_key.or(default.verifying_key),
}
}
Expand Down Expand Up @@ -261,20 +258,23 @@ fn apply_command_line_args(config: Config, args: CommandLineArgs) -> Config {
.map(|c| c.start_height)
.unwrap_or_else(|| CelestiaConfig::default().start_height)
}),
namespace_id: args.celestia_namespace_id.unwrap_or_else(|| {
snark_namespace_id: args.snark_namespace_id.unwrap_or_else(|| {
config
.celestia_config
.as_ref()
.map(|c| c.namespace_id.clone())
.unwrap_or_else(|| CelestiaConfig::default().namespace_id)
.map(|c| c.snark_namespace_id.clone())
.unwrap_or_else(|| CelestiaConfig::default().snark_namespace_id)
}),
operation_namespace_id: Some(args.operation_namespace_id.unwrap_or_else(|| {
config
.celestia_config
.as_ref()
.map(|c| c.operation_namespace_id.clone())
.unwrap_or_else(|| CelestiaConfig::default().operation_namespace_id)
.unwrap()
})),
}),
da_layer: config.da_layer,
epoch_time: Some(args.epoch_time.unwrap_or_else(|| {
config
.epoch_time
.unwrap_or_else(|| Config::default().epoch_time.unwrap())
})),
verifying_key: args.verifying_key.or(config.verifying_key),
}
}
Expand All @@ -296,13 +296,7 @@ pub async fn initialize_da_layer(
))?;

for attempt in 1..=DA_RETRY_COUNT {
match CelestiaConnection::new(
&celestia_conf.connection_string,
None,
&celestia_conf.namespace_id,
)
.await
{
match CelestiaConnection::new(&celestia_conf, None).await {
Ok(da) => return Ok(Arc::new(da) as Arc<dyn DataAvailabilityLayer + 'static>),
Err(e) => {
if attempt == DA_RETRY_COUNT {
Expand All @@ -323,8 +317,6 @@ pub async fn initialize_da_layer(
Ok(Arc::new(LocalDataAvailabilityLayer::new())
as Arc<dyn DataAvailabilityLayer + 'static>)
}
DALayerOption::None => Err(PrismError::ConfigError(
"No DA Layer specified".to_string(),
)),
DALayerOption::None => Err(PrismError::ConfigError("No DA Layer specified".to_string())),
}
}
5 changes: 3 additions & 2 deletions src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use indexed_merkle_tree::{sha256_mod, Hash};
use serde::{Deserialize, Serialize};
use std::fmt::Display;
use borsh::{BorshDeserialize, BorshSerialize};

#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
#[derive(Clone, BorshDeserialize, BorshSerialize, Serialize, Deserialize, Debug, PartialEq)]
// An [`Operation`] represents a state transition in the system.
// In a blockchain analogy, this would be the full set of our transaction types.
pub enum Operation {
Expand All @@ -24,7 +25,7 @@ pub enum Operation {
},
}

#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
#[derive(Clone, BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, PartialEq)]
// An [`AccountSource`] represents the source of an account. See adr-002 for more information.
pub enum AccountSource {
SignedBySequencer { signature: String },
Expand Down
Loading