From 630795b10eda0a2367f16aad0cacee21ef59ee73 Mon Sep 17 00:00:00 2001
From: jouzo <jdesclercs@gmail.com>
Date: Wed, 14 Jun 2023 12:35:11 +0200
Subject: [PATCH] Make genesis.json field optional

---
 lib/ain-evm/src/block.rs   | 16 ++++++++--------
 lib/ain-evm/src/genesis.rs | 16 +++++++++-------
 lib/ain-evm/src/trie.rs    | 36 +++++++++++++++++++-----------------
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/lib/ain-evm/src/block.rs b/lib/ain-evm/src/block.rs
index 1055a8b9855..c6009e527db 100644
--- a/lib/ain-evm/src/block.rs
+++ b/lib/ain-evm/src/block.rs
@@ -272,18 +272,18 @@ pub fn new_block_from_json(path: PathBuf, state_root: H256) -> Result<BlockAny,
     Ok(Block::new(
         PartialHeader {
             state_root,
-            beneficiary: genesis.coinbase,
-            timestamp: genesis.timestamp,
-            difficulty: genesis.difficulty,
-            extra_data: genesis.extra_data,
             number: U256::zero(),
-            parent_hash: Default::default(),
+            timestamp: genesis.timestamp.unwrap_or_default().as_u64(),
+            beneficiary: genesis.coinbase.unwrap_or_default(),
+            difficulty: genesis.difficulty.unwrap_or_default(),
+            extra_data: genesis.extra_data.unwrap_or_default(),
+            parent_hash: genesis.parent_hash.unwrap_or_default(),
+            gas_limit: genesis.gas_limit.unwrap_or_default(),
+            mix_hash: genesis.mix_hash.unwrap_or_default(),
+            nonce: genesis.nonce.unwrap_or_default(),
             receipts_root: Default::default(),
             logs_bloom: Default::default(),
-            gas_limit: Default::default(),
             gas_used: Default::default(),
-            mix_hash: Default::default(),
-            nonce: Default::default(),
         },
         Vec::new(),
         Vec::new(),
diff --git a/lib/ain-evm/src/genesis.rs b/lib/ain-evm/src/genesis.rs
index 36693ce9976..e1da5653b80 100644
--- a/lib/ain-evm/src/genesis.rs
+++ b/lib/ain-evm/src/genesis.rs
@@ -23,11 +23,13 @@ pub struct Alloc {
 #[serde(rename_all = "camelCase")]
 pub struct GenesisData {
     // config: Config,
-    pub coinbase: H160,
-    pub difficulty: U256,
-    pub extra_data: Vec<u8>,
-    pub gas_limit: U256,
-    pub nonce: H64,
-    pub timestamp: u64,
-    pub alloc: HashMap<H160, Alloc>,
+    pub coinbase: Option<H160>,
+    pub difficulty: Option<U256>,
+    pub extra_data: Option<Vec<u8>>,
+    pub gas_limit: Option<U256>,
+    pub nonce: Option<H64>,
+    pub timestamp: Option<U256>,
+    pub alloc: Option<HashMap<H160, Alloc>>,
+    pub parent_hash: Option<H256>,
+    pub mix_hash: Option<H256>,
 }
diff --git a/lib/ain-evm/src/trie.rs b/lib/ain-evm/src/trie.rs
index 3a78a56a5ea..527154ecbf0 100644
--- a/lib/ain-evm/src/trie.rs
+++ b/lib/ain-evm/src/trie.rs
@@ -71,24 +71,26 @@ impl TrieDBStore {
         let reader = BufReader::new(file);
         let genesis: GenesisData = serde_json::from_reader(reader)?;
 
-        for (address, data) in genesis.alloc {
-            debug!("Setting data {:#?} for address {:x?}", data, address);
-            let basic = backend.basic(address);
+        if let Some(alloc) = genesis.alloc {
+            for (address, data) in alloc {
+                debug!("Setting data {:#?} for address {:x?}", data, address);
+                let basic = backend.basic(address);
 
-            let new_basic = Basic {
-                balance: data.balance,
-                ..basic
-            };
-            backend
-                .apply(
-                    address,
-                    new_basic,
-                    data.code,
-                    data.storage.unwrap_or_default(),
-                    false,
-                )
-                .expect("Could not set account data");
-            backend.commit();
+                let new_basic = Basic {
+                    balance: data.balance,
+                    ..basic
+                };
+                backend
+                    .apply(
+                        address,
+                        new_basic,
+                        data.code,
+                        data.storage.unwrap_or_default(),
+                        false,
+                    )
+                    .expect("Could not set account data");
+                backend.commit();
+            }
         }
 
         let state_root = backend.commit();