chore: Remove shall_save_to_public_bucket, public_object_store and related code (#3701)

## What ❔

Remove `shall_save_to_public_bucket`, `public_object_store` and related
code.

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

To cleanup outdated feature, reduce code and config size.

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- The `Why` has to be clear to non-Matter Labs entities running their
own ZK Chain -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Is this a breaking change?
- [ ] Yes
- [x] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [x] Documentation comments have been added / updated.
- [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev
lint`.

ref ZKD-2281

Author: yorik

zkstack_cli/crates/config/src/general.rs

@@ -16,7 +16,6 @@ pub struct RocksDbs {
 }
 
 pub struct FileArtifacts {
-    pub public_object_store: PathBuf,
     pub prover_object_store: PathBuf,
     pub snapshot: PathBuf,
     pub core_object_store: PathBuf,
@@ -26,7 +25,6 @@ impl FileArtifacts {
     /// Currently all artifacts are stored in one path, but we keep an opportunity to update this paths
     pub fn new(path: PathBuf) -> Self {
         Self {
-            public_object_store: path.clone(),
             prover_object_store: path.clone(),
             snapshot: path.clone(),
             core_object_store: path.clone(),
@@ -57,11 +55,6 @@ pub fn set_file_artifacts(
         "prover.prover_object_store",
         &file_artifacts.prover_object_store,
     )?;
-    set_file_backed_path_if_selected(
-        config,
-        "prover.public_object_store",
-        &file_artifacts.public_object_store,
-    )?;
     set_file_backed_path_if_selected(
         config,
         "snapshot_creator.object_store",

zkstack_cli/crates/zkstack/README.md

@@ -452,9 +452,8 @@ contracts to be deployed.
 
 - `--from-genesis` — Set attester committee to `consensus.genesis_spec.attesters` in general.yaml Mutually exclusive
   with `--from-file`.
-- `--from-file <PATH>` — Set attester committee to committee specified in yaml file at `PATH`.  
-  Mutually exclusive with `--from-genesis`. File format is specified in
-  `zk_inception/src/commands/consensus/proto/mod.proto`. Example:
+- `--from-file <PATH>` — Set attester committee to committee specified in yaml file at `PATH`. Mutually exclusive with
+  `--from-genesis`. File format is specified in `zk_inception/src/commands/consensus/proto/mod.proto`. Example:
 
   ```yaml
   attesters:
@@ -497,16 +496,9 @@ Initialize prover
 - `--bucket-name <BUCKET_NAME>`
 - `--location <LOCATION>`
 - `--project-id <PROJECT_ID>`
-- `--shall-save-to-public-bucket <SHALL_SAVE_TO_PUBLIC_BUCKET>`
 
   Possible values: `true`, `false`
 
-- `--public-store-dir <PUBLIC_STORE_DIR>`
-- `--public-bucket-base-url <PUBLIC_BUCKET_BASE_URL>`
-- `--public-credentials-file <PUBLIC_CREDENTIALS_FILE>`
-- `--public-bucket-name <PUBLIC_BUCKET_NAME>`
-- `--public-location <PUBLIC_LOCATION>`
-- `--public-project-id <PUBLIC_PROJECT_ID>`
 - `--bellman-cuda-dir <BELLMAN_CUDA_DIR>`
 - `--bellman-cuda`
 

zkstack_cli/crates/zkstack/completion/_zkstack.zsh

@@ -1896,13 +1896,6 @@ _arguments "${_arguments_options[@]}" : \
 '--bucket-name=[]:BUCKET_NAME:_default' \
 '--location=[]:LOCATION:_default' \
 '--project-id=[]:PROJECT_ID:_default' \
-'--shall-save-to-public-bucket=[]:SHALL_SAVE_TO_PUBLIC_BUCKET:(true false)' \
-'--public-store-dir=[]:PUBLIC_STORE_DIR:_default' \
-'--public-bucket-base-url=[]:PUBLIC_BUCKET_BASE_URL:_default' \
-'--public-credentials-file=[]:PUBLIC_CREDENTIALS_FILE:_default' \
-'--public-bucket-name=[]:PUBLIC_BUCKET_NAME:_default' \
-'--public-location=[]:PUBLIC_LOCATION:_default' \
-'--public-project-id=[]:PUBLIC_PROJECT_ID:_default' \
 '(--clone)--bellman-cuda-dir=[]:BELLMAN_CUDA_DIR:_default' \
 '--bellman-cuda=[]' \
 '--setup-compressor-key=[]' \

zkstack_cli/crates/zkstack/completion/zkstack.fish

@@ -487,13 +487,6 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l bucket-name -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l location -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l project-id -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l shall-save-to-public-bucket -r -f -a "{true\t'',false\t''}"
-complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-store-dir -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-bucket-base-url -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-credentials-file -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-bucket-name -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-location -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l public-project-id -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l bellman-cuda-dir -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l bellman-cuda -r -f -a "{true\t'',false\t''}"
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from init" -l setup-compressor-key -r -f -a "{true\t'',false\t''}"

zkstack_cli/crates/zkstack/completion/zkstack.sh

@@ -7226,7 +7226,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__prover__init)
-            opts="-u -d -v -h --dev --proof-store-dir --bucket-base-url --credentials-file --bucket-name --location --project-id --shall-save-to-public-bucket --public-store-dir --public-bucket-base-url --public-credentials-file --public-bucket-name --public-location --public-project-id --clone --bellman-cuda-dir --bellman-cuda --setup-compressor-key --path --region --mode --setup-keys --setup-database --prover-db-url --prover-db-name --use-default --dont-drop --cloud-type --verbose --chain --ignore-prerequisites --help"
+            opts="-u -d -v -h --dev --proof-store-dir --bucket-base-url --credentials-file --bucket-name --location --project-id --clone --bellman-cuda-dir --bellman-cuda --setup-compressor-key --path --region --mode --setup-keys --setup-database --prover-db-url --prover-db-name --use-default --dont-drop --cloud-type --verbose --chain --ignore-prerequisites --help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -7256,34 +7256,6 @@ _zkstack() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                --shall-save-to-public-bucket)
-                    COMPREPLY=($(compgen -W "true false" -- "${cur}"))
-                    return 0
-                    ;;
-                --public-store-dir)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --public-bucket-base-url)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --public-credentials-file)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --public-bucket-name)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --public-location)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
-                --public-project-id)
-                    COMPREPLY=($(compgen -f "${cur}"))
-                    return 0
-                    ;;
                 --bellman-cuda-dir)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0

zkstack_cli/crates/zkstack/src/commands/prover/args/init.rs

@@ -23,11 +23,10 @@ use crate::{
         MSG_CREATE_GCS_BUCKET_PROJECT_ID_NO_PROJECTS_PROMPT,
         MSG_CREATE_GCS_BUCKET_PROJECT_ID_PROMPT, MSG_CREATE_GCS_BUCKET_PROMPT,
         MSG_DOWNLOAD_SETUP_COMPRESSOR_KEY_PROMPT, MSG_GETTING_PROOF_STORE_CONFIG,
-        MSG_GETTING_PUBLIC_STORE_CONFIG, MSG_INITIALIZE_BELLMAN_CUDA_PROMPT,
-        MSG_PROOF_STORE_CONFIG_PROMPT, MSG_PROOF_STORE_DIR_PROMPT,
-        MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_ERR, MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_PROMPT,
-        MSG_PROOF_STORE_GCS_CREDENTIALS_FILE_PROMPT, MSG_PROVER_DB_NAME_HELP,
-        MSG_PROVER_DB_URL_HELP, MSG_SAVE_TO_PUBLIC_BUCKET_PROMPT, MSG_SETUP_KEYS_PROMPT,
+        MSG_INITIALIZE_BELLMAN_CUDA_PROMPT, MSG_PROOF_STORE_CONFIG_PROMPT,
+        MSG_PROOF_STORE_DIR_PROMPT, MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_ERR,
+        MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_PROMPT, MSG_PROOF_STORE_GCS_CREDENTIALS_FILE_PROMPT,
+        MSG_PROVER_DB_NAME_HELP, MSG_PROVER_DB_URL_HELP, MSG_SETUP_KEYS_PROMPT,
         MSG_USE_DEFAULT_DATABASES_HELP,
     },
 };
@@ -45,16 +44,6 @@ pub struct ProverInitArgs {
     #[clap(flatten)]
     pub create_gcs_bucket_config: ProofStorageGCSCreateBucketTmp,
 
-    // Public store object
-    #[clap(long)]
-    pub shall_save_to_public_bucket: Option<bool>,
-    #[clap(long)]
-    pub public_store_dir: Option<String>,
-    #[clap(flatten)]
-    pub public_store_gcs_config: PublicStorageGCSTmp,
-    #[clap(flatten)]
-    pub public_create_gcs_bucket_config: PublicStorageGCSCreateBucketTmp,
-
     // Bellman cuda
     #[clap(flatten)]
     pub bellman_cuda_config: InitBellmanCudaArgs,
@@ -119,24 +108,6 @@ pub struct ProofStorageGCSCreateBucketTmp {
     pub project_id: Option<String>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, Parser, Default)]
-pub struct PublicStorageGCSTmp {
-    #[clap(long)]
-    pub public_bucket_base_url: Option<String>,
-    #[clap(long)]
-    pub public_credentials_file: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Parser, Default)]
-pub struct PublicStorageGCSCreateBucketTmp {
-    #[clap(long)]
-    pub public_bucket_name: Option<String>,
-    #[clap(long)]
-    pub public_location: Option<String>,
-    #[clap(long)]
-    pub public_project_id: Option<String>,
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize, Parser, Default)]
 pub struct SetupCompressorKeyConfigTmp {
     #[clap(long)]
@@ -181,7 +152,6 @@ pub struct ProverDatabaseConfig {
 #[derive(Debug, Clone)]
 pub struct ProverInitArgsFinal {
     pub proof_store: ProofStorageConfig,
-    pub public_store: Option<ProofStorageConfig>,
     pub compressor_key_args: Option<CompressorKeysArgs>,
     pub setup_keys: Option<SetupKeysArgs>,
     pub bellman_cuda_config: Option<InitBellmanCudaArgs>,
@@ -197,7 +167,6 @@ impl ProverInitArgs {
         chain_config: &ChainConfig,
     ) -> anyhow::Result<ProverInitArgsFinal> {
         let proof_store = self.fill_proof_storage_values_with_prompt(shell)?;
-        let public_store = self.fill_public_storage_values_with_prompt(shell)?;
         let compressor_key_args =
             self.fill_setup_compressor_key_values_with_prompt(default_compressor_key_path);
         let bellman_cuda_config = self.fill_bellman_cuda_values_with_prompt();
@@ -207,7 +176,6 @@ impl ProverInitArgs {
 
         Ok(ProverInitArgsFinal {
             proof_store,
-            public_store,
             compressor_key_args,
             setup_keys,
             bellman_cuda_config,
@@ -270,80 +238,6 @@ impl ProverInitArgs {
         }
     }
 
-    fn fill_public_storage_values_with_prompt(
-        &self,
-        shell: &Shell,
-    ) -> anyhow::Result<Option<ProofStorageConfig>> {
-        logger::info(MSG_GETTING_PUBLIC_STORE_CONFIG);
-
-        if self.dev {
-            return Ok(None);
-        }
-
-        let shall_save_to_public_bucket = self
-            .shall_save_to_public_bucket
-            .unwrap_or_else(|| PromptConfirm::new(MSG_SAVE_TO_PUBLIC_BUCKET_PROMPT).ask());
-
-        if !shall_save_to_public_bucket {
-            return Ok(None);
-        }
-
-        if self.public_store_dir.is_some() {
-            return Ok(Some(
-                self.handle_file_backed_config(self.public_store_dir.clone()),
-            ));
-        }
-
-        if self.partial_gcs_config_provided(
-            self.public_store_gcs_config.public_bucket_base_url.clone(),
-            self.public_store_gcs_config.public_credentials_file.clone(),
-        ) {
-            return Ok(Some(self.ask_gcs_config(
-                self.public_store_gcs_config.public_bucket_base_url.clone(),
-                self.public_store_gcs_config.public_credentials_file.clone(),
-            )));
-        }
-
-        if self.partial_create_gcs_bucket_config_provided(
-            self.public_create_gcs_bucket_config
-                .public_bucket_name
-                .clone(),
-            self.public_create_gcs_bucket_config.public_location.clone(),
-            self.public_create_gcs_bucket_config
-                .public_project_id
-                .clone(),
-        ) {
-            let project_ids = get_project_ids(shell)?;
-            return Ok(Some(
-                self.handle_create_gcs_bucket(
-                    project_ids,
-                    self.public_create_gcs_bucket_config
-                        .public_project_id
-                        .clone(),
-                    self.public_create_gcs_bucket_config
-                        .public_bucket_name
-                        .clone(),
-                    self.public_create_gcs_bucket_config.public_location.clone(),
-                    self.public_store_gcs_config.public_credentials_file.clone(),
-                ),
-            ));
-        }
-
-        match PromptSelect::new(MSG_PROOF_STORE_CONFIG_PROMPT, ProofStoreConfig::iter()).ask() {
-            ProofStoreConfig::Local => Ok(Some(
-                self.handle_file_backed_config(self.public_store_dir.clone()),
-            )),
-            ProofStoreConfig::GCS => {
-                let project_ids = get_project_ids(shell)?;
-                Ok(Some(self.handle_gcs_config(
-                    project_ids,
-                    self.public_store_gcs_config.public_bucket_base_url.clone(),
-                    self.public_store_gcs_config.public_credentials_file.clone(),
-                )))
-            }
-        }
-    }
-
     fn fill_setup_compressor_key_values_with_prompt(
         &self,
         default_path: &Path,

zkstack_cli/crates/zkstack/src/commands/prover/init.rs

@@ -50,7 +50,6 @@ pub(crate) async fn run(args: ProverInitArgs, shell: &Shell) -> anyhow::Result<(
 
     let proof_object_store_config =
         get_object_store_config(shell, Some(args.proof_store))?.unwrap();
-    let public_object_store_config = get_object_store_config(shell, args.public_store)?;
 
     if let Some(args) = args.compressor_key_args {
         let path = args.path.context(MSG_SETUP_KEY_PATH_ERROR)?;
@@ -67,16 +66,6 @@ pub(crate) async fn run(args: ProverInitArgs, shell: &Shell) -> anyhow::Result<(
         "prover.prover_object_store",
         &proof_object_store_config,
     )?;
-    if let Some(public_object_store_config) = public_object_store_config {
-        general_config.insert("prover.shall_save_to_public_bucket", true)?;
-        set_object_store(
-            &mut general_config,
-            "prover.public_object_store",
-            &public_object_store_config,
-        )?;
-    } else {
-        general_config.insert("prover.shall_save_to_public_bucket", false)?;
-    }
     general_config.insert_yaml("prover.cloud_type", args.cloud_type)?;
     general_config.save().await?;
 

zkstack_cli/crates/zkstack/src/messages.rs

@@ -424,9 +424,7 @@ pub(super) const MSG_INITIALIZE_BELLMAN_CUDA_PROMPT: &str =
 pub(super) const MSG_SETUP_COMPRESSOR_KEY_PATH_PROMPT: &str = "Provide the path to the setup key:";
 pub(super) const MSG_GETTING_GCP_PROJECTS_SPINNER: &str = "Getting GCP projects...";
 pub(super) const MSG_GETTING_PROOF_STORE_CONFIG: &str = "Getting proof store configuration...";
-pub(super) const MSG_GETTING_PUBLIC_STORE_CONFIG: &str = "Getting public store configuration...";
 pub(super) const MSG_CREATING_GCS_BUCKET_SPINNER: &str = "Creating GCS bucket...";
-pub(super) const MSG_SAVE_TO_PUBLIC_BUCKET_PROMPT: &str = "Do you want to save to public bucket?";
 pub(super) const MSG_ROUND_SELECT_PROMPT: &str = "Select the round to run";
 pub(super) const MSG_WITNESS_GENERATOR_ROUND_ERR: &str = "Witness generator round not found";
 pub(super) const MSG_SETUP_KEY_PATH_ERROR: &str = "Failed to get setup key path";