From d3f08cd44121e870b3e53f7e029598d790f4ffb6 Mon Sep 17 00:00:00 2001 From: 0xKarasu <0xKarasu@protonmail.com> Date: Wed, 4 Oct 2023 13:08:08 +0200 Subject: [PATCH] fix merge --- Cargo.lock | 4 +--- crates/client/data-availability/src/bitcoin/config.rs | 2 +- crates/client/data-availability/src/bitcoin/mod.rs | 3 +-- crates/node/src/cli.rs | 11 ----------- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b50b0c3d9..51e30fffd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -894,7 +894,7 @@ dependencies = [ [[package]] name = "bitcoin-da" version = "0.1.0" -source = "git+https://github.com/KasarLabs/da?branch=bitcoin-da/prod#9493f923748a7dc4a88c71c9fd43c1e2ba8b65a2" +source = "git+https://github.com/KasarLabs/bitcoin-da?branch=bitcoin-da/prod#9493f923748a7dc4a88c71c9fd43c1e2ba8b65a2" dependencies = [ "bitcoin", "bitcoin_hashes", @@ -902,8 +902,6 @@ dependencies = [ "dotenv", "env_logger 0.9.3", "ethers", - "env_logger 0.9.3", - "ethers", "hex", "log", "serde", diff --git a/crates/client/data-availability/src/bitcoin/config.rs b/crates/client/data-availability/src/bitcoin/config.rs index ef7462dacf..e364aa83b1 100644 --- a/crates/client/data-availability/src/bitcoin/config.rs +++ b/crates/client/data-availability/src/bitcoin/config.rs @@ -6,7 +6,7 @@ use serde::Deserialize; use crate::DaMode; -pub const DEFAULT_BITCOIN_HOST: &str = "37.187.123.130:8332"; +pub const DEFAULT_BITCOIN_HOST: &str = "localhost:8332"; pub const DEFAULT_BITCOIN_USER: &str = "rpcuser"; pub const DEFAULT_BITCOIN_PASS: &str = "rpcpass"; diff --git a/crates/client/data-availability/src/bitcoin/mod.rs b/crates/client/data-availability/src/bitcoin/mod.rs index 3cd2714ed3..78f97e743c 100644 --- a/crates/client/data-availability/src/bitcoin/mod.rs +++ b/crates/client/data-availability/src/bitcoin/mod.rs @@ -3,8 +3,7 @@ pub mod config; // Bitcoin imports use anyhow::Result; use async_trait::async_trait; -use bitcoin_da::{BitcoinError, Config as BitcoinDAConfig, Relayer}; -use bitcoincore_rpc::RpcApi; +use bitcoin_da::{Config as BitcoinDAConfig, Relayer}; // Bitcoincore RPC imports use ethers::types::{I256, U256}; diff --git a/crates/node/src/cli.rs b/crates/node/src/cli.rs index d66ef6fd9d..732c818768 100644 --- a/crates/node/src/cli.rs +++ b/crates/node/src/cli.rs @@ -63,17 +63,6 @@ pub struct ExtendedRunCmd { pub testnet: Option, } - #[clap(long)] - pub madara_path: Option, - - #[clap(long)] - pub chain_spec_url: Option, - - #[clap(long)] - pub genesis_url: Option, - - #[clap(long)] - pub da_layer: Option, #[derive(Debug, clap::Args)] pub struct SetupCmd { /// Load a index.json file for downloading assets