Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@StanislavBreadless
StanislavBreadless committed Dec 18, 2024
1 parent 3cffdb2 commit 335b61c
Show file tree
Hide file tree
Showing 5 changed files with 166 additions and 161 deletions.
271 changes: 133 additions & 138 deletions core/bin/block_reverter/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ use zksync_block_reverter::{
BlockReverter, BlockReverterEthConfig, NodeRole,
};
use zksync_config::{
configs::{
chain::NetworkConfig, wallets::Wallets, BasicWitnessInputProducerConfig, DatabaseSecrets,
GeneralConfig, L1Secrets, ObservabilityConfig, ProtectiveReadsWriterConfig,
},
ContractsConfig, DBConfig, EthConfig, GenesisConfig, PostgresConfig,
configs::{GatewayChainConfig, ObservabilityConfig},
GenesisConfig,
};
use zksync_core_leftovers::temp_config_store::read_yaml_repr;
use zksync_dal::{ConnectionPool, Core};
Expand All @@ -27,25 +24,34 @@ use zksync_object_store::ObjectStoreFactory;
use zksync_types::{Address, L1BatchNumber};

#[derive(Debug, Parser)]
#[command(author = "Matter Labs", version, about = "Block revert utility", long_about = None)]
#[command(author = "Matter Labs", version, about = "Block revert utility", long_about = None, subcommand_negates_reqs = true)]
struct Cli {
#[command(subcommand)]
command: Command,
/// Path to yaml config. If set, it will be used instead of env vars
#[arg(long, global = true)]
/// Path to yaml config. Note, that while required,
/// it is still an `Option` due to internal specifics of the `clap` crate.
#[arg(long, global = true, required = true)]
config_path: Option<PathBuf>,
/// Path to yaml contracts config. If set, it will be used instead of env vars
#[arg(long, global = true)]
/// Path to yaml contracts config. Note, that while required,
/// it is still an `Option` due to internal specifics of the `clap` crate.
#[arg(long, global = true, required = true)]
contracts_config_path: Option<PathBuf>,
/// Path to yaml secrets config. If set, it will be used instead of env vars
#[arg(long, global = true)]
/// Path to yaml secrets config. Note, that while required,
/// it is still an `Option` due to internal specifics of the `clap` crate.
#[arg(long, global = true, required = true)]
secrets_path: Option<PathBuf>,
/// Path to yaml wallets config. If set, it will be used instead of env vars
#[arg(long, global = true)]
/// Path to yaml wallets config. Note, that while required,
/// it is still an `Option` due to internal specifics of the `clap` crate.
#[arg(long, global = true, required = true)]
wallets_path: Option<PathBuf>,
/// Path to yaml genesis config. If set, it will be used instead of env vars
#[arg(long, global = true)]
/// Path to yaml genesis config. Note, that while required,
/// it is still an `Option` due to internal specifics of the `clap` crate.
#[arg(long, global = true, required = true)]
genesis_path: Option<PathBuf>,
/// Path to yaml config of the chain on top of gateway.
/// It may be `None` in case a chain is not settling on top of Gateway.
#[arg(long, global = true)]
gateway_chain_path: Option<PathBuf>,
}

#[derive(Debug, Subcommand)]
Expand Down Expand Up @@ -126,111 +132,112 @@ async fn main() -> anyhow::Result<()> {
.with_opentelemetry(opentelemetry)
.build();

let general_config: Option<GeneralConfig> = if let Some(path) = opts.config_path {
Some(
read_yaml_repr::<zksync_protobuf_config::proto::general::GeneralConfig>(&path)
.context("failed decoding general YAML config")?,
)
} else {
None
};
let wallets_config: Option<Wallets> = if let Some(path) = opts.wallets_path {
Some(
read_yaml_repr::<zksync_protobuf_config::proto::wallets::Wallets>(&path)
.context("failed decoding wallets YAML config")?,
)
} else {
None
};
let genesis_config: Option<GenesisConfig> = if let Some(path) = opts.genesis_path {
Some(
read_yaml_repr::<zksync_protobuf_config::proto::genesis::Genesis>(&path)
.context("failed decoding genesis YAML config")?,
)
} else {
None
};
let general_config = read_yaml_repr::<zksync_protobuf_config::proto::general::GeneralConfig>(
&opts.config_path.context("Config path missing")?,
)
.context("failed decoding general YAML config")?;

let eth_sender = match &general_config {
Some(general_config) => general_config
.eth
.clone()
.context("Failed to find eth config")?,
None => EthConfig::from_env().context("EthConfig::from_env()")?,
};
let db_config = match &general_config {
Some(general_config) => general_config
.db_config
.clone()
.context("Failed to find eth config")?,
None => DBConfig::from_env().context("DBConfig::from_env()")?,
};
let protective_reads_writer_config = match &general_config {
Some(general_config) => general_config
.protective_reads_writer_config
.clone()
.context("Failed to find eth config")?,
None => ProtectiveReadsWriterConfig::from_env()
.context("ProtectiveReadsWriterConfig::from_env()")?,
};
let basic_witness_input_producer_config = match &general_config {
Some(general_config) => general_config
.basic_witness_input_producer_config
.clone()
.context("Failed to find eth config")?,
None => BasicWitnessInputProducerConfig::from_env()
.context("BasicWitnessInputProducerConfig::from_env()")?,
};
let contracts = match opts.contracts_config_path {
Some(path) => read_yaml_repr::<zksync_protobuf_config::proto::contracts::Contracts>(&path)
.context("failed decoding contracts YAML config")?,
None => ContractsConfig::from_env().context("ContractsConfig::from_env()")?,
};
let secrets_config = if let Some(path) = opts.secrets_path {
Some(
read_yaml_repr::<zksync_protobuf_config::proto::secrets::Secrets>(&path)
.context("failed decoding secrets YAML config")?,
)
} else {
None
};
let wallets_config = read_yaml_repr::<zksync_protobuf_config::proto::wallets::Wallets>(
&opts.wallets_path.context("Wallets path missing")?,
)
.context("failed decoding wallets YAML config")?;

let genesis_config: GenesisConfig = read_yaml_repr::<
zksync_protobuf_config::proto::genesis::Genesis,
>(&opts.genesis_path.context("Genesis path missing")?)
.context("failed decoding genesis YAML config")?;

let eth_sender = general_config
.eth
.clone()
.context("Failed to find eth config")?;

let db_config = general_config
.db_config
.clone()
.context("Failed to find eth config")?;
let protective_reads_writer_config = general_config
.protective_reads_writer_config
.clone()
.context("Failed to find eth config")?;
let basic_witness_input_producer_config = general_config
.basic_witness_input_producer_config
.clone()
.context("Failed to find eth config")?;
let contracts = read_yaml_repr::<zksync_protobuf_config::proto::contracts::Contracts>(
&opts
.contracts_config_path
.context("Missing contracts config")?,
)
.context("failed decoding contracts YAML config")?;

let secrets_config = read_yaml_repr::<zksync_protobuf_config::proto::secrets::Secrets>(
&opts.secrets_path.context("Missing secrets config")?,
)
.context("failed decoding secrets YAML config")?;

let default_priority_fee_per_gas = eth_sender
.gas_adjuster
.context("gas_adjuster")?
.default_priority_fee_per_gas;

let database_secrets = match &secrets_config {
Some(secrets_config) => secrets_config
.database
.clone()
.context("Failed to find database config")?,
None => DatabaseSecrets::from_env().context("DatabaseSecrets::from_env()")?,
};
let l1_secrets = match &secrets_config {
Some(secrets_config) => secrets_config
.l1
.clone()
.context("Failed to find l1 config")?,
None => L1Secrets::from_env().context("L1Secrets::from_env()")?,
};
let postgres_config = match &general_config {
Some(general_config) => general_config
.postgres_config
.clone()
.context("Failed to find postgres config")?,
None => PostgresConfig::from_env().context("PostgresConfig::from_env()")?,
};
let zksync_network_id = match &genesis_config {
Some(genesis_config) => genesis_config.l2_chain_id,
None => {
NetworkConfig::from_env()
.context("NetworkConfig::from_env()")?
.zksync_network_id
}
let database_secrets = secrets_config
.database
.clone()
.context("Failed to find database config")?;

let l1_secrets = secrets_config
.l1
.clone()
.context("Failed to find l1 config")?;

let postgres_config = general_config
.postgres_config
.clone()
.context("Failed to find postgres config")?;

let zksync_network_id = genesis_config.l2_chain_id;

let settlement_mode = general_config
.eth
.context("Missing `eth` config")?
.gas_adjuster
.context("Missing `gas_adjuster` config")?
.settlement_mode;

let (sl_rpc_url, sl_diamond_proxy, sl_validator_timelock) = if settlement_mode.is_gateway() {
let gateway_chain_config: GatewayChainConfig =
read_yaml_repr::<zksync_protobuf_config::proto::gateway::GatewayChainConfig>(
&opts
.gateway_chain_path
.context("Genesis config path not provided")?,
)
.context("failed decoding genesis YAML config")?;

let gateway_url = l1_secrets
.gateway_rpc_url
.context("Gateway URL not found")?;

(
gateway_url,
gateway_chain_config.diamond_proxy_addr,
gateway_chain_config.validator_timelock_addr,
)
} else {
(
l1_secrets.l1_rpc_url,
contracts.diamond_proxy_addr,
contracts.validator_timelock_addr,
)
};

let config = BlockReverterEthConfig::new(&eth_sender, &contracts, zksync_network_id)?;
let config = BlockReverterEthConfig::new(
&eth_sender,
sl_diamond_proxy,
sl_validator_timelock,
zksync_network_id,
settlement_mode,
)?;

let connection_pool = ConnectionPool::<Core>::builder(
database_secrets.master_url()?,
Expand All @@ -246,12 +253,12 @@ async fn main() -> anyhow::Result<()> {
json,
operator_address,
} => {
let eth_client = Client::<L1>::http(l1_secrets.l1_rpc_url.clone())
let sl_client = Client::<L1>::http(sl_rpc_url)
.context("Ethereum client")?
.build();

let suggested_values = block_reverter
.suggested_values(&eth_client, &config, operator_address)
.suggested_values(&sl_client, &config, operator_address)
.await?;
if json {
println!("{}", serde_json::to_string(&suggested_values)?);
Expand All @@ -264,42 +271,30 @@ async fn main() -> anyhow::Result<()> {
priority_fee_per_gas,
nonce,
} => {
let eth_client = Client::http(l1_secrets.l1_rpc_url.clone())
.context("Ethereum client")?
.build();
let reverter_private_key = if let Some(wallets_config) = wallets_config {
wallets_config
.eth_sender
.unwrap()
.operator
.private_key()
.to_owned()
} else {
#[allow(deprecated)]
eth_sender
.sender
.context("eth_sender_config")?
.private_key()
.context("eth_sender_config.private_key")?
.context("eth_sender_config.private_key is not set")?
};
let sl_client = Client::http(sl_rpc_url).context("Ethereum client")?.build();
let reverter_private_key = wallets_config
.eth_sender
.unwrap()
.operator
.private_key()
.to_owned();

let priority_fee_per_gas = priority_fee_per_gas.unwrap_or(default_priority_fee_per_gas);
let l1_chain_id = eth_client
let l1_chain_id = sl_client
.fetch_chain_id()
.await
.context("cannot fetch Ethereum chain ID")?;
let eth_client = PKSigningClient::new_raw(
let sl_client = PKSigningClient::new_raw(
reverter_private_key,
contracts.diamond_proxy_addr,
sl_diamond_proxy,
priority_fee_per_gas,
l1_chain_id,
Box::new(eth_client),
Box::new(sl_client),
);

block_reverter
.send_ethereum_revert_transaction(
&eth_client,
&sl_client,
&config,
L1BatchNumber(l1_batch_number),
nonce,
Expand Down
Loading

0 comments on commit 335b61c

Please sign in to comment.