From 4c1e755cc8912a44231a0ec05018ed38ab077ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B3=CE=BB?= Date: Mon, 30 Dec 2024 15:39:08 +1100 Subject: [PATCH] Rename things (#226) * Rename `enclave_node` -> `runtime` * Rename `runtime` -> `enclave_core` * Revert poor replace * Use workspace paths --- packages/ciphernode/Cargo.lock | 114 +++++++++--------- packages/ciphernode/Cargo.toml | 12 +- packages/ciphernode/aggregator/Cargo.toml | 2 +- packages/ciphernode/aggregator/src/feature.rs | 2 +- .../aggregator/src/plaintext_aggregator.rs | 2 +- .../aggregator/src/publickey_aggregator.rs | 2 +- packages/ciphernode/aggregator/src/repo.rs | 2 +- packages/ciphernode/config/Cargo.toml | 2 +- packages/ciphernode/config/src/store_keys.rs | 2 +- .../ciphernode/{cipher => crypto}/Cargo.toml | 2 +- .../{cipher => crypto}/src/cipher.rs | 0 .../ciphernode/{cipher => crypto}/src/lib.rs | 0 .../src/password_manager.rs | 0 packages/ciphernode/data/Cargo.toml | 2 +- packages/ciphernode/data/src/sled_store.rs | 2 +- packages/ciphernode/e3_request/Cargo.toml | 2 +- packages/ciphernode/e3_request/src/context.rs | 2 +- packages/ciphernode/e3_request/src/meta.rs | 2 +- packages/ciphernode/e3_request/src/repo.rs | 2 +- packages/ciphernode/e3_request/src/router.rs | 6 +- packages/ciphernode/enclave/Cargo.toml | 6 +- .../enclave/src/aggregator_start.rs | 4 +- packages/ciphernode/enclave/src/cli.rs | 2 +- packages/ciphernode/enclave/src/init.rs | 4 +- packages/ciphernode/enclave/src/main.rs | 2 +- .../ciphernode/enclave/src/net_generate.rs | 2 +- packages/ciphernode/enclave/src/net_purge.rs | 2 +- packages/ciphernode/enclave/src/net_set.rs | 2 +- .../ciphernode/enclave/src/password_create.rs | 2 +- .../ciphernode/enclave/src/password_delete.rs | 2 +- packages/ciphernode/enclave/src/start.rs | 4 +- packages/ciphernode/enclave/src/wallet_set.rs | 2 +- .../{enclave_node => enclave_core}/Cargo.toml | 6 +- .../{enclave_node => enclave_core}/build.rs | 0 .../src/aggregator_start.rs | 4 +- .../src/helpers/datastore.rs | 2 +- .../src/helpers/mod.rs | 0 .../src/helpers/shutdown.rs | 2 +- .../src/init.rs | 2 +- .../{enclave_node => enclave_core}/src/lib.rs | 0 .../src/net_generate.rs | 4 +- .../src/net_purge.rs | 2 +- .../src/net_set.rs | 4 +- .../src/password_create.rs | 2 +- .../src/password_delete.rs | 2 +- .../src/start.rs | 4 +- .../src/wallet_set.rs | 4 +- .../ciphernode/{core => events}/Cargo.toml | 2 +- .../{core => events}/src/eventbus.rs | 0 .../ciphernode/{core => events}/src/events.rs | 0 .../ciphernode/{core => events}/src/lib.rs | 4 - .../{core => events}/src/ordered_set.rs | 0 .../ciphernode/{core => events}/src/tag.rs | 0 packages/ciphernode/evm/Cargo.toml | 6 +- .../evm/src/ciphernode_registry_sol.rs | 14 +-- packages/ciphernode/evm/src/enclave_sol.rs | 2 +- .../ciphernode/evm/src/enclave_sol_reader.rs | 14 +-- .../ciphernode/evm/src/enclave_sol_writer.rs | 6 +- packages/ciphernode/evm/src/event_reader.rs | 4 +- packages/ciphernode/evm/src/helpers.rs | 2 +- .../ciphernode/evm/src/registry_filter_sol.rs | 2 +- packages/ciphernode/evm/tests/evm_reader.rs | 4 +- packages/ciphernode/fhe/Cargo.toml | 2 +- packages/ciphernode/fhe/src/feature.rs | 2 +- packages/ciphernode/fhe/src/fhe.rs | 2 +- packages/ciphernode/fhe/src/repo.rs | 2 +- packages/ciphernode/keyshare/Cargo.toml | 4 +- packages/ciphernode/keyshare/src/feature.rs | 4 +- packages/ciphernode/keyshare/src/keyshare.rs | 4 +- packages/ciphernode/keyshare/src/repo.rs | 2 +- packages/ciphernode/logger/Cargo.toml | 2 +- packages/ciphernode/logger/src/logger.rs | 2 +- packages/ciphernode/net/Cargo.toml | 4 +- .../ciphernode/net/src/network_manager.rs | 4 +- packages/ciphernode/sortition/Cargo.toml | 2 +- .../sortition/src/ciphernode_selector.rs | 2 +- .../ciphernode/sortition/src/sortition.rs | 2 +- packages/ciphernode/test_helpers/Cargo.toml | 2 +- .../test_helpers/src/plaintext_writer.rs | 2 +- .../test_helpers/src/public_key_writer.rs | 2 +- packages/ciphernode/tests/Cargo.toml | 4 +- .../tests/test_aggregation_and_decryption.rs | 4 +- 82 files changed, 170 insertions(+), 176 deletions(-) rename packages/ciphernode/{cipher => crypto}/Cargo.toml (96%) rename packages/ciphernode/{cipher => crypto}/src/cipher.rs (100%) rename packages/ciphernode/{cipher => crypto}/src/lib.rs (100%) rename packages/ciphernode/{cipher => crypto}/src/password_manager.rs (100%) rename packages/ciphernode/{enclave_node => enclave_core}/Cargo.toml (92%) rename packages/ciphernode/{enclave_node => enclave_core}/build.rs (100%) rename packages/ciphernode/{enclave_node => enclave_core}/src/aggregator_start.rs (98%) rename packages/ciphernode/{enclave_node => enclave_core}/src/helpers/datastore.rs (96%) rename packages/ciphernode/{enclave_node => enclave_core}/src/helpers/mod.rs (100%) rename packages/ciphernode/{enclave_node => enclave_core}/src/helpers/shutdown.rs (94%) rename packages/ciphernode/{enclave_node => enclave_core}/src/init.rs (99%) rename packages/ciphernode/{enclave_node => enclave_core}/src/lib.rs (100%) rename packages/ciphernode/{enclave_node => enclave_core}/src/net_generate.rs (93%) rename packages/ciphernode/{enclave_node => enclave_core}/src/net_purge.rs (92%) rename packages/ciphernode/{enclave_node => enclave_core}/src/net_set.rs (94%) rename packages/ciphernode/{enclave_node => enclave_core}/src/password_create.rs (93%) rename packages/ciphernode/{enclave_node => enclave_core}/src/password_delete.rs (92%) rename packages/ciphernode/{enclave_node => enclave_core}/src/start.rs (98%) rename packages/ciphernode/{enclave_node => enclave_core}/src/wallet_set.rs (94%) rename packages/ciphernode/{core => events}/Cargo.toml (97%) rename packages/ciphernode/{core => events}/src/eventbus.rs (100%) rename packages/ciphernode/{core => events}/src/events.rs (100%) rename packages/ciphernode/{core => events}/src/lib.rs (57%) rename packages/ciphernode/{core => events}/src/ordered_set.rs (100%) rename packages/ciphernode/{core => events}/src/tag.rs (100%) diff --git a/packages/ciphernode/Cargo.lock b/packages/ciphernode/Cargo.lock index 8df8065e..606d89d1 100644 --- a/packages/ciphernode/Cargo.lock +++ b/packages/ciphernode/Cargo.lock @@ -90,7 +90,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] @@ -102,7 +102,7 @@ checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", - "cipher 0.4.4", + "cipher", "ctr", "ghash", "subtle", @@ -119,7 +119,7 @@ dependencies = [ "config", "data", "e3_request", - "enclave-core", + "events", "fhe 0.1.0", "serde", "sortition", @@ -1608,20 +1608,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cipher" -version = "0.1.0" -dependencies = [ - "aes-gcm", - "anyhow", - "argon2", - "async-trait", - "config", - "rand", - "tokio", - "zeroize", -] - [[package]] name = "cipher" version = "0.4.4" @@ -1708,7 +1694,7 @@ dependencies = [ "alloy", "anyhow", "dirs", - "enclave-core", + "events", "figment", "serde", "shellexpand", @@ -1827,6 +1813,20 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto" +version = "0.1.0" +dependencies = [ + "aes-gcm", + "anyhow", + "argon2", + "async-trait", + "config", + "rand", + "tokio", + "zeroize", +] + [[package]] name = "crypto-bigint" version = "0.5.5" @@ -1856,7 +1856,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -1908,7 +1908,7 @@ dependencies = [ "anyhow", "async-trait", "bincode", - "enclave-core", + "events", "serde", "sled", "tracing", @@ -2118,7 +2118,7 @@ dependencies = [ "bincode", "config", "data", - "enclave-core", + "events", "serde", "tracing", ] @@ -2193,13 +2193,13 @@ version = "0.1.0" dependencies = [ "actix", "anyhow", - "cipher 0.1.0", "clap", "compile-time", "config", + "crypto", "dialoguer", - "enclave-core", - "enclave_node", + "enclave_core", + "events", "hex", "petname", "rand", @@ -2210,24 +2210,7 @@ dependencies = [ ] [[package]] -name = "enclave-core" -version = "0.1.0" -dependencies = [ - "actix", - "alloy", - "alloy-primitives 0.6.4", - "alloy-sol-types 0.6.4", - "anyhow", - "bincode", - "bs58", - "futures-util", - "lazy_static", - "serde", - "sha2", -] - -[[package]] -name = "enclave_node" +name = "enclave_core" version = "0.1.0" dependencies = [ "actix", @@ -2237,13 +2220,13 @@ dependencies = [ "anyhow", "bfv", "bincode", - "cipher 0.1.0", "clap", "config", + "crypto", "data", "dirs", "e3_request", - "enclave-core", + "events", "evm", "fhe 0.1.0", "keyshare", @@ -2340,6 +2323,23 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "events" +version = "0.1.0" +dependencies = [ + "actix", + "alloy", + "alloy-primitives 0.6.4", + "alloy-sol-types 0.6.4", + "anyhow", + "bincode", + "bs58", + "futures-util", + "lazy_static", + "serde", + "sha2", +] + [[package]] name = "evm" version = "0.1.0" @@ -2350,11 +2350,11 @@ dependencies = [ "anyhow", "async-trait", "base64", - "cipher 0.1.0", "config", + "crypto", "data", - "enclave-core", - "enclave_node", + "enclave_core", + "events", "futures-util", "serde", "sortition", @@ -2434,7 +2434,7 @@ dependencies = [ "config", "data", "e3_request", - "enclave-core", + "events", "fhe 0.1.0-beta.7", "fhe-traits", "fhe-util", @@ -3504,11 +3504,11 @@ dependencies = [ "actix", "anyhow", "async-trait", - "cipher 0.1.0", "config", + "crypto", "data", "e3_request", - "enclave-core", + "events", "fhe 0.1.0", "serde", "tracing", @@ -3980,7 +3980,7 @@ version = "0.1.0" dependencies = [ "actix", "base64", - "enclave-core", + "events", "tracing", ] @@ -4164,10 +4164,10 @@ dependencies = [ "anyhow", "async-std", "async-trait", - "cipher 0.1.0", "config", + "crypto", "data", - "enclave-core", + "events", "futures", "libp2p", "tokio", @@ -5838,7 +5838,7 @@ dependencies = [ "async-trait", "config", "data", - "enclave-core", + "events", "num", "rand", "serde", @@ -6032,7 +6032,7 @@ dependencies = [ "actix", "bincode", "clap", - "enclave-core", + "events", "fhe 0.1.0", "fhe 0.1.0-beta.7", "fhe-traits", @@ -6054,11 +6054,11 @@ dependencies = [ "base64", "bfv", "bincode", - "cipher 0.1.0", "clap", + "crypto", "data", "e3_request", - "enclave-core", + "events", "evm", "fhe 0.1.0", "fhe 0.1.0-beta.7", diff --git a/packages/ciphernode/Cargo.toml b/packages/ciphernode/Cargo.toml index 1dddc596..d9569d48 100644 --- a/packages/ciphernode/Cargo.toml +++ b/packages/ciphernode/Cargo.toml @@ -1,8 +1,8 @@ [workspace] members = [ - "core", + "events", "enclave", - "enclave_node", + "enclave_core", "net", "bfv", "data", @@ -14,7 +14,7 @@ members = [ "test_helpers", "logger", "tests", - "cipher", + "crypto", "config", ] @@ -36,13 +36,13 @@ bincode = "1.3.3" bs58 = "0.5.1" base64 = "0.22.1" clap = { version = "4.5.17", features = ["derive"] } -cipher = { path = "./cipher" } +crypto = { path = "./crypto" } compile-time = "0.2.0" config = { path = "./config" } dirs = "5.0.1" data = { path = "./data" } -enclave-core = { path = "./core" } -enclave_node = { path = "./enclave_node" } +events = { path = "./events" } +enclave_core = { path = "./enclave_core" } evm = { path = "./evm" } shellexpand = "3.1.0" figment = { version = "0.10.19", features = ["yaml", "test"] } diff --git a/packages/ciphernode/aggregator/Cargo.toml b/packages/ciphernode/aggregator/Cargo.toml index 491f51bd..8bb971fc 100644 --- a/packages/ciphernode/aggregator/Cargo.toml +++ b/packages/ciphernode/aggregator/Cargo.toml @@ -10,7 +10,7 @@ serde = { workspace = true } bincode = { workspace = true } config = { workspace = true } async-trait = { workspace = true } -enclave-core = { path = "../core" } +events = { workspace = true } fhe = { path = "../fhe" } sortition = { path = "../sortition" } e3_request = { workspace = true } diff --git a/packages/ciphernode/aggregator/src/feature.rs b/packages/ciphernode/aggregator/src/feature.rs index e93de3d2..bd37838f 100644 --- a/packages/ciphernode/aggregator/src/feature.rs +++ b/packages/ciphernode/aggregator/src/feature.rs @@ -8,7 +8,7 @@ use anyhow::{anyhow, Result}; use async_trait::async_trait; use data::{AutoPersist, RepositoriesFactory}; use e3_request::{E3Context, E3ContextSnapshot, E3Feature, META_KEY}; -use enclave_core::{BusError, EnclaveErrorType, EnclaveEvent, EventBus}; +use events::{BusError, EnclaveErrorType, EnclaveEvent, EventBus}; use fhe::FHE_KEY; use sortition::Sortition; diff --git a/packages/ciphernode/aggregator/src/plaintext_aggregator.rs b/packages/ciphernode/aggregator/src/plaintext_aggregator.rs index c2db077f..04914ef3 100644 --- a/packages/ciphernode/aggregator/src/plaintext_aggregator.rs +++ b/packages/ciphernode/aggregator/src/plaintext_aggregator.rs @@ -1,7 +1,7 @@ use actix::prelude::*; use anyhow::Result; use data::Persistable; -use enclave_core::{ +use events::{ DecryptionshareCreated, Die, E3id, EnclaveEvent, EventBus, OrderedSet, PlaintextAggregated, Seed, }; diff --git a/packages/ciphernode/aggregator/src/publickey_aggregator.rs b/packages/ciphernode/aggregator/src/publickey_aggregator.rs index f64d148f..4cd8cf28 100644 --- a/packages/ciphernode/aggregator/src/publickey_aggregator.rs +++ b/packages/ciphernode/aggregator/src/publickey_aggregator.rs @@ -1,7 +1,7 @@ use actix::prelude::*; use anyhow::Result; use data::Persistable; -use enclave_core::{ +use events::{ Die, E3id, EnclaveEvent, EventBus, KeyshareCreated, OrderedSet, PublicKeyAggregated, Seed, }; use fhe::{Fhe, GetAggregatePublicKey}; diff --git a/packages/ciphernode/aggregator/src/repo.rs b/packages/ciphernode/aggregator/src/repo.rs index a010b142..e12ad6e8 100644 --- a/packages/ciphernode/aggregator/src/repo.rs +++ b/packages/ciphernode/aggregator/src/repo.rs @@ -1,6 +1,6 @@ use config::StoreKeys; use data::{Repositories, Repository}; -use enclave_core::E3id; +use events::E3id; use crate::{PlaintextAggregatorState, PublicKeyAggregatorState}; diff --git a/packages/ciphernode/config/Cargo.toml b/packages/ciphernode/config/Cargo.toml index 0ce89132..3bec1b3b 100644 --- a/packages/ciphernode/config/Cargo.toml +++ b/packages/ciphernode/config/Cargo.toml @@ -11,7 +11,7 @@ figment = { workspace = true } alloy = { workspace = true } shellexpand = { workspace = true } url = { workspace = true } -enclave-core = { workspace = true } +events = { workspace = true } [dev-dependencies] tempfile = { workspace = true } diff --git a/packages/ciphernode/config/src/store_keys.rs b/packages/ciphernode/config/src/store_keys.rs index 3cdb653f..812d0bdc 100644 --- a/packages/ciphernode/config/src/store_keys.rs +++ b/packages/ciphernode/config/src/store_keys.rs @@ -1,4 +1,4 @@ -use enclave_core::E3id; +use events::E3id; pub struct StoreKeys; diff --git a/packages/ciphernode/cipher/Cargo.toml b/packages/ciphernode/crypto/Cargo.toml similarity index 96% rename from packages/ciphernode/cipher/Cargo.toml rename to packages/ciphernode/crypto/Cargo.toml index 4bbf0f0f..98da1ae0 100644 --- a/packages/ciphernode/cipher/Cargo.toml +++ b/packages/ciphernode/crypto/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cipher" +name = "crypto" version = "0.1.0" edition = "2021" diff --git a/packages/ciphernode/cipher/src/cipher.rs b/packages/ciphernode/crypto/src/cipher.rs similarity index 100% rename from packages/ciphernode/cipher/src/cipher.rs rename to packages/ciphernode/crypto/src/cipher.rs diff --git a/packages/ciphernode/cipher/src/lib.rs b/packages/ciphernode/crypto/src/lib.rs similarity index 100% rename from packages/ciphernode/cipher/src/lib.rs rename to packages/ciphernode/crypto/src/lib.rs diff --git a/packages/ciphernode/cipher/src/password_manager.rs b/packages/ciphernode/crypto/src/password_manager.rs similarity index 100% rename from packages/ciphernode/cipher/src/password_manager.rs rename to packages/ciphernode/crypto/src/password_manager.rs diff --git a/packages/ciphernode/data/Cargo.toml b/packages/ciphernode/data/Cargo.toml index eb9990ef..145d6b92 100644 --- a/packages/ciphernode/data/Cargo.toml +++ b/packages/ciphernode/data/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/gnosisguild/enclave/packages/ciphernode" [dependencies] actix = { workspace = true } -enclave-core = { path = "../core" } +events = { workspace = true } anyhow = { workspace = true } serde = { workspace = true } sled = { workspace = true } diff --git a/packages/ciphernode/data/src/sled_store.rs b/packages/ciphernode/data/src/sled_store.rs index 0c79b71c..f4075cc4 100644 --- a/packages/ciphernode/data/src/sled_store.rs +++ b/packages/ciphernode/data/src/sled_store.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use crate::{Get, Insert, Remove}; use actix::{Actor, ActorContext, Addr, Handler}; use anyhow::{Context, Result}; -use enclave_core::{BusError, EnclaveErrorType, EnclaveEvent, EventBus, Subscribe}; +use events::{BusError, EnclaveErrorType, EnclaveEvent, EventBus, Subscribe}; use sled::Db; use tracing::{error, info}; diff --git a/packages/ciphernode/e3_request/Cargo.toml b/packages/ciphernode/e3_request/Cargo.toml index 966e9b81..0c26c63e 100644 --- a/packages/ciphernode/e3_request/Cargo.toml +++ b/packages/ciphernode/e3_request/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix = { workspace = true } -enclave-core = { path = "../core" } +events = { workspace = true } data = { path = "../data" } anyhow = { workspace = true } serde = { workspace = true } diff --git a/packages/ciphernode/e3_request/src/context.rs b/packages/ciphernode/e3_request/src/context.rs index 96f03d38..b338861b 100644 --- a/packages/ciphernode/e3_request/src/context.rs +++ b/packages/ciphernode/e3_request/src/context.rs @@ -5,7 +5,7 @@ use async_trait::async_trait; use data::{ Checkpoint, FromSnapshotWithParams, Repositories, RepositoriesFactory, Repository, Snapshot, }; -use enclave_core::{E3id, EnclaveEvent}; +use events::{E3id, EnclaveEvent}; use serde::{Deserialize, Serialize}; use std::{collections::HashMap, sync::Arc}; diff --git a/packages/ciphernode/e3_request/src/meta.rs b/packages/ciphernode/e3_request/src/meta.rs index e17215eb..257bac07 100644 --- a/packages/ciphernode/e3_request/src/meta.rs +++ b/packages/ciphernode/e3_request/src/meta.rs @@ -2,7 +2,7 @@ use crate::{E3Context, E3ContextSnapshot, E3Feature, MetaRepositoryFactory, Type use anyhow::*; use async_trait::async_trait; use data::RepositoriesFactory; -use enclave_core::{E3Requested, EnclaveEvent, Seed}; +use events::{E3Requested, EnclaveEvent, Seed}; pub const META_KEY: TypedKey = TypedKey::new("meta"); diff --git a/packages/ciphernode/e3_request/src/repo.rs b/packages/ciphernode/e3_request/src/repo.rs index d885d321..21f781f4 100644 --- a/packages/ciphernode/e3_request/src/repo.rs +++ b/packages/ciphernode/e3_request/src/repo.rs @@ -1,6 +1,6 @@ use config::StoreKeys; use data::{Repositories, Repository}; -use enclave_core::E3id; +use events::E3id; use crate::{E3ContextSnapshot, E3Meta, E3RouterSnapshot}; diff --git a/packages/ciphernode/e3_request/src/router.rs b/packages/ciphernode/e3_request/src/router.rs index ce3a55bb..d6e40335 100644 --- a/packages/ciphernode/e3_request/src/router.rs +++ b/packages/ciphernode/e3_request/src/router.rs @@ -14,9 +14,9 @@ use data::FromSnapshotWithParams; use data::RepositoriesFactory; use data::Repository; use data::Snapshot; -use enclave_core::E3RequestComplete; -use enclave_core::Shutdown; -use enclave_core::{E3id, EnclaveEvent, EventBus, Subscribe}; +use events::E3RequestComplete; +use events::Shutdown; +use events::{E3id, EnclaveEvent, EventBus, Subscribe}; use serde::Deserialize; use serde::Serialize; use std::collections::HashSet; diff --git a/packages/ciphernode/enclave/Cargo.toml b/packages/ciphernode/enclave/Cargo.toml index 07dccf05..0cac8145 100644 --- a/packages/ciphernode/enclave/Cargo.toml +++ b/packages/ciphernode/enclave/Cargo.toml @@ -8,13 +8,13 @@ repository = "https://github.com/gnosisguild/enclave/packages/ciphernode" [dependencies] actix = { workspace = true } anyhow = { workspace = true } -cipher = { path = "../cipher" } +crypto = { workspace = true } clap = { workspace = true } compile-time = { workspace = true } config = { path = "../config" } dialoguer = "0.11.0" -enclave-core = { path = "../core" } -enclave_node = { workspace = true } +events = { workspace = true } +enclave_core = { workspace = true } hex = { workspace = true } petname = "2.0.2" rand = { workspace = true } diff --git a/packages/ciphernode/enclave/src/aggregator_start.rs b/packages/ciphernode/enclave/src/aggregator_start.rs index 5750c8ec..326dc8cb 100644 --- a/packages/ciphernode/enclave/src/aggregator_start.rs +++ b/packages/ciphernode/enclave/src/aggregator_start.rs @@ -1,7 +1,7 @@ use anyhow::*; use config::AppConfig; -use enclave_core::get_tag; -use enclave_node::{aggregator_start, listen_for_shutdown}; +use enclave_core::{aggregator_start, listen_for_shutdown}; +use events::get_tag; use tracing::{info, instrument}; use crate::owo; diff --git a/packages/ciphernode/enclave/src/cli.rs b/packages/ciphernode/enclave/src/cli.rs index 4e521115..72674d19 100644 --- a/packages/ciphernode/enclave/src/cli.rs +++ b/packages/ciphernode/enclave/src/cli.rs @@ -7,7 +7,7 @@ use crate::{aggregator::AggregatorCommands, start}; use anyhow::Result; use clap::{command, Parser, Subcommand}; use config::load_config; -use enclave_core::get_tag; +use events::get_tag; use tracing::instrument; #[derive(Parser, Debug)] diff --git a/packages/ciphernode/enclave/src/init.rs b/packages/ciphernode/enclave/src/init.rs index 8d4ea439..0c36edd5 100644 --- a/packages/ciphernode/enclave/src/init.rs +++ b/packages/ciphernode/enclave/src/init.rs @@ -1,7 +1,7 @@ use anyhow::Result; use dialoguer::{theme::ColorfulTheme, Input}; -use enclave_core::get_tag; -use enclave_node::init; +use enclave_core::init; +use events::get_tag; use tracing::instrument; use crate::net; diff --git a/packages/ciphernode/enclave/src/main.rs b/packages/ciphernode/enclave/src/main.rs index c7caa613..8e344196 100644 --- a/packages/ciphernode/enclave/src/main.rs +++ b/packages/ciphernode/enclave/src/main.rs @@ -1,6 +1,6 @@ use clap::Parser; use cli::Cli; -use enclave_core::set_tag; +use events::set_tag; use tracing::info; use tracing_subscriber::EnvFilter; diff --git a/packages/ciphernode/enclave/src/net_generate.rs b/packages/ciphernode/enclave/src/net_generate.rs index 35aaf84d..d97785e8 100644 --- a/packages/ciphernode/enclave/src/net_generate.rs +++ b/packages/ciphernode/enclave/src/net_generate.rs @@ -1,6 +1,6 @@ use anyhow::Result; use config::AppConfig; -use enclave_node::net_generate; +use enclave_core::net_generate; pub async fn execute(config: &AppConfig) -> Result<()> { let peer_id = net_generate::execute(config).await?; diff --git a/packages/ciphernode/enclave/src/net_purge.rs b/packages/ciphernode/enclave/src/net_purge.rs index 9aedf2c8..bf0be1a5 100644 --- a/packages/ciphernode/enclave/src/net_purge.rs +++ b/packages/ciphernode/enclave/src/net_purge.rs @@ -1,6 +1,6 @@ use anyhow::*; use config::AppConfig; -use enclave_node::net_purge; +use enclave_core::net_purge; pub async fn execute(config: &AppConfig) -> Result<()> { net_purge::execute(config).await?; diff --git a/packages/ciphernode/enclave/src/net_set.rs b/packages/ciphernode/enclave/src/net_set.rs index a8f61439..7a5a22dc 100644 --- a/packages/ciphernode/enclave/src/net_set.rs +++ b/packages/ciphernode/enclave/src/net_set.rs @@ -1,7 +1,7 @@ use anyhow::Result; use config::AppConfig; use dialoguer::{theme::ColorfulTheme, Password}; -use enclave_node::net_set::{self, validate_keypair_input}; +use enclave_core::net_set::{self, validate_keypair_input}; pub async fn execute(config: &AppConfig, net_keypair: Option) -> Result<()> { let input = if let Some(nkp) = net_keypair { diff --git a/packages/ciphernode/enclave/src/password_create.rs b/packages/ciphernode/enclave/src/password_create.rs index dda0b0be..46d7ec94 100644 --- a/packages/ciphernode/enclave/src/password_create.rs +++ b/packages/ciphernode/enclave/src/password_create.rs @@ -1,6 +1,6 @@ use anyhow::{bail, Result}; use config::AppConfig; -use enclave_node::password_create; +use enclave_core::password_create; use zeroize::{Zeroize, Zeroizing}; use crate::helpers::prompt_password::prompt_password; diff --git a/packages/ciphernode/enclave/src/password_delete.rs b/packages/ciphernode/enclave/src/password_delete.rs index a5071bf2..6914053f 100644 --- a/packages/ciphernode/enclave/src/password_delete.rs +++ b/packages/ciphernode/enclave/src/password_delete.rs @@ -2,7 +2,7 @@ use crate::helpers::prompt_password::prompt_password; use anyhow::Result; use config::AppConfig; use dialoguer::{theme::ColorfulTheme, Confirm}; -use enclave_node::password_delete; +use enclave_core::password_delete; use zeroize::Zeroize; pub enum DeleteMode { diff --git a/packages/ciphernode/enclave/src/start.rs b/packages/ciphernode/enclave/src/start.rs index 9f73311b..4a2abb03 100644 --- a/packages/ciphernode/enclave/src/start.rs +++ b/packages/ciphernode/enclave/src/start.rs @@ -1,8 +1,8 @@ use crate::owo; use anyhow::{anyhow, Result}; use config::AppConfig; -use enclave_core::get_tag; -use enclave_node::{listen_for_shutdown, start}; +use enclave_core::{listen_for_shutdown, start}; +use events::get_tag; use tracing::{info, instrument}; #[instrument(name="app", skip_all,fields(id = get_tag()))] diff --git a/packages/ciphernode/enclave/src/wallet_set.rs b/packages/ciphernode/enclave/src/wallet_set.rs index e128787d..ba2a5f5e 100644 --- a/packages/ciphernode/enclave/src/wallet_set.rs +++ b/packages/ciphernode/enclave/src/wallet_set.rs @@ -1,7 +1,7 @@ use anyhow::Result; use config::AppConfig; use dialoguer::{theme::ColorfulTheme, Password}; -use enclave_node::wallet_set::{self, validate_private_key}; +use enclave_core::wallet_set::{self, validate_private_key}; pub async fn execute(config: &AppConfig, private_key: Option) -> Result<()> { let input = if let Some(private_key) = private_key { diff --git a/packages/ciphernode/enclave_node/Cargo.toml b/packages/ciphernode/enclave_core/Cargo.toml similarity index 92% rename from packages/ciphernode/enclave_node/Cargo.toml rename to packages/ciphernode/enclave_core/Cargo.toml index 84917330..8e972443 100644 --- a/packages/ciphernode/enclave_node/Cargo.toml +++ b/packages/ciphernode/enclave_core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "enclave_node" +name = "enclave_core" version = "0.1.0" edition = "2021" description = ": coordinates the encryption and decryption of enclave computations" @@ -16,10 +16,10 @@ bfv = { path = "../bfv" } bincode = { workspace = true } config = { path = "../config" } clap = { workspace = true } -cipher = { path = "../cipher" } +crypto = { workspace = true } data = { path = "../data" } dirs = { workspace = true } -enclave-core = { path = "../core" } +events = { workspace = true } evm = { path = "../evm" } fhe = { path = "../fhe" } keyshare = { path = "../keyshare" } diff --git a/packages/ciphernode/enclave_node/build.rs b/packages/ciphernode/enclave_core/build.rs similarity index 100% rename from packages/ciphernode/enclave_node/build.rs rename to packages/ciphernode/enclave_core/build.rs diff --git a/packages/ciphernode/enclave_node/src/aggregator_start.rs b/packages/ciphernode/enclave_core/src/aggregator_start.rs similarity index 98% rename from packages/ciphernode/enclave_node/src/aggregator_start.rs rename to packages/ciphernode/enclave_core/src/aggregator_start.rs index eda426a4..2ddff355 100644 --- a/packages/ciphernode/enclave_node/src/aggregator_start.rs +++ b/packages/ciphernode/enclave_core/src/aggregator_start.rs @@ -1,11 +1,11 @@ use actix::{Actor, Addr}; use aggregator::{PlaintextAggregatorFeature, PublicKeyAggregatorFeature}; use anyhow::Result; -use cipher::Cipher; use config::AppConfig; +use crypto::Cipher; use data::RepositoriesFactory; use e3_request::E3Router; -use enclave_core::EventBus; +use events::EventBus; use evm::{ helpers::{get_signer_from_repository, ProviderConfig}, CiphernodeRegistryReaderRepositoryFactory, CiphernodeRegistrySol, EnclaveSol, diff --git a/packages/ciphernode/enclave_node/src/helpers/datastore.rs b/packages/ciphernode/enclave_core/src/helpers/datastore.rs similarity index 96% rename from packages/ciphernode/enclave_node/src/helpers/datastore.rs rename to packages/ciphernode/enclave_core/src/helpers/datastore.rs index 43ff182f..cfa6c49d 100644 --- a/packages/ciphernode/enclave_node/src/helpers/datastore.rs +++ b/packages/ciphernode/enclave_core/src/helpers/datastore.rs @@ -5,7 +5,7 @@ use anyhow::Result; use config::AppConfig; use data::{DataStore, InMemStore, SledStore}; use data::{Repositories, RepositoriesFactory}; -use enclave_core::EventBus; +use events::EventBus; pub fn get_sled_store(bus: &Addr, db_file: &PathBuf) -> Result { Ok((&SledStore::new(bus, db_file)?).into()) diff --git a/packages/ciphernode/enclave_node/src/helpers/mod.rs b/packages/ciphernode/enclave_core/src/helpers/mod.rs similarity index 100% rename from packages/ciphernode/enclave_node/src/helpers/mod.rs rename to packages/ciphernode/enclave_core/src/helpers/mod.rs diff --git a/packages/ciphernode/enclave_node/src/helpers/shutdown.rs b/packages/ciphernode/enclave_core/src/helpers/shutdown.rs similarity index 94% rename from packages/ciphernode/enclave_node/src/helpers/shutdown.rs rename to packages/ciphernode/enclave_core/src/helpers/shutdown.rs index 58771dc5..1736b648 100644 --- a/packages/ciphernode/enclave_node/src/helpers/shutdown.rs +++ b/packages/ciphernode/enclave_core/src/helpers/shutdown.rs @@ -1,6 +1,6 @@ use actix::Recipient; use anyhow::Result; -use enclave_core::{EnclaveEvent, Shutdown}; +use events::{EnclaveEvent, Shutdown}; use std::time::Duration; use tokio::{ signal::unix::{signal, SignalKind}, diff --git a/packages/ciphernode/enclave_node/src/init.rs b/packages/ciphernode/enclave_core/src/init.rs similarity index 99% rename from packages/ciphernode/enclave_node/src/init.rs rename to packages/ciphernode/enclave_core/src/init.rs index adae77f5..7b949ec1 100644 --- a/packages/ciphernode/enclave_node/src/init.rs +++ b/packages/ciphernode/enclave_core/src/init.rs @@ -3,7 +3,7 @@ use anyhow::{anyhow, bail, Result}; use config::load_config; use config::AppConfig; use config::RPC; -use enclave_core::get_tag; +use events::get_tag; use std::fs; use tracing::instrument; diff --git a/packages/ciphernode/enclave_node/src/lib.rs b/packages/ciphernode/enclave_core/src/lib.rs similarity index 100% rename from packages/ciphernode/enclave_node/src/lib.rs rename to packages/ciphernode/enclave_core/src/lib.rs diff --git a/packages/ciphernode/enclave_node/src/net_generate.rs b/packages/ciphernode/enclave_core/src/net_generate.rs similarity index 93% rename from packages/ciphernode/enclave_node/src/net_generate.rs rename to packages/ciphernode/enclave_core/src/net_generate.rs index 32ce3d28..f040937e 100644 --- a/packages/ciphernode/enclave_node/src/net_generate.rs +++ b/packages/ciphernode/enclave_core/src/net_generate.rs @@ -1,8 +1,8 @@ use actix::Actor; use anyhow::{anyhow, Result}; -use cipher::Cipher; use config::AppConfig; -use enclave_core::{EventBus, GetErrors}; +use crypto::Cipher; +use events::{EventBus, GetErrors}; use libp2p::{identity::Keypair, PeerId}; use net::NetRepositoryFactory; use zeroize::Zeroize; diff --git a/packages/ciphernode/enclave_node/src/net_purge.rs b/packages/ciphernode/enclave_core/src/net_purge.rs similarity index 92% rename from packages/ciphernode/enclave_node/src/net_purge.rs rename to packages/ciphernode/enclave_core/src/net_purge.rs index 704f0f5d..fc337f09 100644 --- a/packages/ciphernode/enclave_node/src/net_purge.rs +++ b/packages/ciphernode/enclave_core/src/net_purge.rs @@ -2,7 +2,7 @@ use crate::datastore::get_repositories; use actix::Actor; use anyhow::*; use config::AppConfig; -use enclave_core::EventBus; +use events::EventBus; use net::NetRepositoryFactory; pub async fn execute(config: &AppConfig) -> Result<()> { diff --git a/packages/ciphernode/enclave_node/src/net_set.rs b/packages/ciphernode/enclave_core/src/net_set.rs similarity index 94% rename from packages/ciphernode/enclave_node/src/net_set.rs rename to packages/ciphernode/enclave_core/src/net_set.rs index 0f9f4dc7..14163a9a 100644 --- a/packages/ciphernode/enclave_node/src/net_set.rs +++ b/packages/ciphernode/enclave_core/src/net_set.rs @@ -1,9 +1,9 @@ use actix::Actor; use alloy::primitives::hex; use anyhow::{anyhow, Result}; -use cipher::Cipher; use config::AppConfig; -use enclave_core::{EventBus, GetErrors}; +use crypto::Cipher; +use events::{EventBus, GetErrors}; use libp2p::identity::Keypair; use net::NetRepositoryFactory; diff --git a/packages/ciphernode/enclave_node/src/password_create.rs b/packages/ciphernode/enclave_core/src/password_create.rs similarity index 93% rename from packages/ciphernode/enclave_node/src/password_create.rs rename to packages/ciphernode/enclave_core/src/password_create.rs index aee00f7d..29e218ea 100644 --- a/packages/ciphernode/enclave_node/src/password_create.rs +++ b/packages/ciphernode/enclave_core/src/password_create.rs @@ -1,6 +1,6 @@ use anyhow::{bail, Result}; -use cipher::{FilePasswordManager, PasswordManager}; use config::AppConfig; +use crypto::{FilePasswordManager, PasswordManager}; use zeroize::Zeroizing; pub async fn preflight(config: &AppConfig, overwrite: bool) -> Result<()> { diff --git a/packages/ciphernode/enclave_node/src/password_delete.rs b/packages/ciphernode/enclave_core/src/password_delete.rs similarity index 92% rename from packages/ciphernode/enclave_node/src/password_delete.rs rename to packages/ciphernode/enclave_core/src/password_delete.rs index 34e92565..15e47d6a 100644 --- a/packages/ciphernode/enclave_node/src/password_delete.rs +++ b/packages/ciphernode/enclave_core/src/password_delete.rs @@ -1,6 +1,6 @@ use anyhow::*; -use cipher::{FilePasswordManager, PasswordManager}; use config::AppConfig; +use crypto::{FilePasswordManager, PasswordManager}; use zeroize::Zeroizing; pub async fn get_current_password(config: &AppConfig) -> Result> { diff --git a/packages/ciphernode/enclave_node/src/start.rs b/packages/ciphernode/enclave_core/src/start.rs similarity index 98% rename from packages/ciphernode/enclave_node/src/start.rs rename to packages/ciphernode/enclave_core/src/start.rs index 4a6ad045..cc94db08 100644 --- a/packages/ciphernode/enclave_node/src/start.rs +++ b/packages/ciphernode/enclave_core/src/start.rs @@ -1,11 +1,11 @@ use actix::{Actor, Addr}; use alloy::primitives::Address; use anyhow::Result; -use cipher::Cipher; use config::AppConfig; +use crypto::Cipher; use data::RepositoriesFactory; use e3_request::E3Router; -use enclave_core::{get_tag, EventBus}; +use events::{get_tag, EventBus}; use evm::{ helpers::ProviderConfig, CiphernodeRegistryReaderRepositoryFactory, CiphernodeRegistrySol, EnclaveSolReader, EnclaveSolReaderRepositoryFactory, diff --git a/packages/ciphernode/enclave_node/src/wallet_set.rs b/packages/ciphernode/enclave_core/src/wallet_set.rs similarity index 94% rename from packages/ciphernode/enclave_node/src/wallet_set.rs rename to packages/ciphernode/enclave_core/src/wallet_set.rs index 81003469..97d7ce60 100644 --- a/packages/ciphernode/enclave_node/src/wallet_set.rs +++ b/packages/ciphernode/enclave_core/src/wallet_set.rs @@ -1,9 +1,9 @@ use actix::Actor; use alloy::{hex::FromHex, primitives::FixedBytes, signers::local::PrivateKeySigner}; use anyhow::{anyhow, Result}; -use cipher::Cipher; use config::AppConfig; -use enclave_core::{EventBus, GetErrors}; +use crypto::Cipher; +use events::{EventBus, GetErrors}; use evm::EthPrivateKeyRepositoryFactory; use crate::datastore::get_repositories; diff --git a/packages/ciphernode/core/Cargo.toml b/packages/ciphernode/events/Cargo.toml similarity index 97% rename from packages/ciphernode/core/Cargo.toml rename to packages/ciphernode/events/Cargo.toml index b77f4045..f257b27f 100644 --- a/packages/ciphernode/core/Cargo.toml +++ b/packages/ciphernode/events/Cargo.toml @@ -1,6 +1,6 @@ [package] # we have to name this other than core for disambiguation -name = "enclave-core" +name = "events" version = "0.1.0" edition = "2021" description = ": coordinates the encryption and decryption of enclave computations" diff --git a/packages/ciphernode/core/src/eventbus.rs b/packages/ciphernode/events/src/eventbus.rs similarity index 100% rename from packages/ciphernode/core/src/eventbus.rs rename to packages/ciphernode/events/src/eventbus.rs diff --git a/packages/ciphernode/core/src/events.rs b/packages/ciphernode/events/src/events.rs similarity index 100% rename from packages/ciphernode/core/src/events.rs rename to packages/ciphernode/events/src/events.rs diff --git a/packages/ciphernode/core/src/lib.rs b/packages/ciphernode/events/src/lib.rs similarity index 57% rename from packages/ciphernode/core/src/lib.rs rename to packages/ciphernode/events/src/lib.rs index 0084e902..a4432629 100644 --- a/packages/ciphernode/core/src/lib.rs +++ b/packages/ciphernode/events/src/lib.rs @@ -1,7 +1,3 @@ -#![crate_name = "enclave_core"] -#![crate_type = "lib"] -// #![warn(missing_docs, unused_imports)] - mod eventbus; mod events; mod ordered_set; diff --git a/packages/ciphernode/core/src/ordered_set.rs b/packages/ciphernode/events/src/ordered_set.rs similarity index 100% rename from packages/ciphernode/core/src/ordered_set.rs rename to packages/ciphernode/events/src/ordered_set.rs diff --git a/packages/ciphernode/core/src/tag.rs b/packages/ciphernode/events/src/tag.rs similarity index 100% rename from packages/ciphernode/core/src/tag.rs rename to packages/ciphernode/events/src/tag.rs diff --git a/packages/ciphernode/evm/Cargo.toml b/packages/ciphernode/evm/Cargo.toml index 0a50c22a..826a134e 100644 --- a/packages/ciphernode/evm/Cargo.toml +++ b/packages/ciphernode/evm/Cargo.toml @@ -10,10 +10,10 @@ alloy-primitives = { workspace = true } anyhow = { workspace = true } async-trait = { workspace = true } base64 = { workspace = true } -cipher = { path = "../cipher" } +crypto = { workspace = true } config = { path = "../config" } data = { path = "../data" } -enclave-core = { path = "../core" } +events = { workspace = true } futures-util = { workspace = true } sortition = { path = "../sortition" } serde = { workspace = true } @@ -23,5 +23,5 @@ url = { workspace = true } zeroize = { workspace = true } [dev-dependencies] -enclave_node = { path = "../enclave_node" } +enclave_core = { workspace = true } diff --git a/packages/ciphernode/evm/src/ciphernode_registry_sol.rs b/packages/ciphernode/evm/src/ciphernode_registry_sol.rs index d4846a50..14821333 100644 --- a/packages/ciphernode/evm/src/ciphernode_registry_sol.rs +++ b/packages/ciphernode/evm/src/ciphernode_registry_sol.rs @@ -12,7 +12,7 @@ use alloy::{ }; use anyhow::Result; use data::Repository; -use enclave_core::{EnclaveEvent, EventBus}; +use events::{EnclaveEvent, EventBus}; use tracing::{error, info, trace}; sol!( @@ -22,9 +22,9 @@ sol!( "../../evm/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json" ); -impl From for enclave_core::CiphernodeAdded { +impl From for events::CiphernodeAdded { fn from(value: ICiphernodeRegistry::CiphernodeAdded) -> Self { - enclave_core::CiphernodeAdded { + events::CiphernodeAdded { address: value.node.to_string(), // TODO: limit index and numNodes to uint32 at the solidity level index: value @@ -41,14 +41,14 @@ impl From for enclave_core::CiphernodeAdde impl From for EnclaveEvent { fn from(value: ICiphernodeRegistry::CiphernodeAdded) -> Self { - let payload: enclave_core::CiphernodeAdded = value.into(); + let payload: events::CiphernodeAdded = value.into(); EnclaveEvent::from(payload) } } -impl From for enclave_core::CiphernodeRemoved { +impl From for events::CiphernodeRemoved { fn from(value: ICiphernodeRegistry::CiphernodeRemoved) -> Self { - enclave_core::CiphernodeRemoved { + events::CiphernodeRemoved { address: value.node.to_string(), index: value .index @@ -64,7 +64,7 @@ impl From for enclave_core::CiphernodeRe impl From for EnclaveEvent { fn from(value: ICiphernodeRegistry::CiphernodeRemoved) -> Self { - let payload: enclave_core::CiphernodeRemoved = value.into(); + let payload: events::CiphernodeRemoved = value.into(); EnclaveEvent::from(payload) } } diff --git a/packages/ciphernode/evm/src/enclave_sol.rs b/packages/ciphernode/evm/src/enclave_sol.rs index bcdcab98..03db5817 100644 --- a/packages/ciphernode/evm/src/enclave_sol.rs +++ b/packages/ciphernode/evm/src/enclave_sol.rs @@ -8,7 +8,7 @@ use actix::Addr; use alloy::transports::BoxTransport; use anyhow::Result; use data::Repository; -use enclave_core::EventBus; +use events::EventBus; pub struct EnclaveSol; impl EnclaveSol { diff --git a/packages/ciphernode/evm/src/enclave_sol_reader.rs b/packages/ciphernode/evm/src/enclave_sol_reader.rs index c71c39de..63f42013 100644 --- a/packages/ciphernode/evm/src/enclave_sol_reader.rs +++ b/packages/ciphernode/evm/src/enclave_sol_reader.rs @@ -7,7 +7,7 @@ use alloy::transports::BoxTransport; use alloy::{sol, sol_types::SolEvent}; use anyhow::Result; use data::Repository; -use enclave_core::{EnclaveEvent, EventBus}; +use events::{EnclaveEvent, EventBus}; use tracing::{error, info, trace}; sol!( @@ -18,9 +18,9 @@ sol!( struct E3RequestedWithChainId(pub IEnclave::E3Requested, pub u64); -impl From for enclave_core::E3Requested { +impl From for events::E3Requested { fn from(value: E3RequestedWithChainId) -> Self { - enclave_core::E3Requested { + events::E3Requested { params: value.0.e3.e3ProgramParams.to_vec(), threshold_m: value.0.e3.threshold[0] as usize, seed: value.0.e3.seed.into(), @@ -32,14 +32,14 @@ impl From for enclave_core::E3Requested { impl From for EnclaveEvent { fn from(value: E3RequestedWithChainId) -> Self { - let payload: enclave_core::E3Requested = value.into(); + let payload: events::E3Requested = value.into(); EnclaveEvent::from(payload) } } -impl From for enclave_core::CiphertextOutputPublished { +impl From for events::CiphertextOutputPublished { fn from(value: IEnclave::CiphertextOutputPublished) -> Self { - enclave_core::CiphertextOutputPublished { + events::CiphertextOutputPublished { e3_id: value.e3Id.to_string().into(), ciphertext_output: value.ciphertextOutput.to_vec(), } @@ -48,7 +48,7 @@ impl From for enclave_core::CiphertextOutpu impl From for EnclaveEvent { fn from(value: IEnclave::CiphertextOutputPublished) -> Self { - let payload: enclave_core::CiphertextOutputPublished = value.into(); + let payload: events::CiphertextOutputPublished = value.into(); EnclaveEvent::from(payload) } } diff --git a/packages/ciphernode/evm/src/enclave_sol_writer.rs b/packages/ciphernode/evm/src/enclave_sol_writer.rs index 36b519b0..8eb3105c 100644 --- a/packages/ciphernode/evm/src/enclave_sol_writer.rs +++ b/packages/ciphernode/evm/src/enclave_sol_writer.rs @@ -7,9 +7,9 @@ use alloy::{ rpc::types::TransactionReceipt, }; use anyhow::Result; -use enclave_core::Shutdown; -use enclave_core::{BusError, E3id, EnclaveErrorType, PlaintextAggregated, Subscribe}; -use enclave_core::{EnclaveEvent, EventBus}; +use events::Shutdown; +use events::{BusError, E3id, EnclaveErrorType, PlaintextAggregated, Subscribe}; +use events::{EnclaveEvent, EventBus}; use tracing::info; sol!( diff --git a/packages/ciphernode/evm/src/event_reader.rs b/packages/ciphernode/evm/src/event_reader.rs index 79c90029..b279e126 100644 --- a/packages/ciphernode/evm/src/event_reader.rs +++ b/packages/ciphernode/evm/src/event_reader.rs @@ -9,9 +9,7 @@ use alloy::rpc::types::Filter; use alloy::transports::{BoxTransport, Transport}; use anyhow::{anyhow, Result}; use data::{AutoPersist, Persistable, Repository}; -use enclave_core::{ - get_tag, BusError, EnclaveErrorType, EnclaveEvent, EventBus, EventId, Subscribe, -}; +use events::{get_tag, BusError, EnclaveErrorType, EnclaveEvent, EventBus, EventId, Subscribe}; use futures_util::stream::StreamExt; use std::collections::HashSet; use tokio::select; diff --git a/packages/ciphernode/evm/src/helpers.rs b/packages/ciphernode/evm/src/helpers.rs index 08a5921f..10a36b5e 100644 --- a/packages/ciphernode/evm/src/helpers.rs +++ b/packages/ciphernode/evm/src/helpers.rs @@ -24,8 +24,8 @@ use alloy::{ }; use anyhow::{bail, Context, Result}; use base64::{engine::general_purpose::STANDARD, Engine}; -use cipher::Cipher; use config::{RpcAuth, RPC}; +use crypto::Cipher; use data::Repository; use std::{env, marker::PhantomData, sync::Arc}; use zeroize::Zeroizing; diff --git a/packages/ciphernode/evm/src/registry_filter_sol.rs b/packages/ciphernode/evm/src/registry_filter_sol.rs index b4b8f770..f9a4731f 100644 --- a/packages/ciphernode/evm/src/registry_filter_sol.rs +++ b/packages/ciphernode/evm/src/registry_filter_sol.rs @@ -6,7 +6,7 @@ use alloy::{ sol, }; use anyhow::Result; -use enclave_core::{ +use events::{ BusError, E3id, EnclaveErrorType, EnclaveEvent, EventBus, OrderedSet, PublicKeyAggregated, Shutdown, Subscribe, }; diff --git a/packages/ciphernode/evm/tests/evm_reader.rs b/packages/ciphernode/evm/tests/evm_reader.rs index 9505bd2e..376d859d 100644 --- a/packages/ciphernode/evm/tests/evm_reader.rs +++ b/packages/ciphernode/evm/tests/evm_reader.rs @@ -8,8 +8,8 @@ use alloy::{ }; use anyhow::Result; use data::Repository; -use enclave_core::{EnclaveEvent, EventBus, GetHistory, Shutdown, TestEvent}; -use enclave_node::datastore::get_in_mem_store; +use enclave_core::datastore::get_in_mem_store; +use events::{EnclaveEvent, EventBus, GetHistory, Shutdown, TestEvent}; use evm::{helpers::WithChainId, EvmEventReader}; use std::time::Duration; use tokio::time::sleep; diff --git a/packages/ciphernode/fhe/Cargo.toml b/packages/ciphernode/fhe/Cargo.toml index 6909c463..1a6a3f72 100644 --- a/packages/ciphernode/fhe/Cargo.toml +++ b/packages/ciphernode/fhe/Cargo.toml @@ -10,7 +10,7 @@ async-trait = { workspace = true } bincode = { workspace = true } config = { workspace = true } data = { path = "../data" } -enclave-core = { path = "../core" } +events = { workspace = true } fhe-traits = { workspace = true } fhe-util = { workspace = true } fhe_rs = { workspace = true } diff --git a/packages/ciphernode/fhe/src/feature.rs b/packages/ciphernode/fhe/src/feature.rs index 0dbb017f..bae9ef3a 100644 --- a/packages/ciphernode/fhe/src/feature.rs +++ b/packages/ciphernode/fhe/src/feature.rs @@ -4,7 +4,7 @@ use anyhow::{anyhow, Result}; use async_trait::async_trait; use data::{FromSnapshotWithParams, RepositoriesFactory, Snapshot}; use e3_request::{E3Context, E3ContextSnapshot, E3Feature, TypedKey}; -use enclave_core::{BusError, E3Requested, EnclaveErrorType, EnclaveEvent, EventBus}; +use events::{BusError, E3Requested, EnclaveErrorType, EnclaveEvent, EventBus}; use std::sync::Arc; pub const FHE_KEY: TypedKey> = TypedKey::new("fhe"); diff --git a/packages/ciphernode/fhe/src/fhe.rs b/packages/ciphernode/fhe/src/fhe.rs index 84333de4..8d72575b 100644 --- a/packages/ciphernode/fhe/src/fhe.rs +++ b/packages/ciphernode/fhe/src/fhe.rs @@ -2,7 +2,7 @@ use super::set_up_crp; use anyhow::*; use async_trait::async_trait; use data::{FromSnapshotWithParams, Snapshot}; -use enclave_core::{OrderedSet, Seed}; +use events::{OrderedSet, Seed}; use fhe_rs::{ bfv::{ BfvParameters, BfvParametersBuilder, Ciphertext, Encoding, Plaintext, PublicKey, SecretKey, diff --git a/packages/ciphernode/fhe/src/repo.rs b/packages/ciphernode/fhe/src/repo.rs index 7e035b73..b7ef37e4 100644 --- a/packages/ciphernode/fhe/src/repo.rs +++ b/packages/ciphernode/fhe/src/repo.rs @@ -1,6 +1,6 @@ use config::StoreKeys; use data::{Repositories, Repository}; -use enclave_core::E3id; +use events::E3id; use crate::FheSnapshot; diff --git a/packages/ciphernode/keyshare/Cargo.toml b/packages/ciphernode/keyshare/Cargo.toml index d6cb60b1..f7551f98 100644 --- a/packages/ciphernode/keyshare/Cargo.toml +++ b/packages/ciphernode/keyshare/Cargo.toml @@ -9,8 +9,8 @@ anyhow = { workspace = true } async-trait = { workspace = true } config = { workspace = true } data = { path = "../data" } -cipher = { path = "../cipher" } -enclave-core = { path = "../core" } +crypto = { workspace = true } +events = { workspace = true } fhe = { path = "../fhe" } e3_request = { workspace = true } serde = { workspace = true } diff --git a/packages/ciphernode/keyshare/src/feature.rs b/packages/ciphernode/keyshare/src/feature.rs index dc4bc098..0fbc5a10 100644 --- a/packages/ciphernode/keyshare/src/feature.rs +++ b/packages/ciphernode/keyshare/src/feature.rs @@ -2,10 +2,10 @@ use crate::{Keyshare, KeyshareParams, KeyshareRepositoryFactory}; use actix::{Actor, Addr}; use anyhow::{anyhow, Result}; use async_trait::async_trait; -use cipher::Cipher; +use crypto::Cipher; use data::{AutoPersist, RepositoriesFactory}; use e3_request::{E3Context, E3ContextSnapshot, E3Feature}; -use enclave_core::{BusError, EnclaveErrorType, EnclaveEvent, EventBus}; +use events::{BusError, EnclaveErrorType, EnclaveEvent, EventBus}; use fhe::FHE_KEY; use std::sync::Arc; diff --git a/packages/ciphernode/keyshare/src/keyshare.rs b/packages/ciphernode/keyshare/src/keyshare.rs index dab8a0c8..35acebdd 100644 --- a/packages/ciphernode/keyshare/src/keyshare.rs +++ b/packages/ciphernode/keyshare/src/keyshare.rs @@ -1,8 +1,8 @@ use actix::prelude::*; use anyhow::{anyhow, Result}; -use cipher::Cipher; +use crypto::Cipher; use data::Persistable; -use enclave_core::{ +use events::{ BusError, CiphernodeSelected, CiphertextOutputPublished, DecryptionshareCreated, Die, E3RequestComplete, EnclaveErrorType, EnclaveEvent, EventBus, FromError, KeyshareCreated, }; diff --git a/packages/ciphernode/keyshare/src/repo.rs b/packages/ciphernode/keyshare/src/repo.rs index 772c5335..504c2fa7 100644 --- a/packages/ciphernode/keyshare/src/repo.rs +++ b/packages/ciphernode/keyshare/src/repo.rs @@ -1,6 +1,6 @@ use config::StoreKeys; use data::{Repositories, Repository}; -use enclave_core::E3id; +use events::E3id; pub trait KeyshareRepositoryFactory { fn keyshare(&self, e3_id: &E3id) -> Repository>; diff --git a/packages/ciphernode/logger/Cargo.toml b/packages/ciphernode/logger/Cargo.toml index 9f87116f..e13453a8 100644 --- a/packages/ciphernode/logger/Cargo.toml +++ b/packages/ciphernode/logger/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -enclave-core = { path = "../core" } +events = { workspace = true } actix = { workspace = true } base64 = { workspace = true } tracing = { workspace = true } diff --git a/packages/ciphernode/logger/src/logger.rs b/packages/ciphernode/logger/src/logger.rs index 8fe3a3cb..0586a0c4 100644 --- a/packages/ciphernode/logger/src/logger.rs +++ b/packages/ciphernode/logger/src/logger.rs @@ -1,5 +1,5 @@ use actix::{Actor, Addr, Context, Handler}; -use enclave_core::{EnclaveEvent, EventBus, Subscribe}; +use events::{EnclaveEvent, EventBus, Subscribe}; use tracing::{error, info}; pub struct SimpleLogger { diff --git a/packages/ciphernode/net/Cargo.toml b/packages/ciphernode/net/Cargo.toml index dba2c1d5..d2794b3b 100644 --- a/packages/ciphernode/net/Cargo.toml +++ b/packages/ciphernode/net/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/gnosisguild/enclave/packages/ciphernode" async-std = { workspace = true, features = ["attributes"] } async-trait = { workspace = true } futures = { workspace = true } -cipher = { workspace = true } +crypto = { workspace = true } config = { workspace = true } data = { workspace = true } libp2p = { workspace = true, features = [ @@ -28,7 +28,7 @@ libp2p = { workspace = true, features = [ tokio = { workspace = true, features = ["full"] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } -enclave-core = { path = "../core" } +events = { workspace = true } anyhow = { workspace = true } actix = { workspace = true } zeroize = { workspace = true } diff --git a/packages/ciphernode/net/src/network_manager.rs b/packages/ciphernode/net/src/network_manager.rs index 7c26f1e1..5bf23cbb 100644 --- a/packages/ciphernode/net/src/network_manager.rs +++ b/packages/ciphernode/net/src/network_manager.rs @@ -6,9 +6,9 @@ use crate::NetworkPeer; /// This Actor should be responsible for use actix::prelude::*; use anyhow::{bail, Result}; -use cipher::Cipher; +use crypto::Cipher; use data::Repository; -use enclave_core::{EnclaveEvent, EventBus, EventId, Subscribe}; +use events::{EnclaveEvent, EventBus, EventId, Subscribe}; use libp2p::identity::ed25519; use std::collections::HashSet; use std::sync::Arc; diff --git a/packages/ciphernode/sortition/Cargo.toml b/packages/ciphernode/sortition/Cargo.toml index bed3b0a7..3e72f855 100644 --- a/packages/ciphernode/sortition/Cargo.toml +++ b/packages/ciphernode/sortition/Cargo.toml @@ -15,7 +15,7 @@ anyhow = { workspace = true } async-trait = { workspace = true } config = { workspace = true } data = { path = "../data" } -enclave-core = { path = "../core" } +events = { workspace = true } num = { workspace = true } rand = { workspace = true } serde = { workspace = true } diff --git a/packages/ciphernode/sortition/src/ciphernode_selector.rs b/packages/ciphernode/sortition/src/ciphernode_selector.rs index 72ca1d50..97b71e2b 100644 --- a/packages/ciphernode/sortition/src/ciphernode_selector.rs +++ b/packages/ciphernode/sortition/src/ciphernode_selector.rs @@ -2,7 +2,7 @@ use crate::{GetHasNode, Sortition}; /// CiphernodeSelector is an actor that determines if a ciphernode is part of a committee and if so /// forwards a CiphernodeSelected event to the event bus use actix::prelude::*; -use enclave_core::{CiphernodeSelected, E3Requested, EnclaveEvent, EventBus, Shutdown, Subscribe}; +use events::{CiphernodeSelected, E3Requested, EnclaveEvent, EventBus, Shutdown, Subscribe}; use tracing::info; pub struct CiphernodeSelector { diff --git a/packages/ciphernode/sortition/src/sortition.rs b/packages/ciphernode/sortition/src/sortition.rs index 07ff6704..c0b0f569 100644 --- a/packages/ciphernode/sortition/src/sortition.rs +++ b/packages/ciphernode/sortition/src/sortition.rs @@ -3,7 +3,7 @@ use actix::prelude::*; use alloy::primitives::Address; use anyhow::{anyhow, Result}; use data::{AutoPersist, Persistable, Repository}; -use enclave_core::{ +use events::{ get_tag, BusError, CiphernodeAdded, CiphernodeRemoved, EnclaveErrorType, EnclaveEvent, EventBus, Seed, Subscribe, }; diff --git a/packages/ciphernode/test_helpers/Cargo.toml b/packages/ciphernode/test_helpers/Cargo.toml index e91ac8dd..6ae81a66 100644 --- a/packages/ciphernode/test_helpers/Cargo.toml +++ b/packages/ciphernode/test_helpers/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix = { workspace = true } -enclave-core = { path = "../core" } +events = { workspace = true } fhe = { path = "../fhe" } bincode = { workspace = true } clap = { workspace = true, features = ["derive"] } diff --git a/packages/ciphernode/test_helpers/src/plaintext_writer.rs b/packages/ciphernode/test_helpers/src/plaintext_writer.rs index 851d2f1f..d5d14209 100644 --- a/packages/ciphernode/test_helpers/src/plaintext_writer.rs +++ b/packages/ciphernode/test_helpers/src/plaintext_writer.rs @@ -1,6 +1,6 @@ use super::write_file_with_dirs; use actix::{Actor, Addr, Context, Handler}; -use enclave_core::{EnclaveEvent, EventBus, Subscribe}; +use events::{EnclaveEvent, EventBus, Subscribe}; use tracing::info; pub struct PlaintextWriter { diff --git a/packages/ciphernode/test_helpers/src/public_key_writer.rs b/packages/ciphernode/test_helpers/src/public_key_writer.rs index 7310ee2e..cda81557 100644 --- a/packages/ciphernode/test_helpers/src/public_key_writer.rs +++ b/packages/ciphernode/test_helpers/src/public_key_writer.rs @@ -1,6 +1,6 @@ use super::write_file_with_dirs; use actix::{Actor, Addr, Context, Handler}; -use enclave_core::{EnclaveEvent, EventBus, Subscribe}; +use events::{EnclaveEvent, EventBus, Subscribe}; use tracing::info; pub struct PublicKeyWriter { diff --git a/packages/ciphernode/tests/Cargo.toml b/packages/ciphernode/tests/Cargo.toml index 9bf651a7..ac203690 100644 --- a/packages/ciphernode/tests/Cargo.toml +++ b/packages/ciphernode/tests/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" net = { path = "../net" } bfv = { path = "../bfv" } sortition = { path = "../sortition" } -enclave-core = { path = "../core" } +events = { workspace = true } evm = { path = "../evm" } logger = { path = "../logger" } fhe = { path = "../fhe" } -cipher = { path = "../cipher" } +crypto = { workspace = true } data = { path = "../data" } keyshare = { path = "../keyshare" } aggregator = { path = "../aggregator" } diff --git a/packages/ciphernode/tests/tests/test_aggregation_and_decryption.rs b/packages/ciphernode/tests/tests/test_aggregation_and_decryption.rs index cdc8be5c..f81286d9 100644 --- a/packages/ciphernode/tests/tests/test_aggregation_and_decryption.rs +++ b/packages/ciphernode/tests/tests/test_aggregation_and_decryption.rs @@ -1,9 +1,9 @@ use aggregator::{PlaintextAggregatorFeature, PublicKeyAggregatorFeature}; -use cipher::Cipher; +use crypto::Cipher; use data::RepositoriesFactory; use data::{DataStore, InMemStore}; use e3_request::E3Router; -use enclave_core::{ +use events::{ CiphernodeAdded, CiphernodeSelected, CiphertextOutputPublished, DecryptionshareCreated, E3RequestComplete, E3Requested, E3id, EnclaveEvent, EventBus, GetErrors, GetHistory, KeyshareCreated, OrderedSet, PlaintextAggregated, PublicKeyAggregated, ResetHistory, Seed,