Merge pull request #4 from AvailX/update-to-beta

Update to beta

backend/Cargo.toml

@@ -14,7 +14,7 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-alpha.11", features = [] }
+tauri-build = { version = "2.0.0-beta.1", features = [] }
 
 
 [dependencies]
@@ -42,9 +42,10 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 snarkvm = { version = "0.16.17", features = [] }
 ssss = "0.2.0"
-tauri = { version = "2.0.0-alpha.17", features = [] }
-tauri-plugin-deep-link = "0.1.2"
-tauri-plugin-http = { version = "2.0.0-alpha.9", features = ["cookies"] }
+tauri = { version = "2.0.0-beta.1", features = [] }
+tauri-plugin-deep-link = "2.0.0-beta"
+tauri-plugin-http = { version = "2.0.0-beta", features = ["cookies"] }
+tauri-plugin-updater = { version = "2.0.0-beta.0", features = [] }
 tiny-bip39 = "1.0.0"
 tokio = { version = "1.29.1", features = ["full"] }
 ureq = { version = "2.7.1", features = ["json"] }

backend/capabilities/capabilities.toml

@@ -0,0 +1,19 @@
+"$schema" = "./schemas/desktop-schema.toml"
+identifier = "main-capability"
+description = "Capability for the main window"
+windows = ["main", "walletConnect"]
+permissions = [
+  "path:default",
+  "event:default",
+  "event:allow-listen",
+  "window:default",
+  "window:allow-create",
+  "window:allow-close",
+  "window:allow-set-title",
+  "webview:allow-create-webview-window", 
+  "webview:default",
+  "app:default",
+  "resources:default",
+  "menu:default",
+  "tray:default",
+]

backend/src/api/aleo_client.rs

@@ -10,25 +10,16 @@ use crate::services::local_storage::persistent_storage::update_network;
 
 /* --Client Setup functions-- */
 pub fn setup_local_client<N: Network>() -> AleoAPIClient<N> {
-    dotenv::dotenv().ok();
-
-    let dev_node_ip = match std::env::var("DEV_NODE_IP") {
-        Ok(val) => val,
-        Err(_e) => _e.to_string(),
-    };
 
+    let dev_node_ip = env!("DEV_NODE_IP");
     let api_client = AleoAPIClient::<N>::local_testnet3("3030", &dev_node_ip);
 
     api_client
 }
 
 pub fn setup_client<N: Network>() -> AvailResult<AleoAPIClient<N>> {
-    dotenv::dotenv().ok();
 
-    let node_api_obscura = match std::env::var("TESTNET_API_OBSCURA") {
-        Ok(val) => val,
-        Err(_e) => "".to_string(),
-    };
+    let node_api_obscura = env!("TESTNET_API_OBSCURA");
 
     println!("Node API Obscura: {:?}", node_api_obscura);
 
@@ -50,10 +41,7 @@ pub struct AleoClient<N: Network> {
 
 impl<N: Network> AleoClient<N> {
     pub fn new() -> AvailResult<Self> {
-        let node_api_obscura = match std::env::var("MAINNET_API_OBSCURA") {
-            Ok(val) => val,
-            Err(_e) => "".to_string(),
-        };
+        let node_api_obscura = env!("MAINNET_API_OBSCURA");
 
         let base_url = format!("https://aleo-mainnet.obscura.build/v1/{}", node_api_obscura);
 
@@ -63,10 +51,7 @@ impl<N: Network> AleoClient<N> {
     }
 
     pub fn devnet() -> AvailResult<Self> {
-        let node_api_obscura = match std::env::var("DEVNET_API_OBSCURA") {
-            Ok(val) => val,
-            Err(_e) => "".to_string(),
-        };
+        let node_api_obscura = env!("DEVNET_API_OBSCURA");
 
         let base_url = format!("https://aleo-devnet.obscura.build/v1/{}", node_api_obscura);
 
@@ -76,10 +61,7 @@ impl<N: Network> AleoClient<N> {
     }
 
     pub fn testnet3() -> AvailResult<Self> {
-        let node_api_obscura = match std::env::var("TESTNET_API_OBSCURA") {
-            Ok(val) => val,
-            Err(_e) => "".to_string(),
-        };
+        let node_api_obscura = env!("TESTNET_API_OBSCURA");
 
         let base_url = format!(
             "https://aleo-testnet3.obscura.build/v1/{}",
@@ -117,10 +99,7 @@ impl<N: Network> AleoClient<N> {
     }
 
     pub fn local_dev() -> AvailResult<Self> {
-        let dev_node_ip = match std::env::var("DEV_NODE_IP") {
-            Ok(val) => val,
-            Err(_e) => "".to_string(),
-        };
+        let dev_node_ip = env!("DEV_NODE_IP");
 
         Ok(Self {
             client: AleoAPIClient::local_testnet3("3030", &dev_node_ip),

backend/src/api/client.rs

@@ -10,9 +10,8 @@ pub fn get_rm_client_with_session(
     method: reqwest::Method,
     path: &str,
 ) -> AvailResult<reqwest::RequestBuilder> {
-    dotenv::dotenv().ok();
-
-    let api = env!("API");
+
+     let api = env!("API");
 
     let client = reqwest::Client::new();
     let cookie_name = "id";
@@ -41,8 +40,7 @@ pub fn get_um_client_with_session(
     method: reqwest::Method,
     path: &str,
 ) -> AvailResult<reqwest::RequestBuilder> {
-    dotenv::dotenv().ok();
-
+
     let api = env!("API");
 
     let client = reqwest::Client::new();

backend/src/api/user.rs

@@ -23,7 +23,7 @@ use avail_common::{
 
 // create user online account
 pub async fn create_user(request: User) -> AvailResult<String> {
-    dotenv::dotenv().ok();
+
 
     let api = env!("API");
 

backend/src/lib.rs

@@ -3,8 +3,6 @@ pub mod helpers;
 pub mod models;
 pub mod services;
 
-use tauri::Manager;
-
 use services::account::generation::create_seed_phrase_wallet;
 use services::account::generation::import_wallet;
 use services::account::phrase_recovery::recover_wallet_from_seed_phrase;
@@ -22,7 +20,10 @@ use api::user::{update_backup_flag, update_username};
 use services::local_storage::{
     encrypted_data::get_and_store_all_data,
     tokens::get_stored_tokens,
-    utils::{delete_util, get_private_key_tauri, get_seed_phrase, get_view_key_tauri,delete_local_for_recovery},
+    utils::{
+        delete_local_for_recovery, delete_util, get_private_key_tauri, get_seed_phrase,
+        get_view_key_tauri,
+    },
 };
 
 // record handliong services
@@ -40,18 +41,11 @@ use crate::services::wallet_connect_api::{
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-    tauri_plugin_deep_link::prepare("com.avail.wallet");
-
     #[cfg(target_os = "macos")]
     tauri::Builder::default()
+        .plugin(tauri_plugin_deep_link::init())
         .setup(|app| {
             let handle = app.handle().clone();
-
-            let _ = tauri_plugin_deep_link::register("avail", move |request| {
-                dbg!(&request);
-                handle.emit("wc-request-received", request).unwrap();
-            });
-
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![

backend/src/services/account/key_management/key_controller.rs

@@ -9,17 +9,13 @@ use super::ios::{delete_ios, search, store_keys_local};
 
 use snarkvm::prelude::{Identifier, Network, PrivateKey, ViewKey};
 
-use super::desktop::{delete_key, read_key, store,read_seed_phrase};
+use super::desktop::{delete_key, read_key, read_seed_phrase, store};
 use avail_common::errors::{AvailError, AvailErrorType, AvailResult};
 
 /// This trait is used as a standard interface for the key management service.
 /// The key_type field refers to the private key type when true and the viewing key type when false.
 pub trait KeyController<N: Network> {
-    fn store_key(
-        &self,
-        password: &str,
-        wallet: &BetterAvailWallet<N>
-    ) -> AvailResult<String>;
+    fn store_key(&self, password: &str, wallet: &BetterAvailWallet<N>) -> AvailResult<String>;
 
     fn delete_key(&self, password: Option<&str>, ext: Identifier<N>) -> AvailResult<String>;
     fn read_key(&self, password: Option<&str>, key_type: &str) -> AvailResult<Keys<N>>;
@@ -30,11 +26,7 @@ pub struct AndroidKeyController;
 
 #[cfg(target_os = "android")]
 impl<N: Network> KeyController<N> for AndroidKeyController {
-    fn store_key(
-        &self,
-        password: &str,
-        wallet: BetterAvailWallet<N>
-    ) -> AvailResult<String> {
+    fn store_key(&self, password: &str, wallet: BetterAvailWallet<N>) -> AvailResult<String> {
         keystore_init(password, access_type, p_key, v_key)
     }
 
@@ -65,11 +57,7 @@ pub struct iOSKeyController;
 
 #[cfg(target_os = "ios")]
 impl<N: Network> KeyController<N> for iOSKeyController {
-    fn store_key(
-        &self,
-        password: &str,
-        wallet: BetterAvailWallet<N>
-    ) -> AvailResult<String> {
+    fn store_key(&self, password: &str, wallet: BetterAvailWallet<N>) -> AvailResult<String> {
         store_keys_local(password, access_type, p_key, v_key)
     }
 
@@ -101,12 +89,8 @@ pub struct macKeyController;
 
 #[cfg(target_os = "macos")]
 impl<N: Network> KeyController<N> for macKeyController {
-    fn store_key(
-        &self,
-        password: &str,
-        wallet: &BetterAvailWallet<N>
-    ) -> AvailResult<String> {
-        store(wallet,password)
+    fn store_key(&self, password: &str, wallet: &BetterAvailWallet<N>) -> AvailResult<String> {
+        store(wallet, password)
     }
 
     fn delete_key(&self, password: Option<&str>, _ext: Identifier<N>) -> AvailResult<String> {
@@ -144,12 +128,8 @@ impl<N: Network> KeyController<N> for macKeyController {
 pub struct linuxKeyController;
 
 impl<N: Network> KeyController<N> for linuxKeyController {
-    fn store_key(
-        &self,
-        password: &str,
-        wallet: &BetterAvailWallet<N>
-    ) -> AvailResult<String> {
-        store(wallet,password)
+    fn store_key(&self, password: &str, wallet: &BetterAvailWallet<N>) -> AvailResult<String> {
+        store(wallet, password)
     }
 
     //TODO authenticate using read_key
@@ -189,12 +169,8 @@ pub struct windowsKeyController;
 
 #[cfg(target_os = "windows")]
 impl<N: Network> KeyController<N> for windowsKeyController {
-    fn store_key(
-        &self,
-        password: &str,
-        wallet: &BetterAvailWallet<N>
-    ) -> AvailResult<String> {
-        store(wallet,password)
+    fn store_key(&self, password: &str, wallet: &BetterAvailWallet<N>) -> AvailResult<String> {
+        store(wallet, password)
     }
 
     //TODO authenticate using read_key

backend/src/services/authentication/session.rs

@@ -37,8 +37,6 @@ pub async fn get_session(password: Option<String>) -> AvailResult<String> {
         session_id: session_request.session_id,
     };
 
-    dotenv::dotenv().ok();
-
     let api = env!("API");
 
     let client = reqwest::Client::new();
@@ -93,8 +91,6 @@ pub async fn get_session_after_creation<N: Network>(
         session_id: session_request.session_id,
     };
 
-    dotenv::dotenv().ok();
-
     let api = env!("API");
 
     let res = reqwest::Client::new()
@@ -147,8 +143,6 @@ pub async fn request_hash(address:&str) -> AvailResult<server_auth::CreateSessio
         public_key: address.to_owned(),
     };
 
-    dotenv::dotenv().ok();
-
     let api = env!("API");
 
     let res = client