fix calldatasize inside create (#753)

* fix calldatasize inside create

* fix call.call_data_len

* testing

Author: lispc

bus-mapping/src/circuit_input_builder/transaction.rs

@@ -93,7 +93,14 @@ impl TransactionContext {
             reversion_groups: Vec::new(),
             l1_fee: geth_trace.l1_fee,
         };
-        tx_ctx.push_call_ctx(0, eth_tx.input.to_vec());
+        tx_ctx.push_call_ctx(
+            0,
+            if eth_tx.to.is_none() {
+                Vec::new()
+            } else {
+                eth_tx.input.to_vec()
+            },
+        );
 
         Ok(tx_ctx)
     }
@@ -344,7 +351,7 @@ impl Transaction {
                 code_hash,
                 depth: 1,
                 value: eth_tx.value,
-                call_data_length: eth_tx.input.len().try_into().unwrap(),
+                call_data_length: 0,
                 ..Default::default()
             }
         };

bus-mapping/src/evm/opcodes.rs

@@ -754,10 +754,7 @@ pub fn gen_begin_tx_ops(
                     CallContextField::CallDataOffset,
                     call.call_data_offset.into(),
                 ),
-                (
-                    CallContextField::CallDataLength,
-                    state.tx.input.len().into(),
-                ),
+                (CallContextField::CallDataLength, 0.into()),
                 (CallContextField::Value, call.value),
                 (CallContextField::IsStatic, (call.is_static as usize).into()),
                 (CallContextField::LastCalleeId, 0.into()),

zkevm-circuits/src/evm_circuit/execution/begin_tx.rs

@@ -412,10 +412,7 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
                     call_callee_address.expr(),
                 ),
                 (CallContextFieldTag::CallDataOffset, 0.expr()),
-                (
-                    CallContextFieldTag::CallDataLength,
-                    tx_call_data_length.expr(),
-                ),
+                (CallContextFieldTag::CallDataLength, 0.expr()),
                 (CallContextFieldTag::Value, tx_value.expr()),
                 (CallContextFieldTag::IsStatic, 0.expr()),
                 (CallContextFieldTag::LastCalleeId, 0.expr()),
@@ -1236,6 +1233,7 @@ mod test {
             PUSH1(0)
             MSTORE
 
+            CALLDATASIZE
             PUSH1(2)
             PUSH1(0)
             RETURN

zkevm-circuits/src/evm_circuit/execution/calldatacopy.rs

@@ -194,7 +194,14 @@ impl<F: Field> ExecutionGadget<F> for CallDataCopyGadget<F> {
 
         // Call data length and call data offset
         let (call_data_length, call_data_offset) = if call.is_root {
-            (tx.call_data_length as u64, 0_u64)
+            (
+                if tx.is_create {
+                    0
+                } else {
+                    tx.call_data_length as u64
+                },
+                0_u64,
+            )
         } else {
             (call.call_data_length, call.call_data_offset)
         };

zkevm-circuits/src/evm_circuit/execution/create.rs

@@ -835,6 +835,7 @@ mod test {
             PUSH10(memory_value)
             PUSH1(memory_address)
             MSTORE
+            CALLDATASIZE
             PUSH2(5)
             PUSH2(32u64 - u64::try_from(memory_bytes.len()).unwrap())
         };