Merge pull request #4439 from nymtech/chore/move-nym-id

Chore/move nym

Cargo.lock

@@ -5128,7 +5128,7 @@ dependencies = [
  "nym-credentials",
  "nym-credentials-interface",
  "nym-crypto",
- "nym-id-lib",
+ "nym-id",
  "nym-mixnet-contract-common",
  "nym-multisig-contract-common",
  "nym-name-service-common",
@@ -5169,7 +5169,7 @@ dependencies = [
  "nym-credentials",
  "nym-crypto",
  "nym-gateway-requests",
- "nym-id-lib",
+ "nym-id",
  "nym-network-defaults",
  "nym-pemstore",
  "nym-sphinx",
@@ -5631,20 +5631,6 @@ dependencies = [
 [[package]]
 name = "nym-id"
 version = "0.1.0"
-dependencies = [
- "anyhow",
- "bs58 0.5.0",
- "clap 4.4.7",
- "nym-bin-common",
- "nym-credential-storage",
- "nym-id-lib",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "nym-id-lib"
-version = "0.1.0"
 dependencies = [
  "nym-credential-storage",
  "nym-credentials",
@@ -5654,6 +5640,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "nym-id-cli"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bs58 0.5.0",
+ "clap 4.4.7",
+ "nym-bin-common",
+ "nym-credential-storage",
+ "nym-id",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "nym-inclusion-probability"
 version = "0.1.0"
@@ -5892,7 +5892,7 @@ dependencies = [
  "nym-credentials",
  "nym-crypto",
  "nym-exit-policy",
- "nym-id-lib",
+ "nym-id",
  "nym-network-defaults",
  "nym-ordered-buffer",
  "nym-sdk",
@@ -6180,7 +6180,7 @@ dependencies = [
  "nym-credentials",
  "nym-crypto",
  "nym-gateway-requests",
- "nym-id-lib",
+ "nym-id",
  "nym-network-defaults",
  "nym-ordered-buffer",
  "nym-pemstore",

Cargo.toml

@@ -56,6 +56,7 @@ members = [
     "common/node-tester-utils",
     "common/nonexhaustive-delayqueue",
     "common/nymcoconut",
+    "common/nym-id",
     "common/nymsphinx",
     "common/nymsphinx/acknowledgements",
     "common/nymsphinx/addressing",
@@ -106,13 +107,14 @@ members = [
     "tools/internal/ssl-inject",
     # "tools/internal/sdk-version-bump",
     "tools/nym-cli",
+    "tools/nym-id-cli",
     "tools/nym-nr-query",
     "tools/nymvisor",
     "tools/ts-rs-cli",
     "wasm/client",
 #    "wasm/full-nym-wasm",
     "wasm/mix-fetch",
-    "wasm/node-tester", "nym-id", "common/nym-id-lib",
+    "wasm/node-tester",
 ]
 
 default-members = [

clients/native/Cargo.toml

@@ -51,6 +51,6 @@ nym-task = { path = "../../common/task" }
 nym-topology = { path = "../../common/topology" }
 nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] }
 nym-client-websocket-requests = { path = "websocket-requests" }
-nym-id-lib = { path = "../../common/nym-id-lib" }
+nym-id = { path = "../../common/nym-id" }
 
 [dev-dependencies]

clients/native/src/commands/import_credential.rs

@@ -5,7 +5,7 @@ use crate::commands::try_load_current_config;
 use crate::error::ClientError;
 use clap::ArgGroup;
 
-use nym_id_lib::import_credential;
+use nym_id::import_credential;
 use std::fs;
 use std::path::PathBuf;
 

clients/native/src/error.rs

@@ -1,6 +1,6 @@
 use nym_client_core::error::ClientCoreError;
 
-use nym_id_lib::NymIdError;
+use nym_id::NymIdError;
 
 #[derive(thiserror::Error, Debug)]
 pub enum ClientError {

clients/socks5/Cargo.toml

@@ -35,7 +35,7 @@ nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
 nym-pemstore = { path = "../../common/pemstore" }
 nym-topology = { path = "../../common/topology" }
 nym-socks5-client-core = { path = "../../common/socks5-client-core" }
-nym-id-lib = { path = "../../common/nym-id-lib" }
+nym-id = { path = "../../common/nym-id" }
 
 [features]
 default = []

clients/socks5/src/commands/import_credential.rs

@@ -5,7 +5,7 @@ use crate::commands::try_load_current_config;
 use crate::error::Socks5ClientError;
 use clap::ArgGroup;
 
-use nym_id_lib::import_credential;
+use nym_id::import_credential;
 use std::fs;
 use std::path::PathBuf;
 

clients/socks5/src/error.rs

@@ -1,6 +1,6 @@
 use nym_client_core::error::ClientCoreError;
 
-use nym_id_lib::NymIdError;
+use nym_id::NymIdError;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Socks5ClientError {

common/commands/Cargo.toml

@@ -55,7 +55,7 @@ nym-credentials = { path = "../../common/credentials" }
 nym-credentials-interface = { path = "../../common/credentials-interface" }
 nym-credential-storage = { path = "../../common/credential-storage" }
 nym-credential-utils = { path = "../../common/credential-utils" }
-nym-id-lib = { path = "../../common/nym-id-lib" }
+nym-id = { path = "../nym-id" }
 
 nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" }
 nym-types = { path = "../../common/types" }

common/commands/src/coconut/import_credential.rs

@@ -6,7 +6,7 @@ use anyhow::bail;
 use clap::ArgGroup;
 use clap::Parser;
 use nym_credential_storage::initialise_persistent_storage;
-use nym_id_lib::import_credential;
+use nym_id::import_credential;
 use std::fs;
 use std::path::PathBuf;
 

common/nym-id/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "nym-id-lib"
+name = "nym-id"
 version = "0.1.0"
 authors.workspace = true
 repository.workspace = true

service-providers/network-requester/Cargo.toml

@@ -61,7 +61,7 @@ nym-statistics-common = { path = "../../common/statistics" }
 nym-task = { path = "../../common/task" }
 nym-types = { path = "../../common/types" }
 nym-exit-policy = { path = "../../common/exit-policy", features = ["client"] }
-nym-id-lib = { path = "../../common/nym-id-lib" }
+nym-id = { path = "../../common/nym-id" }
 
 [dev-dependencies]
 tempfile = "3.5.0"

service-providers/network-requester/src/cli/import_credential.rs

@@ -5,7 +5,7 @@ use crate::cli::try_load_current_config;
 use crate::error::NetworkRequesterError;
 use clap::ArgGroup;
 
-use nym_id_lib::import_credential;
+use nym_id::import_credential;
 use std::fs;
 use std::path::PathBuf;
 

service-providers/network-requester/src/error.rs

@@ -4,7 +4,7 @@
 pub use nym_client_core::error::ClientCoreError;
 
 use nym_exit_policy::policy::PolicyError;
-use nym_id_lib::NymIdError;
+use nym_id::NymIdError;
 use nym_socks5_requests::{RemoteAddress, Socks5RequestError};
 use std::net::SocketAddr;
 

tools/nym-id-cli/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "nym-id"
+name = "nym-id-cli"
 version = "0.1.0"
 authors.workspace = true
 repository.workspace = true
@@ -17,6 +17,6 @@ clap = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tracing.workspace = true
 
-nym-bin-common = { path = "../common/bin-common", features = ["output_format", "basic_tracing"] }
-nym-credential-storage = { path = "../common/credential-storage" }
-nym-id-lib = { path = "../common/nym-id-lib" }
+nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "basic_tracing"] }
+nym-credential-storage = { path = "../../common/credential-storage" }
+nym-id = { path = "../../common/nym-id" }

tools/nym-id-cli/src/commands/import_credential.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use clap::ArgGroup;
-use nym_id_lib::import_credential;
+use nym_id::import_credential;
 use std::fs;
 use std::path::PathBuf;