diff --git a/zkevm-circuits/src/rlp_circuit.rs b/zkevm-circuits/src/rlp_circuit.rs index 020a436f..61d5bfeb 100644 --- a/zkevm-circuits/src/rlp_circuit.rs +++ b/zkevm-circuits/src/rlp_circuit.rs @@ -401,6 +401,8 @@ impl RlpCircuitConfig { is_sig_r(meta), is_sig_s(meta), #[cfg(feature = "kroma")] + is_mint(meta), + #[cfg(feature = "kroma")] is_source_hash(meta), ]); @@ -1209,7 +1211,7 @@ impl RlpCircuitConfig { cb.condition( and::expr(vec![ not::expr(meta.query_advice(rlp_table.data_type, Rotation::cur())), - not::expr(is_tag_next_padding), + not::expr(is_tag_next_padding.clone()), ]), |cb| { cb.require_equal( @@ -1222,6 +1224,7 @@ impl RlpCircuitConfig { meta.query_advice(rlp_table.data_type, Rotation::next()), RlpDataType::TxHash.expr(), ); + #[cfg(not(feature = "kroma"))] cb.require_equal( "TxHash rows' first row is Prefix again", meta.query_advice(rlp_table.tag, Rotation::next()), @@ -1235,6 +1238,22 @@ impl RlpCircuitConfig { }, ); + #[cfg(feature = "kroma")] + cb.condition( + and::expr(vec![ + not::expr(meta.query_advice(rlp_table.data_type, Rotation::cur())), + not::expr(is_tag_next_padding), + not::expr(meta.query_advice(is_deposit_tx, Rotation::cur())), + ]), + |cb| { + cb.require_equal( + "TxHash rows' first row is Prefix again", + meta.query_advice(rlp_table.tag, Rotation::next()), + RlpTxTag::Prefix.expr(), + ); + }, + ); + cb.gate(and::expr(vec![ meta.query_fixed(q_usable, Rotation::cur()), meta.query_advice(is_last, Rotation::cur()), diff --git a/zkevm-circuits/src/version.rs b/zkevm-circuits/src/version.rs index 1521d7e3..f6b802d7 100644 --- a/zkevm-circuits/src/version.rs +++ b/zkevm-circuits/src/version.rs @@ -3,7 +3,7 @@ /// Major version pub const MAJOR: u32 = 0; /// Minor version -pub const MINOR: u32 = 1; +pub const MINOR: u32 = 2; /// Patch version pub const PATCH: u32 = 0; @@ -18,10 +18,10 @@ mod tests { #[test] fn test_version_string() { - let expected = "0.1.0"; + let expected = "0.2.0"; assert_eq!(version::MAJOR, 0, "wrong version"); - assert_eq!(version::MINOR, 1, "wrong version"); + assert_eq!(version::MINOR, 2, "wrong version"); assert_eq!(version::PATCH, 0, "wrong version"); assert_eq!(version::as_string(), expected, "wrong version"); }