Przeglądaj źródła

lilith emerges from sneed ashes

aggstam 4 lat temu
rodzic
commit
a6b487c617

+ 1 - 0
.gitignore

@@ -19,3 +19,4 @@
 /taud
 /vanityaddr
 /zkas
+/lilith

+ 22 - 0
Cargo.lock

@@ -2381,6 +2381,28 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "lilith"
+version = "0.3.0"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-std",
+ "ctrlc-async",
+ "darkfi",
+ "easy-parallel",
+ "futures-lite",
+ "fxhash",
+ "log",
+ "serde",
+ "serde_derive",
+ "simplelog",
+ "structopt",
+ "structopt-toml",
+ "toml 0.5.9",
+ "url",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.7"

+ 1 - 0
Cargo.toml

@@ -31,6 +31,7 @@ members = [
 	"bin/tau/taud",
 	"bin/tau/tau-cli",
 	"bin/vanityaddr",
+	"bin/lilith",
 
 	"src/sdk",
 	"src/util/derive",

+ 13 - 7
script/research/seedd/Cargo.toml → bin/lilith/Cargo.toml

@@ -1,19 +1,27 @@
 [package]
-name = "seedd"
+name = "lilith"
+description = "Daemon that spawns P2P seeds"
 version = "0.3.0"
 edition = "2021"
-
-[dependencies.darkfi]
-path = "../../../"
-features = ["net"]
+authors = ["darkfi <dev@dark.fi>"]
+license = "AGPL-3.0-only"
+homepage = "https://dark.fi"
+repository = "https://github.com/darkrenaissance/darkfi"
+keywords = []
+categories = []
 
 [dependencies]
+darkfi = {path = "../../", features = ["net"]}
+
+# Async
 async-channel = "1.6.1"
 async-executor = "1.4.1"
 async-std = "1.12.0"
 ctrlc-async = {version = "3.2.2", default-features = false, features = ["async-std", "termination"]}
 easy-parallel = "3.2.0"
 futures-lite = "1.12.0"
+
+# Misc
 fxhash = "0.2.1"
 log = "0.4.17"
 simplelog = "0.12.0"
@@ -25,5 +33,3 @@ serde_derive = "1.0.138"
 structopt = "0.3.26"
 structopt-toml = "0.5.0"
 toml = "0.5.9"
-
-[workspace]

+ 7 - 7
script/research/seedd/README.md → bin/lilith/README.md

@@ -1,4 +1,4 @@
-seedd
+lilith
 ==========
 
 A tool to deploy multiple P2P network seed nodes for darkfi applications, in a single daemon.
@@ -6,11 +6,11 @@ A tool to deploy multiple P2P network seed nodes for darkfi applications, in a s
 ## Usage
 
 ```
-seedd 0.3.0
-Defines the network specific settings
+lilith 0.3.0
+Daemon that spawns P2P seeds
 
 USAGE:
-    seedd [FLAGS] [OPTIONS]
+    lilith [FLAGS] [OPTIONS]
 
 FLAGS:
     -h, --help       Prints help information
@@ -22,13 +22,13 @@ OPTIONS:
         --url <url>          Daemon published url, common for all enabled networks [default: tcp://127.0.0.1]
 ```
 
-On first execution, daemon will create default config file ~/.config/darkfi/seedd_config.toml.
+On first execution, daemon will create default config file ~/.config/darkfi/lilith_config.toml.
 Configuration must be verified, and application networks should be configured accordingly.
 
-Run seedd as follows:
+Run lilith as follows:
 
 ```
-% cargo run
+% lilith
 13:02:30 [INFO] Found configuration for network: darkfid
 13:02:30 [INFO] Found configuration for network: ircd
 13:02:30 [INFO] Found configuration for network: taud

+ 1 - 2
script/research/seedd/seedd_config.toml → bin/lilith/lilith_config.toml

@@ -1,4 +1,4 @@
-## seedd configuration file
+## lilith configuration file
 ##
 ## Please make sure you go through all the settings so you can configure
 ## your daemon properly.
@@ -15,7 +15,6 @@
 #seeds = []
 #peers = []
 
-## Per-network settings
 #[network."darkfid_consensus"]
 #port = 33033
 #seeds = []

+ 1 - 1
script/research/seedd/src/config.rs → bin/lilith/src/config.rs

@@ -10,7 +10,7 @@ use darkfi::{cli_desc, Result};
 
 #[derive(Clone, Debug, Deserialize, StructOpt, StructOptToml)]
 #[serde(default)]
-#[structopt(name = "seedd", about = cli_desc!())]
+#[structopt(name = "lilith", about = cli_desc!())]
 pub struct Args {
     #[structopt(short, long)]
     /// Configuration file to use

+ 2 - 2
script/research/seedd/src/main.rs → bin/lilith/src/main.rs

@@ -17,8 +17,8 @@ use darkfi::{
 mod config;
 use config::{parse_configured_networks, Args, NetInfo};
 
-const CONFIG_FILE: &str = "seedd_config.toml";
-const CONFIG_FILE_CONTENTS: &str = include_str!("../seedd_config.toml");
+const CONFIG_FILE: &str = "lilith_config.toml";
+const CONFIG_FILE_CONTENTS: &str = include_str!("../lilith_config.toml");
 
 async fn spawn_network(
     name: &str,

+ 0 - 0
script/research/seedd/init/lilith.confd → contrib/init/lilith.confd


+ 0 - 0
script/research/seedd/init/lilith.initd → contrib/init/lilith.initd


+ 0 - 2
script/research/seedd/.gitignore

@@ -1,2 +0,0 @@
-/target
-Cargo.lock