feat: mark identity wallet ids (#83)

* feat: mark identity wallet ids * feat: add read_keystore_menmonic_path api
consenlabs · Mar 27, 2024 · 1319819 · 1319819
1 parent 2a7bd76
commit 1319819
Show file tree

Hide file tree

Showing 13 changed files with 582 additions and 130 deletions.
diff --git a/token-core/tcx-migration/src/migration.rs b/token-core/tcx-migration/src/migration.rs
@@ -59,7 +59,7 @@ impl OldMetadata {
             self.source
                 .clone()
                 .map_or((Source::Mnemonic, None), |source| match source.as_str() {
-                    "RECOVER_IDENTITY" => (Source::Mnemonic, None),
+                    "RECOVERED_IDENTITY" => (Source::Mnemonic, None),
                     "NEW_IDENTITY" => (Source::NewMnemonic, None),
                     "KEYSTORE" => (Source::KeystoreV3, Some(vec!["ETHEREUM".to_string()])),
                     "PRIVATE" => (Source::Private, Some(vec!["ETHEREUM".to_string()])),

diff --git a/token-core/tcx-proto/src/params.proto b/token-core/tcx-proto/src/params.proto
@@ -277,4 +277,13 @@ message MigrateKeystoreParam {
 
   message BackupResult {
     string original = 1;
+  }
+
+  message MarkIdentityWalletsParam {
+    repeated string ids = 1;
+    string source = 2;
+  }
+
+message ReadKeystoreMnemonicPathResult {
+    string path = 1;
   }
diff --git a/token-core/tcx/src/api.rs b/token-core/tcx/src/api.rs
@@ -704,6 +704,20 @@ pub struct BackupResult {
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MarkIdentityWalletsParam {
+    #[prost(string, repeated, tag = "1")]
+    pub ids: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, tag = "2")]
+    pub source: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ReadKeystoreMnemonicPathResult {
+    #[prost(string, tag = "1")]
+    pub path: ::prost::alloc::string::String,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct VerifyDerivedKeyParam {
     #[prost(string, tag = "1")]
     pub id: ::prost::alloc::string::String,

diff --git a/token-core/tcx/src/handler.rs b/token-core/tcx/src/handler.rs
@@ -70,7 +70,9 @@ use tcx_primitive::TypedDeterministicPublicKey;
 use tcx_tezos::{encode_tezos_private_key, parse_tezos_private_key};
 
 use crate::macros::{impl_to_key, use_chains};
-use crate::migration::remove_old_keystore_by_id;
+use crate::migration::{
+    read_all_identity_wallet_ids, remove_all_identity_wallets, remove_old_keystore_by_id,
+};
 
 use_chains!(
     tcx_btc_kin::bitcoin,
@@ -727,12 +729,24 @@ pub(crate) fn delete_keystore(data: &[u8]) -> Result<Vec<u8>> {
         delete_keystore_file(&param.id)?;
         map.remove(&param.id);
 
+        // Used to delete all duplicated mnemonic keystore
         if let Some(file_ids) = remove_old_keystore_by_id(&param.id.clone()) {
             for file_id in file_ids {
                 map.remove(&file_id);
             }
         }
 
+        // Used to delete all identity keystore if is deleting identity wallet
+        if let Some(all_identity_wallets) = read_all_identity_wallet_ids() {
+            if all_identity_wallets.wallet_ids.contains(&param.id) {
+                if let Some(file_ids) = remove_all_identity_wallets() {
+                    for file_id in file_ids {
+                        map.remove(&file_id);
+                    }
+                }
+            }
+        }
+
         let rsp = GeneralResult {
             is_success: true,
             error: "".to_owned(),

diff --git a/token-core/tcx/src/lib.rs b/token-core/tcx/src/lib.rs
@@ -7,6 +7,7 @@ use std::os::raw::c_char;
 
 use anyhow::anyhow;
 use handler::{backup, sign_bls_to_execution_change};
+use migration::{mark_identity_wallets, read_legacy_keystore_mnemonic_path};
 use prost::Message;
 
 pub mod api;
@@ -78,6 +79,9 @@ pub unsafe extern "C" fn call_tcx_api(hex_str: *const c_char) -> *const c_char {
             let ret = scan_legacy_keystores()?;
             encode_message(ret)
         }),
+        "read_keystore_mnemonic_path" => {
+            landingpad(|| read_legacy_keystore_mnemonic_path(&action.param.unwrap().value))
+        }
         "create_keystore" => landingpad(|| create_keystore(&action.param.unwrap().value)),
         "import_mnemonic" => landingpad(|| import_mnemonic(&action.param.unwrap().value)),
         "export_mnemonic" => landingpad(|| export_mnemonic(&action.param.unwrap().value)),
@@ -122,6 +126,9 @@ pub unsafe extern "C" fn call_tcx_api(hex_str: *const c_char) -> *const c_char {
         "eth_batch_personal_sign" => {
             landingpad(|| eth_batch_personal_sign(&action.param.unwrap().value))
         }
+        "mark_identity_wallets" => {
+            landingpad(|| mark_identity_wallets(&action.param.unwrap().value))
+        }
         _ => landingpad(|| Err(anyhow!("unsupported_method"))),
     };
     match reply {