From bf9106b5f7551d3167c166e261453fadd2ca6a6c Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 16 May 2022 13:33:42 +0200 Subject: [PATCH] bin: Rename darkfid2 to darkfid. --- .gitignore | 2 -- Cargo.toml | 3 +-- bin/{darkfid2 => darkfid}/Cargo.toml | 2 +- bin/{darkfid2 => darkfid}/darkfid_config.toml | 16 +++++++++++----- bin/{darkfid2 => darkfid}/src/error.rs | 0 bin/{darkfid2 => darkfid}/src/main.rs | 2 +- bin/{darkfid2 => darkfid}/src/rpc_blockchain.rs | 0 bin/{darkfid2 => darkfid}/src/rpc_misc.rs | 0 bin/{darkfid2 => darkfid}/src/rpc_tx.rs | 0 bin/{darkfid2 => darkfid}/src/rpc_wallet.rs | 0 contrib/localnet/tmux_sessions.sh | 6 +++--- 11 files changed, 17 insertions(+), 14 deletions(-) rename bin/{darkfid2 => darkfid}/Cargo.toml (98%) rename bin/{darkfid2 => darkfid}/darkfid_config.toml (80%) rename bin/{darkfid2 => darkfid}/src/error.rs (100%) rename bin/{darkfid2 => darkfid}/src/main.rs (99%) rename bin/{darkfid2 => darkfid}/src/rpc_blockchain.rs (100%) rename bin/{darkfid2 => darkfid}/src/rpc_misc.rs (100%) rename bin/{darkfid2 => darkfid}/src/rpc_tx.rs (100%) rename bin/{darkfid2 => darkfid}/src/rpc_wallet.rs (100%) diff --git a/.gitignore b/.gitignore index 86cb60bca..3273617c5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,11 +10,9 @@ /dao-cli /daod /darkfid -/darkfid2 /dnetview /drk /faucetd -/gatewayd /ircd /tau /taud diff --git a/Cargo.toml b/Cargo.toml index 4b8f5ed68..72748e164 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,7 @@ name = "darkfi" members = [ "bin/zkas", #"bin/cashierd", -#"bin/darkfid", - "bin/darkfid2", + "bin/darkfid", "bin/drk", "bin/faucetd", "bin/ircd", diff --git a/bin/darkfid2/Cargo.toml b/bin/darkfid/Cargo.toml similarity index 98% rename from bin/darkfid2/Cargo.toml rename to bin/darkfid/Cargo.toml index d1ea6e5da..1203d51a7 100644 --- a/bin/darkfid2/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "darkfid2" +name = "darkfid" version = "0.3.0" homepage = "https://dark.fi" description = "DarkFi node daemon" diff --git a/bin/darkfid2/darkfid_config.toml b/bin/darkfid/darkfid_config.toml similarity index 80% rename from bin/darkfid2/darkfid_config.toml rename to bin/darkfid/darkfid_config.toml index ac07f0d3f..43bff23b1 100644 --- a/bin/darkfid2/darkfid_config.toml +++ b/bin/darkfid/darkfid_config.toml @@ -18,17 +18,17 @@ # Path to the blockchain database directory #database = "~/.config/darkfi/darkfid_blockchain" -# JSON-RPC listen url +# JSON-RPC listen URL #rpc_listen = "tcp://127.0.0.1:8340" # Participate in the consensus protocol #consensus = false # P2P accept address for the consensus protocol -#consensus_p2p_accept = "tls://0.0.0.0:8341" +#consensus_p2p_accept = "tls://127.0.0.1:8341" # P2P external address for the consensus protocol -#consensus_p2p_external = "tls://0.0.0.0:8341" +#consensus_p2p_external = "tls://127.0.0.1:8341" # Connection slots for the consensus protocol #consensus_slots = 8 @@ -40,10 +40,10 @@ #consensus_p2p_peer = [] # P2P accept address for the syncing protocol -#sync_p2p_accept = "tls://0.0.0.0:8342" +#sync_p2p_accept = "tls://127.0.0.1:8342" # P2P external address for the syncing protocol -#sync_p2p_external = "tls://0.0.0.0:8342" +#sync_p2p_external = "tls://127.0.0.1:8342" # Connection slots for the syncing protocol #sync_slots = 8 @@ -53,3 +53,9 @@ # Peers to connect to for the syncing protocol #sync_p2p_peer = [] + +# Whitelisted cashier addresses +#cashier_pub = [] + +# Whitelisted faucet addresses +#faucet_pub = [] diff --git a/bin/darkfid2/src/error.rs b/bin/darkfid/src/error.rs similarity index 100% rename from bin/darkfid2/src/error.rs rename to bin/darkfid/src/error.rs diff --git a/bin/darkfid2/src/main.rs b/bin/darkfid/src/main.rs similarity index 99% rename from bin/darkfid2/src/main.rs rename to bin/darkfid/src/main.rs index b7a9c5e06..0c1b805d6 100644 --- a/bin/darkfid2/src/main.rs +++ b/bin/darkfid/src/main.rs @@ -129,7 +129,7 @@ struct Args { cashier_pub: Vec, #[structopt(long)] - /// Whitelisted fauced address (repeatable flag) + /// Whitelisted faucet address (repeatable flag) faucet_pub: Vec, #[structopt(short, parse(from_occurrences))] diff --git a/bin/darkfid2/src/rpc_blockchain.rs b/bin/darkfid/src/rpc_blockchain.rs similarity index 100% rename from bin/darkfid2/src/rpc_blockchain.rs rename to bin/darkfid/src/rpc_blockchain.rs diff --git a/bin/darkfid2/src/rpc_misc.rs b/bin/darkfid/src/rpc_misc.rs similarity index 100% rename from bin/darkfid2/src/rpc_misc.rs rename to bin/darkfid/src/rpc_misc.rs diff --git a/bin/darkfid2/src/rpc_tx.rs b/bin/darkfid/src/rpc_tx.rs similarity index 100% rename from bin/darkfid2/src/rpc_tx.rs rename to bin/darkfid/src/rpc_tx.rs diff --git a/bin/darkfid2/src/rpc_wallet.rs b/bin/darkfid/src/rpc_wallet.rs similarity index 100% rename from bin/darkfid2/src/rpc_wallet.rs rename to bin/darkfid/src/rpc_wallet.rs diff --git a/contrib/localnet/tmux_sessions.sh b/contrib/localnet/tmux_sessions.sh index ceaf4bb59..710452aca 100755 --- a/contrib/localnet/tmux_sessions.sh +++ b/contrib/localnet/tmux_sessions.sh @@ -4,11 +4,11 @@ set -e # Start a tmux session with two consensus nodes and a non-consensus node, and # a faucet that's able to mint tokens. -tmux new-session -d "LOG_TARGETS='!sled' ../../darkfid2 -v -c darkfid0.toml" +tmux new-session -d "LOG_TARGETS='!sled' ../../darkfid -v -c darkfid0.toml" sleep 2 -tmux split-window -v "LOG_TARGETS='!sled' ../../darkfid2 -v -c darkfid1.toml" +tmux split-window -v "LOG_TARGETS='!sled' ../../darkfid -v -c darkfid1.toml" sleep 2 -tmux split-window -h "LOG_TARGETS='!sled' ../../darkfid2 -v -c darkfid2.toml" +tmux split-window -h "LOG_TARGETS='!sled' ../../darkfid -v -c darkfid2.toml" sleep 2 tmux select-pane -t 0 tmux split-window -h "LOG_TARGETS='!sled' ../../faucetd -v -c faucetd.toml"