diff --git a/core/bin/external_node/src/node_builder.rs b/core/bin/external_node/src/node_builder.rs index a78b2c9bf13..2058ca58c3a 100644 --- a/core/bin/external_node/src/node_builder.rs +++ b/core/bin/external_node/src/node_builder.rs @@ -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) { diff --git a/core/lib/dal/.sqlx/query-1701ec926e3fc1a170cc9432cc39544065610769d865092197ec0b8e52384939.json b/core/lib/dal/.sqlx/query-1701ec926e3fc1a170cc9432cc39544065610769d865092197ec0b8e52384939.json new file mode 100644 index 00000000000..a496beb6ea5 --- /dev/null +++ b/core/lib/dal/.sqlx/query-1701ec926e3fc1a170cc9432cc39544065610769d865092197ec0b8e52384939.json @@ -0,0 +1,24 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO eth_txs (raw_tx, nonce, tx_type, contract_address, predicted_gas_cost, chain_id, created_at, updated_at) VALUES ('\\x00', 0, $1, $2, NULL, $3, now(), now()) RETURNING id", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Text", + "Text", + "Int8" + ] + }, + "nullable": [ + false + ] + }, + "hash": "1701ec926e3fc1a170cc9432cc39544065610769d865092197ec0b8e52384939" +} diff --git a/core/lib/dal/.sqlx/query-843b299bbffbade83dd673ed4a488eefd4419e8a9eb05a9528da11163f52b2c7.json b/core/lib/dal/.sqlx/query-843b299bbffbade83dd673ed4a488eefd4419e8a9eb05a9528da11163f52b2c7.json deleted file mode 100644 index 63f71c88c57..00000000000 --- a/core/lib/dal/.sqlx/query-843b299bbffbade83dd673ed4a488eefd4419e8a9eb05a9528da11163f52b2c7.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "db_name": "PostgreSQL", -<<<<<<<< HEAD:core/lib/dal/.sqlx/query-52f1ab74661845b61a371d01c5d5f86051e80928c5530cacc02530a93812be8c.json - "query": "INSERT INTO eth_txs (raw_tx, nonce, tx_type, contract_address, predicted_gas_cost, created_at, updated_at) VALUES ('\\x00', 0, $1, $2, 0, now(), now()) RETURNING id", -======== - "query": "INSERT INTO eth_txs (raw_tx, nonce, tx_type, contract_address, predicted_gas_cost, chain_id, created_at, updated_at) VALUES ('\\x00', 0, $1, '', NULL, $2, now(), now()) RETURNING id", ->>>>>>>> origin/main:core/lib/dal/.sqlx/query-843b299bbffbade83dd673ed4a488eefd4419e8a9eb05a9528da11163f52b2c7.json - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Text", -<<<<<<<< HEAD:core/lib/dal/.sqlx/query-52f1ab74661845b61a371d01c5d5f86051e80928c5530cacc02530a93812be8c.json - "Text" -======== - "Int8" ->>>>>>>> origin/main:core/lib/dal/.sqlx/query-843b299bbffbade83dd673ed4a488eefd4419e8a9eb05a9528da11163f52b2c7.json - ] - }, - "nullable": [ - false - ] - }, -<<<<<<<< HEAD:core/lib/dal/.sqlx/query-52f1ab74661845b61a371d01c5d5f86051e80928c5530cacc02530a93812be8c.json - "hash": "52f1ab74661845b61a371d01c5d5f86051e80928c5530cacc02530a93812be8c" -======== - "hash": "843b299bbffbade83dd673ed4a488eefd4419e8a9eb05a9528da11163f52b2c7" ->>>>>>>> origin/main:core/lib/dal/.sqlx/query-843b299bbffbade83dd673ed4a488eefd4419e8a9eb05a9528da11163f52b2c7.json -} diff --git a/core/node/l1_recovery/src/processor/db_recovery.rs b/core/node/l1_recovery/src/processor/db_recovery.rs index c024cb885f3..6f281d95aee 100644 --- a/core/node/l1_recovery/src/processor/db_recovery.rs +++ b/core/node/l1_recovery/src/processor/db_recovery.rs @@ -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, @@ -140,7 +137,6 @@ pub async fn recover_latest_l1_batch( fee_address: Default::default(), }, &[], - BlockGasCount::default(), &[], &[], CircuitStatistic::default(), @@ -236,6 +232,7 @@ 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( @@ -243,6 +240,7 @@ pub async fn recover_eth_sender( AggregatedActionType::Commit, H256::random(), DateTime::default(), + chain_id, ) .await .unwrap(); @@ -253,6 +251,7 @@ pub async fn recover_eth_sender( AggregatedActionType::PublishProofOnchain, H256::random(), DateTime::default(), + chain_id, ) .await .unwrap(); @@ -263,6 +262,7 @@ pub async fn recover_eth_sender( AggregatedActionType::Execute, H256::random(), DateTime::default(), + chain_id, ) .await .unwrap(); diff --git a/core/node/node_framework/src/implementations/layers/node_storage_init/main_node_strategy.rs b/core/node/node_framework/src/implementations/layers/node_storage_init/main_node_strategy.rs index edfdd5611f0..3371b6efdcd 100644 --- a/core/node/node_framework/src/implementations/layers/node_storage_init/main_node_strategy.rs +++ b/core/node/node_framework/src/implementations/layers/node_storage_init/main_node_strategy.rs @@ -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, diff --git a/zkstack_cli/Cargo.lock b/zkstack_cli/Cargo.lock index 900ac677fd6..a3a4e4ef949 100644 --- a/zkstack_cli/Cargo.lock +++ b/zkstack_cli/Cargo.lock @@ -6771,9 +6771,9 @@ dependencies = [ [[package]] name = "zksync_concurrency" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24c9a056499823227503dd9e5fb3037d93bcc3ae9b06c1ac0a47334c6283af" +checksum = "e8312ab73d3caa55775bd531795b507fa8f76bd9dabfaeb0954fe43e8fc1323b" dependencies = [ "anyhow", "once_cell", @@ -6804,9 +6804,9 @@ dependencies = [ [[package]] name = "zksync_consensus_crypto" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da303b01f24283e93f80f361bf62c3df4a761d061c8b38b4faebeebf26362fc" +checksum = "86b539960de98df3c3bd27d2d9b97de862027686bbb3bdfc5aaad5b74bb929a1" dependencies = [ "anyhow", "blst", @@ -6825,9 +6825,9 @@ dependencies = [ [[package]] name = "zksync_consensus_roles" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f07db2a8ec2d2cda5cb4c5ac408101e81c8fa5d95c9f3302829dafae78d11c" +checksum = "c49949546895a10431b9daec6ec4208ef0917ace006446d304b51f5b234ba462" dependencies = [ "anyhow", "bit-vec", @@ -6847,9 +6847,9 @@ dependencies = [ [[package]] name = "zksync_consensus_utils" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3222410c67617a86edb192e0c4bb48afc254a17052200a0a839c90e8b0378842" +checksum = "723e2a4b056cc5af192a83163c89a6951ee75c098cc5c4a4cdc435f4232d88bd" dependencies = [ "anyhow", "rand", @@ -6897,9 +6897,9 @@ dependencies = [ [[package]] name = "zksync_protobuf" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05755c38b134b409736008bfdfd0fdb42bfa061947be93be4c78069aa10c9b3" +checksum = "e8986ad796f8e00d8999fee72effba1a21bce40f5f877d681ac9cd89a94834d8" dependencies = [ "anyhow", "bit-vec", @@ -6918,9 +6918,9 @@ dependencies = [ [[package]] name = "zksync_protobuf_build" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c3930a73ca667780be6dcd94e469d40a93fa52f4654c9ab732991b62238cb5" +checksum = "8d870b31995e3acb8e47afeb68ebeeffcf6121e70020e65b3d5d31692115d236" dependencies = [ "anyhow", "heck", @@ -6946,6 +6946,7 @@ dependencies = [ "serde_yaml", "tracing", "zksync_basic_types", + "zksync_concurrency", "zksync_config", "zksync_protobuf", "zksync_protobuf_build",