Update geph5 dependencies to stable 0.2 and refactor config.rs removi…

…ng unused imports and adding BrokerKeys

Cargo.toml

@@ -75,8 +75,8 @@ geph-nat = "0.1.6"
 mizaru = "0.1.3"
 geph4-aioutils = "0.1.5"
 # alloc_geiger = "0.1"
-geph5-client = {version="0.2.0-alpha.17", features=["windivert"]}
-geph5-broker-protocol = "0.2.0-alpha.17"
+geph5-client = {version="0.2", features=["windivert"]}
+geph5-broker-protocol = "0.2"
 sillad = "0.2.1"
 # socks2http
 tokio = { version = "1.33.0", features = ["rt", "net", "io-util"] }

src/config.rs

@@ -1,20 +1,15 @@
 use std::{path::PathBuf, str::FromStr, sync::LazyLock};
 
 use crate::fronts::parse_fronts;
-use anyhow::Context;
 
-use geph4_protocol::binder::protocol::{BinderClient, Credentials};
+use geph4_protocol::binder::protocol::BinderClient;
 
-use geph5_client::{BridgeMode, BrokerSource, Config};
+use geph5_client::{BridgeMode, BrokerKeys, BrokerSource, Config};
 use serde::{Deserialize, Serialize};
-use sqlx::{
-    sqlite::{SqliteConnectOptions, SqliteJournalMode, SqliteSynchronous},
-    SqlitePool,
-};
+
 use std::net::{Ipv4Addr, SocketAddr};
-use stdcode::StdcodeSerializeExt;
+
 use structopt::StructOpt;
-use tmelcrypt::Ed25519SK;
 
 #[derive(Debug, StructOpt, Deserialize, Serialize, Clone)]
 #[allow(clippy::large_enum_variant)]
@@ -298,6 +293,11 @@ pub static GEPH5_CONFIG_TEMPLATE: LazyLock<Config> = LazyLock::new(|| Config {
             .to_string(),
         },
     ])),
+    broker_keys: Some(BrokerKeys {
+        master: "88c1d2d4197bed815b01a22cadfc6c35aa246dddb553682037a118aebfaa3954".into(),
+        mizaru_free: "0558216cbab7a9c46f298f4c26e171add9af87d0694988b8a8fe52ee932aa754".into(),
+        mizaru_plus: "cf6f58868c6d9459b3a63bc2bd86165631b3e916bad7f62b578cd9614e0bcb3b".into(),
+    }),
     vpn: false,
     spoof_dns: false,
     passthrough_china: false,