Fix: scanner error. (#228)

FindoraNetwork · Oct 31, 2023 · a23b9b1 · a23b9b1
1 parent d272fa5
commit a23b9b1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/scanner/src/rpc.rs b/scanner/src/rpc.rs
@@ -200,7 +200,18 @@ impl RPCCaller {
             let hasher = sha2::Sha256::digest(&bytes);
             let tx_hash = hex::encode(hasher);
             let tx = self.rpc.load_transaction(&tx_hash).await?;
-            let result = serde_json::to_value(tx.tx_result.clone()).unwrap();
+            let mut result_tmp = tx.tx_result.clone();
+            if !result_tmp.log.is_empty() {
+                let mut trim_log: Vec<u8> = vec![];
+                let log_bytes = result_tmp.log.as_bytes();
+                for b in log_bytes {
+                    if *b > 31 {
+                        trim_log.push(*b);
+                    }
+                }
+                result_tmp.log = String::from_utf8_lossy(&trim_log).parse().unwrap();
+            }
+            let result = serde_json::to_value(&result_tmp).unwrap();
 
             match tx::try_tx_catalog(&bytes) {
                 tx::TxCatalog::EvmTx => {
@@ -269,7 +280,7 @@ impl RPCCaller {
                         ty_sub,
                         sender: sender.clone(),
                         receiver: receivers_val,
-                        log: tx.tx_result.log,
+                        log: result_tmp.log,
                         origin,
                         result,
                         value: v,
@@ -531,7 +542,7 @@ impl RPCCaller {
                         ty_sub,
                         sender: sender.clone(),
                         receiver: receivers_val,
-                        log: tx.tx_result.log,
+                        log: result_tmp.log,
                         origin,
                         result,
                         value,

diff --git a/scanner/src/tx.rs b/scanner/src/tx.rs
@@ -1,6 +1,6 @@
 use crate::{Error, Result};
 
-pub const EVM_TX_TAG: [u8; 4] = [0x65, 0x76, 0x6d, 0x3a];
+pub const EVM_TX_TAG: [u8; 4] = [0x65, 0x76, 0x6d, 0x3a]; // 101 118 109 58
 
 pub fn unwrap(tx: &[u8]) -> Result<&[u8]> {
     let len = EVM_TX_TAG.len();