handle non-merklized values in State methods

crates/state/src/lib.rs

@@ -48,6 +48,12 @@ pub type Result<T> = std::result::Result<T, Error>;
 /// it has 2 blocks delay on validator set update.
 pub const EPOCH_SWITCH_BLOCKS_DELAY: u32 = 2;
 
+/// Returns true if the given key is one whose data is not merklized
+pub fn is_key_not_merklized(_key: &Key) -> bool {
+    // dummy value for now
+    false
+}
+
 /// The ledger's state
 #[derive(Debug)]
 pub struct State<D, H>
@@ -338,17 +344,23 @@ where
     /// gas cost.
     pub fn has_key(&self, key: &Key) -> Result<(bool, u64)> {
         Ok((
-            self.block.tree.has_key(key)?,
+            if is_key_not_merklized(key) {
+                self.db.read_subspace_val(key)?.is_some()
+            } else {
+                self.block.tree.has_key(key)?
+            },
             key.len() as u64 * STORAGE_ACCESS_GAS_PER_BYTE,
         ))
     }
 
     /// Returns a value from the specified subspace and the gas cost
     pub fn read(&self, key: &Key) -> Result<(Option<Vec<u8>>, u64)> {
         tracing::debug!("storage read key {}", key);
-        let (present, gas) = self.has_key(key)?;
-        if !present {
-            return Ok((None, gas));
+        if !is_key_not_merklized(key) {
+            let (present, gas) = self.has_key(key)?;
+            if !present {
+                return Ok((None, gas));
+            }
         }
 
         match self.db.read_subspace_val(key)? {