RLP encoding for EVM transactions

chain-evm/Cargo.toml

@@ -6,9 +6,13 @@ edition = "2021"
 [dependencies]
 imhamt = { path = "../imhamt" }
 chain-ser = { path = "../chain-ser" }
+chain-core = { path = "../chain-core" }
+typed-bytes = { path = "../typed-bytes" }
+base64 = { version = "0.13.0", default-features = false, features = ["alloc"] }
 blake2 = { version = "0.9.1", git = "https://github.com/near/near-blake2.git", rev = "736ff607cc8160af87ffa697c14ebef85050138f", default-features = false }
 bn = { package = "aurora-bn", version = "0.1.0", git = "https://github.com/aurora-is-near/aurora-bn.git", default-features = false, features = ["std"] }
 libsecp256k1 = { version = "0.7.0", default-features = false, features = ["static-context"] }
+secp256k1 = { version = "0.22.1", features = ["global-context", "rand-std", "recovery"] }
 num = { version = "0.4.0", default-features = false, features = ["alloc"] }
 ripemd = { version = "0.1", default-features = false }
 rlp = { version = "0.5.1", default-features = false }
@@ -20,6 +24,7 @@ byte-slice-cast = { version = "1.0", default-features = false }
 thiserror = "1.0"
 quickcheck = { version = "0.9", optional = true }
 evm = { version = "0.35.0" }
+ethereum = { version = "0.12.0" }
 ethereum-types = { version = "0.13.1", features = ["rlp"] }
 
 [dev-dependencies]

chain-evm/src/lib.rs

@@ -1,10 +1,14 @@
+pub use ethereum;
 pub use ethereum_types;
+pub use rlp;
 
 pub mod machine;
 mod precompiles;
 pub mod state;
+pub mod transaction;
+pub mod util;
 
 #[cfg(test)]
 mod tests;
 
-pub use machine::{Address, BlockGasLimit, Config, Environment, ExitError, GasLimit, GasPrice};
+pub use machine::{AccessList, Address, BlockGasLimit, Config, Environment, GasLimit, GasPrice};

chain-evm/src/machine.rs

@@ -22,6 +22,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use thiserror::Error;
 
 /// Export EVM types
+pub use ethereum::{AccessList, AccessListItem};
 pub use evm::backend::Log;
 pub use evm::ExitError;
 
@@ -267,24 +268,35 @@ where
     }
 }
 
+// Convenience function to convert AccessList types into
+// arguments used by the EVM transactions.
+fn convert_access_list_to_tuples_vec(access_list: AccessList) -> Vec<(Address, Vec<Key>)> {
+    access_list
+        .iter()
+        .map(|list_item| {
+            let AccessListItem {
+                address,
+                storage_keys,
+            } = list_item;
+            (*address, storage_keys.clone())
+        })
+        .collect()
+}
+
 /// Execute a CREATE transaction
 #[allow(clippy::too_many_arguments)]
+#[allow(clippy::boxed_local)]
 pub fn transact_create<State: EvmState>(
     vm: VirtualMachine<State>,
     value: U256,
     init_code: ByteCode,
-    access_list: Vec<(Address, Vec<Key>)>,
+    access_list: AccessList,
 ) -> Result<Vec<u8>, Error> {
     let caller = vm.origin;
     let gas_limit = vm.gas_limit;
+    let access_list = convert_access_list_to_tuples_vec(access_list);
     execute_transaction(vm, |executor| {
-        executor.transact_create(
-            caller,
-            value,
-            init_code.into(),
-            gas_limit,
-            access_list.clone(),
-        )
+        executor.transact_create(caller, value, init_code.to_vec(), gas_limit, access_list)
     })
 }
 
@@ -295,18 +307,19 @@ pub fn transact_create2<State: EvmState>(
     value: U256,
     init_code: ByteCode,
     salt: H256,
-    access_list: Vec<(Address, Vec<Key>)>,
+    access_list: AccessList,
 ) -> Result<Vec<u8>, Error> {
     let caller = vm.origin;
     let gas_limit = vm.gas_limit;
+    let access_list = convert_access_list_to_tuples_vec(access_list);
     execute_transaction(vm, |executor| {
         executor.transact_create2(
             caller,
             value,
             init_code.into(),
             salt,
             gas_limit,
-            access_list.clone(),
+            access_list,
         )
     })
 }
@@ -318,19 +331,13 @@ pub fn transact_call<State: EvmState>(
     address: Address,
     value: U256,
     data: ByteCode,
-    access_list: Vec<(Address, Vec<Key>)>,
+    access_list: AccessList,
 ) -> Result<Vec<u8>, Error> {
     let caller = vm.origin;
     let gas_limit = vm.gas_limit;
+    let access_list = convert_access_list_to_tuples_vec(access_list);
     execute_transaction(vm, |executor| {
-        executor.transact_call(
-            caller,
-            address,
-            value,
-            data.into(),
-            gas_limit,
-            access_list.clone(),
-        )
+        executor.transact_call(caller, address, value, data.into(), gas_limit, access_list)
     })
 }