Merge pull request #4 from chinyuchan/chinyuchan/fix/rpc/chain-id

initialize chain id when creating evm runtime.

crates/model/src/lazy.rs

@@ -1,8 +1,13 @@
 use crate::types::Hex;
 use arc_swap::ArcSwap;
 use once_cell::sync::Lazy;
+use std::sync::Arc;
 
 pub static CHAIN_ID: Lazy<ArcSwap<u64>> =
     Lazy::new(|| ArcSwap::from_pointee(Default::default()));
 pub static PROTOCOL_VERSION: Lazy<ArcSwap<Hex>> =
     Lazy::new(|| ArcSwap::from_pointee(Default::default()));
+
+pub fn set_chain_id(id: u64) {
+    CHAIN_ID.store(Arc::from(id));
+}

crates/model/src/types/transaction.rs

@@ -408,7 +408,11 @@ impl SignatureComponents {
     }
 
     pub fn extract_chain_id(v: u64) -> Option<u64> {
-        if v >= 35 { Some((v - 35) / 2u64) } else { None }
+        if v >= 35 {
+            Some((v - 35) / 2u64)
+        } else {
+            None
+        }
     }
 
     #[allow(clippy::len_without_is_empty)]

src/lib.rs

@@ -24,6 +24,7 @@ use model::{
     types::{Basic, Block, H160, U256},
 };
 use once_cell::sync::Lazy;
+use rt_evm_model::lazy::set_chain_id;
 use ruc::*;
 use std::{fs, io::ErrorKind, mem::size_of, path::PathBuf, sync::Arc};
 use storage::{get_account_by_backend, save_account_by_backend, MptStore, Storage};
@@ -62,6 +63,8 @@ impl EvmRuntime {
         #[cfg(feature = "benchmark")]
         const MEM_POOL_CAP: u64 = 200_0000;
 
+        set_chain_id(chain_id);
+
         let trie_db = Arc::new(t);
         let storage = Arc::new(s);