CALLDATALOAD: bus-mapping and refactoring

bus-mapping/Cargo.toml

@@ -20,5 +20,6 @@ serde_json = "1.0.66"
 hex = "0.4.3"
 mock = { path = "../mock" }
 pretty_assertions = "1.0.0"
+rand = "0.8"
 tokio = { version = "1.13", features = ["macros"] }
 url = "2.2.2"

bus-mapping/src/evm/opcodes.rs

@@ -18,6 +18,7 @@ use log::warn;
 
 mod call;
 mod calldatacopy;
+mod calldataload;
 mod calldatasize;
 mod caller;
 mod callvalue;
@@ -39,6 +40,7 @@ mod swap;
 
 use call::Call;
 use calldatacopy::Calldatacopy;
+use calldataload::Calldataload;
 use calldatasize::Calldatasize;
 use caller::Caller;
 use callvalue::Callvalue;
@@ -118,7 +120,7 @@ fn fn_gen_associated_ops(opcode_id: &OpcodeId) -> FnGenAssociatedOps {
         OpcodeId::CALLER => Caller::gen_associated_ops,
         OpcodeId::CALLVALUE => Callvalue::gen_associated_ops,
         OpcodeId::CALLDATASIZE => Calldatasize::gen_associated_ops,
-        OpcodeId::CALLDATALOAD => StackOnlyOpcode::<1, 1>::gen_associated_ops,
+        OpcodeId::CALLDATALOAD => Calldataload::gen_associated_ops,
         OpcodeId::CALLDATACOPY => Calldatacopy::gen_associated_ops,
         // OpcodeId::CODESIZE => {},
         OpcodeId::GASPRICE => GasPrice::gen_associated_ops,

bus-mapping/src/evm/opcodes/calldatacopy.rs

@@ -188,19 +188,18 @@ mod calldatacopy_tests {
         operation::{CallContextField, CallContextOp, MemoryOp, StackOp, RW},
     };
     use eth_types::{
-        address, bytecode,
+        bytecode,
         evm_types::{OpcodeId, StackAddress},
         geth_types::GethData,
-        Address, ToWord, Word,
+        ToWord, Word,
     };
 
     use mock::test_ctx::{helpers::*, TestContext};
     use pretty_assertions::assert_eq;
 
     #[test]
     fn calldatacopy_opcode_internal() {
-        let addr_a = address!("0x000000000000000000000000000000000cafe00a");
-        let addr_b = address!("0x000000000000000000000000000000000cafe00b");
+        let (addr_a, addr_b) = (mock::MOCK_ACCOUNTS[0], mock::MOCK_ACCOUNTS[1]);
 
         // code B gets called by code A, so the call is an internal call.
         let dst_offset = 0x00usize;
@@ -246,13 +245,13 @@ mod calldatacopy_tests {
                 accs[0].address(addr_b).code(code_b);
                 accs[1].address(addr_a).code(code_a);
                 accs[2]
-                    .address(Address::random())
+                    .address(mock::MOCK_ACCOUNTS[2])
                     .balance(Word::from(1u64 << 30));
             },
             |mut txs, accs| {
                 txs[0].to(accs[1].address).from(accs[2].address);
             },
-            |block, _tx| block.number(0xcafeu64),
+            |block, _tx| block,
         )
         .unwrap()
         .into();
@@ -384,7 +383,7 @@ mod calldatacopy_tests {
             None,
             account_0_code_account_1_no_code(code),
             tx_from_1_to_0,
-            |block, _tx| block.number(0xcafeu64),
+            |block, _tx| block,
         )
         .unwrap()
         .into();