evm: Load state from genesis.json

lib/ain-cpp-imports/src/bridge.rs

@@ -8,11 +8,13 @@ pub mod ffi {
         fn publishEthTransaction(data: Vec<u8>) -> String;
         fn getAccounts() -> Vec<String>;
         fn getDatadir() -> String;
+        fn getNetwork() -> String;
         fn getDifficulty(_block_hash: [u8; 32]) -> u32;
         fn getChainWork(_block_hash: [u8; 32]) -> [u8; 32];
         fn getPoolTransactions() -> Vec<String>;
         fn getNativeTxSize(data: Vec<u8>) -> u64;
         fn getMinRelayTxFee() -> u64;
         fn getEthPrivKey(key_id: [u8; 20]) -> [u8; 32];
+        fn getStateInputJSON() -> String;
     }
 }

lib/ain-cpp-imports/src/lib.rs

@@ -25,6 +25,9 @@ mod ffi {
     pub fn getDatadir() -> String {
         unimplemented!("{}", UNIMPL_MSG)
     }
+    pub fn getNetwork() -> String {
+        unimplemented!("{}", UNIMPL_MSG)
+    }
     pub fn getDifficulty(_block_hash: [u8; 32]) -> u32 {
         unimplemented!("{}", UNIMPL_MSG)
     }
@@ -43,6 +46,9 @@ mod ffi {
     pub fn getEthPrivKey(_key_id: [u8; 20]) -> [u8; 32] {
         unimplemented!("{}", UNIMPL_MSG)
     }
+    pub fn getStateInputJSON() -> String {
+        unimplemented!("{}", UNIMPL_MSG)
+    }
 }
 
 pub fn get_chain_id() -> Result<u64, Box<dyn Error>> {
@@ -70,6 +76,10 @@ pub fn get_datadir() -> Result<String, Box<dyn Error>> {
     Ok(datadir)
 }
 
+pub fn get_network() -> String {
+    ffi::getNetwork()
+}
+
 pub fn get_difficulty(block_hash: [u8; 32]) -> Result<u32, Box<dyn Error>> {
     let bits = ffi::getDifficulty(block_hash);
     Ok(bits)
@@ -100,5 +110,14 @@ pub fn get_eth_priv_key(key_id: [u8; 20]) -> Result<[u8; 32], Box<dyn Error>> {
     Ok(eth_key)
 }
 
+pub fn get_state_input_json() -> Option<String> {
+    let json_path = ffi::getStateInputJSON();
+    if json_path.is_empty() {
+        None
+    } else {
+        Some(json_path)
+    }
+}
+
 #[cfg(test)]
 mod tests {}

lib/ain-evm/Cargo.toml

@@ -22,6 +22,7 @@ keccak-hash = "0.10.0"
 serde = { version = "1.0", features = ["derive"] }
 ethbloom = "0.13.0"
 ethereum-types = "0.14.1"
+serde_json = "1.0.96"
 
 # Trie dependencies
 hash-db = "0.16.0"

lib/ain-evm/src/backend.rs

@@ -9,10 +9,10 @@ use sp_core::Blake2Hasher;
 use vsdb_trie_db::MptOnce;
 
 use crate::{
-    evm::TrieDBStore,
     storage::{traits::BlockStorage, Storage},
     traits::BridgeBackend,
     transaction::SignedTx,
+    trie::TrieDBStore,
 };
 
 type Hasher = Blake2Hasher;

lib/ain-evm/src/evm.rs

@@ -1,29 +1,25 @@
 use crate::backend::{EVMBackend, EVMBackendError, InsufficientBalance, Vicinity};
 use crate::executor::TxResponse;
-use crate::storage::traits::{BlockStorage, PersistentState, PersistentStateError};
+use crate::storage::traits::{BlockStorage, PersistentStateError};
 use crate::storage::Storage;
 use crate::transaction::bridge::{BalanceUpdate, BridgeTx};
+use crate::trie::TrieDBStore;
 use crate::tx_queue::{QueueError, QueueTx, TransactionQueueMap};
 use crate::{
     executor::AinExecutor,
     traits::{Executor, ExecutorContext},
     transaction::SignedTx,
 };
 use anyhow::anyhow;
-use ethereum::{AccessList, Account, Log, TransactionV2};
-use ethereum_types::{Bloom, BloomInput};
+use ethereum::{AccessList, Account, Block, Log, PartialHeader, TransactionV2};
+use ethereum_types::{Bloom, BloomInput, H160, U256};
 
 use hex::FromHex;
 use log::debug;
-use primitive_types::{H160, H256, U256};
-use serde::{Deserialize, Serialize};
 use std::error::Error;
 use std::path::PathBuf;
 use std::sync::Arc;
 use vsdb_core::vsdb_set_base_dir;
-use vsdb_trie_db::MptStore;
-
-pub static TRIE_DB_STORE: &str = "trie_db_store.bin";
 
 pub type NativeTxHash = [u8; 32];
 
@@ -33,34 +29,6 @@ pub struct EVMHandler {
     storage: Arc<Storage>,
 }
 
-#[derive(Serialize, Deserialize)]
-pub struct TrieDBStore {
-    pub trie_db: MptStore,
-}
-
-impl Default for TrieDBStore {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl TrieDBStore {
-    pub fn new() -> Self {
-        debug!("Creating new trie store");
-        let trie_store = MptStore::new();
-        let mut trie = trie_store
-            .trie_create(&[0], None, false)
-            .expect("Error creating initial backend");
-        let state_root: H256 = trie.commit().into();
-        debug!("Initial state_root : {:#x}", state_root);
-        Self {
-            trie_db: trie_store,
-        }
-    }
-}
-
-impl PersistentState for TrieDBStore {}
-
 fn init_vsdb() {
     debug!(target: "vsdb", "Initializating VSDB");
     let datadir = ain_cpp_imports::get_datadir().expect("Could not get imported datadir");
@@ -74,20 +42,56 @@ fn init_vsdb() {
 }
 
 impl EVMHandler {
-    pub fn new(storage: Arc<Storage>) -> Self {
+    pub fn restore(storage: Arc<Storage>) -> Self {
         init_vsdb();
 
         Self {
             tx_queues: Arc::new(TransactionQueueMap::new()),
-            trie_store: Arc::new(
-                TrieDBStore::load_from_disk(TRIE_DB_STORE).expect("Error loading trie db store"),
-            ),
+            trie_store: Arc::new(TrieDBStore::restore()),
             storage,
         }
     }
 
+    pub fn new_from_json(storage: Arc<Storage>, path: PathBuf) -> Self {
+        debug!("Loading genesis state from {}", path.display());
+        init_vsdb();
+
+        let handler = Self {
+            tx_queues: Arc::new(TransactionQueueMap::new()),
+            trie_store: Arc::new(TrieDBStore::new()),
+            storage: Arc::clone(&storage),
+        };
+        let state_root =
+            TrieDBStore::genesis_state_root_from_json(&handler.trie_store, &handler.storage, path)
+                .expect("Error getting genesis state root from json");
+
+        let block: Block<TransactionV2> = Block::new(
+            PartialHeader {
+                state_root,
+                number: U256::zero(),
+                parent_hash: Default::default(),
+                beneficiary: Default::default(),
+                receipts_root: Default::default(),
+                logs_bloom: Default::default(),
+                difficulty: Default::default(),
+                gas_limit: Default::default(),
+                gas_used: Default::default(),
+                timestamp: Default::default(),
+                extra_data: Default::default(),
+                mix_hash: Default::default(),
+                nonce: Default::default(),
+            },
+            Vec::new(),
+            Vec::new(),
+        );
+        storage.put_latest_block(Some(&block));
+        storage.put_block(&block);
+
+        handler
+    }
+
     pub fn flush(&self) -> Result<(), PersistentStateError> {
-        self.trie_store.save_to_disk(TRIE_DB_STORE)
+        self.trie_store.flush()
     }
 
     pub fn call(

lib/ain-evm/src/genesis.rs

@@ -0,0 +1,33 @@
+use ethereum_types::{H160, H256, H64, U256};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+#[derive(Debug, Serialize, Deserialize)]
+struct Config {
+    chain_id: u32,
+    homestead_block: u32,
+    eip150_block: u32,
+    eip150_hash: String,
+    eip155_block: u32,
+    eip158_block: u32,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Alloc {
+    pub balance: U256,
+    pub code: Option<Vec<u8>>,
+    pub storage: Option<HashMap<H256, H256>>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GenesisData {
+    // config: Config,
+    coinbase: String,
+    difficulty: String,
+    extra_data: String,
+    gas_limit: U256,
+    nonce: H64,
+    timestamp: U256,
+    pub alloc: HashMap<H160, Alloc>,
+}

lib/ain-evm/src/handler.rs

@@ -7,39 +7,63 @@ use crate::storage::traits::BlockStorage;
 use crate::storage::Storage;
 use crate::traits::Executor;
 use crate::transaction::bridge::{BalanceUpdate, BridgeTx};
+use crate::trie::GENESIS_STATE_ROOT;
 use crate::tx_queue::QueueTx;
 
+use anyhow::anyhow;
 use ethereum::{Block, PartialHeader, ReceiptV3};
 use ethereum_types::{Bloom, H160, H64, U256};
 use log::debug;
 use primitive_types::H256;
 use std::error::Error;
+use std::path::PathBuf;
 use std::sync::Arc;
 
-const GENESIS_STATE_ROOT: &str =
-    "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a";
-
 pub struct Handlers {
     pub evm: EVMHandler,
     pub block: BlockHandler,
     pub receipt: ReceiptHandler,
     pub storage: Arc<Storage>,
 }
 
-impl Default for Handlers {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl Handlers {
-    pub fn new() -> Self {
-        let storage = Arc::new(Storage::new());
-        Self {
-            evm: EVMHandler::new(Arc::clone(&storage)),
-            block: BlockHandler::new(Arc::clone(&storage)),
-            receipt: ReceiptHandler::new(Arc::clone(&storage)),
-            storage,
+    /// Constructs a new Handlers instance. Depending on whether the defid -ethstartstate flag is set,
+    /// it either revives the storage from a previously saved state or initializes new storage using input from a JSON file.
+    /// This JSON-based initialization is exclusively reserved for regtest environments.
+    ///
+    /// # Warning
+    ///
+    /// Loading state from JSON will overwrite previous stored state
+    ///
+    /// # Errors
+    ///
+    /// This method will return an error if an attempt is made to load a genesis state from a JSON file outside of a regtest environment.
+    ///
+    /// # Return
+    ///
+    /// Returns an instance of the struct, either restored from storage or created from a JSON file.
+    pub fn new() -> Result<Self, anyhow::Error> {
+        if let Some(path) = ain_cpp_imports::get_state_input_json() {
+            if ain_cpp_imports::get_network() != "regtest" {
+                return Err(anyhow!(
+                    "Loading a genesis from JSON file is restricted to regtest network"
+                ));
+            }
+            let storage = Arc::new(Storage::new());
+            Ok(Self {
+                evm: EVMHandler::new_from_json(Arc::clone(&storage), PathBuf::from(path)),
+                block: BlockHandler::new(Arc::clone(&storage)),
+                receipt: ReceiptHandler::new(Arc::clone(&storage)),
+                storage,
+            })
+        } else {
+            let storage = Arc::new(Storage::restore());
+            Ok(Self {
+                evm: EVMHandler::restore(Arc::clone(&storage)),
+                block: BlockHandler::new(Arc::clone(&storage)),
+                receipt: ReceiptHandler::new(Arc::clone(&storage)),
+                storage,
+            })
         }
     }
 

lib/ain-evm/src/lib.rs

@@ -3,10 +3,12 @@ mod block;
 mod ecrecover;
 pub mod evm;
 pub mod executor;
+mod genesis;
 pub mod handler;
 pub mod receipt;
 pub mod runtime;
 pub mod storage;
 pub mod traits;
 pub mod transaction;
+mod trie;
 mod tx_queue;

lib/ain-evm/src/runtime.rs

@@ -41,7 +41,7 @@ impl Runtime {
                 });
             }))),
             jrpc_handle: Mutex::new(None),
-            handlers: Arc::new(Handlers::new()),
+            handlers: Arc::new(Handlers::new().expect("Error initializating handlers")),
         }
     }
 

lib/ain-evm/src/storage/data_handler.rs

@@ -33,7 +33,7 @@ impl PersistentState for LatestBlockNumber {}
 impl PersistentState for TransactionHashToReceipt {}
 impl PersistentState for TxHashToTx {}
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct BlockchainDataHandler {
     // Improvements: Add transaction_map behind feature flag -txindex or equivalent
     transactions: RwLock<TxHashToTx>,
@@ -48,7 +48,7 @@ pub struct BlockchainDataHandler {
 }
 
 impl BlockchainDataHandler {
-    pub fn new() -> Self {
+    pub fn restore() -> Self {
         BlockchainDataHandler {
             transactions: RwLock::new(
                 TxHashToTx::load_from_disk(TRANSACTION_DATA_PATH)

lib/ain-evm/src/storage/mod.rs

@@ -33,7 +33,14 @@ impl Storage {
     pub fn new() -> Self {
         Self {
             cache: Cache::new(None),
-            blockchain_data_handler: BlockchainDataHandler::new(),
+            blockchain_data_handler: BlockchainDataHandler::default(),
+        }
+    }
+
+    pub fn restore() -> Self {
+        Self {
+            cache: Cache::new(None),
+            blockchain_data_handler: BlockchainDataHandler::restore(),
         }
     }
 }