Merge branch 'duniter-launcher' into dev

ec96572a · Éloïs · a5c925b3 · 7f346282 · ec96572a · ec96572a
Commit ec96572a authored 4 years ago by Éloïs
--- a/.cargo/config
+++ b/.cargo/config
+[alias]
+xtask = "run --package xtask --"
--- a/.gitignore
+++ b/.gitignore
@@ -46,14 +46,16 @@ app/**/*.d.ts
 neon/lib/*.d.ts
 test/**/*.d.ts

-# files generated by neon tests
-test2.bin.gz
+# files generated by neon
+neon/native/artifacts.json

 # rust binaries
+bin/duniter
 neon/native/index.node
 target

 # files generated by rust tests
 neon/native/tests/*.txt
 neon/native/tests/wotb-*
+test2.bin.gz
 **/*.wot
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ workflow:
    - changes:
      - .gitlab/**/*
      - app/**/*
-      - bin/duniter
+      - bin/duniter_js
      - neon/**/*
      - releases/**/*
      - rust-libs/**/*
@@ -27,11 +27,13 @@ workflow:
  tags:
    - redshift
  before_script:
+    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    - export PATH="$HOME/.cargo/bin:$PATH"
+    - export RUSTFLAGS="-D warnings"
    - export NVM_DIR="$HOME/.nvm"
    - . "$NVM_DIR/nvm.sh"
    - nvm install 10
    - nvm use 10
-    - export RUSTFLAGS="-D warnings"


 .cached_nvm: &cached_nvm

--- a/.gitlab/test/check_indexes.sh
+++ b/.gitlab/test/check_indexes.sh
@@ -18,7 +18,7 @@ checksum_test() {
  local correct_hash=$2
  local db=$3
  echo "Checking $table's checksum..."
-  bin/duniter --mdb ${db} dump table "$table" > "$DUMP_DIR/$table"
+  bin/duniter_js --mdb ${db} dump table "$table" > "$DUMP_DIR/$table"
  result_hash=`sha1sum "$DUMP_DIR/$table" | grep -Po ".* " | grep -Po "[a-f0-9]+"`
 #  rm -f "$DUMP_DIR/$table"
  if [ "$result_hash" == "$correct_hash" ]; then
@@ -33,8 +33,8 @@ sync_data() {
  local db=$1
  local target=$2
  local target_block=$3
-  local reset_data="bin/duniter --mdb ${db} reset all"
-  local sync="bin/duniter --mdb ${db} sync ${target} --nointeractive ${target_block}"
+  local reset_data="bin/duniter_js --mdb ${db} reset all"
+  local sync="bin/duniter_js --mdb ${db} sync ${target} --nointeractive ${target_block}"
  echo "$reset_data"
  ${reset_data}
  echo "$sync"

--- a/.rusty-hook.toml
+++ b/.rusty-hook.toml
+[hooks]
+pre-commit = "cargo fmt -- --check && npm run format:check"
+
+[logging]
+verbose = true
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,6 +24,44 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
+
+[[package]]
+name = "arrayref"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+
+[[package]]
+name = "arrayvec"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.0.0"
@@ -50,6 +88,12 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"

+[[package]]
+name = "base64"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+
 [[package]]
 name = "beef"
 version = "0.4.4"
@@ -66,6 +110,23 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "blake2b_simd"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -123,6 +184,36 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"

+[[package]]
+name = "ci_info"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24f638c70e8c5753795cc9a8c07c44da91554a09e4cf11a7326e8161b0a3c45e"
+dependencies = [
+ "envmnt",
+]
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
 [[package]]
 name = "crc32fast"
 version = "1.2.0"
@@ -191,6 +282,27 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "697c714f50560202b1f4e2e09cd50a421881c83e9025db75d15f276616f04f40"

+[[package]]
+name = "ctrlc"
+version = "3.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0b676fa23f995faf587496dcd1c80fead847ed58d2da52ac1caca9a72790dd2"
+dependencies = [
+ "nix",
+ "winapi",
+]
+
+[[package]]
+name = "daemonize-me"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078464a47febb5786c43fc1f65fd1a58dae38f0544912dd855cbdde2e2bdf197"
+dependencies = [
+ "libc",
+ "nix",
+ "snafu",
+]
+
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -200,6 +312,32 @@ dependencies = [
 "generic-array",
 ]

+[[package]]
+name = "dirs"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
 [[package]]
 name = "dubp-common"
 version = "0.2.0"
@@ -275,6 +413,21 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "duniter-launcher"
+version = "1.9.0-alpha1"
+dependencies = [
+ "anyhow",
+ "ctrlc",
+ "daemonize-me",
+ "dirs",
+ "log",
+ "logwatcher",
+ "nix",
+ "rusty-hook",
+ "structopt",
+]
+
 [[package]]
 name = "duniteroxyde"
 version = "0.3.0"
@@ -299,7 +452,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7315898eda74bf7c9e825f9afae1c9f16debb401fdb7d658fb851fb00a6260c"
 dependencies = [
- "base64",
+ "base64 0.11.0",
 "bs58",
 "byteorder",
 "ring",
@@ -315,7 +468,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "287b23c4281016278b47b80baf67186ce756dde738070cc7a41297da5e81dec1"
 dependencies = [
- "base64",
+ "base64 0.11.0",
 "bs58",
 "byteorder",
 "cryptoxide",
@@ -332,6 +485,16 @@ version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"

+[[package]]
+name = "envmnt"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2d328fc287c61314c4a61af7cfdcbd7e678e39778488c7cb13ec133ce0f4059"
+dependencies = [
+ "fsio",
+ "indexmap",
+]
+
 [[package]]
 name = "error-chain"
 version = "0.12.4"
@@ -360,6 +523,12 @@ dependencies = [
 "miniz_oxide",
 ]

+[[package]]
+name = "fsio"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fd087255f739f4f1aeea69f11b72f8080e9c2e7645cd06955dad4a178a49e3"
+
 [[package]]
 name = "generic-array"
 version = "0.12.3"
@@ -369,6 +538,15 @@ dependencies = [
 "typenum",
 ]

+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.15"
@@ -387,6 +565,21 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"

+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+
+[[package]]
+name = "heck"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.12"
@@ -396,6 +589,16 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "indexmap"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.6"
@@ -437,13 +640,19 @@ checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"

 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
 "cfg-if",
 ]

+[[package]]
+name = "logwatcher"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d0925aed5b12ed59857f438d25a910cf051dbcd4107907be1e7abf6c44ec903"
+
 [[package]]
 name = "maplit"
 version = "1.0.2"
@@ -535,6 +744,25 @@ dependencies = [
 "regex",
 ]

+[[package]]
+name = "nias"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0"
+
+[[package]]
+name = "nix"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+ "void",
+]
+
 [[package]]
 name = "num"
 version = "0.2.1"
@@ -670,6 +898,30 @@ dependencies = [
 "sha-1",
 ]

+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.19"
@@ -712,6 +964,23 @@ dependencies = [
 "num_cpus",
 ]

+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "redox_users"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
+dependencies = [
+ "getrandom",
+ "redox_syscall",
+ "rust-argon2",
+]
+
 [[package]]
 name = "regex"
 version = "1.3.7"
@@ -745,12 +1014,36 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "rust-argon2"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"
+dependencies = [
+ "base64 0.12.3",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"

+[[package]]
+name = "rusty-hook"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3"
+dependencies = [
+ "ci_info",
+ "getopts",
+ "nias",
+ "toml",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.5"
@@ -830,12 +1123,63 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "snafu"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c4e6046e4691afe918fd1b603fd6e515bcda5388a1092a9edbada307d159f09"
+dependencies = [
+ "doc-comment",
+ "snafu-derive",
+]
+
+[[package]]
+name = "snafu-derive"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7073448732a89f2f3e6581989106067f403d378faeafb4a50812eb814170d3e5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "structopt"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33f6461027d7f08a13715659b2948e1602c31a3756aeae9378bfe7518c72e82"
+dependencies = [
+ "clap",
+ "lazy_static",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92e775028122a4b3dd55d58f14fc5120289c69bee99df1d117ae30f84b225c9"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.39"
@@ -859,6 +1203,15 @@ dependencies = [
 "unicode-xid",
 ]

+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.20"
@@ -888,6 +1241,15 @@ dependencies = [
 "lazy_static",
 ]

+[[package]]
+name = "toml"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "typenum"
 version = "1.12.0"
@@ -900,6 +1262,18 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"

+[[package]]
+name = "unicode-segmentation"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
@@ -918,12 +1292,24 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e33648dd74328e622c7be51f3b40a303c63f93e6fa5f08778b6203a4c25c20f"

+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
 [[package]]
 name = "version_check"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"

+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+
 [[package]]
 name = "wasi"
 version = "0.9.0+wasi-snapshot-preview1"
@@ -1016,6 +1402,14 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "xtask"
+version = "0.1.0"
+dependencies = [
+ "structopt",
+ "version_check",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.1.0"

--- a/Cargo.toml
+++ b/Cargo.toml
+[package]
+authors = ["elois <elois@duniter.org>"]
+description = "Duniter launcher."
+edition = "2018"
+keywords = ["duniter", "launcher"]
+license = "AGPL-3.0"
+name = "duniter-launcher"
+repository = "https://git.duniter.org/nodes/typescript/duniter"
+version = "1.9.0-alpha1"
+
+[[bin]]
+bench = false
+path = "rust-bins/duniter-launcher/src/main.rs"
+name = "duniter"
+
+[dependencies]
+anyhow = "1.0.32"
+ctrlc = "3.1.6"
+daemonize-me = "0.3.1"
+dirs = "3.0.1"
+log = "0.4.11"
+logwatcher = "0.1.1"
+nix = "0.17.0"
+structopt = "0.3.18"
+
+[dev-dependencies]
+rusty-hook = "0.11.2"
+
 [workspace]
 members = [
    "neon/native",
+    "rust-bins/xtask",
    "rust-libs/dubp-wot"
 ]


--- a/app/modules/daemon.ts
+++ b/app/modules/daemon.ts
@@ -13,12 +13,8 @@

 import { ConfDTO } from "../lib/dto/ConfDTO";
 import { Server } from "../../server";
-import { Directory, RealFS } from "../lib/system/directory";
 import { ExitCodes } from "../lib/common-libs/exit-codes";

-const constants = require("../lib/constants");
-const Tail = require("tail").Tail;
-
 module.exports = {
  duniter: {
    cliOptions: [
@@ -48,51 +44,6 @@ module.exports = {
    },

    cli: [
-      {
-        name: "start",
-        desc: "Starts Duniter as a daemon (background task).",
-        logs: false,
-        onConfiguredExecute: async (
-          server: Server,
-          conf: ConfDTO,
-          program: any,
-          params: any
-        ) => {
-          await server.checkConfig();
-          const daemon = server.getDaemon("direct_start", "start");
-          await startDaemon(daemon);
-        },
-      },
-      {
-        name: "stop",
-        desc: "Stops Duniter daemon if it is running.",
-        logs: false,
-        onConfiguredExecute: async (
-          server: Server,
-          conf: ConfDTO,
-          program: any,
-          params: any
-        ) => {
-          const daemon = server.getDaemon();
-          await stopDaemon(daemon);
-        },
-      },
-      {
-        name: "restart",
-        desc: "Stops Duniter daemon and restart it.",
-        logs: false,
-        onConfiguredExecute: async (
-          server: Server,
-          conf: ConfDTO,
-          program: any,
-          params: any
-        ) => {
-          await server.checkConfig();
-          const daemon = server.getDaemon("direct_start", "restart");
-          await stopDaemon(daemon);
-          await startDaemon(daemon);
-        },
-      },
      {
        name: "status",
        desc: "Get Duniter daemon status.",
@@ -114,24 +65,6 @@ module.exports = {
          }
        },
      },
-      {
-        name: "logs",
-        desc: "Follow duniter logs.",
-        logs: false,
-        onConfiguredExecute: async (
-          server: Server,
-          conf: ConfDTO,
-          program: any,
-          params: any
-        ) => {
-          printTailAndWatchFile(
-            Directory.INSTANCE_HOMELOG_FILE,
-            constants.NB_INITIAL_LINES_TO_SHOW
-          );
-          // Never ending command
-          return new Promise((res) => null);
-        },
-      },
      {
        name: "direct_start",
        desc: "Start Duniter node with direct output, non-daemonized.",
@@ -142,6 +75,7 @@ module.exports = {
          params: any,
          startServices: any
        ) => {
+          process.title = program.mdb || "duniter_default";
          const logger = server.logger;

          logger.info(">> Server starting...");
@@ -171,55 +105,3 @@ function ServerService(server: Server) {
  server.stopService = () => Promise.resolve();
  return server;
 }
-
-function startDaemon(daemon: any) {
-  return new Promise((resolve, reject) =>
-    daemon.start((err: any) => {
-      if (err) return reject(err);
-      resolve();
-    })
-  );
-}
-
-function stopDaemon(daemon: any) {
-  return new Promise((resolve, reject) =>
-    daemon.stop((err: any) => {
-      err && console.error(err);
-      if (err) return reject(err);
-      resolve();
-    })
-  );
-}
-
-async function printTailAndWatchFile(file: any, tailSize: number) {
-  const fs = RealFS();
-  if (await fs.fsExists(file)) {
-    const content = await fs.fsReadFile(file);
-    const lines = content.split("\n");
-    const from = Math.max(0, lines.length - tailSize);
-    const lastLines = lines.slice(from).join("\n");
-    console.log(lastLines);
-  }
-  watchFile(file);
-}
-
-function watchFile(file: any) {
-  const tail = new Tail(file);
-
-  // Specific errors handling
-  process.on("uncaughtException", (err: any) => {
-    if (err.code === "ENOENT") {
-      console.error("EXCEPTION: ", err.message);
-      setTimeout(() => watchFile(file), 1000); // Wait a second
-    }
-  });
-
-  // On new line
-  tail.on("line", function (data: any) {
-    console.log(data);
-  });
-
-  tail.on("error", function (error: any) {
-    console.error("ERROR: ", error);
-  });
-}
--- a/app/modules/keypair/index.ts
+++ b/app/modules/keypair/index.ts
@@ -27,11 +27,6 @@ export const KeypairDependency = {
    },

    cliOptions: [
-      { value: "--salt <salt>", desc: "Salt to generate the keypair" },
-      {
-        value: "--passwd <password>",
-        desc: "Password to generate the keypair",
-      },
      {
        value: "--keyN <N>",
        desc:
@@ -98,22 +93,6 @@ export const KeypairDependency = {
        logger: any,
        confDAL: any
      ) => {
-        if (
-          (program.keyN || program.keyr || program.keyp) &&
-          !(program.salt && program.passwd)
-        ) {
-          throw Error(
-            "Missing --salt and --passwd options along with --keyN|keyr|keyp option"
-          );
-        }
-
-        // If we have salt and password, convert it to keypair
-        if (program.salt || program.passwd) {
-          const salt = program.salt || "";
-          const key = program.passwd || "";
-          conf.pair = await Scrypt(salt, key);
-        }
-
        // If no keypair has been loaded, try the default .yml file
        if (!conf.pair || !conf.pair.pub || !conf.pair.sec) {
          const ymlContent = await confDAL.coreFS.read("keyring.yml");
@@ -223,6 +202,12 @@ async function promptKey(conf: KeypairConfDTO, program: any) {
      obfuscatedPasswd.length > 0 && obfuscatedPasswd == answersPasswd.passwd;
    const salt = keepOldSalt ? program.salt : answersSalt.salt;
    const passwd = keepOldPasswd ? program.passwd : answersPasswd.passwd;
-    conf.pair = await Scrypt(salt, passwd);
+    conf.pair = await Scrypt(
+      salt,
+      passwd,
+      program.keyN || 4096,
+      program.keyr || 16,
+      program.keyp || 1
+    );
  }
 }
--- a/app/modules/ws2p/index.ts
+++ b/app/modules/ws2p/index.ts
@@ -64,8 +64,8 @@ export const WS2PDependency = {
      },
      { value: "--ws2p-prefered-rm  <pubkey>", desc: "Remove prefered node." },
      {
-        value: "--ws2p-prefered-only  <pubkey>",
-        desc: "Only connect to prefered node.",
+        value: "--ws2p-prefered-only",
+        desc: "Only connect to prefered nodes.",
      },
      {
        value: "--ws2p-privileged-add <pubkey>",
@@ -73,7 +73,7 @@ export const WS2PDependency = {
      },
      { value: "--ws2p-privileged-rm <pubkey>", desc: "Remove a privileged." },
      {
-        value: "--ws2p-privileged-only <pubkey>",
+        value: "--ws2p-privileged-only",
        desc: "Accept only connections from a privileged node.",
      },
    ],

--- a/bin/duniter
+++ b/bin/duniter
--- a/doc/dev/setup_env_dev.md
+++ b/doc/dev/setup_env_dev.md
@@ -10,14 +10,12 @@ Authors: elois
 ## In a post-it

 ```bash
-nvm use 10
 git clone git@git.duniter.org:nodes/typescript/duniter.git
 cd duniter
-npm install
-bin/duniter start
+cargo xtask build
+./target/release/duniter start
 ```

-
 ## Step by step

 ### Prerequisites
@@ -26,31 +24,35 @@ To develop on Duniter, there is currently the following requirement:

 - A computer with GNU/Linux or Mac as operating system
 - Build essential tools
- curl
+- wget
 - git (apt-get install git)
- Nvm
+- Rust

 And preferably an IDE that supports [Typescript] and [Rust] well.

 #### Install Prerequisites

-Nvm:
-
-    wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
+##### Rust

-### Build the project
+```bash
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+```

-#### Clone de repository
+Them add `~/.cargo/bin` on your PATH.

-    git clone https://git.duniter.org/nodes/typescript/duniter
+If you use `bash`:

-#### Install and use the correct version of nodejs
+```bash
+echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> .bashrc
+```

-Check the required node version in the `package.json` file on line 5.
+### Build the project

-If, for example, version 10 is expected, install and select it with the following command:
+#### Clone the repository

-    nvm install 10 && nvm use 10
+```bash
+git clone https://git.duniter.org/nodes/typescript/duniter
+```

 #### Build the project and play automated tests

@@ -58,20 +60,25 @@ If, for example, version 10 is expected, install and select it with the followin

 Command to compile :

-    npm install
+```bash
+cargo xtask build
+```
+
+The binary to run duniter-server is then found here: `target/release/duniter`

 **WARNING**: playing automated tests takes a lot of resources on your machine and those for several minutes, don't do anything else at the same time!

 Command to play automated tests:

-    npm test
+```bash
+cargo xtask test
+```

 If all the tests are successful, the command ends like this:

 ```bash
  777 passing (40s)
  19 pending
-
 Done in 43.80s.
 ```

@@ -88,14 +95,16 @@ For the Rust part, I strongly recommend the following plugins:
 - CodeLLDB (identifier: `vadimcn.vscode-lldb`)
 - rust-analyzer (identifier: `matklad.rust-analyzer`)

-The recommended ide configuration can be found in `doc/dev/vscode/settings.json`.
+The recommended IDE configuration can be found in `doc/dev/vscode/settings.json`.

 ##### Debugger configuration

 The recommended debugger configuration can be found in `doc/dev/.vscode/launch.json`.  
 For import it:

+```bash
 cp doc/dev/vscode/launch.json .vscode/launch.json
+```

 You can then adapt it according to your preferences for use :)


--- a/doc/use/advanced-commands.md
+++ b/doc/use/advanced-commands.md
+Title: Advanced commands
+Order: 9
+Date: 2022-10-04
+Slug: advanced_commands
+Authors: elois
+
+# Advanced commands
+
+Before reading this page, first read the on-board help in Duniter, it meets the most common needs:
+
+```bash
+duniter help
+```
+
+If you are new to Duniter, or/and you just want to configure your network properly, read this page instead: [Configure Duniter server variant](./configure.md).
+
+This page is intended for advanced users, advanced testers and developers.
+
+Some advanced options are hidden in the embedded help (duniter help) because they are rarely used and/or are mainly intended for advanced testers and developers.
+
+Some commands are not available via the Duniter binary and need to call directly the NodeJs part.
+
+## Hidden options
+
+This part lists the options accessible via the Duniter binary but hidden in the help.
+
+### Hidden `sync` options
+
+These options must be used with the `sync` sub command.
+
+#### `--cautious`
+
+Check all DUPB rules (very long).
+
+#### `--localsync`
+
+Allow to synchronize on nodes with local network IP address.
+
+### Hidden `config` options
+
+These options must be used with the `config` sub command.
+
+#### `--nb-cores`
+
+Number of cores uses for proof-of-work computation
+
+### `---addep`
+
+Add given endpoint to the list of endpoints of this node.
+
+### `---remep`
+
+Remove given endpoint to the list of endpoints of this node.
+
+### WS2P preferred/privileged options
+
+These options are described in a dedicated page: [WS2P: preferred and privileged nodes](./ws2p_preferred_privileged.md)
+
+#### `--ws2p-no-private`
+
+Disable WS2P Private.
+
+#### `--ws2p-private`
+
+Enable WS2P Private.
+
+#### `--ws2p-socks-proxy <host:port>`
+
+Use Socks Proxy for WS2P Private
+
+#### `--rm-proxies`
+
+Remove all proxies options
+
+### WS2P TOR options
+
+To have your Duniter node use Tor for outgoing connections it makes with other nodes, just set up a Tor proxy and choose a policy for normal ws2p access points (the `--reaching-clear-ep` option):
+
+```bash
+duniter config --tor-proxy localhost:9050 --reaching-clear-ep tor
+```
+
+You will also need to install the *Tor Browser* or *Tor Standalone* on the same machine. By default, Tor listens on localhost on port 9050. If you change your Tor configuration you will obviously need to change the Duniter configuration accordingly.
+
+You can also choose a mixed node, which will contact the regular access points in plain text, so it will only use Tor to contact .onion access points:
+
+```bash
+duniter config --tor-proxy localhost:9050 --reaching-clear-ep clear
+```
+
+Finally 3rd choice, you can choose to contact only the .onion access points, the clear access points will never be contacted:
+
+```bash
+duniter config --tor-proxy localhost:9050 --reaching-clear-ep none
+```
+
+/!\ Each time you change one of these two options you must repeat the other one at the same time or it will be reset!
+
+Finally, to remove your Tor configuration and return to a classic node:
+
+```bash
+duniter --rm-proxies
+```
+
+You can also decide to encapsulate Duniter in a Tor VM as whonix, in which case you will need to inform Duniter that it will be able to contact .onion access points by enabling the `--force-tor' option:
+
+```bash
+duniter config --force-tor --reaching-clear-ep tor|none
+```
+
+#### Hidden service
+
+Just enter the .onion address of your hidden service in the `--ws2p-remote-host` option.
+
+## Hidden commands and more hidden options
+
+The following commands and options are not accessible via the `duniter` binary. The NodeJs code must be called directly for them.
+
+For this use the embedded NodeJs :
+
+```bash
+/opt/duniter/node/bin/node duniter_js <hidden-command>
+```
+
+If you compiled Duniter yourself, you don't have any NodeJs embedded, then use the version of NodeJs you used to compile Duniter.
+
+Not all commands and options are listed here, if you don't find what you need:
+
+1. Search in `duniter_js --help`.
+
+2. Search into the Duniter's code itself.
+
+3. Ask for help on the [Duniter forum](https://forum.duniter.org).
+
+### sync `--memory`
+
+Perform synchronization in memory only. Synchronization will not be stored on the hard disk. This option is useful for a quick blockchain integrity check when combined with the --cautious option.
+
+`duniter_js sync g1.duniter.org 443 --cautious --memory`
+
+### Generate a block manually
+
+Generates the next block from the pool data and the current block, performs the working proof for the requested difficulty and then submits the resulting block to a node.
+
+`duniter_js gen-next g1.duniter.org 10901 74`
+
+This command generates the next block, sends it to node `g1.duniter.org:10901` and calculates the working proof with 74 trouble (footprint beginning with 4 zeros).
+
+#### Option `--show`
+
+Displays the calculated block **before** the proof of work and submission to the network. Controls its contents.
+
+`duniter_js gen-next g1.duniter.org 10901 74 --show`
+
+#### Option `--check`
+
+Modifies the behaviour of the command: it no longer produces proof of work nor submits the block to the network. Instead, it generates the block and checks if it is acceptable by a node.
+
+`duniter_js gen-next --show --check`
+
+### Generate genesis block
+
+Generates block #0 automatically, including a maximum number of members:
+
+`duniter_js gen-root duniter.org 10901 74`
+
+Generates block #0 by manually selecting members to include:
+
+```bash
+duniter_js gen-root-choose duniter.org 10901 74
+? Newcomers to add:
+ ◯ john
+ ◯ dude404
+ ◉ sinogeek
+❯◉ deviantime
+ ◯ kernel
+ ◯
+```
+
+## Not listed
+
+Not all commands and options are listed on this page, if you don't find what you need:
+
+1. Search in `duniter_js --help`.
+
+2. Search into the Duniter's code itself.
+
+3. Ask for help on the [Duniter forum](https://forum.duniter.org).
--- a/doc/use/configure.md
+++ b/doc/use/configure.md
+Title: Configure Duniter server variant
+Order: 9
+Date: 2017-09-22
+Slug: configurer
+Authors: elois
+
+# Configure Duniter server variant
+
+Here is a short tutorial to configure your newly installed Duniter server node.  
+Warning: this tutorial is for server variant users only and in **version 1.9.x or higher**.
+
+## Configuring the cryptographic keypair
+
+All duniter nodes have a cryptographic keypair, which they use to sign the information they transmit over the network. There are two types of duniter nodes:
+
+**1. member nodes:** If the node's keypair corresponds to a member identity, then the node is a "member" node, and 
+will automatically take part in the calculation of the blocks.
+
+**2. Mirror nodes:** If the node's keypair does not match a member identity, then the node is "mirror" type, it will not be able to write a block, but will still be useful for network resilience and for responding to client requests.
+
+By default this keypair is random, so the duniter node is a mirror node. You can change the node's keypair with this command:
+
+```bash
+duniter wizard key
+```
+
+Please note that the keypair filled in with this command will be stored in clear on the disk!
+To avoid this you can choose to set the keypair to be inserted only at the start of the node so that your keypair will be stored only in RAM, so add the option `--keyprompt` to the node start command.
+
+### Having several nodes with the same keypair
+
+It is possible to have several member nodes with your member keypair but in this case you must assign a unique identifier to each of your nodes, this unique identifier is named **prefix** because its unique role is to prefix the nonce of the blocks you are calculating in order to prevent two of your nodes from calculating the same proof.
+  
+On your 1st node: You don't have to do anything, the prefix is `1` by default.
+
+On your second node:
+
+```bash
+duniter config --prefix 2
+```
+
+On your third node:
+
+```bash
+duniter config --prefix 3
+```
+
+etc
+
+The prefix must be an integer between `1` and `899`.
+
+## Configuring the network
+
+### The APIs
+
+  In version `1.9.x` there are two APIs (Application Programming Interface) allowing your node to communicate with other programs.
+
+1. WS2P (WebSocketToPeer): this API is dedicated to inter-node communication, i.e. between your duniter node and other nodes of the same currency. **WS2P is enabled by default** on your duniter node.
+2. BMA (Basic Merkled Api) : this old API is dedicated to the communication with client software (Cesium, Sakia, Silkaj), it can also be used by any external program wishing to request the network (a website that would like to check the presence of a blockchain transaction for example). BMA is looking forward to developing a new client API to replace it. **BMA is disabled by default** on your duniter node.
+
+### Configuring WS2P
+
+#### Notion of WS2P Public and WS2P Private
+
+WS2P Private = outgoing WS2P connections.
+WS2P public = incoming WS2P connections.
+
+A WS2P connection between two duniter nodes always has a direction, it is initiated by one of the nodes which is therefore the initiator and the other is the acceptor. Connections that your duniter node initiates with other duniter nodes are outbound, depending on your private WS2P configuration. On the other hand, connections that your duniter node accepts from another node are incoming, depending on your public WS2P configuration.
+
+#### WS2P Private
+
+This mode is enabled by default and configured automatically.
+
+To change the maximum number of simultaneous outgoing WS2P connections:
+
+```bash
+duniter config --ws2p-max-private <count>
+```
+
+#### WS2P Public
+
+This mode is disabled by default, in order for it to work you must configure a WS2P endpoint that other duniter nodes will be able to use to reach you.
+
+First enable the public WS2P mode:
+
+```bash
+duniter config --ws2p-public
+```
+
+##### Configure a WS2P endpoint
+
+For WS2P Public to work you must configure a WS2P endpoint that other duniter nodes will be able to use to reach you. There are three possible cases:
+
+1. You host your node at home and you want to use UPnP (enabled by default) and then you don't have to do anything, duniter will automatically control your box to configure an endpoint.
+
+2. You host your node at home but you don't want to use UPnP (For security reasons for example).
+
+3. You host your node on a dedicated server on a hosting provider,  so you don't have UPnP.
+
+If you are in case 2 or 3, you must configure an access point manually:
+
+```bash
+duniter config --ws2p-noupnp --ws2p-port PORT --ws2p-host HOST --ws2p-remote-port REMOTE_PORT --ws2p-remote-host REMOTE_HOST
+```
+
+*The "remote" options correspond, for example, to a box that would do a NAT to your machine, or to a nginx/apache that would do a reverse proxy to your Duniter instance.*
+If your duniter node is connected to the internet through a box, you will need to configure port forwarding on your box by redirecting the port of your choice to the machine running your duniter node. In addition, in order to keep the local IP of this machine unchanged, you must ask your box to assign a permanent DHCP lease to it.
+
+##### Maximum number of public WS2P connections
+
+To change the maximum number of simultaneous incoming WS2P connections :
+
+```bash
+duniter config --ws2p-max-public <count>
+```
+
+#### Check your WS2P configuration
+
+```bash
+duniter ws2p show-conf
+```
+
+#### Define a path for your WS2P endpoint
+
+```bash
+duniter config --ws2p-remote-path <path>
+```
+
+Use only if you want to place your duniter node behind a reverse proxy.
+This option allows you to add a path for your public WS2P access point.
+Your WS2P access point will then be: `ws://host:port/path`.
+
+Note that `ws://` will be replaced by `wss://` if you set the remote port to 443.
+
+#### WS2P preferred/privileged nodes
+
+See [WS2P: preferred and privileged nodes](ws2p_preferred_privileged.md)
+
+### Configuring BMA
+
+The only thing you need to configure is an access point. Answer the questions in the following interactive command:
+
+```bash
+duniter wizard bma
+```
+
+Here is an example with my own configuration at home:
+
+```text
+2017-10-01T19:02:09+02:00 - debug: Plugging file system...
+2017-10-01T19:02:09+02:00 - debug: Loading conf...
+2017-10-01T19:02:10+02:00 - debug: Configuration saved.
+? IPv4 interface eth0 192.168.0.11
+? IPv6 interface None
+? Port 10901
+? Remote IPv4 81.64.137.147
+? Remote port 10901
+? Does this server has a DNS name? No
+2017-10-01T19:02:33+02:00 - debug: Configuration saved.
+```
+
+I'm wired, otherwise in wifi you have to choose the wlan0 option.
+Unfortunately my box does not support IPv6, so no IPv6 interface: None
+I don't use UPnP so I manually set a port (here 10901).
+Remote IPv4 corresponds to the public ip of my box, you can know it by visiting the site [https://www.myip.com/](https://www.myip.com/)
+Here I have not configured a DNS domain pointing to my duniter node.
+
+If like me you don't use UPnP, you have to manually configure a port forwarding on your box.
+
+### What is UPnP
+
+Universal Plug and Play (UPnP) is a protocol that, if enabled on your Internet box, allows the programs you use to configure the network themselves by " controlling " your box.  
+UPnP has the advantage of being practical, because it avoids you having to configure the network yourself, but in return you have to trust the programs you use because a malicious program can use UPnP to open your network in an unwanted way.  
+If you are not afraid of the command line and you are demanding on the security of your local network, we recommend you to disable UPnP.
+
+If you install duniter on a VPS or a dedicated server you will have to do without UPnP anyway.
+
+### Note on public WS2P (recommended)
+
+Nodes with public WS2P are necessary for the duniter network to work, and the more nodes with public WS2P, the more decentralized the network is.  
+This mode is optional if only because technically it is sometimes difficult or even impossible to be accessible from the outside (node behind a 4G router for example).
+
+## Synchronize your node
+
+To join the network of a currency you must synchronize with a node already on this network:
+
+```bash
+duniter sync DUNITER_NODE_HOST:DUNITER_NODE_PORT
+```
+
+For Ğ1, if you don't know any node you can choose the official node `g1.duniter.org:443`.
+
+## Launch
+
+There are four different commands depending on whether or not you want to demonize your Duniter instance and whether or not you want to use the web-ui:
+
+```bash
+duniter start
+duniter direct_start
+duniter webstart
+duniter direct_webstart
+```
+
+The `direct_` prefix cancels the demonization, but then you will have to leave your terminal open or use nohup or screen or similar.
+
+In addition, the `direct_start` and `direct_webstart` commands accept the `--keyprompt` option (see the keypair section).
+
+## Tracking logs
+
+```bash
+duniter logs
+```
+
+## Go further
+
+See the [advanced commands](./advanced-commands.md).
--- a/doc/use/index.md
+++ b/doc/use/index.md
+Title: User documentation for Duniter Server
+Order: 9
+Date: 2017-09-22
+Slug: configurer
+Authors: elois
+
+# User documentation for Duniter Server
+
+- [Use Duniter Docker image](./docker.md)
+- [Configure Duniter server variant](./configure.md)
+- [WS2P: preferred and privileged nodes](./ws2p_preferred_privileged.md)
+- [Compile Duniter manually from source code](./manual_compilation.md)
+- [Advanced commands](./advanced-commands.md)
--- a/doc/use/install.md
+++ b/doc/use/install.md
+Title: Install Duniter Server
+Order: 9
+Date: 2017-09-22
+Slug: configurer
+Authors: elois
+
+# Install Duniter Server
+
+## Distribution based on debian (including Ubuntu and some others)
+
+A debian package is provided for the `x86_64` and `armv7l` architectures. If you don't know what it is, you probably need package for `x86_64` architecture.
+
+If your architecture is different, you can try to [compile Duniter yourself](manual_compilation.md) or [install Duniter via Docker](docker.md).
+
+Go to the [release page](https://git.duniter.org/nodes/typescript/duniter/-/releases) to get a link to the last stable release.
+
+Download the debian package and install it:
+
+```bash
+sudo dpkg -i duniter-*-linux-x64.deb
+```
+
+Then [configure your Duniter node](configure.md).
+
+## Gentoo 64 bits
+
+In order to install Duniter on Gentoo, there is a package in the overlay [sveyret-overlay](https://github.com/sveyret/sveyret-overlay). A README file can be found in this overlay to help you and add it to the Portage tree.
+
+You will then be able to install the package net-p2p/duniter:
+
+`emerge -av net-p2p/duniter`
+
+The following USE flags allow you to decide what will be built:
+Flag Description
+desktop Build and install the desktop version instead of the server one
+gui Add the GUI (mandatory for desktop version, add the web interface for server version)
+
+The server version node for Gentoo can also be automatically started.
+
+## YunoHost
+
+A [YunoHost package](https://github.com/duniter/duniter_ynh) is available.
+
+## Other distributions
+
+You need to [compile Duniter yourself](manual_compilation.md) or [install Duniter via Docker](docker.md).
+
+## Mac
+
+In theory, duniter-server should compile under Mac, but this has never been tested. You can try to [compile it from source](manual_compilation.md) and let us know the result on the [Duniter forum](https://forum.duniter.org).
+
+## Windows
+
+Duniter-server does not support Windows.
--- a/doc/use/manual_compilation.md
+++ b/doc/use/manual_compilation.md
@@ -15,7 +15,7 @@ To compile Duniter manually, there is currently the following requirement:
 - Build essential tools
 - curl
 - tar or unzip or git (to download and extract source code)
- Nvm
+- Rust

 ### Get source code

@@ -60,44 +60,25 @@ Depend on your distribution:

 TODO: If you know how to install build essential tools for other gnu/linux distributions or for mac, you can complete this documentation and submit a merge request.

-#### Nvm
+#### Rust

-Nvm:
-
-    wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

 ## Build the project

 Go to the root of the folder where you extracted the source code (or possibly cloned from git).

-### Install and use the correct version of nodejs
-
-Check the required node version in the `package.json` file on line 5.
-
-If, for example, version 10 is expected, install and select it with the following command:
-
-    nvm install 10 && nvm use 10
-
-### Optionally add GUI
-
-The graphical user interface (GUI) is optional because it is possible to do everything from the command line.  
-If you wish to have the GUI, you must add it (before compiling) with the following command:
-
-    npm add duniter-ui
-
-### Compile
-
 **WARNING**: the compilation of the project requires a lot of resources on your machine, and several long minutes, don't do anything else at the same time!

 Command to compile :

-    NEON_BUILD_RELEASE=true npm install && npm prune --production
+    cargo xtask build --production

 ### Set autocompletion

 To install or update Duniter's command auto-completion:

-    cp release/extra/completion/duniter_completion.bash /etc/bash_completion.d/
+    bin/duniter completions bash > /etc/bash_completion.d/duniter_completion.bash

 ### Run on command line


--- a/doc/use/ws2p_preferred_privileged.md
+++ b/doc/use/ws2p_preferred_privileged.md
+Title: WS2P: preferred and privileged nodes
+Order: 9
+Date: 2020-10-04
+Slug: ws2p_preferred_privileged
+Authors: elois
+
+# WS2P: preferred and privileged nodes
+
+## Preferred nodes
+
+List of preferred public keys, your node will connect in priority to duniter nodes whose public key is in your preferred public key list.
+
+To add a public key to your list of preferred keys:
+
+```bash
+duniter config --ws2p-prefered-add <pubkey>
+```
+
+To remove a key from your preferred key list :
+
+```bash
+duniter config --ws2p-prefered-rm <pubkey>
+```
+
+To consult the list of your preferred keys:
+
+```bash
+duniter ws2p list-prefered
+```
+
+## Privileged nodes
+
+Just as you can set preferred keys for your outgoing WS2P connections, you can set privileged keys for your incoming WS2P connections. That is, if you receive more connection requests than the maximum number you have configured, connections initiated by nodes whose public key is part of your privileged keys will be given priority.
+
+To add a key to your privileged key list :
+
+```bash
+duniter config --ws2p-privileged-add <pubkey>
+```
+
+To remove a key from your privileged key list:
+
+```bash
+duniter config --ws2p-privileged-rm <pubkey>
+```
+
+To consult the list of your privileged keys:
+
+```bash
+duniter ws2p list-privileged
+```
--- a/duniter.sh
+++ b/duniter.sh
-#!/bin/bash
-
-##########################
-#    DUNITER EXECUTABLE
-#
-# Wraps bin/duniter that is called with Node.js
-#
-
-DEB_PACKAGING=
-
-if [[ $DEB_PACKAGING ]]; then
-  DUNITER_DIR=/opt/duniter/
-fi
-
-duniter() {
-
-	local NODE
-	local LOGS_FILE
-
-	if [ -z "$DEV_MODE" ]; then
-
-		### Production mode
-		if [[ -d $DUNITER_DIR/node ]]; then
-			NODE=$DUNITER_DIR/node/bin/node
-	  else
-	    echo "Node.js is not embedded in this version of Duniter"
-	    return
-		fi;
-	else
-
-		### Cheating with DEV mode
-		DUNITER_DIR=`pwd`
-		NODE=node
-	fi
-
-	VERSION=`$NODE -v`
-
-	if [[ $VERSION != v10* ]]; then
-	  echo "$NODE v10 is required";
-	else
-
-	  # Calls duniter JS command
-	  cd $DUNITER_DIR
-	  $NODE "$DUNITER_DIR/bin/duniter" "$@"
-
-	fi;
-}
-
-# If the script was launched with parameters, try to launch the Duniter command
-if [ ! -z $1 ]; then
-	duniter "$@"
-fi
--- a/format.sh
+++ b/format.sh
-#!/bin/sh
-
-if [ "${1}" = "check" ]
-then
-    $HOME/.cargo/bin/cargo fmt -- --check && prettier --list-different "app/**/*.{ts,json}"
-elif [ "${1}" = "all" ]
-then
-    $HOME/.cargo/bin/cargo fmt && prettier --write "app/**/*.{ts,json}"
-else
-    echo  "first argument must be \"check\" or \"all\"."
-fi