Skip to content

Commit

Permalink
Fix format
Browse files Browse the repository at this point in the history
  • Loading branch information
IAvecilla committed Aug 19, 2024
1 parent 6b2dcb5 commit c578625
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ use zk_evm_1_5_0::{
zkevm_opcode_defs::{FatPointer, Opcode, UMAOpcode},
};
use zksync_state::interface::{StoragePtr, WriteStorage};
use zksync_types::{
Address, StorageKey, U256,
};
use zksync_types::{Address, StorageKey, U256};

use crate::{
interface::tracer::TracerExecutionStatus, tracers::dynamic::vm_1_5_0::DynTracer, vm_latest::{
old_vm::utils::heap_page_from_base,
BootloaderState, HistoryMode, SimpleMemory, VmTracer, ZkSyncVmState,
}
interface::tracer::TracerExecutionStatus,
tracers::dynamic::vm_1_5_0::DynTracer,
vm_latest::{
old_vm::utils::heap_page_from_base, BootloaderState, HistoryMode, SimpleMemory, VmTracer,
ZkSyncVmState,
},
};

pub(crate) struct EvmDebugTracer<S: WriteStorage, H: HistoryMode> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ use zksync_utils::{bytes_to_be_words, h256_to_u256};

use super::{traits::VmTracer, utils::read_pointer};
use crate::{
interface::tracer::TracerExecutionStatus, tracers::dynamic::vm_1_5_0::DynTracer, vm_latest::{
interface::tracer::TracerExecutionStatus,
tracers::dynamic::vm_1_5_0::DynTracer,
vm_latest::{
utils::hash_evm_bytecode, BootloaderState, HistoryMode, SimpleMemory, ZkSyncVmState,
}
},
};

/// Tracer responsible for collecting information about EVM deploys and providing those
Expand Down
1 change: 0 additions & 1 deletion core/lib/vm_interface/src/storage/in_memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use zksync_types::{
system_contracts::{get_evm_interpreter_hash, get_system_smart_contracts},
L2ChainId, StorageKey, StorageLog, StorageValue, H256, U256,
};

use zksync_utils::u256_to_h256;

use super::ReadStorage;
Expand Down
4 changes: 3 additions & 1 deletion core/lib/vm_utils/src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ use anyhow::Context;
use zksync_contracts::BaseSystemContracts;
use zksync_dal::{Connection, Core, CoreDal, DalError};
use zksync_types::{
block::L2BlockHeader, fee_model::BatchFeeInput, snapshots::SnapshotRecoveryStatus, web3::contract, Address, L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersionId, H256, ZKPORTER_IS_AVAILABLE
block::L2BlockHeader, fee_model::BatchFeeInput, snapshots::SnapshotRecoveryStatus,
web3::contract, Address, L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersionId, H256,
ZKPORTER_IS_AVAILABLE,
};
use zksync_vm_interface::{L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode};

Expand Down
4 changes: 1 addition & 3 deletions core/node/state_keeper/src/batch_executor/main_executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ use zksync_multivm::{
MultiVMTracer, VmInstance,
};
use zksync_shared_metrics::{InteractionType, TxStage, APP_METRICS};
use zksync_types::{
vm::FastVmMode, Transaction,
};
use zksync_types::{vm::FastVmMode, Transaction};

use super::{BatchExecutor, BatchExecutorHandle, Command, TxExecutionResult};
use crate::{
Expand Down
4 changes: 2 additions & 2 deletions core/node/state_keeper/src/batch_executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use tokio::{
task::JoinHandle,
};
use zksync_multivm::interface::{
Call, CompressedBytecodeInfo, FinishedL1Batch, Halt, L1BatchEnv,
L2BlockEnv, SystemEnv, VmExecutionResultAndLogs,
Call, CompressedBytecodeInfo, FinishedL1Batch, Halt, L1BatchEnv, L2BlockEnv, SystemEnv,
VmExecutionResultAndLogs,
};
use zksync_state::{interface::StorageViewCache, OwnedStorage};
use zksync_types::{Transaction, H256};
Expand Down
6 changes: 5 additions & 1 deletion core/node/state_keeper/src/updates/l2_block_updates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ use zksync_multivm::{
};
use zksync_system_constants::KNOWN_CODES_STORAGE_ADDRESS;
use zksync_types::{
block::{BlockGasCount, L2BlockHasher}, ethabi, l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log}, L2BlockNumber, ProtocolVersionId, StorageLogKind, StorageLogQuery, StorageLogWithPreviousValue, Transaction, H256
block::{BlockGasCount, L2BlockHasher},
ethabi,
l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
L2BlockNumber, ProtocolVersionId, StorageLogKind, StorageLogQuery, StorageLogWithPreviousValue,
Transaction, H256,
};
use zksync_utils::bytecode::hash_bytecode;

Expand Down
3 changes: 1 addition & 2 deletions core/node/state_keeper/src/updates/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ use zksync_multivm::{
utils::{get_batch_base_fee, StorageWritesDeduplicator},
};
use zksync_types::{
block::BlockGasCount, fee_model::BatchFeeInput,
Address, L1BatchNumber, L2BlockNumber,
block::BlockGasCount, fee_model::BatchFeeInput, Address, L1BatchNumber, L2BlockNumber,
ProtocolVersionId, Transaction, H256,
};

Expand Down

0 comments on commit c578625

Please sign in to comment.