Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

fix sender_nonce vs tx_nonce handling inside begin tx #731

Merged
merged 1 commit into from
Aug 7, 2023
Merged

fix sender_nonce vs tx_nonce handling inside begin tx #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions bus-mapping/src/evm/opcodes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,13 +547,13 @@ pub fn gen_begin_tx_ops(
}

// Increase caller's nonce
let mut nonce_prev = state.sdb.get_nonce(&caller_address);
debug_assert!(nonce_prev <= state.tx.nonce);
while nonce_prev < state.tx.nonce {
state.sdb.increase_nonce(&caller_address);
nonce_prev = state.sdb.get_nonce(&caller_address);
log::warn!("[debug] increase nonce to {}", nonce_prev);
}
let nonce_prev = state.sdb.get_nonce(&caller_address);
//debug_assert!(nonce_prev <= state.tx.nonce);
//while nonce_prev < state.tx.nonce {
// state.sdb.increase_nonce(&caller_address);
// nonce_prev = state.sdb.get_nonce(&caller_address);
// log::warn!("[debug] increase nonce to {}", nonce_prev);
//}
state.account_write(
&mut exec_step,
caller_address,
Expand Down
78 changes: 58 additions & 20 deletions zkevm-circuits/src/evm_circuit/execution/begin_tx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ use crate::{
witness::{Block, Call, ExecStep, Transaction},
},
table::{
AccountFieldTag, BlockContextFieldTag, CallContextFieldTag, TxFieldTag as TxContextFieldTag,
AccountFieldTag, BlockContextFieldTag, CallContextFieldTag, RwTableTag,
TxFieldTag as TxContextFieldTag,
},
};
use bus_mapping::circuit_input_builder::CopyDataType;
Expand All @@ -42,6 +43,7 @@ use gadgets::util::select;
#[derive(Clone, Debug)]
pub(crate) struct BeginTxGadget<F> {
tx_id: Cell<F>,
sender_nonce: Cell<F>,
tx_nonce: Cell<F>,
tx_gas: Cell<F>,
tx_gas_price: Word<F>,
Expand Down Expand Up @@ -100,6 +102,7 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {

let tx_id = cb.query_cell();

let sender_nonce = cb.query_cell();
let [tx_nonce, tx_gas, tx_caller_address, tx_callee_address, tx_is_create, tx_call_data_length, tx_call_data_gas_cost, tx_data_gas_cost] =
[
TxContextFieldTag::Nonce,
Expand All @@ -115,6 +118,11 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {

let tx_l1_msg = TxL1MsgGadget::construct(cb, tx_id.expr(), tx_caller_address.expr());
let tx_l1_fee = cb.condition(not::expr(tx_l1_msg.is_l1_msg()), |cb| {
cb.require_equal(
"tx.nonce == sender.nonce",
tx_nonce.expr(),
sender_nonce.expr(),
);
TxL1FeeGadget::construct(cb, tx_id.expr(), tx_data_gas_cost.expr())
});
cb.condition(tx_l1_msg.is_l1_msg(), |cb| {
Expand Down Expand Up @@ -181,8 +189,8 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
cb.account_write(
tx_caller_address.expr(),
AccountFieldTag::Nonce,
tx_nonce.expr() + 1.expr(),
tx_nonce.expr(),
sender_nonce.expr() + 1.expr(),
sender_nonce.expr(),
None,
); // rwc_delta += 1

Expand Down Expand Up @@ -654,6 +662,7 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
Self {
tx_id,
tx_nonce,
sender_nonce,
tx_gas,
tx_gas_price,
mul_gas_fee_by_gas,
Expand Down Expand Up @@ -720,26 +729,53 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
self.tx_l1_msg
.assign(region, offset, tx.tx_type, caller_code_hash)?;

rws.offset_add(
if tx.tx_type.is_l1_msg() {
if caller_code_hash.is_zero() {
assert_eq!(
tx.nonce, 0,
"unexpected nonce {} when caller is not existed (must be 0)",
tx.nonce
);
if cfg!(feature = "scroll") {
10
} else {
9
}
////////////// RWS ////////////////
// if L1:
// CodeHash
// if empty:
// CodeHash
// if scroll:
// KeccakCodeHash
// else:
// 3 l1 fee rw
// TxId
// RwCounterEndOfReversion
// IsPersistent
// IsSuccess
// Nonce
// Precompiles
// caller addr
// callee addr
// coinbase
rws.offset_add(if tx.tx_type.is_l1_msg() {
if caller_code_hash.is_zero() {
assert_eq!(
tx.nonce, 0,
"unexpected nonce {} when caller is not existed (must be 0)",
tx.nonce
);
if cfg!(feature = "scroll") {
2
} else {
8
1
}
} else {
10
} + PRECOMPILE_COUNT,
);
0
}
} else {
3
});
let rw = rws.next();
debug_assert_eq!(rw.tag(), RwTableTag::CallContext);
debug_assert_eq!(rw.field_tag(), Some(CallContextFieldTag::TxId as u64));
rws.offset_add(3);

let rw = rws.next();
debug_assert_eq!(rw.tag(), RwTableTag::Account);
debug_assert_eq!(rw.field_tag(), Some(AccountFieldTag::Nonce as u64));
let nonce_rw = rw.account_nonce_pair();

rws.offset_add(PRECOMPILE_COUNT + 2);

#[cfg(feature = "shanghai")]
let is_coinbase_warm = rws.next().tx_access_list_value_pair().1;
Expand Down Expand Up @@ -778,6 +814,8 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
.assign(region, offset, Value::known(F::from(tx.id as u64)))?;
self.tx_nonce
.assign(region, offset, Value::known(F::from(tx.nonce)))?;
self.sender_nonce
.assign(region, offset, Value::known(F::from(nonce_rw.1.as_u64())))?;
self.tx_gas
.assign(region, offset, Value::known(F::from(tx.gas)))?;
self.tx_gas_price
Expand Down
4 changes: 4 additions & 0 deletions zkevm-circuits/src/evm_circuit/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,10 @@ impl<'a> StepRws<'a> {
}
/// Increment the step rw operation offset by `offset`.
pub(crate) fn offset_add(&mut self, offset: usize) {
self.offset += offset
}
/// Set the step rw operation offset by `offset`.
pub(crate) fn offset_set(&mut self, offset: usize) {
self.offset = offset
}
/// Return the next rw operation from the step.
Expand Down