Add evm block hash directly

DeFiCh · Nov 11, 2024 · d159556 · d159556
1 parent 720c499
commit d159556
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/ain-evm/src/storage/block_store.rs b/lib/ain-evm/src/storage/block_store.rs
@@ -56,7 +56,7 @@ impl BlockStore {
     }
 
     pub fn hash_db_state(&self) -> Result<String> {
-        Ok(self.0.hash_db_state(&[columns::Blocks::NAME])?)
+        Ok(self.0.hash_db_state(&COLUMN_NAMES)?)
     }
 }
 

diff --git a/src/dfi/rpc_accounts.cpp b/src/dfi/rpc_accounts.cpp
@@ -3703,16 +3703,24 @@ UniValue logdbhashes(const JSONRPCRequest &request) {
     const auto height = ::ChainActive().Height();
     const auto blockHash = ::ChainActive().Tip()->GetBlockHash().ToString();
 
+
     // Prepare result
     UniValue result(UniValue::VOBJ);
     result.pushKV("height", height);
     result.pushKV("blockhash", blockHash);
     result.pushKV("dvmhash", hashHex);
     result.pushKV("dvmhash_no_undo", hashHexNoUndo);
 
-    const auto evmHashHex = XResultValueLogged(evm_try_get_hash_db_state(result));
-    if (evmHashHex) {
-        result.pushKV("evm_db_node_hash", std::string(*evmHashHex));
+    auto res = XResultValueLogged(evm_try_get_latest_block_hash(result));
+    if (res) {
+        // Only available after EVM activation
+        auto evmBlockHash = uint256::FromByteArray(*res).GetHex();
+        result.pushKV("evmhash", evmBlockHash);
+    }
+
+    const auto evmDbNodeHashHex = XResultValueLogged(evm_try_get_hash_db_state(result));
+    if (evmDbNodeHashHex) {
+        result.pushKV("evm_db_node_hash", std::string(*evmDbNodeHashHex));
     }
 
     if (gArgs.GetBoolArg("-oceanarchive", DEFAULT_OCEAN_INDEXER_ENABLED) ||
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ impl BlockStore { @@
         }
         pub fn hash_db_state(&self) -> Result<String> {
-            Ok(self.0.hash_db_state(&[columns::Blocks::NAME])?)
+            Ok(self.0.hash_db_state(&COLUMN_NAMES)?)
         }
     }
@@ Expand Down @@