From 8e4d72a565e11609ac3d3be8e7f692ce044c5c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Thu, 24 Oct 2024 09:58:33 +0200
Subject: [PATCH] Update for rebase

---
 Cargo.lock | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml |  10 +++---
 2 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9dc7a9c6b9..b0564a99e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2186,6 +2186,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "dotenv"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -5194,6 +5200,75 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "nym-credential-proxy"
+version = "0.1.1"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "axum 0.7.7",
+ "bip39",
+ "bs58",
+ "cfg-if",
+ "clap 4.5.20",
+ "colored",
+ "dotenv",
+ "futures",
+ "humantime 2.1.0",
+ "nym-bin-common 0.6.0",
+ "nym-compact-ecash 0.1.0",
+ "nym-config 0.1.0",
+ "nym-credential-proxy-requests",
+ "nym-credentials",
+ "nym-credentials-interface 0.1.0",
+ "nym-crypto 0.4.0",
+ "nym-http-api-common",
+ "nym-network-defaults 0.1.0",
+ "nym-validator-client 0.1.0",
+ "rand",
+ "reqwest 0.12.4",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "strum 0.26.3",
+ "strum_macros 0.26.4",
+ "tempfile",
+ "thiserror",
+ "time",
+ "tokio",
+ "tokio-util",
+ "tower 0.4.13",
+ "tower-http",
+ "tracing",
+ "url",
+ "utoipa",
+ "utoipa-swagger-ui",
+ "uuid",
+ "zeroize",
+]
+
+[[package]]
+name = "nym-credential-proxy-requests"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "nym-credentials",
+ "nym-credentials-interface 0.1.0",
+ "nym-http-api-client 0.1.0",
+ "nym-http-api-common",
+ "nym-serde-helpers 0.1.0",
+ "reqwest 0.12.4",
+ "schemars",
+ "serde",
+ "serde_json",
+ "time",
+ "tsify",
+ "utoipa",
+ "uuid",
+ "wasm-bindgen",
+ "wasmtimer",
+]
+
 [[package]]
 name = "nym-credential-storage"
 version = "0.1.0"
@@ -7096,6 +7171,31 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "nym-vpn-api-lib-wasm"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "getrandom",
+ "js-sys",
+ "nym-bin-common 0.6.0",
+ "nym-compact-ecash 0.1.0",
+ "nym-credential-proxy-requests",
+ "nym-credentials",
+ "nym-credentials-interface 0.1.0",
+ "nym-crypto 0.4.0",
+ "nym-ecash-time 0.1.0",
+ "serde",
+ "serde-wasm-bindgen 0.6.5",
+ "serde_json",
+ "thiserror",
+ "time",
+ "tsify",
+ "wasm-bindgen",
+ "wasm-utils",
+ "zeroize",
+]
+
 [[package]]
 name = "nym-wallet-types"
 version = "1.0.0"
@@ -8724,6 +8824,7 @@ dependencies = [
  "schemars_derive",
  "serde",
  "serde_json",
+ "uuid",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 7cc41c0cb6..e6fbec5579 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -113,11 +113,14 @@ members = [
     "service-providers/common",
     "service-providers/ip-packet-router",
     "service-providers/network-requester",
-    "nym-network-monitor",
     "nym-api",
-    "nym-browser-extension/storage",
     "nym-api/nym-api-requests",
+    "nym-browser-extension/storage",
+    "nym-credential-proxy/nym-credential-proxy",
+    "nym-credential-proxy/nym-credential-proxy-requests",
+    "nym-credential-proxy/vpn-api-lib-wasm",
     "nym-data-observatory",
+    "nym-network-monitor",
     "nym-node",
     "nym-node/nym-node-http-api",
     "nym-node/nym-node-requests",
@@ -125,9 +128,6 @@ members = [
     "nym-node-status-agent",
     "nym-outfox",
     "nym-validator-rewarder",
-    "nym-vpn-api/vpn-api-lib-wasm",
-    "nym-vpn-api/vpn-api-requests",
-    "nym-vpn-api/vpn-api-server",
     "tools/echo-server",
     "tools/internal/ssl-inject",
     # "tools/internal/sdk-version-bump",