Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tomg10 committed Dec 18, 2024
1 parent 7d0164e commit a5cd16d
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 54 deletions.
2 changes: 1 addition & 1 deletion core/bin/external_node/src/node_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ impl ExternalNodeBuilder {
.optional
.snapshots_recovery_postgres_max_concurrency,
snapshot_recovery_config,
diamond_proxy_addr: self.config.diamond_proxy_address(),
diamond_proxy_addr: self.config.l1_diamond_proxy_address(),
});
let mut layer = NodeStorageInitializerLayer::new();
if matches!(kind, LayerKind::Precondition) {
Expand Down

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

This file was deleted.

10 changes: 5 additions & 5 deletions core/node/l1_recovery/src/processor/db_recovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ use zksync_eth_client::EthInterface;
use zksync_object_store::ObjectStore;
use zksync_types::{
aggregated_operations::AggregatedActionType,
block::{
BlockGasCount, L1BatchHeader, L1BatchTreeData, L2BlockHasher, L2BlockHeader,
UnsealedL1BatchHeader,
},
block::{L1BatchHeader, L1BatchTreeData, L2BlockHasher, L2BlockHeader, UnsealedL1BatchHeader},
commitment::{L1BatchCommitmentArtifacts, L1BatchCommitmentHash},
fee_model::{BatchFeeInput, L1PeggedBatchFeeModelInput},
snapshots::SnapshotFactoryDependencies,
Expand Down Expand Up @@ -140,7 +137,6 @@ pub async fn recover_latest_l1_batch(
fee_address: Default::default(),
},
&[],
BlockGasCount::default(),
&[],
&[],
CircuitStatistic::default(),
Expand Down Expand Up @@ -236,13 +232,15 @@ pub async fn recover_eth_sender(
.await
.unwrap();
let mut storage = connection_pool.connection().await.unwrap();
let chain_id = Some(l1_client.fetch_chain_id().await.unwrap());
storage
.eth_sender_dal()
.insert_bogus_confirmed_eth_tx(
last_l1_batch_number,
AggregatedActionType::Commit,
H256::random(),
DateTime::default(),
chain_id,
)
.await
.unwrap();
Expand All @@ -253,6 +251,7 @@ pub async fn recover_eth_sender(
AggregatedActionType::PublishProofOnchain,
H256::random(),
DateTime::default(),
chain_id,
)
.await
.unwrap();
Expand All @@ -263,6 +262,7 @@ pub async fn recover_eth_sender(
AggregatedActionType::Execute,
H256::random(),
DateTime::default(),
chain_id,
)
.await
.unwrap();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use std::{num::NonZeroUsize, sync::Arc};
use zksync_config::{
configs::object_store::ObjectStoreMode, ContractsConfig, GenesisConfig, ObjectStoreConfig,
};
use zksync_dal::CoreDal;
use zksync_node_storage_init::{
external_node::NodeRecovery, main_node::MainNodeGenesis, InitializeStorage,
NodeInitializationStrategy, SnapshotRecoveryConfig,
Expand Down
25 changes: 13 additions & 12 deletions zkstack_cli/Cargo.lock

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

0 comments on commit a5cd16d

Please sign in to comment.