Merge branch 'main' into feat/telemetry-service

.github/workflows/release.yml

@@ -60,6 +60,7 @@ jobs:
           AIRDROP_API_BASE_URL: ${{ secrets.BETA_AIRDROP_API_BASE_URL }}
           AIRDROP_TWITTER_AUTH_URL: ${{ secrets.BETA_AIRDROP_TWITTER_AUTH_URL }}
           TELEMETRY_API_URL: ${{ secrets.BETA_TELEMETRY_API_URL }}
+          AIRDROP_WEBSOCKET_CRYPTO_KEY: ${{ secrets.DEV_AIRDROP_WEBSOCKET_CRYPTO_KEY }}
         shell: bash
         run: |
           #set -xueo pipefail
@@ -69,6 +70,7 @@ jobs:
           echo "AIRDROP_API_BASE_URL=${{ env.AIRDROP_API_BASE_URL }}" >> $GITHUB_ENV
           echo "AIRDROP_TWITTER_AUTH_URL=${{ env.AIRDROP_TWITTER_AUTH_URL }}" >> $GITHUB_ENV
           echo "TELEMETRY_API_URL=${{ env.TELEMETRY_API_URL }}" >> $GITHUB_ENV
+          echo "AIRDROP_WEBSOCKET_CRYPTO_KEY=${{ env.AIRDROP_WEBSOCKET_CRYPTO_KEY }}" >> $GITHUB_ENV
           echo "TS_FEATURES=release-ci-beta, airdrop-env" >> $GITHUB_ENV
           # numeric-only and cannot be greater than 65535 for msi target
           export BETA_DATE=$(date +%m%d)

src-tauri/src/commands.rs

@@ -46,8 +46,9 @@ use keyring::Entry;
 use log::{debug, error, info, warn};
 use monero_address_creator::Seed as MoneroSeed;
 use regex::Regex;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
+use std::fmt::Debug;
 use std::fs::{read_dir, remove_dir_all, remove_file, File};
 use std::sync::atomic::Ordering;
 use std::thread::{available_parallelism, sleep};

src-tauri/src/main.rs

@@ -33,6 +33,8 @@ use p2pool::models::Connections;
 use serde_json::json;
 use std::fs::{create_dir_all, remove_dir_all, remove_file, File};
 use std::ops::Deref;
+use std::path::Path;
+use tauri_plugin_cli::CliExt;
 use telemetry_service::TelemetryService;
 use tokio::sync::watch::{self};
 use updates_manager::UpdatesManager;
@@ -548,22 +550,23 @@ async fn setup_inner(
         )
         .await?;
 
+    progress.set_max(45).await;
+    progress.update("wallet-started".to_string(), None, 0).await;
+    progress
+        .update("waiting-for-node".to_string(), None, 0)
+        .await;
+    progress.set_max(75).await;
     drop(
         telemetry_service
             .send(
                 "preparing-for-initial-sync".to_string(),
                 json!({
                     "service": "initial_sync",
-                    "percentage":40,
+                    "percentage":45,
                 }),
             )
             .await,
     );
-    progress.set_max(75).await;
-    progress
-        .update("waiting-for-node".to_string(), None, 0)
-        .await;
-    progress.set_max(75).await;
     state.node_manager.wait_synced(progress.clone()).await?;
 
     if state.config.read().await.p2pool_enabled() {