fix multi-output outputs file naming (& ui icons), parametrize & reduce PoW of Stone from 3 to 2 (since now proving in general already involves more recursive steps

Author: arnaucube

app_cli/src/lib.rs

@@ -16,8 +16,8 @@ use common::{
 use craftlib::{
     constants::{
         AXE_BLUEPRINT, AXE_MINING_MAX, AXE_WORK, DUST_BLUEPRINT, DUST_MINING_MAX, DUST_WORK,
-        GEM_BLUEPRINT, STONE_BLUEPRINT, STONE_MINING_MAX, WOOD_BLUEPRINT, WOOD_MINING_MAX,
-        WOOD_WORK, WOODEN_AXE_BLUEPRINT, WOODEN_AXE_MINING_MAX, WOODEN_AXE_WORK,
+        GEM_BLUEPRINT, STONE_BLUEPRINT, STONE_MINING_MAX, STONE_WORK_COST, WOOD_BLUEPRINT,
+        WOOD_MINING_MAX, WOOD_WORK, WOODEN_AXE_BLUEPRINT, WOODEN_AXE_MINING_MAX, WOODEN_AXE_WORK,
     },
     item::{CraftBuilder, MiningRecipe},
     powpod::PowPod,
@@ -375,7 +375,7 @@ impl Helper {
 pub fn craft_item(
     params: &Params,
     recipe: Recipe,
-    output: &Path,
+    outputs: &[PathBuf],
     inputs: &[PathBuf],
 ) -> anyhow::Result<Vec<PathBuf>> {
     let vd_set = DEFAULT_VD_SET.clone();
@@ -397,7 +397,7 @@ pub fn craft_item(
             let pow_pod = PowPod::new(
                 params,
                 vd_set.clone(),
-                3, // num_iters
+                STONE_WORK_COST, // num_iters
                 RawValue::from(ingredients_def.dict(params)?.commitment()),
             )?;
             log::info!("[TIME] PowPod proving time: {:?}", start.elapsed());
@@ -491,7 +491,7 @@ pub fn craft_item(
     // create output dir (if there is a parent dir), in case it does not exist
     // yet, so that later when creating the file we don't get an error if the
     // directory does not exist
-    if let Some(dir) = output.parent() {
+    if let Some(dir) = outputs[0].parent() {
         std::fs::create_dir_all(dir)?;
     }
 
@@ -513,14 +513,8 @@ pub fn craft_item(
 
     let filenames: Vec<PathBuf> = item_def
         .iter()
-        .map(|ItemDef { index, batch: _ }| {
-            let suffix = if pods.len() > 1 {
-                format!("_{}", index.name())
-            } else {
-                "".to_string()
-            };
-            format! {"{}{suffix}", output.display()}.into()
-        })
+        .enumerate()
+        .map(|(i, _)| format! {"{}", outputs[i].display()}.into())
         .collect();
 
     for (filename, (def, pod)) in

app_cli/src/main.rs

@@ -28,8 +28,8 @@ enum Commands {
     Craft {
         #[arg(long, value_name = "RECIPE")]
         recipe: String,
-        #[arg(long, value_name = "FILE")]
-        output: PathBuf,
+        #[arg(long = "input", value_name = "FILE")]
+        outputs: Vec<PathBuf>,
         #[arg(long = "input", value_name = "FILE")]
         inputs: Vec<PathBuf>,
     },
@@ -59,11 +59,11 @@ async fn main() -> anyhow::Result<()> {
     match cli.command {
         Some(Commands::Craft {
             recipe,
-            output,
+            outputs,
             inputs,
         }) => {
             let recipe = Recipe::from_str(&recipe)?;
-            craft_item(&params, recipe, &output, &inputs)?;
+            craft_item(&params, recipe, &outputs, &inputs)?;
         }
         Some(Commands::Commit { input }) => {
             commit_item(&params, &cfg, &input).await?;

app_gui/src/crafting.rs

@@ -549,7 +549,7 @@ pub struct Crafting {
     pub selected_action: Option<&'static str>,
     // Input index to item index
     pub input_items: HashMap<usize, usize>,
-    pub output_filename: String,
+    pub outputs_filename: Vec<String>,
     pub craft_result: Option<Result<Vec<PathBuf>>>,
     pub commit_result: Option<Result<PathBuf>>,
 }
@@ -737,11 +737,20 @@ impl App {
 
             self.crafting.selected_action = selected_action;
 
-            // NOTE: If we don't show filenames in the left panel, then we shouldn't ask for a
-            // filename either.
-            if self.crafting.output_filename.is_empty() {
-                self.crafting.output_filename =
-                    format!("{:?}_{}", process, self.items.len() + self.used_items.len());
+            // prepare the outputs names that will be used to store the outputs files
+            let process_outputs = process.data().outputs;
+            if self.crafting.outputs_filename.is_empty() {
+                self.crafting.outputs_filename = process_outputs
+                    .iter()
+                    .enumerate()
+                    .map(|(i, process_output)| {
+                        format!(
+                            "{}_{}",
+                            process_output,
+                            self.items.len() + self.used_items.len() + i
+                        )
+                    })
+                    .collect();
             }
 
             ui.add_space(8.0);
@@ -771,11 +780,15 @@ impl App {
                 });
 
             if button_craft_clicked {
-                if self.crafting.output_filename.is_empty() {
+                if self.crafting.outputs_filename.is_empty() {
                     self.crafting.craft_result = Some(Err(anyhow!("Please enter a filename.")));
                 } else {
-                    let output =
-                        Path::new(&self.cfg.pods_path).join(&self.crafting.output_filename);
+                    let outputs_paths = self
+                        .crafting
+                        .outputs_filename
+                        .iter()
+                        .map(|output| Path::new(&self.cfg.pods_path).join(output))
+                        .collect();
                     let input_paths = (0..inputs.len())
                         .map(|i| {
                             self.crafting
@@ -798,7 +811,7 @@ impl App {
                                         params: self.params.clone(),
                                         pods_path: self.cfg.pods_path.clone(),
                                         recipe,
-                                        output,
+                                        outputs: outputs_paths,
                                         input_paths,
                                     })
                                     .unwrap();
@@ -809,7 +822,7 @@ impl App {
             }
 
             if button_commit_clicked {
-                if self.crafting.output_filename.is_empty() {
+                if self.crafting.outputs_filename.is_empty() {
                     self.crafting.commit_result = Some(Err(anyhow!("Please enter a filename.")));
                 } else if self.crafting.craft_result.is_none()
                     || self.crafting.craft_result.as_ref().unwrap().is_err()
@@ -837,11 +850,15 @@ impl App {
             }
 
             if button_craft_and_commit_clicked {
-                if self.crafting.output_filename.is_empty() {
+                if self.crafting.outputs_filename.is_empty() {
                     self.crafting.commit_result = Some(Err(anyhow!("Please enter a filename.")));
                 } else {
-                    let output =
-                        Path::new(&self.cfg.pods_path).join(&self.crafting.output_filename);
+                    let outputs_paths = self
+                        .crafting
+                        .outputs_filename
+                        .iter()
+                        .map(|output| Path::new(&self.cfg.pods_path).join(output))
+                        .collect();
                     let input_paths = (0..inputs.len())
                         .map(|i| {
                             self.crafting
@@ -865,7 +882,7 @@ impl App {
                                         cfg: self.cfg.clone(),
                                         pods_path: self.cfg.pods_path.clone(),
                                         recipe,
-                                        output,
+                                        outputs: outputs_paths,
                                         input_paths,
                                     })
                                     .unwrap();

app_gui/src/main.rs

@@ -68,7 +68,7 @@ impl eframe::App for App {
                         log::error!("{e:?}");
                     }
                     // Reset filename
-                    self.crafting.output_filename = "".to_string();
+                    self.crafting.outputs_filename = vec![];
                     self.crafting.commit_result = Some(r);
                 }
                 Response::CraftAndCommit(r) => {
@@ -82,7 +82,7 @@ impl eframe::App for App {
                     self.refresh_items().unwrap();
                     self.crafting.input_items = HashMap::new();
                     // Reset filename
-                    self.crafting.output_filename = "".to_string();
+                    self.crafting.outputs_filename = vec![];
                     self.crafting.craft_result = None;
                     self.crafting.commit_result = r.map(|entries| Ok(entries[0].clone())).ok();
                 }

app_gui/src/task_system.rs

@@ -19,7 +19,7 @@ pub enum Request {
         params: Params,
         pods_path: String,
         recipe: Recipe,
-        output: PathBuf,
+        outputs: Vec<PathBuf>,
         input_paths: Vec<PathBuf>,
     },
     Commit {
@@ -32,7 +32,7 @@ pub enum Request {
         cfg: Config,
         pods_path: String,
         recipe: Recipe,
-        output: PathBuf,
+        outputs: Vec<PathBuf>,
         input_paths: Vec<PathBuf>,
     },
     Exit,
@@ -55,24 +55,31 @@ pub fn handle_req(task_status: &RwLock<TaskStatus>, req: Request) -> Response {
             params,
             pods_path,
             recipe,
-            output,
+            outputs,
             input_paths,
-        } => craft(task_status, &params, pods_path, recipe, output, input_paths),
+        } => craft(
+            task_status,
+            &params,
+            pods_path,
+            recipe,
+            outputs,
+            input_paths,
+        ),
         Request::Commit { params, cfg, input } => commit(task_status, &params, cfg, input),
         Request::CraftAndCommit {
             params,
             cfg,
             pods_path,
             recipe,
-            output,
+            outputs,
             input_paths,
         } => {
             let craft_res = craft(
                 task_status,
                 &params,
                 pods_path,
                 recipe,
-                output.clone(),
+                outputs,
                 input_paths,
             );
             match craft_res {
@@ -98,13 +105,13 @@ fn craft(
     params: &Params,
     pods_path: String,
     recipe: Recipe,
-    output: PathBuf,
+    outputs: Vec<PathBuf>,
     input_paths: Vec<PathBuf>,
 ) -> Response {
     set_busy_task(task_status, "Crafting");
 
     let start = std::time::Instant::now();
-    let r = craft_item(params, recipe, &output, &input_paths);
+    let r = craft_item(params, recipe, &outputs, &input_paths);
     log::info!("[TIME] total Craft Item time: {:?}", start.elapsed());
 
     // move the files of the used inputs into the `used` subdir

craftlib/src/constants.rs

@@ -3,6 +3,7 @@ use pod2::middleware::{EMPTY_VALUE, RawValue};
 pub const STONE_BLUEPRINT: &str = "stone";
 pub const STONE_MINING_MAX: u64 = 0x0020_0000_0000_0000;
 pub const STONE_WORK: RawValue = EMPTY_VALUE;
+pub const STONE_WORK_COST: usize = 2;
 
 pub const WOOD_BLUEPRINT: &str = "wood";
 pub const WOOD_MINING_MAX: u64 = 0x0020_0000_0000_0000;

craftlib/src/item.rs

@@ -474,7 +474,7 @@ mod tests {
         let pow_pod = PowPod::new(
             &params,
             vd_set.clone(),
-            3, // num_iters
+            crate::constants::STONE_WORK_COST, // num_iters
             RawValue::from(ingredients_def.dict(&params)?.commitment()),
         )?;
         let main_pow_pod = MainPod {

craftlib/src/predicates.rs

@@ -4,6 +4,8 @@ use commitlib::predicates::CommitPredicates;
 use pod2::middleware::{CustomPredicateRef, Params};
 use pod2utils::PredicateDefs;
 
+use crate::constants::STONE_WORK_COST;
+
 pub struct ItemPredicates {
     pub defs: PredicateDefs,
 
@@ -18,33 +20,34 @@ impl ItemPredicates {
         // 8 arguments per predicate, at most 5 of which are public
         // 5 statements per predicate
         let batch_defs = [
-            r#"
+            &format!(
+                r#"
             use intro Pow(count, input, output) from 0x3493488bc23af15ac5fabe38c3cb6c4b66adb57e3898adf201ae50cc57183f65 // powpod vd hash
         
             // Example of a mined item with no inputs or sequential work.
             // Stone requires working in a stone mine (blueprint="stone") and
             // 10 leading 0s.
             IsStone(item, private: ingredients, inputs, key, work) = AND(
                 ItemDef(item, ingredients, inputs, key, work)
-                Equal(inputs, {})
+                Equal(inputs, {{}})
                 DictContains(ingredients, "blueprint", "stone")
-                Pow(3, ingredients, work)
+                Pow({STONE_WORK_COST}, ingredients, work)
             )
         
             // Example of a mined item which is more common but takes more work to
             // extract.
             IsWood(item, private: ingredients, inputs, key, work) = AND(
                 ItemDef(item, ingredients, inputs, key, work)
-                Equal(inputs, {})
+                Equal(inputs, {{}})
                 DictContains(ingredients, "blueprint", "wood")
-                Equal(work, {})
+                Equal(work, {{}})
                 // TODO input POD: SequentialWork(ingredients, work, 5)
                 // TODO input POD: HashInRange(0, 1<<5, ingredients)
             )
 
             AxeInputs(inputs, private: s1, wood, stone) = AND(
                 // 2 ingredients
-                SetInsert(s1, {}, wood)
+                SetInsert(s1, {{}}, wood)
                 SetInsert(inputs, s1, stone)
         
                 // prove the ingredients are correct.
@@ -57,11 +60,12 @@ impl ItemPredicates {
             IsAxe(item, private: ingredients, inputs, key, work) = AND(
                 ItemDef(item, ingredients, inputs, key, work)
                 DictContains(ingredients, "blueprint", "axe")
-                Equal(work, {})
+                Equal(work, {{}})
         
                 AxeInputs(inputs)
             )
-            "#,
+            "#
+            ),
             r#"
         
             // Wooden Axe:
@@ -214,7 +218,7 @@ mod tests {
         let pow_pod = PowPod::new(
             &params,
             vd_set.clone(),
-            3,
+            STONE_WORK_COST,
             RawValue::from(ingredients_def.dict(&params)?.commitment()),
         )?;
         let main_pow_pod = MainPod {

shell.nix

@@ -3,12 +3,13 @@
 let
   dlopenLibraries = with pkgs; [
     libxkbcommon
-    libxkbcommon.dev
+    # libxkbcommon.dev
 
+    #vulkan-loader
     wayland
-    wayland.dev
+    # wayland.dev
     wayland-protocols
-    emacs
+    sway
     mesa
     mesa-gl-headers
     egl-wayland
@@ -17,9 +18,10 @@ let
 in pkgs.mkShell {
   nativeBuildInputs = with pkgs; [
     rustup
-    mesa
-    mesa-gl-headers
+    gcc
+    pkg-config
   ];
 
-  env.RUSTFLAGS = "-C link-arg=-Wl,-rpath,${pkgs.lib.makeLibraryPath dlopenLibraries}";
+  env.RUSTFLAGS = "-C linker=clang -C link-arg=-Wl,-rpath,${pkgs.lib.makeLibraryPath dlopenLibraries}";
+  LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath dlopenLibraries;
 }