Build EVM Environment from payload

input-output-hk · Oct 26, 2021 · 4a20866 · 4a20866
1 parent 85c71ec
commit 4a20866
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/chain-evm/src/machine.rs b/chain-evm/src/machine.rs
@@ -62,6 +62,9 @@ pub type BlockGasLimit = U256;
 /// A block's origin
 pub type Origin = H160;
 
+/// A block's coinbase
+pub type BlockCoinBase = H160;
+
 /// Gas quantity integer for EVM operations.
 pub type Gas = U256;
 

diff --git a/chain-impl-mockchain/src/config.rs b/chain-impl-mockchain/src/config.rs
@@ -14,7 +14,7 @@ use chain_core::packer::Codec;
 use chain_core::property;
 use chain_crypto::PublicKey;
 #[cfg(feature = "evm")]
-use chain_evm::machine::{Config, Environment};
+use chain_evm::machine::{BlockCoinBase, BlockHash, Config, Environment, Origin};
 #[cfg(feature = "evm")]
 use std::convert::TryInto;
 use std::{
@@ -993,8 +993,40 @@ impl ConfigParamVariant for EvmConfigParams {
             has_ext_code_hash,
             estimate,
         };
+
         // Read Enviroment
-        todo!();
+        let gas_price = rb.get_slice(32)?.into();
+        let origin = Origin::from_slice(rb.get_slice(20)?);
+        let chain_id = rb.get_slice(32)?.into();
+
+        let block_hashes = match rb.get_u64()? {
+            0 => Vec::new(),
+            n => (0..n)
+                .map(|_| BlockHash::from_slice(rb.get_slice(32).unwrap()))
+                .collect(),
+        };
+        let block_number = rb.get_slice(32)?.into();
+        let block_coinbase = BlockCoinBase::from_slice(rb.get_slice(20)?);
+        let block_timestamp = rb.get_slice(32)?.into();
+        let block_difficulty = rb.get_slice(32)?.into();
+        let block_gas_limit = rb.get_slice(32)?.into();
+
+        let environment = Environment {
+            gas_price,
+            origin,
+            chain_id,
+            block_hashes,
+            block_number,
+            block_coinbase,
+            block_timestamp,
+            block_difficulty,
+            block_gas_limit,
+        };
+
+        Ok(EvmConfigParams {
+            config: Box::new(config),
+            environment,
+        })
     }
 }
 

diff --git a/chain-impl-mockchain/src/testing/ledger.rs b/chain-impl-mockchain/src/testing/ledger.rs
@@ -34,8 +34,8 @@ use chain_crypto::*;
 #[cfg(feature = "evm")]
 use chain_evm::{
     machine::{
-        BlockDifficulty, BlockHashes, BlockNumber, BlockTimestamp, ChainId, Config, Environment,
-        GasLimit, GasPrice, Origin,
+        BlockCoinBase, BlockDifficulty, BlockHashes, BlockNumber, BlockTimestamp, ChainId, Config,
+        Environment, GasLimit, GasPrice, Origin,
     },
     state::AccountAddress,
 };
@@ -122,7 +122,7 @@ impl ConfigBuilder {
                     chain_id: ChainId::zero(),
                     block_hashes: BlockHashes::new(),
                     block_number: BlockNumber::zero(),
-                    block_coinbase: AccountAddress::zero(),
+                    block_coinbase: BlockCoinBase::zero(),
                     block_timestamp: BlockTimestamp::now(),
                     block_difficulty: BlockDifficulty::from(131_072),
                     // FIXME: need to set a real limit