fix(velas-ccount): Fix velas account storage key finding method.

velas · Oct 12, 2021 · b36f753 · b36f753
1 parent 71481d9
commit b36f753
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/core/src/rpc.rs b/core/src/rpc.rs
@@ -4030,10 +4030,12 @@ pub mod rpc_full {
             );
 
             let accounts = storages
+                .expect("velas account operational index to be activated")
                 .into_iter()
-                .flatten()
-                .flat_map(|(storage, _)| meta.get_velas_accounts_by_storage_key(&bank, storage))
-                .flatten();
+                .flat_map(|(storage, _)| {
+                    meta.get_velas_accounts_by_storage_key(&bank, storage)
+                        .expect("velas account storage index to be activated")
+                });
             debug!(
                 "get_velas_accounts_by_operational_key velas accounts {:?}",
                 accounts

diff --git a/programs/velas-account-program/src/lib.rs b/programs/velas-account-program/src/lib.rs
@@ -38,12 +38,14 @@ pub struct VAccountInfo {
 }
 
 impl VAccountInfo {
+    const SUFFIX_OPERATIONAL_STORAGE: &'static [u8] = b"operationals";
+
     pub fn find_storage_key(&self, vaccount: &Pubkey) -> Pubkey {
         Pubkey::find_program_address(
             &[
                 &vaccount.to_bytes(),
-                b"storage",
-                &self.programs_storage_nonce.to_le_bytes(),
+                Self::SUFFIX_OPERATIONAL_STORAGE,
+                &self.operational_storage_nonce.to_le_bytes(),
             ],
             &crate::id(),
         )