Merge pull request #115 from AvailX/fix/testnet-fix-keys-and-obscura-fix

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "avail_wallet"
-version = "0.4.2"
+version = "0.4.3"
 description = "Avail Wallet | Make it yours."
 authors = ["Avail"]
 license = "Apache-2.0"

src-tauri/Info.plist

@@ -32,7 +32,7 @@
         </dict>
     </array>
   <key>CFBundleShortVersionString</key>
-	<string>0.4.2</string>
+	<string>0.4.3</string>
 	<key>CFBundleVersion</key>
 	<string>20240222.152850</string>
 	<key>CSResourcesFileMapped</key>

src-tauri/src/api/fee.rs

@@ -131,7 +131,6 @@ mod tests {
     #[tokio::test]
     async fn test_create_record() {
         let new_exec = get_execution_object().await.unwrap();
-        // let new_exec = Execution::<Testnet3>::new();
         let exec_obj: Vec<u8> = FeeRequest::to_bytes_execution_object::<TestnetV0>(new_exec)
             .await
             .unwrap();

src-tauri/src/models/wallet.rs

@@ -33,9 +33,9 @@ impl<N: Network> BetterAvailWallet<N> {
     /// ```
     /// use availx_lib::models::wallet::BetterAvailWallet;
     /// # use availx_lib::models::storage::languages::Languages;
-    /// # use snarkvm::prelude::Testnet3;
+    /// # use snarkvm::prelude::TestnetV0;
     ///
-    /// let wallet = BetterAvailWallet::<Testnet3>::new(24, &Languages::English);
+    /// let wallet = BetterAvailWallet::<TestnetV0>::new(24, &Languages::English);
     ///
     /// assert!(wallet.is_ok());
     /// ```

src-tauri/src/services/account/key_management/android.rs

@@ -599,7 +599,7 @@ pub fn keystore_delete(password: Option<&str>) -> AvailResult<String> {
     let network = get_network()?;
 
     let _validation = match SupportedNetworks::from_str(&network)? {
-        SupportedNetworks::Testnet => keystore_load::<Testnet3>(password, "avl-v")?,
+        SupportedNetworks::Testnet => keystore_load::<TestnetV0>(password, "avl-v")?,
     };
 
     let (jvm, activity) = prepare_jvm()?;
@@ -664,7 +664,7 @@ mod tests {
 
     #[test]
     fn test_keystore_init_password() {
-        let wallet = AvailWallet::<Testnet3>::new().unwrap();
+        let wallet = AvailWallet::<TestnetV0>::new().unwrap();
 
         let _result = keystore_init(
             STRONG_PASSWORD,
@@ -678,15 +678,15 @@ mod tests {
     //Requires android environment to run
     #[test]
     fn test_keystore_init_biometric() {
-        let wallet = AvailWallet::<Testnet3>::new().unwrap();
+        let wallet = AvailWallet::<TestnetV0>::new().unwrap();
 
         let _result = keystore_init("", true, &wallet.private_key, &wallet.view_key).unwrap();
     }
 
     //Requires android environment to run if not password auth
     #[test]
     fn test_keystore_load() {
-        let _result = keystore_load::<Testnet3>(Some(STRONG_PASSWORD), "avl-p").unwrap();
+        let _result = keystore_load::<TestnetV0>(Some(STRONG_PASSWORD), "avl-p").unwrap();
     }
 
     //Requires android environment to run
@@ -714,6 +714,6 @@ mod tests {
             110, 76, 116, 67, 76, 82, 82, 82, 116, 100, 115, 69,
         ];
 
-        let _view_key = ViewKey::<Testnet3>::from_bytes_le(&v_key).unwrap();
+        let _view_key = ViewKey::<TestnetV0>::from_bytes_le(&v_key).unwrap();
     }
 }

src-tauri/src/services/account/key_management/iOS.rs

@@ -123,7 +123,7 @@ pub fn delete_ios(password: Option<&str>) -> AvailResult<String> {
     let network = get_network()?;
     // verify password is correct before deletion
     let _validation = match SupportedNetworks::from_str(&network)? {
-        SupportedNetworks::Testnet => search::<Testnet3>(password, "avl-v")?,
+        SupportedNetworks::Testnet => search::<TestnetV0>(password, "avl-v")?,
     };
 
     match passwords::delete_generic_password("com.avail", "avail-user-view", "avl-v") {
@@ -200,11 +200,11 @@ pub fn prepare_context() -> bool {
 mod tests {
     use super::*;
     use avail_common::models::constants::STRONG_PASSWORD;
-    use snarkvm::prelude::{PrivateKey, Testnet3};
+    use snarkvm::prelude::{PrivateKey, TestnetV0};
 
     #[test]
     fn test_store_key_local_password() {
-        let pk = PrivateKey::<Testnet3>::new(&mut rand::thread_rng()).unwrap();
+        let pk = PrivateKey::<TestnetV0>::new(&mut rand::thread_rng()).unwrap();
         let seed = pk.to_bytes_le().unwrap();
         let password = STRONG_PASSWORD.to_string();
 
@@ -213,7 +213,7 @@ mod tests {
 
     #[test]
     fn test_store_key_local_biometrics() {
-        let pk = PrivateKey::<Testnet3>::new(&mut rand::thread_rng()).unwrap();
+        let pk = PrivateKey::<TestnetV0>::new(&mut rand::thread_rng()).unwrap();
         let seed = pk.to_bytes_le().unwrap();
 
         store_key_local(&seed, "", true, true).unwrap();
@@ -229,12 +229,12 @@ mod tests {
 
     #[test]
     fn test_search_password() {
-        search::<Testnet3>(Some(STRONG_PASSWORD), "avl-p").unwrap();
+        search::<TestnetV0>(Some(STRONG_PASSWORD), "avl-p").unwrap();
     }
 
     #[test]
     fn test_search_biometrics() {
-        search::<Testnet3>(None, "avl-p").unwrap();
+        search::<TestnetV0>(None, "avl-p").unwrap();
     }
 
     #[tokio::test]

src-tauri/src/services/authentication/android.rs

@@ -1,4 +1,4 @@
-use snarkvm::prelude::{Testnet3, ToBytes};
+use snarkvm::prelude::{TestnetV0, ToBytes};
 use std::str::FromStr;
 
 use crate::{
@@ -19,7 +19,7 @@ pub fn android_auth(password: Option<&str>, _key_type: &str) -> AvailResult<()>
     let network = get_network()?;
 
     let result = match SupportedNetworks::from_str(&network)? {
-        SupportedNetworks::Testnet => keystore_load::<Testnet3>(password, "avl-v")?,
+        SupportedNetworks::Testnet => keystore_load::<TestnetV0>(password, "avl-v")?,
     };
 
     let view_key_bytes = match result {

src-tauri/src/services/authentication/ios.rs

@@ -1,4 +1,4 @@
-use snarkvm::prelude::{Testnet3, ToBytes};
+use snarkvm::prelude::{TestnetV0, ToBytes};
 use std::str::FromStr;
 
 use avail_common::models::network::SupportedNetworks;
@@ -16,8 +16,8 @@ pub fn ios_auth(password: Option<&str>, key_type: &str) -> AvailResult<()> {
     let network = get_network()?;
 
     let key = match SupportedNetworks::from_str(&network)? {
-        SupportedNetworks::Testnet => search::<Testnet3>(password, key_type)?,
-        _ => search::<Testnet3>(password, key_type)?,
+        SupportedNetworks::Testnet => search::<TestnetV0>(password, key_type)?,
+        _ => search::<TestnetV0>(password, key_type)?,
     };
 
     let view_key_bytes = match key {

src-tauri/src/services/record_handling/records.rs

@@ -157,6 +157,9 @@ pub fn get_records<N: Network>(
                     || e.to_string().contains("status code 500")
                     || e.to_string().contains("Error getting blocks")
                     || e.to_string().contains("https://aleo-testnetbeta.obscura.network/v1/92acf30f-5cea-4679-880c-f06e9a7e8465/testnet/blocks?start=")
+                    || e.to_string().contains("Invalid Data")
+                    || e.to_string().contains("Failed to parse block")
+                    || e.to_string().contains("JSON")
                 {
                     api_client = setup_aleo_client::<N>()?;
                     println!("Switched to aleo client;;;;{:?}", api_client.base_url());