lilith emerges from sneed ashes

This commit is contained in:
aggstam
2022-08-03 14:49:21 +03:00
parent 22444e04c6
commit a6b487c617
11 changed files with 48 additions and 21 deletions

1
.gitignore vendored
View File

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

22
Cargo.lock generated
View File

@@ -2381,6 +2381,28 @@ dependencies = [
"vcpkg", "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]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.7" version = "0.4.7"

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
seedd lilith
========== ==========
A tool to deploy multiple P2P network seed nodes for darkfi applications, in a single daemon. 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 ## Usage
``` ```
seedd 0.3.0 lilith 0.3.0
Defines the network specific settings Daemon that spawns P2P seeds
USAGE: USAGE:
seedd [FLAGS] [OPTIONS] lilith [FLAGS] [OPTIONS]
FLAGS: FLAGS:
-h, --help Prints help information -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] --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. 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: darkfid
13:02:30 [INFO] Found configuration for network: ircd 13:02:30 [INFO] Found configuration for network: ircd
13:02:30 [INFO] Found configuration for network: taud 13:02:30 [INFO] Found configuration for network: taud

View File

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

View File

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

View File

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

View File

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