bin: Rename darkfid2 to darkfid.

.gitignore

@@ -10,11 +10,9 @@
 /dao-cli
 /daod
 /darkfid
-/darkfid2
 /dnetview
 /drk
 /faucetd
-/gatewayd
 /ircd
 /tau
 /taud

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",

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"

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 = []

bin/darkfid/src/main.rs

@@ -129,7 +129,7 @@ struct Args {
     cashier_pub: Vec<String>,
 
     #[structopt(long)]
-    /// Whitelisted fauced address (repeatable flag)
+    /// Whitelisted faucet address (repeatable flag)
     faucet_pub: Vec<String>,
 
     #[structopt(short, parse(from_occurrences))]

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"