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

feat: replacing 1.3.3 test harness with circuit sequencer api #1382

Merged
merged 1 commit into from
Mar 7, 2024
Merged

feat: replacing 1.3.3 test harness with circuit sequencer api #1382

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
97 changes: 14 additions & 83 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/lib/l1_contract_interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ zksync_prover_interface = { path = "../prover_interface" }
# Used to serialize proof data
codegen = { git = "https://github.com/matter-labs/solidity_plonk_verifier.git", branch = "dev" }
# Used to calculate commitment for vk from the old L1 verifier contract (backward comatibility needs)
zkevm_test_harness_1_3_3 = { package = "zkevm_test_harness", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }

circuit_sequencer_api_1_3_3 = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
# Used to calculate the kzg commitment and proofs
zkevm_test_harness_1_4_2 = { package = "zkevm_test_harness", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2" }
sha2 = "0.10.8"
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ zk_evm_1_4_0 = { package = "zk_evm", git = "https://github.com/matter-labs/era-z
zk_evm_1_3_3 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", tag= "v1.3.3-rc2" }
zk_evm_1_3_1 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", tag= "v1.3.1-rc2" }

zkevm_test_harness_1_3_3 = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3", package = "zkevm_test_harness" }
circuit_sequencer_api_1_3_3 = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
zkevm_test_harness_1_4_0 = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", package = "zkevm_test_harness" }
zkevm_test_harness_1_4_1 = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.1", package = "zkevm_test_harness" }
zkevm_test_harness_1_4_2 = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2", package = "zkevm_test_harness" }
Expand Down
4 changes: 2 additions & 2 deletions core/lib/multivm/src/glue/types/vm/vm_block_result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries as sort_storage_access_queries_1_3_3;
use itertools::Itertools;
use zk_evm_1_3_1::aux_structures::LogQuery as LogQuery_1_3_1;
use zkevm_test_harness_1_3_3::witness::sort_storage_access::sort_storage_access_queries as sort_storage_access_queries_1_3_3;
use zksync_types::l2_to_l1_log::UserL2ToL1Log;

use crate::{
Expand Down Expand Up @@ -144,7 +144,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult> for crate::interface:
fn glue_from(value: crate::vm_1_3_2::vm_instance::VmBlockResult) -> Self {
let storage_log_queries = value.full_result.storage_log_queries.clone();
let deduplicated_storage_log_queries =
zkevm_test_harness_1_3_3::witness::sort_storage_access::sort_storage_access_queries(
circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries(
storage_log_queries.iter().map(|log| &log.log_query),
)
.1;
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_1_3_2/pubdata_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashMap;

use circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries;
use zk_evm_1_3_3::aux_structures::Timestamp;
use zkevm_test_harness_1_3_3::witness::sort_storage_access::sort_storage_access_queries;
use zksync_state::WriteStorage;
use zksync_types::{
event::{extract_long_l2_to_l1_messages, extract_published_bytecodes},
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_1_3_2/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::HashSet;

use zkevm_test_harness_1_3_3::witness::sort_storage_access::sort_storage_access_queries;
use circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries;
use zksync_state::{StoragePtr, WriteStorage};
use zksync_types::{
l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_1_3_2/vm_with_bootloader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::collections::HashMap;

use circuit_sequencer_api_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use itertools::Itertools;
use zk_evm_1_3_3::{
aux_structures::{MemoryPage, Timestamp},
Expand All @@ -11,7 +12,6 @@ use zk_evm_1_3_3::{
STARTING_TIMESTAMP,
},
};
use zkevm_test_harness_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zksync_contracts::BaseSystemContracts;
use zksync_state::WriteStorage;
use zksync_system_constants::MAX_L2_TX_GAS_LIMIT;
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_1_4_1/types/internals/vm_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use circuit_sequencer_api_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zk_evm_1_4_1::{
aux_structures::{MemoryPage, Timestamp},
block_properties::BlockProperties,
Expand All @@ -9,7 +10,6 @@ use zk_evm_1_4_1::{
STARTING_BASE_PAGE, STARTING_TIMESTAMP,
},
};
use zkevm_test_harness_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zksync_state::{StoragePtr, WriteStorage};
use zksync_system_constants::BOOTLOADER_ADDRESS;
use zksync_types::{block::MiniblockHasher, Address, MiniblockNumber};
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_boojum_integration/types/internals/vm_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use circuit_sequencer_api_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zk_evm_1_4_0::{
aux_structures::{MemoryPage, Timestamp},
block_properties::BlockProperties,
Expand All @@ -9,7 +10,6 @@ use zk_evm_1_4_0::{
STARTING_BASE_PAGE, STARTING_TIMESTAMP,
},
};
use zkevm_test_harness_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zksync_state::{StoragePtr, WriteStorage};
use zksync_system_constants::BOOTLOADER_ADDRESS;
use zksync_types::{block::MiniblockHasher, Address, MiniblockNumber};
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use circuit_sequencer_api_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zk_evm_1_4_1::{
aux_structures::{MemoryPage, Timestamp},
block_properties::BlockProperties,
Expand All @@ -9,7 +10,6 @@ use zk_evm_1_4_1::{
STARTING_BASE_PAGE, STARTING_TIMESTAMP,
},
};
use zkevm_test_harness_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zksync_state::{StoragePtr, WriteStorage};
use zksync_system_constants::BOOTLOADER_ADDRESS;
use zksync_types::{block::MiniblockHasher, Address, MiniblockNumber};
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_m5/pubdata_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::collections::HashMap;

use circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries;
use itertools::Itertools;
use zk_evm_1_3_1::aux_structures::{LogQuery, Timestamp};
use zkevm_test_harness_1_3_3::witness::sort_storage_access::sort_storage_access_queries;
use zksync_types::{
event::{extract_long_l2_to_l1_messages, extract_published_bytecodes},
StorageKey, PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS,
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_m5/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries;
use itertools::Itertools;
use zk_evm_1_3_1::aux_structures::LogQuery;
use zkevm_test_harness_1_3_3::witness::sort_storage_access::sort_storage_access_queries;
use zksync_state::StoragePtr;
use zksync_types::{
l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_m5/vm_with_bootloader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::collections::HashMap;

use circuit_sequencer_api_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zk_evm_1_3_1::{
abstractions::{MAX_HEAP_PAGE_SIZE_IN_WORDS, MAX_MEMORY_BYTES},
aux_structures::{MemoryPage, Timestamp},
Expand All @@ -10,7 +11,6 @@ use zk_evm_1_3_1::{
BOOTLOADER_CALLDATA_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP,
},
};
use zkevm_test_harness_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zksync_contracts::BaseSystemContracts;
use zksync_system_constants::MAX_L2_TX_GAS_LIMIT;
use zksync_types::{
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_m6/pubdata_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::collections::HashMap;

use circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries;
use itertools::Itertools;
use zk_evm_1_3_1::aux_structures::{LogQuery, Timestamp};
use zkevm_test_harness_1_3_3::witness::sort_storage_access::sort_storage_access_queries;
use zksync_types::{
event::{extract_long_l2_to_l1_messages, extract_published_bytecodes},
StorageKey, PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS,
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_m6/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::collections::HashSet;

use circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries;
use itertools::Itertools;
use zk_evm_1_3_1::aux_structures::LogQuery;
use zkevm_test_harness_1_3_3::witness::sort_storage_access::sort_storage_access_queries;
use zksync_state::StoragePtr;
use zksync_types::{
l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_m6/vm_with_bootloader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::collections::HashMap;

use circuit_sequencer_api_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zk_evm_1_3_1::{
abstractions::{MAX_HEAP_PAGE_SIZE_IN_WORDS, MAX_MEMORY_BYTES},
aux_structures::{MemoryPage, Timestamp},
Expand All @@ -10,7 +11,6 @@ use zk_evm_1_3_1::{
BOOTLOADER_CALLDATA_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP,
},
};
use zkevm_test_harness_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zksync_contracts::BaseSystemContracts;
use zksync_system_constants::MAX_L2_TX_GAS_LIMIT;
use zksync_types::{
Expand Down
2 changes: 1 addition & 1 deletion core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/vm_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use circuit_sequencer_api_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zk_evm_1_3_3::{
aux_structures::{MemoryPage, Timestamp},
block_properties::BlockProperties,
Expand All @@ -9,7 +10,6 @@ use zk_evm_1_3_3::{
STARTING_BASE_PAGE, STARTING_TIMESTAMP,
},
};
use zkevm_test_harness_1_3_3::INITIAL_MONOTONIC_CYCLE_COUNTER;
use zksync_state::{StoragePtr, WriteStorage};
use zksync_system_constants::BOOTLOADER_ADDRESS;
use zksync_types::{block::MiniblockHasher, Address, MiniblockNumber};
Expand Down
Loading
Loading