Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions src/cli/explorer.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::collections::HashMap;

use bollard::models::{HostConfig, PortBinding};
use clap::Args;
use rand::distributions::Alphanumeric;
use rand::Rng;

use clap::Args;
use std::collections::HashMap;

use crate::utils::docker::{container_exists, kill_container, run_docker_image};

#[derive(Args)]
Expand Down
9 changes: 5 additions & 4 deletions src/da/avail.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use async_trait::async_trait;
use std::fs;

use crate::app::config::AppChainConfig;
use crate::cli::prompt::get_boolean_input;
use async_trait::async_trait;
use hex::encode;
use serde::{Deserialize, Serialize};
use sp_core::{sr25519, Pair};
use thiserror::Error;

use crate::app::config::AppChainConfig;
use crate::cli::prompt::get_boolean_input;
use crate::da::da_layers::{DaClient, DaError};

pub struct AvailClient;
Expand Down Expand Up @@ -49,7 +49,8 @@ impl DaClient for AvailClient {
AVAIL_DOCS
);
log::info!(
"🛠️ If you want to use a custom Avail address, please enter your seed and address in the config file: {}.",
"🛠️ If you want to use a custom Avail address, please enter your seed and address in the config file: \
{}.",
file_path_str
);
}
Expand Down
7 changes: 3 additions & 4 deletions src/da/da_layers.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
use async_trait::async_trait;
use std::io;
use std::path::PathBuf;

use async_trait::async_trait;
use eyre::Result as EyreResult;
use serde::{Deserialize, Serialize};
use strum_macros::{Display, EnumIter, EnumString};
use thiserror::Error;

use crate::app::config::AppChainConfig;
use crate::da::avail::{AvailClient, AvailError};
use crate::da::ethereum::EthereumClient;
use crate::da::ethereum::EthereumError;
use crate::da::ethereum::{EthereumClient, EthereumError};
use crate::da::no_da::NoDAConfig;
use crate::utils::constants::APP_DA_CONFIG_NAME;
use crate::utils::paths::get_app_home;
use eyre::Result as EyreResult;

#[derive(Debug, Serialize, Deserialize, EnumIter, Display, Clone, EnumString, clap::ValueEnum)]
pub enum DALayer {
Expand Down
29 changes: 16 additions & 13 deletions src/da/ethereum.rs
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
use crate::app::config::AppChainConfig;
use crate::da::da_layers::{DaClient, DaError};
use crate::utils::serde::bytes_from_hex_str;
use async_trait::async_trait;
use eyre::Result as EyreResult;
use std::fs;
use std::str::FromStr;
use std::sync::Arc;
use std::time::Duration;

use async_trait::async_trait;
use ethers::contract::abigen;

use ethers::middleware::SignerMiddleware;
use ethers::providers::{Http, Provider};
use ethers::signers::{LocalWallet, Signer, WalletError};

use eyre::Result as EyreResult;
use serde::{Deserialize, Serialize};
use std::fs;
use thiserror::Error;

use crate::app::config::AppChainConfig;
use crate::cli::prompt::get_boolean_input;
use std::str::FromStr;
use std::sync::Arc;
use std::time::Duration;
use thiserror::Error;
use crate::da::da_layers::{DaClient, DaError};
use crate::utils::serde::bytes_from_hex_str;

pub struct EthereumClient;

Expand Down Expand Up @@ -72,7 +70,12 @@ impl DaClient for EthereumClient {

async fn setup(&self, config: &AppChainConfig) -> EyreResult<()> {
match get_boolean_input(
format!("Are you running an Anvil node locally? The CLI tool has been tested on Anvil version 0.2.0 (c312c0d). Docs: {}", ANVIL_DOCS).as_str(),
format!(
"Are you running an Anvil node locally? The CLI tool has been tested on Anvil version 0.2.0 \
(c312c0d). Docs: {}",
ANVIL_DOCS
)
.as_str(),
Some(true),
)? {
true => Ok(()),
Expand Down
3 changes: 2 additions & 1 deletion src/da/no_da.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
pub struct NoDAConfig;

use async_trait::async_trait;

use crate::app::config::AppChainConfig;
use crate::da::da_layers::{DaClient, DaError};
use async_trait::async_trait;

#[async_trait]
impl DaClient for NoDAConfig {
Expand Down
1 change: 1 addition & 0 deletions src/utils/errors.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::ffi::OsString;

use thiserror::Error;

#[derive(Debug, Error)]
Expand Down
2 changes: 1 addition & 1 deletion src/utils/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ use std::fs;
use std::path::PathBuf;
use std::process::{Command, Stdio};

use crate::utils::cmd::{execute_cmd, execute_cmd_stdio};
use git2::Repository;
use reqwest::Client;
use serde::Deserialize;

use crate::utils::cmd::{execute_cmd, execute_cmd_stdio};
use crate::utils::errors::GithubError;
pub const GITHUB_API_BASE_URL: &str = "https://api.github.com";

Expand Down