remove primitive_types dep (#783)

Author: Mr-Leshiy

chain-evm/Cargo.toml

@@ -22,17 +22,8 @@ hex = { version = "0.4", default-features = false, features = ["alloc"] }
 byte-slice-cast = { version = "1.0", default-features = false }
 thiserror = "1.0"
 quickcheck = { version = "0.9", optional = true }
-
-[dependencies.evm]
-version = "0.34.0"
-
-[dependencies.primitive-types]
-version = ">= 0.10, <= 0.11"
-features = ["rlp"]
-
-[dependencies.ethereum-types]
-version = "0.13.1"
-features = ["rlp"]
+evm = { version = "0.34.0" }
+ethereum-types = { version = "0.13.1", features = ["rlp"] }
 
 [dev-dependencies]
 rand = "0.7.3"

chain-evm/src/lib.rs

@@ -1,4 +1,4 @@
-pub use primitive_types;
+pub use ethereum_types;
 
 pub mod machine;
 mod precompiles;

chain-evm/src/machine.rs

@@ -8,12 +8,12 @@
 //! ## Handler <- EVM Context Handler
 //! ## StackState<'config>
 //!
+use ethereum_types::{H160, H256, U256};
 use evm::{
     backend::{Backend, Basic},
     executor::stack::{Accessed, StackExecutor, StackState, StackSubstateMetadata},
     Context, ExitError, ExitFatal, ExitReason, ExitRevert, Transfer,
 };
-use primitive_types::{H160, H256, U256};
 use std::collections::{BTreeMap, BTreeSet};
 
 use thiserror::Error;
@@ -133,7 +133,7 @@ pub trait EvmState {
     where
         F: FnOnce(Account) -> Option<Account>;
 
-    fn update_logs(&mut self, block_hash: H256, logs: Vec<Log>);
+    fn update_logs(&mut self, block_hash: BlockHash, logs: Vec<Log>);
 }
 
 struct VirtualMachineSubstate<'a> {

chain-evm/src/precompiles/prelude.rs

@@ -1,5 +1,5 @@
 pub use crate::Address;
-pub use primitive_types::{H160, H256, U256};
+pub use ethereum_types::{H160, H256, U256};
 pub use std::collections::BTreeMap;
 pub use std::marker::PhantomData;
 pub use std::mem;

chain-evm/src/state/account.rs

@@ -2,8 +2,7 @@ use crate::{
     state::{storage::Storage, trie::Trie, Error},
     Address,
 };
-
-use primitive_types::U256;
+use ethereum_types::U256;
 
 pub type Nonce = U256;
 

chain-evm/src/state/storage.rs

@@ -1,6 +1,6 @@
 use crate::state::trie::Trie;
 
-use primitive_types::H256;
+use ethereum_types::H256;
 
 /// Representation of a storage key. Fixed-size uninterpreted hash type with 32 bytes (256 bits) size.
 pub type Key = H256;

chain-evm/src/tests.rs

@@ -1,8 +1,8 @@
 use crate::machine::test::TestEvmState;
 use crate::machine::{transact_call, VirtualMachine};
 use crate::{state::Account, Config};
+use ethereum_types::{H160, U256};
 use evm_test_suite::{AccountState, BlockHeader, CallTransaction, NetworkType};
-use primitive_types::{H160, U256};
 use std::collections::BTreeSet;
 
 struct TestEvmLedger {

chain-impl-mockchain/src/evm/mod.rs

@@ -5,7 +5,7 @@ use chain_core::{
 };
 #[cfg(feature = "evm")]
 use chain_evm::{
-    primitive_types,
+    ethereum_types::{H256, U256},
     state::{ByteCode, Key},
 };
 use typed_bytes::ByteBuilder;
@@ -27,25 +27,25 @@ pub enum EvmTransaction {
     #[cfg(feature = "evm")]
     Create {
         caller: Address,
-        value: primitive_types::U256,
+        value: U256,
         init_code: ByteCode,
         gas_limit: u64,
         access_list: Vec<(Address, Vec<Key>)>,
     },
     #[cfg(feature = "evm")]
     Create2 {
         caller: Address,
-        value: primitive_types::U256,
+        value: U256,
         init_code: ByteCode,
-        salt: primitive_types::H256,
+        salt: H256,
         gas_limit: u64,
         access_list: Vec<(Address, Vec<Key>)>,
     },
     #[cfg(feature = "evm")]
     Call {
         caller: Address,
         address: Address,
-        value: primitive_types::U256,
+        value: U256,
         data: ByteCode,
         gas_limit: u64,
         access_list: Vec<(Address, Vec<Key>)>,
@@ -120,24 +120,21 @@ pub fn serialize_address<T>(bb: ByteBuilder<T>, caller: &Address) -> ByteBuilder
 
 #[cfg(feature = "evm")]
 /// Serializes U256 types as fixed bytes.
-pub fn serialize_u256<T>(bb: ByteBuilder<T>, value: &primitive_types::U256) -> ByteBuilder<T> {
+pub fn serialize_u256<T>(bb: ByteBuilder<T>, value: &U256) -> ByteBuilder<T> {
     let mut value_bytes = [0u8; 32];
     value.to_big_endian(&mut value_bytes);
     bb.bytes(&value_bytes)
 }
 
 #[cfg(feature = "evm")]
 /// Serializes H256 types as fixed bytes.
-pub fn serialize_h256<T>(bb: ByteBuilder<T>, value: &primitive_types::H256) -> ByteBuilder<T> {
+pub fn serialize_h256<T>(bb: ByteBuilder<T>, value: &H256) -> ByteBuilder<T> {
     bb.bytes(value.as_fixed_bytes())
 }
 
 #[cfg(feature = "evm")]
 /// Serializes H256 types as fixed bytes.
-pub fn serialize_h256_list<T>(
-    bb: ByteBuilder<T>,
-    value: &[primitive_types::H256],
-) -> ByteBuilder<T> {
+pub fn serialize_h256_list<T>(bb: ByteBuilder<T>, value: &[H256]) -> ByteBuilder<T> {
     bb.u64(value.len() as u64)
         .fold(value.iter(), serialize_h256)
 }
@@ -174,13 +171,13 @@ fn read_address(codec: &mut Codec<&[u8]>) -> Result<Address, ReadError> {
 }
 
 #[cfg(feature = "evm")]
-fn read_h256(codec: &mut Codec<&[u8]>) -> Result<primitive_types::H256, ReadError> {
-    Ok(primitive_types::H256::from_slice(codec.get_slice(32)?))
+fn read_h256(codec: &mut Codec<&[u8]>) -> Result<H256, ReadError> {
+    Ok(H256::from_slice(codec.get_slice(32)?))
 }
 
 #[cfg(feature = "evm")]
-pub fn read_u256(codec: &mut Codec<&[u8]>) -> Result<primitive_types::U256, ReadError> {
-    Ok(primitive_types::U256::from(codec.get_slice(32)?))
+pub fn read_u256(codec: &mut Codec<&[u8]>) -> Result<U256, ReadError> {
+    Ok(U256::from(codec.get_slice(32)?))
 }
 
 #[cfg(feature = "evm")]
@@ -304,7 +301,7 @@ impl Payload for EvmTransaction {
 #[cfg(all(any(test, feature = "property-test-api"), feature = "evm"))]
 mod test {
     use super::*;
-    use chain_evm::primitive_types::{H160, H256};
+    use chain_evm::ethereum_types::H160;
     use quickcheck::Arbitrary;
 
     impl Arbitrary for EvmTransaction {

chain-impl-mockchain/src/ledger/evm.rs

@@ -7,7 +7,6 @@ use chain_evm::{
         transact_call, transact_create, transact_create2, BlockHash, BlockNumber, BlockTimestamp,
         Config, Environment, EvmState, Log, VirtualMachine,
     },
-    primitive_types::{H256, U256},
     state::{Account, AccountTrie, LogsState},
     Address,
 };
@@ -46,7 +45,7 @@ impl EvmState for super::Ledger {
         self.evm.accounts = self.evm.accounts.clone().modify_account(address, f);
     }
 
-    fn update_logs(&mut self, block_hash: H256, logs: Vec<Log>) {
+    fn update_logs(&mut self, block_hash: BlockHash, logs: Vec<Log>) {
         self.evm.logs.put(block_hash, logs);
     }
 }
@@ -186,12 +185,10 @@ impl Ledger {
     pub(crate) fn stats(&self) -> String {
         let Ledger { accounts, .. } = self;
         let mut count = 0;
-        let mut total = U256::zero();
-        for (_, account) in accounts {
+        for (_, _) in accounts {
             count += 1;
-            total += account.balance.into();
         }
-        format!("EVM accounts: #{} Total={:?}", count, total)
+        format!("EVM accounts: #{}", count)
     }
 
     pub(crate) fn info_eq(&self, other: &Self) -> String {