Merge remote-tracking branch 'origin/master' into feat/galileo-v2

Author: lispc

crates/tools/upload-axiom/src/main.rs

@@ -12,7 +12,7 @@ use jiff::civil::{DateTime, DateTimeDifference};
 use jiff::tz::TimeZone;
 use jiff::{Timestamp, Unit, Zoned};
 use openvm_sdk::commit::CommitBytes;
-use scroll_zkvm_types::axiom::get_config_id;
+use scroll_zkvm_types::axiom::{AxiomProgram, get_config_id};
 use scroll_zkvm_types::utils::serialize_vk;
 use std::collections::HashMap;
 use std::fs::File;
@@ -252,7 +252,7 @@ fn main() -> eyre::Result<()> {
             "{LOG_PREFIX} {OK} Uploaded project {styled_project} with Program ID: {program_id}"
         );
 
-        program_ids.insert(vk, program_id);
+        program_ids.insert(vk, AxiomProgram::new(program_id, config_id));
     }
 
     if !cli.no_write_ids {

crates/types/src/axiom.rs

@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 pub mod config {
     /// Axiom configuration ID for [openvm.toml](../../circuits/chunk-circuit/openvm.toml).
     /// Should be updated when the openvm.toml changes.
@@ -10,6 +12,41 @@ pub mod config {
     pub const BUNDLE: &str = "cfg_01k9b6xjt0va25sy94tztwehs7";
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct AxiomProgram {
+    program_id: String,
+    config_id: String,
+}
+
+impl AxiomProgram {
+    pub fn new<P: Into<String>, C: Into<String>>(program_id: P, config_id: C) -> Self {
+        Self {
+            program_id: program_id.into(),
+            config_id: config_id.into(),
+        }
+    }
+
+    pub fn chunk<S: Into<String>>(program_id: S) -> Self {
+        Self::new(program_id, config::CHUNK)
+    }
+
+    pub fn batch<S: Into<String>>(program_id: S) -> Self {
+        Self::new(program_id, config::BATCH)
+    }
+
+    pub fn bundle<S: Into<String>>(program_id: S) -> Self {
+        Self::new(program_id, config::BUNDLE)
+    }
+
+    pub fn program_id(&self) -> &str {
+        &self.program_id
+    }
+
+    pub fn config_id(&self) -> &str {
+        &self.config_id
+    }
+}
+
 /// Get the Axiom configuration ID for the given circuit kind.
 ///
 /// # Panics