Skip to content

Commit

Permalink
fix: Compression setup generation (#63)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Artemka374
Artemka374 authored Nov 6, 2024
1 parent 47266d1 commit a17c0c0
Showing 1 changed file with 19 additions and 18 deletions.
37 changes: 19 additions & 18 deletions crates/zkevm_test_harness/src/compute_setups/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ use circuit_definitions::circuit_definitions::aux_layer::compression::{
CompressionMode5ForWrapperCircuit, ProofCompressionFunction,
};
use circuit_definitions::circuit_definitions::aux_layer::compression_modes::{
CompressionMode1, CompressionMode2, CompressionMode3, CompressionMode4, CompressionMode5,
CompressionMode1, CompressionMode2, CompressionMode3, CompressionMode4,
};
use circuit_definitions::circuit_definitions::aux_layer::{
ZkSyncCompressionForWrapperCircuit, ZkSyncCompressionLayerCircuit,
};
use circuit_definitions::circuit_definitions::base_layer::ZkSyncBaseLayerCircuit;
use circuit_definitions::circuit_definitions::recursion_layer::leaf_layer::ZkSyncLeafLayerRecursiveCircuit;
use circuit_definitions::circuit_definitions::recursion_layer::{
base_circuit_type_into_recursive_leaf_circuit_type, ZkSyncRecursionLayerStorageType,
ZkSyncRecursiveLayerCircuit, RECURSION_ARITY, SCHEDULER_CAPACITY,
base_circuit_type_into_recursive_leaf_circuit_type, circuit_def,
ZkSyncRecursionLayerStorageType, ZkSyncRecursiveLayerCircuit, RECURSION_ARITY,
SCHEDULER_CAPACITY,
};
use circuit_definitions::circuit_definitions::ZkSyncUniformCircuitInstance;
use circuit_definitions::recursion_layer_proof_config;
Expand Down Expand Up @@ -46,7 +47,7 @@ fn get_compression_circuits(
ZkSyncCompressionLayerCircuit::CompressionMode1Circuit(CompressionMode1Circuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode1::proof_config_for_compression_step(),
proof_config: recursion_layer_proof_config(),
// recursion circuit 1 is scheduler
verification_key: source.get_recursion_layer_vk(1).unwrap().into_inner(),
_marker: Default::default(),
Expand All @@ -57,7 +58,7 @@ fn get_compression_circuits(
ZkSyncCompressionLayerCircuit::CompressionMode2Circuit(CompressionMode2Circuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode2::proof_config_for_compression_step(),
proof_config: CompressionMode1::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(1).unwrap().into_inner(),
_marker: Default::default(),
},
Expand All @@ -67,7 +68,7 @@ fn get_compression_circuits(
ZkSyncCompressionLayerCircuit::CompressionMode3Circuit(CompressionMode3Circuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode3::proof_config_for_compression_step(),
proof_config: CompressionMode2::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(2).unwrap().into_inner(),
_marker: Default::default(),
},
Expand All @@ -77,7 +78,7 @@ fn get_compression_circuits(
ZkSyncCompressionLayerCircuit::CompressionMode4Circuit(CompressionMode4Circuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode4::proof_config_for_compression_step(),
proof_config: CompressionMode3::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(3).unwrap().into_inner(),
_marker: Default::default(),
},
Expand All @@ -87,7 +88,7 @@ fn get_compression_circuits(
ZkSyncCompressionLayerCircuit::CompressionMode5Circuit(CompressionMode5Circuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode5::proof_config_for_compression_step(),
proof_config: CompressionMode4::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(4).unwrap().into_inner(),
_marker: Default::default(),
},
Expand All @@ -105,8 +106,8 @@ fn get_compression_for_wrapper_circuits(
CompressionMode1ForWrapperCircuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode1::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(1).unwrap().into_inner(),
proof_config: recursion_layer_proof_config(),
verification_key: source.get_recursion_layer_vk(1).unwrap().into_inner(),
_marker: Default::default(),
},
transcript_params: (),
Expand All @@ -117,8 +118,8 @@ fn get_compression_for_wrapper_circuits(
CompressionMode2ForWrapperCircuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode2::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(2).unwrap().into_inner(),
proof_config: CompressionMode1::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(1).unwrap().into_inner(),
_marker: Default::default(),
},
transcript_params: (),
Expand All @@ -129,8 +130,8 @@ fn get_compression_for_wrapper_circuits(
CompressionMode3ForWrapperCircuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode3::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(3).unwrap().into_inner(),
proof_config: CompressionMode2::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(2).unwrap().into_inner(),
_marker: Default::default(),
},
transcript_params: (),
Expand All @@ -141,8 +142,8 @@ fn get_compression_for_wrapper_circuits(
CompressionMode4ForWrapperCircuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode4::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(4).unwrap().into_inner(),
proof_config: CompressionMode3::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(3).unwrap().into_inner(),
_marker: Default::default(),
},
transcript_params: (),
Expand All @@ -153,8 +154,8 @@ fn get_compression_for_wrapper_circuits(
CompressionMode5ForWrapperCircuit {
witness: None,
config: CompressionRecursionConfig {
proof_config: CompressionMode5::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(5).unwrap().into_inner(),
proof_config: CompressionMode4::proof_config_for_compression_step(),
verification_key: source.get_compression_vk(4).unwrap().into_inner(),
_marker: Default::default(),
},
transcript_params: (),
Expand Down

0 comments on commit a17c0c0

Please sign in to comment.