Merge branch 'main' into dependabot/cargo/oauth2-5.0.0

web3infra-foundation · Jan 23, 2025 · 66052f5 · 66052f5
2 parents fd87b2b + ebf50c0
commit 66052f5
Show file tree

Hide file tree

Showing 26 changed files with 35 additions and 16 deletions.
diff --git a/.github/ISSUE_TEMPLATE/r2cn.md b/.github/ISSUE_TEMPLATE/r2cn.md
@@ -0,0 +1,32 @@
+---
+name: r2cn
+about: r2cn 任务模板
+title: "[r2cn] "
+labels: r2cn
+assignees: ''
+
+---
+
+[标题] 为xxx实现xxx功能
+
+[任务分值] xx分（根据任务分级自评）
+
+[背景描述] 描述产品及特性
+
+[需求描述] 目前需要开发的特性
+
+[环境要求] 描述开发环境
+
+[产出标准] xxx
+
+[PR 提交地址] 仓库xxx分支的xxx目录
+
+[期望完成时间] 202x年xx月xx日
+
+[开发指导] 参考资料等
+
+[导师及邮箱] YYY <[email protected]>
+
+[备注] xxx
+
+[标签] r2cn
diff --git a/.gitmodules b/.gitmodules
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
     "ceres",
     "libra",
     "vault",
-    "neptune",
     "aries",
     "saturn",
     "taurus",
@@ -29,7 +28,6 @@ ceres = { path = "ceres" }
 callisto = { path = "jupiter/callisto" }
 gemini = { path = "gemini" }
 vault = { path = "vault" }
-neptune = { path = "neptune" }
 saturn = { path = "saturn" }
 taurus = { path = "taurus" }
 mega = { path = "mega" }
@@ -91,4 +89,4 @@ base64 = "0.22.1"
 encoding_rs = "0.8.31"
 
 [profile.release]
-debug = true
+debug = true
diff --git a/neptune/Cargo.toml → archived/neptune/Cargo.toml b/neptune/Cargo.toml → archived/neptune/Cargo.toml
diff --git a/neptune/README.md → archived/neptune/README.md b/neptune/README.md → archived/neptune/README.md
diff --git a/neptune/build.rs → archived/neptune/build.rs b/neptune/build.rs → archived/neptune/build.rs
diff --git a/neptune/hub/ca.js → archived/neptune/hub/ca.js b/neptune/hub/ca.js → archived/neptune/hub/ca.js
diff --git a/neptune/hub/cmdline.js → archived/neptune/hub/cmdline.js b/neptune/hub/cmdline.js → archived/neptune/hub/cmdline.js
diff --git a/neptune/hub/db.js → archived/neptune/hub/db.js b/neptune/hub/db.js → archived/neptune/hub/db.js
diff --git a/neptune/hub/main.js → archived/neptune/hub/main.js b/neptune/hub/main.js → archived/neptune/hub/main.js
diff --git a/neptune/hub/options.js → archived/neptune/hub/options.js b/neptune/hub/options.js → archived/neptune/hub/options.js
diff --git a/neptune/mega/tunnel/api.js → archived/neptune/mega/tunnel/api.js b/neptune/mega/tunnel/api.js → archived/neptune/mega/tunnel/api.js
diff --git a/neptune/mega/tunnel/cli.js → archived/neptune/mega/tunnel/cli.js b/neptune/mega/tunnel/cli.js → archived/neptune/mega/tunnel/cli.js
diff --git a/neptune/mega/tunnel/main.js → archived/neptune/mega/tunnel/main.js b/neptune/mega/tunnel/main.js → archived/neptune/mega/tunnel/main.js
diff --git a/neptune/mega/tunnel_punch/api.js → archived/neptune/mega/tunnel_punch/api.js b/neptune/mega/tunnel_punch/api.js → archived/neptune/mega/tunnel_punch/api.js
diff --git a/neptune/mega/tunnel_punch/cli.js → archived/neptune/mega/tunnel_punch/cli.js b/neptune/mega/tunnel_punch/cli.js → archived/neptune/mega/tunnel_punch/cli.js
diff --git a/neptune/mega/tunnel_punch/main.js → archived/neptune/mega/tunnel_punch/main.js b/neptune/mega/tunnel_punch/main.js → archived/neptune/mega/tunnel_punch/main.js
diff --git a/neptune/mega/tunnel_punch/punch.js → archived/neptune/mega/tunnel_punch/punch.js b/neptune/mega/tunnel_punch/punch.js → archived/neptune/mega/tunnel_punch/punch.js
diff --git a/neptune/src/lib.rs → archived/neptune/src/lib.rs b/neptune/src/lib.rs → archived/neptune/src/lib.rs
diff --git a/neptune/src/main.rs → archived/neptune/src/main.rs b/neptune/src/main.rs → archived/neptune/src/main.rs
diff --git a/gemini/Cargo.toml b/gemini/Cargo.toml
@@ -15,7 +15,6 @@ common = { workspace = true }
 callisto = { workspace = true }
 vault = { workspace = true }
 jupiter = { workspace = true }
-neptune = { workspace = true }
 ceres = { workspace = true }
 
 axum = { workspace = true }

diff --git a/gemini/src/ztm/agent.rs b/gemini/src/ztm/agent.rs
@@ -141,7 +141,7 @@ impl LocalZTMAgent {
                 remove_dir_all(path).unwrap();
             }
 
-            neptune::start_agent(db_path, self.agent_port);
+            // neptune::start_agent(db_path, self.agent_port);
         });
     }
 }

diff --git a/gemini/src/ztm/hub.rs b/gemini/src/ztm/hub.rs
@@ -23,7 +23,7 @@ pub struct LocalZTMHub {
 impl LocalZTMHub {
     pub fn start_ztm_hub(self) {
         tokio::spawn(async move {
-            neptune::start_hub(self.hub_port, self.name, &self.ca);
+            // neptune::start_hub(self.hub_port, self.name, &self.ca);
         });
     }
 }

diff --git a/neptune/libs/ztm b/neptune/libs/ztm
diff --git a/panel/Cargo.toml b/panel/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [features]
 default = []
-p2p = ["neptune"]
 
 [dependencies]
 # ======= Mega Dependencies ======= #
@@ -14,7 +13,6 @@ common.workspace = true
 jupiter.workspace = true
 gateway.workspace = true
 
-neptune = { workspace = true, optional = true }
 
 # ===== Zed Gpui Dependencies ===== #
 gpui = { git = "https://github.com/zed-industries/zed" }

diff --git a/panel/src/backend.rs b/panel/src/backend.rs
@@ -12,9 +12,6 @@ pub(crate) async fn init(config: &MegaConfig) {
     };
     let ztm = ZtmOptions {
         ztm_agent_port: 7777,
-        #[cfg(feature = "p2p")]
-        bootstrap_node: None,
-        #[cfg(not(feature = "p2p"))]
         bootstrap_node: None,
         cache: false,
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,7 +141,7 @@ impl LocalZTMAgent { @@
                     remove_dir_all(path).unwrap();
                 }
-                neptune::start_agent(db_path, self.agent_port);
+                // neptune::start_agent(db_path, self.agent_port);
             });
         }
     }
@@ Expand Down @@