From de422bccf3577a56af57a61e17b599e526462714 Mon Sep 17 00:00:00 2001 From: cgeek <cem.moreau@gmail.com> Date: Mon, 4 Sep 2023 22:30:18 +0200 Subject: [PATCH] feat: duniter-v2s-issue-123-industrialize-releases --- Cargo.lock | 294 +++++++++++++++++++++++++----- rust-bins/duniter-dbex/Cargo.toml | 6 +- 2 files changed, 252 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3aba3cfaa..0f9bc3e7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,6 +872,18 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "dubp-wot" +version = "0.11.1" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "log", + "once_cell", + "parking_lot", + "rayon", + "serde", +] + [[package]] name = "dubp-wot" version = "0.11.1" @@ -884,6 +896,17 @@ dependencies = [ "serde", ] +[[package]] +name = "duniter-bc-reader" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "anyhow", + "dubp", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "resiter", +] + [[package]] name = "duniter-bc-reader" version = "0.1.0" @@ -891,7 +914,7 @@ source = "git+https://git.duniter.org/nodes/rust/duniter-core#8687791c8380504068 dependencies = [ "anyhow", "dubp", - "duniter-dbs", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", "resiter", ] @@ -905,9 +928,9 @@ dependencies = [ "async-bincode", "async_io_stream", "bincode", - "duniter-core", - "duniter-gva-db", - "duniter-gva-dbs-reader", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-gva-db 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", + "duniter-gva-dbs-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", "fast-threadpool", "futures", "once_cell", @@ -939,7 +962,7 @@ dependencies = [ "ctrlc", "daemonize-me", "dirs", - "duniter-core", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", "duniter-gva-conf", "log", "logwatcher", @@ -950,6 +973,20 @@ dependencies = [ "structopt", ] +[[package]] +name = "duniter-conf" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "anyhow", + "dubp", + "envy", + "futures-util", + "log", + "serde", + "serde_json", +] + [[package]] name = "duniter-conf" version = "0.1.0" @@ -964,20 +1001,36 @@ dependencies = [ "serde_json", ] +[[package]] +name = "duniter-core" +version = "1.8.1" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "dubp", + "dubp-wot 0.11.1 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-bc-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-conf 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-dbs-write-ops 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-global 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-mempools 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-module 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", +] + [[package]] name = "duniter-core" version = "1.8.1" source = "git+https://git.duniter.org/nodes/rust/duniter-core#8687791c838050406871439f1ff832a9b56a6e24" dependencies = [ "dubp", - "dubp-wot", - "duniter-bc-reader", - "duniter-conf", - "duniter-dbs", - "duniter-dbs-write-ops", - "duniter-global", - "duniter-mempools", - "duniter-module", + "dubp-wot 0.11.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-bc-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-conf 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-dbs-write-ops 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-global 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-mempools 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-module 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", ] [[package]] @@ -988,9 +1041,9 @@ dependencies = [ "arrayvec 0.5.2", "comfy-table", "dirs", - "duniter-core", - "duniter-gva-db", - "duniter-gva-indexer", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-gva-db 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-gva-indexer 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva?branch=duniter-v2s-issue-123-industrialize-releases)", "fast-threadpool", "flume", "once_cell", @@ -1002,6 +1055,29 @@ dependencies = [ "unwrap", ] +[[package]] +name = "duniter-dbs" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "arrayvec 0.7.0", + "bincode", + "byteorder", + "chrono", + "dubp", + "kv_typed 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "log", + "parking_lot", + "paste", + "rand 0.8.3", + "serde", + "serde_json", + "smallvec", + "thiserror", + "uninit", + "zerocopy", +] + [[package]] name = "duniter-dbs" version = "0.1.0" @@ -1012,7 +1088,7 @@ dependencies = [ "byteorder", "chrono", "dubp", - "kv_typed", + "kv_typed 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", "log", "parking_lot", "paste", @@ -1025,6 +1101,21 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "duniter-dbs-write-ops" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "chrono", + "dubp", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-global 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "fast-threadpool", + "flume", + "log", + "resiter", +] + [[package]] name = "duniter-dbs-write-ops" version = "0.1.0" @@ -1032,14 +1123,27 @@ source = "git+https://git.duniter.org/nodes/rust/duniter-core#8687791c8380504068 dependencies = [ "chrono", "dubp", - "duniter-dbs", - "duniter-global", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-global 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", "fast-threadpool", "flume", "log", "resiter", ] +[[package]] +name = "duniter-global" +version = "1.8.1" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "async-rwlock", + "dubp", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "flume", + "once_cell", + "tokio", +] + [[package]] name = "duniter-global" version = "1.8.1" @@ -1047,7 +1151,7 @@ source = "git+https://git.duniter.org/nodes/rust/duniter-core#8687791c8380504068 dependencies = [ "async-rwlock", "dubp", - "duniter-dbs", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", "flume", "once_cell", "tokio", @@ -1065,12 +1169,12 @@ dependencies = [ "async-trait", "bytes 1.0.1", "duniter-bda", - "duniter-core", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", "duniter-gva-conf", - "duniter-gva-db", - "duniter-gva-dbs-reader", + "duniter-gva-db 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", + "duniter-gva-dbs-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", "duniter-gva-gql", - "duniter-gva-indexer", + "duniter-gva-indexer 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", "fast-threadpool", "flume", "futures", @@ -1089,12 +1193,28 @@ version = "0.1.0" source = "git+https://git.duniter.org/nodes/rust/modules/duniter-gva#c8d178fd8981995f7077dfc910d00a00367e757f" dependencies = [ "anyhow", - "duniter-core", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", "read_input", "serde", "structopt", ] +[[package]] +name = "duniter-gva-db" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/modules/duniter-gva?branch=duniter-v2s-issue-123-industrialize-releases#5e9dc5054e63210febd13026537529c5e19587ff" +dependencies = [ + "bincode", + "chrono", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "parking_lot", + "paste", + "serde", + "serde_json", + "uninit", + "zerocopy", +] + [[package]] name = "duniter-gva-db" version = "0.1.0" @@ -1102,7 +1222,7 @@ source = "git+https://git.duniter.org/nodes/rust/modules/duniter-gva#c8d178fd898 dependencies = [ "bincode", "chrono", - "duniter-core", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", "parking_lot", "paste", "serde", @@ -1111,6 +1231,21 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "duniter-gva-dbs-reader" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/modules/duniter-gva?branch=duniter-v2s-issue-123-industrialize-releases#5e9dc5054e63210febd13026537529c5e19587ff" +dependencies = [ + "anyhow", + "arrayvec 0.7.0", + "bincode", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-gva-db 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva?branch=duniter-v2s-issue-123-industrialize-releases)", + "flate2", + "rand 0.8.3", + "resiter", +] + [[package]] name = "duniter-gva-dbs-reader" version = "0.1.0" @@ -1119,8 +1254,8 @@ dependencies = [ "anyhow", "arrayvec 0.7.0", "bincode", - "duniter-core", - "duniter-gva-db", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-gva-db 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", "flate2", "rand 0.8.3", "resiter", @@ -1135,9 +1270,9 @@ dependencies = [ "arrayvec 0.7.0", "async-graphql", "async-trait", - "duniter-core", - "duniter-gva-db", - "duniter-gva-dbs-reader", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-gva-db 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", + "duniter-gva-dbs-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", "fast-threadpool", "flume", "futures", @@ -1146,6 +1281,22 @@ dependencies = [ "serde", ] +[[package]] +name = "duniter-gva-indexer" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/modules/duniter-gva?branch=duniter-v2s-issue-123-industrialize-releases#5e9dc5054e63210febd13026537529c5e19587ff" +dependencies = [ + "anyhow", + "bincode", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-gva-db 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-gva-dbs-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva?branch=duniter-v2s-issue-123-industrialize-releases)", + "flate2", + "log", + "once_cell", + "resiter", +] + [[package]] name = "duniter-gva-indexer" version = "0.1.0" @@ -1153,9 +1304,9 @@ source = "git+https://git.duniter.org/nodes/rust/modules/duniter-gva#c8d178fd898 dependencies = [ "anyhow", "bincode", - "duniter-core", - "duniter-gva-db", - "duniter-gva-dbs-reader", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-gva-db 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", + "duniter-gva-dbs-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/modules/duniter-gva)", "flate2", "log", "once_cell", @@ -1168,7 +1319,7 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "duniter-core", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", "duniter-server", "fast-threadpool", "flume", @@ -1178,19 +1329,52 @@ dependencies = [ "tokio", ] +[[package]] +name = "duniter-mempools" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "dubp", + "duniter-bc-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-dbs-write-ops 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "log", + "thiserror", +] + [[package]] name = "duniter-mempools" version = "0.1.0" source = "git+https://git.duniter.org/nodes/rust/duniter-core#8687791c838050406871439f1ff832a9b56a6e24" dependencies = [ "dubp", - "duniter-bc-reader", - "duniter-dbs", - "duniter-dbs-write-ops", + "duniter-bc-reader 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-dbs-write-ops 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", "log", "thiserror", ] +[[package]] +name = "duniter-module" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" +dependencies = [ + "anyhow", + "async-mutex", + "async-trait", + "dubp", + "duniter-conf 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-global 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "duniter-mempools 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases)", + "fast-threadpool", + "futures-util", + "log", + "public-ip", + "serde", +] + [[package]] name = "duniter-module" version = "0.1.0" @@ -1200,10 +1384,10 @@ dependencies = [ "async-mutex", "async-trait", "dubp", - "duniter-conf", - "duniter-dbs", - "duniter-global", - "duniter-mempools", + "duniter-conf 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-dbs 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-global 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", + "duniter-mempools 0.1.0 (git+https://git.duniter.org/nodes/rust/duniter-core)", "fast-threadpool", "futures-util", "log", @@ -1232,7 +1416,7 @@ version = "1.9.0-dev" dependencies = [ "anyhow", "cfg-if 1.0.0", - "duniter-core", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", "duniter-gva", "fast-threadpool", "flume", @@ -1247,7 +1431,7 @@ version = "1.9.0-dev" dependencies = [ "bincode", "bs58 0.3.1", - "duniter-core", + "duniter-core 1.8.1 (git+https://git.duniter.org/nodes/rust/duniter-core)", "duniter-server", "flate2", "flexi_logger", @@ -1840,7 +2024,7 @@ dependencies = [ [[package]] name = "kv_typed" version = "0.1.0" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#8687791c838050406871439f1ff832a9b56a6e24" +source = "git+https://git.duniter.org/nodes/rust/duniter-core?branch=duniter-v2s-issue-123-industrialize-releases#1ab6d23bc01281ec3cd0ea5e8e94be35fe3bf9c4" dependencies = [ "byteorder", "cfg-if 0.1.10", @@ -1858,6 +2042,26 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "kv_typed" +version = "0.1.0" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#8687791c838050406871439f1ff832a9b56a6e24" +dependencies = [ + "byteorder", + "cfg-if 0.1.10", + "flume", + "parking_lot", + "paste", + "rayon", + "regex", + "serde_json", + "sled", + "smallvec", + "thiserror", + "uninit", + "zerocopy", +] + [[package]] name = "lazy_static" version = "1.4.0" diff --git a/rust-bins/duniter-dbex/Cargo.toml b/rust-bins/duniter-dbex/Cargo.toml index bd0060974..57bd4a27b 100644 --- a/rust-bins/duniter-dbex/Cargo.toml +++ b/rust-bins/duniter-dbex/Cargo.toml @@ -22,9 +22,9 @@ anyhow = "1.0.33" arrayvec = "0.5.1" comfy-table = "2.1.0" dirs = "3.0.1" -duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["bc-writer", "explorer", "leveldb_backend"] } -duniter-gva-db = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva", default-features = false, features = ["explorer", "leveldb_backend"] } -duniter-gva-indexer = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva" } +duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", branch = "duniter-v2s-issue-123-industrialize-releases", features = ["bc-writer", "explorer", "leveldb_backend"] } +duniter-gva-db = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva", branch = "duniter-v2s-issue-123-industrialize-releases", default-features = false, features = ["explorer", "leveldb_backend"] } +duniter-gva-indexer = { git = "https://git.duniter.org/nodes/rust/modules/duniter-gva", branch = "duniter-v2s-issue-123-industrialize-releases" } fast-threadpool = "0.2.3" flume = "0.10.0" once_cell = "1.7" -- GitLab