feat(zk_toolbox): add fees integration test to toolbox

.github/workflows/ci-core-reusable.yml

@@ -175,6 +175,7 @@ jobs:
           SNAPSHOT_RECOVERY_LOGS_DIR=logs/snapshot_recovery/
           GENESIS_RECOVERY_LOGS_DIR=logs/genesis_recovery/
           EXTERNAL_NODE_LOGS_DIR=logs/external_node
+          FEES_LOGS_DIR=logs/fees
           REVERT_LOGS_DIR=logs/revert
 
           mkdir -p $SERVER_LOGS_DIR
@@ -183,6 +184,7 @@ jobs:
           mkdir -p $SNAPSHOT_RECOVERY_LOGS_DIR
           mkdir -p $GENESIS_RECOVERY_LOGS_DIR
           mkdir -p $EXTERNAL_NODE_LOGS_DIR
+          mkdir -p $FEES_LOGS_DIR
           mkdir -p $REVERT_LOGS_DIR
 
           echo "SERVER_LOGS_DIR=$SERVER_LOGS_DIR" >> $GITHUB_ENV
@@ -444,6 +446,26 @@ jobs:
           wait $PID3
           wait $PID4
 
+      - name: Fee projection tests
+        run: |
+          ci_run zk_supervisor test fees --chain era &> ${{ env.FEES_LOGS_DIR }}/era.log &
+          PID1=$!
+
+          ci_run zk_supervisor test fees --chain validium &> ${{ env.FEES_LOGS_DIR }}/validium.log &
+          PID2=$!
+
+          ci_run zk_supervisor test fees --chain custom_token &> ${{ env.FEES_LOGS_DIR }}/custom_token.log &
+          PID3=$!
+
+          ci_run zk_supervisor test fees --chain consensus &> ${{ env.FEES_LOGS_DIR }}/consensus.log &
+          PID4=$!
+
+          wait $PID1
+          wait $PID2
+          wait $PID3
+          wait $PID4
+
+
       - name: Run revert tests
         run: |
           ci_run killall -INT zksync_server || true

zk_toolbox/crates/zk_supervisor/src/commands/test/args/fees.rs

@@ -0,0 +1,10 @@
+use clap::Parser;
+use serde::{Deserialize, Serialize};
+
+use crate::messages::MSG_NO_DEPS_HELP;
+
+#[derive(Debug, Serialize, Deserialize, Parser)]
+pub struct FeesArgs {
+    #[clap(short, long, help = MSG_NO_DEPS_HELP)]
+    pub no_deps: bool,
+}

zk_toolbox/crates/zk_supervisor/src/commands/test/args/mod.rs

@@ -1,3 +1,4 @@
+pub mod fees;
 pub mod integration;
 pub mod recovery;
 pub mod revert;

zk_toolbox/crates/zk_supervisor/src/commands/test/fees.rs

@@ -0,0 +1,41 @@
+use common::{cmd::Cmd, config::global_config, logger};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::{
+    args::fees::FeesArgs,
+    utils::{build_contracts, install_and_build_dependencies, TS_INTEGRATION_PATH},
+};
+use crate::messages::MSG_INTEGRATION_TESTS_RUN_SUCCESS;
+
+pub async fn run(shell: &Shell, args: FeesArgs) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    shell.change_dir(ecosystem_config.link_to_code.join(TS_INTEGRATION_PATH));
+
+    if !args.no_deps {
+        logger::info("Installing dependencies");
+        build_contracts(shell, &ecosystem_config)?;
+        install_and_build_dependencies(shell, &ecosystem_config)?;
+    }
+
+    logger::info(format!(
+        "Running fees tests on chain: {}",
+        ecosystem_config.current_chain()
+    ));
+
+    let mut command = cmd!(shell, "yarn jest -- fees.test.ts")
+        .env("CHAIN_NAME", ecosystem_config.current_chain());
+
+    if global_config().verbose {
+        command = command.env(
+            "ZKSYNC_DEBUG_LOGS",
+            format!("{:?}", global_config().verbose),
+        )
+    }
+
+    Cmd::new(command).with_force_run().run()?;
+
+    logger::outro(MSG_INTEGRATION_TESTS_RUN_SUCCESS);
+
+    Ok(())
+}

zk_toolbox/crates/zk_supervisor/src/commands/test/integration.rs

@@ -7,15 +7,16 @@ use xshell::{cmd, Shell};
 
 use super::{
     args::integration::IntegrationArgs,
-    utils::{build_contracts, install_and_build_dependencies, TestWallets, TEST_WALLETS_PATH},
+    utils::{
+        build_contracts, install_and_build_dependencies, TestWallets, TEST_WALLETS_PATH,
+        TS_INTEGRATION_PATH,
+    },
 };
 use crate::messages::{
     msg_integration_tests_run, MSG_CHAIN_NOT_FOUND_ERR, MSG_DESERIALIZE_TEST_WALLETS_ERR,
     MSG_INTEGRATION_TESTS_RUN_SUCCESS,
 };
 
-const TS_INTEGRATION_PATH: &str = "core/tests/ts-integration";
-
 pub async fn run(shell: &Shell, args: IntegrationArgs) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
 

zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs

@@ -1,6 +1,6 @@
 use args::{
-    integration::IntegrationArgs, recovery::RecoveryArgs, revert::RevertArgs, rust::RustArgs,
-    upgrade::UpgradeArgs,
+    fees::FeesArgs, integration::IntegrationArgs, recovery::RecoveryArgs, revert::RevertArgs,
+    rust::RustArgs, upgrade::UpgradeArgs,
 };
 use clap::Subcommand;
 use xshell::Shell;
@@ -14,6 +14,7 @@ use crate::messages::{
 mod args;
 mod build;
 mod db;
+mod fees;
 mod integration;
 mod l1_contracts;
 mod loadtest;
@@ -29,6 +30,8 @@ mod wallet;
 pub enum TestCommands {
     #[clap(about = MSG_INTEGRATION_TESTS_ABOUT, alias = "i")]
     Integration(IntegrationArgs),
+    #[clap(about = "Run fees test", alias = "i")]
+    Fees(FeesArgs),
     #[clap(about = MSG_REVERT_TEST_ABOUT, alias = "r")]
     Revert(RevertArgs),
     #[clap(about = MSG_RECOVERY_TEST_ABOUT, alias = "rec")]
@@ -52,6 +55,7 @@ pub enum TestCommands {
 pub async fn run(shell: &Shell, args: TestCommands) -> anyhow::Result<()> {
     match args {
         TestCommands::Integration(args) => integration::run(shell, args).await,
+        TestCommands::Fees(args) => fees::run(shell, args).await,
         TestCommands::Revert(args) => revert::run(shell, args).await,
         TestCommands::Recovery(args) => recovery::run(shell, args).await,
         TestCommands::Upgrade(args) => upgrade::run(shell, args),

zk_toolbox/crates/zk_supervisor/src/commands/test/utils.rs

@@ -17,7 +17,7 @@ use crate::messages::{
 pub const TEST_WALLETS_PATH: &str = "etc/test_config/constant/eth.json";
 const AMOUNT_FOR_DISTRIBUTION_TO_WALLETS: u128 = 1000000000000000000000;
 
-const TS_INTEGRATION_PATH: &str = "core/tests/ts-integration";
+pub const TS_INTEGRATION_PATH: &str = "core/tests/ts-integration";
 const CONTRACTS_TEST_DATA_PATH: &str = "etc/contracts-test-data";
 
 #[derive(Deserialize)]