Improvements (#36)

* clean unused data * remove unnecessary logic * move effect hash computation to parser * fix error handler * add heartbeat checkpoint * fix nanox and add zemu test * remove view_address function
Zondax · Feb 3, 2025 · 051a052 · 051a052
1 parent 8926a0d
commit 051a052
Show file tree

Hide file tree

Showing 409 changed files with 287 additions and 453 deletions.
diff --git a/app/rust/src/ffi/keys.rs b/app/rust/src/ffi/keys.rs
@@ -1,4 +1,3 @@
-use crate::address::address_view::AddressView;
 use crate::address::{Address, AddressIndex};
 use crate::constants::KEY_LEN;
 use crate::ffi::c_api::c_fvk_bytes;
@@ -79,19 +78,15 @@ pub unsafe extern "C" fn rs_is_address_visible(
         return ParserError::InvalidAddress as u32;
     };
 
-    let Ok(address_view) = fvk.view_address(address) else {
-        return ParserError::InvalidAddress as u32;
-    };
-
-    match address_view {
-        AddressView::Opaque { .. } => {
-            *is_visible = false;
-            *index = 0;
-        }
-        AddressView::Visible { index: idx, .. } => {
+    match fvk.address_index(&address) {
+        Some(idx) => {
             *is_visible = true;
             *index = idx.account;
         }
+        None => {
+            *is_visible = false;
+            *index = 0;
+        }
     }
 
     ParserError::Ok as u32
@@ -122,9 +117,6 @@ fn compute_keys(keys: &mut Keys) -> Result<(), ParserError> {
 
 #[cfg(test)]
 mod test {
-    use std::format;
-    use std::string::ToString;
-
     use super::*;
     use crate::keys::fvk::FullViewingKey;
     use crate::keys::nk::NullifierKey;
@@ -186,40 +178,6 @@ mod test {
         assert_eq!(s, EXPECTED_FVK);
     }
 
-    #[test]
-    fn print_address() {
-        let key_bytes = hex::decode(SPEND_ZEMU_KEY).unwrap();
-        let mut key_bytes_array = [0u8; 32];
-        key_bytes_array.copy_from_slice(&key_bytes);
-        let spend_key = SpendKeyBytes::from(key_bytes_array);
-
-        let dummy_address =
-        hex::decode("cefe3931877df56e2eb50626ae0d54c2d44791c154a2b8f056daf11c378116c1a924f91862da10b8b39ecd045062f04dcb345041b0001471d97d73136d424f64239804708ff3d78d645c084ec3ee0315")
-            .unwrap();
-        let address = Address::try_from(dummy_address.as_slice()).unwrap();
-
-        let fvk = spend_key.fvk().unwrap();
-
-        let address_view = fvk.view_address(address).unwrap();
-
-        let account_str = match address_view {
-            AddressView::Opaque { address: _ } => panic!("Address is opaque"),
-            AddressView::Visible {
-                address: _,
-                index,
-                wallet_id: _,
-            } => {
-                if index.account == 0 {
-                    "Main Account".to_string()
-                } else {
-                    format!("Sub-account #{}", index.account)
-                }
-            }
-        };
-
-        assert_eq!(account_str, "Sub-account #90");
-    }
-
     #[test]
     fn get_fvk_from_bytes() {
         let key_bytes = hex::decode(SPEND_ZEMU_KEY).unwrap();

diff --git a/app/rust/src/keys/fvk.rs b/app/rust/src/keys/fvk.rs
@@ -1,5 +1,5 @@
 use crate::{
-    address::{address_view::AddressView, Address, AddressIndex},
+    address::{Address, AddressIndex},
     utils::prf,
     wallet_id::WalletId,
     ParserError,
@@ -41,19 +41,6 @@ impl FullViewingKey {
         self.ivk().payment_address(index)
     }
 
-    /// Views the structure of the supplied address with this viewing key.
-    pub fn view_address(&self, address: Address) -> Result<AddressView, ParserError> {
-        if self.ivk().views_address(&address) {
-            Ok(AddressView::Visible {
-                index: self.ivk().index_for_diversifier(address.diversifier()),
-                wallet_id: self.wallet_id()?,
-                address,
-            })
-        } else {
-            Ok(AddressView::Opaque { address })
-        }
-    }
-
     /// Returns the index of the given address, if the address is viewed by this
     /// viewing key; otherwise, returns `None`.
     pub fn address_index(&self, address: &Address) -> Option<AddressIndex> {

diff --git a/app/rust/src/parser/error.rs b/app/rust/src/parser/error.rs
@@ -54,6 +54,8 @@ pub enum ParserError {
     EffectHashError,
     UndelegateClaimPlanError,
     DelegatorVotePlanError,
+    PositionClosePlanError,
+    PositionOpenPlanError,
     PositionWithdrawPlanError,
     DutchAuctionSchedulePlanError,
     DutchAuctionEndPlanError,