Resolve conflicts

matter-labs · Dec 5, 2023 · 9e35a04 · 9e35a04
1 parent 7fe4f49
commit 9e35a04
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs b/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs
@@ -8,6 +8,7 @@ use std::{
 };
 
 use multivm::interface::{FinishedL1Batch, L1BatchEnv};
+use zksync_dal::blocks_dal::ConsensusBlockFields;
 use zksync_dal::StorageProcessor;
 use zksync_system_constants::ACCOUNT_CODE_STORAGE_ADDRESS;
 use zksync_types::{
@@ -16,7 +17,7 @@ use zksync_types::{
     CURRENT_VIRTUAL_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_ADDRESS,
 };
 use zksync_types::{
-    block::{ConsensusBlockFields, L1BatchHeader, MiniblockHeader},
+    block::{L1BatchHeader, MiniblockHeader},
     event::{extract_added_tokens, extract_long_l2_to_l1_messages},
     storage_writes_deduplicator::{ModifiedSlot, StorageWritesDeduplicator},
     tx::{

diff --git a/core/lib/zksync_core/src/state_keeper/updates/mod.rs b/core/lib/zksync_core/src/state_keeper/updates/mod.rs
@@ -1,12 +1,12 @@
 use multivm::interface::{L1BatchEnv, VmExecutionResultAndLogs};
 
 use zksync_contracts::BaseSystemContractsHashes;
+use zksync_dal::blocks_dal::ConsensusBlockFields;
 use zksync_types::vm_trace::Call;
 use zksync_types::{
-    block::{BlockGasCount, ConsensusBlockFields},
-    storage_writes_deduplicator::StorageWritesDeduplicator,
-    tx::tx_execution_info::ExecutionMetrics,
-    Address, L1BatchNumber, MiniblockNumber, ProtocolVersionId, Transaction,
+    block::BlockGasCount, storage_writes_deduplicator::StorageWritesDeduplicator,
+    tx::tx_execution_info::ExecutionMetrics, Address, L1BatchNumber, MiniblockNumber,
+    ProtocolVersionId, Transaction,
 };
 use zksync_utils::bytecode::CompressedBytecodeInfo;