Fixes check for replay protection keys

anoma · Oct 13, 2023 · 37a6602 · 37a6602
1 parent 1e06990
commit 37a6602
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/apps/src/lib/node/ledger/shell/finalize_block.rs b/apps/src/lib/node/ledger/shell/finalize_block.rs
@@ -2321,6 +2321,7 @@ mod test_finalize_block {
                 .wl_storage
                 .write_log
                 .has_replay_protection_entry(&decrypted_tx.header_hash())
+                .unwrap_or_default()
         );
         // Check that the hash is present in the merkle tree
         assert!(
@@ -2472,24 +2473,28 @@ mod test_finalize_block {
                 .wl_storage
                 .write_log
                 .has_replay_protection_entry(&invalid_wrapper_hash)
+                .unwrap_or_default()
         );
         assert!(
             !shell
                 .wl_storage
                 .write_log
                 .has_replay_protection_entry(&decrypted_3_hash)
+                .unwrap_or_default()
         );
         assert!(
             !shell
                 .wl_storage
                 .write_log
                 .has_replay_protection_entry(&decrypted_hash)
+                .unwrap_or_default()
         );
         assert!(
             shell
                 .wl_storage
                 .write_log
                 .has_replay_protection_entry(&wrapper_hash)
+                .unwrap_or_default()
         );
         assert!(
             shell
@@ -2503,6 +2508,7 @@ mod test_finalize_block {
                 .wl_storage
                 .write_log
                 .has_replay_protection_entry(&wrapper_2_hash)
+                .unwrap_or_default()
         );
     }
 

diff --git a/core/src/ledger/storage/wl_storage.rs b/core/src/ledger/storage/wl_storage.rs
@@ -62,8 +62,9 @@ where
         &self,
         hash: &Hash,
     ) -> Result<bool, super::Error> {
-        if self.write_log.has_replay_protection_entry(hash) {
-            return Ok(true);
+        if let Some(present) = self.write_log.has_replay_protection_entry(hash)
+        {
+            return Ok(present);
         }
 
         self.storage.has_replay_protection_entry(hash)

diff --git a/core/src/ledger/storage/write_log.rs b/core/src/ledger/storage/write_log.rs
@@ -666,12 +666,12 @@ impl WriteLog {
         PrefixIter { iter }
     }
 
-    /// Check if the given tx hash has already been processed
-    pub fn has_replay_protection_entry(&self, hash: &Hash) -> bool {
-        match self.replay_protection.get(hash) {
-            Some(v) => !matches!(v, ReProtStorageModification::Delete),
-            None => false,
-        }
+    /// Check if the given tx hash has already been processed. Returns `None` if
+    /// the key is not known.
+    pub fn has_replay_protection_entry(&self, hash: &Hash) -> Option<bool> {
+        self.replay_protection
+            .get(hash)
+            .map(|action| !matches!(action, ReProtStorageModification::Delete))
     }
 
     /// Write the transaction hash
@@ -714,7 +714,7 @@ impl WriteLog {
 
     /// Move the transaction hash of the previous block to the list of all
     /// blocks. This functions should be called at the beginning of the block
-    /// processing
+    /// processing, before any other replay protection operation is done
     pub fn finalize_tx_hash(&mut self, hash: Hash) -> Result<()> {
         if self
             .replay_protection