Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(zkevm_circuits): patch 0.140.3 to compile with newest nightly rust #76

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −10
Open

fix(zkevm_circuits): patch 0.140.3 to compile with newest nightly rust #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0756ea
chore: Release 0.140.2
popzxc Sep 9, 2024
1ef2d28
fix(zkevm_circuits): make it compile with newest nightly rust
RomanBrodetski Nov 27, 2024
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
2 changes: 1 addition & 1 deletion crates/circuit_encodings/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "circuit_encodings"
version = "0.140.1"
version = "0.140.3"
edition = "2021"
authors = ["The Matter Labs Team <[email protected]>"]
homepage = "https://zksync.io/"
Expand Down
4 changes: 2 additions & 2 deletions crates/circuit_sequencer_api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "circuit_sequencer_api"
version = "0.140.1"
version = "0.140.3"
edition = "2021"
authors = ["The Matter Labs Team <[email protected]>"]
homepage = "https://zksync.io/"
Expand All @@ -16,7 +16,7 @@ description = "ZKsync Era circuits API for sequencer"
circuit_encodings = { version = "0.140", path = "../circuit_encodings" } # Not pinned, because it's an old version used only by MultiVM

zk_evm = { version = "0.140", path = "../zk_evm" } # Not pinned, because it's an old version used only by MultiVM
bellman = { package = "bellman_ce", version = "0" } # Not pinned, because it's an old version used only by MultiVM
bellman = { package = "zksync_bellman", version = "0" } # Not pinned, because it's an old version used only by MultiVM


derivative = "2.2"
Expand Down
4 changes: 2 additions & 2 deletions crates/zkevm_circuits/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zkevm_circuits"
version = "0.140.2"
version = "0.140.3"
edition = "2021"
authors = ["The Matter Labs Team <[email protected]>"]
homepage = "https://zksync.io/"
Expand Down Expand Up @@ -30,7 +30,7 @@ hex = "0.4"
seq-macro = "0.3"

zkevm_opcode_defs = { version = "=0.132.0", path = "../zkevm_opcode_defs" }
cs_derive = "0" # Version is not pinned, since it's an old dependency for MultiVM only.
cs_derive = { version = "0", package = "zksync_cs_derive" } # Version is not pinned, since it's an old dependency for MultiVM only.
boojum = "0" # Version is not pinned, since it's an old dependency for MultiVM only.

[features]
Expand Down
2 changes: 1 addition & 1 deletion crates/zkevm_circuits/src/main_vm/opcodes/call_ret.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ pub(crate) fn apply_calls_and_ret<
let is_call_like = <bool as WitnessCastable<F, F>>::cast_from_source(inputs[1]);
let new_depth = <u32 as WitnessCastable<F, F>>::cast_from_source(inputs[2]);

let mut query =
let mut query: [F; <ExecutionContextRecord<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN] =
[F::ZERO; <ExecutionContextRecord<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN];
query.copy_from_slice(&inputs[3..]);
use crate::base_structures::vm_state::saved_context::ExecutionContextRecordWitness;
Expand Down
2 changes: 1 addition & 1 deletion crates/zkevm_circuits/src/main_vm/opcodes/call_ret_impl/far_call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ where
let execute = <bool as WitnessCastable<F, F>>::cast_from_source(inputs[0]);
let current_depth = <u32 as WitnessCastable<F, F>>::cast_from_source(inputs[1]);

let mut query =
let mut query: [F; <ExecutionContextRecord<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN] =
[F::ZERO; <ExecutionContextRecord<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN];
query.copy_from_slice(&inputs[2..]);
let query: ExecutionContextRecordWitness<F> =
Expand Down
6 changes: 3 additions & 3 deletions crates/zkevm_circuits/src/main_vm/opcodes/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ pub(crate) fn apply_log<
move |inputs: &[F]| {
let is_write = <bool as WitnessCastable<F, F>>::cast_from_source(inputs[0]);
let execute = <bool as WitnessCastable<F, F>>::cast_from_source(inputs[1]);
let mut log_query =
let mut log_query: [F; <LogQuery<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN] =
[F::ZERO; <LogQuery<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN];
log_query.copy_from_slice(&inputs[2..]);
let log_query: LogQueryWitness<F> =
Expand Down Expand Up @@ -291,7 +291,7 @@ pub(crate) fn apply_log<
move |inputs: &[F]| {
let is_storage = <bool as WitnessCastable<F, F>>::cast_from_source(inputs[0]);
let execute = <bool as WitnessCastable<F, F>>::cast_from_source(inputs[1]);
let mut log_query =
let mut log_query: [F; <LogQuery<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN] =
[F::ZERO; <LogQuery<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN];
log_query.copy_from_slice(&inputs[2..]);
let log_query: LogQueryWitness<F> =
Expand Down Expand Up @@ -342,7 +342,7 @@ pub(crate) fn apply_log<
cs,
move |inputs: &[F]| {
let execute_rollback = <bool as WitnessCastable<F, F>>::cast_from_source(inputs[0]);
let mut log_query =
let mut log_query: [F; <LogQuery<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN] =
[F::ZERO; <LogQuery<F> as CSAllocatableExt<F>>::INTERNAL_STRUCT_LEN];
log_query.copy_from_slice(&inputs[1..]);
let log_query: LogQueryWitness<F> =
Expand Down