feat: use multi-output predicates

README.md

@@ -108,3 +108,5 @@ The files in `app_gui/assets` are distributed under the Flaticon License:
 - `uranium.png`: <a href="https://www.flaticon.com/free-icons/uranium" title="uranium icons">Uranium icons created by Freepik - Flaticon</a>
 - `tomato.png`: <a href="https://www.flaticon.com/free-icons/tomato" title="tomato icons">Tomato icons created by PixelPerfect - Flaticon</a>
 - `steel-sword.png`: <a href="https://www.flaticon.com/free-icons/steel-sword" title="steel sword icons">Steel sword icons created by Assia Benkerroum - Flaticon</a>
+- `dust.png`: <a href="https://www.flaticon.com/free-icon/sand_4492623">Dust icon created by Freepik</a>
+- `gem.png`: <a href="https://www.flaticon.com/free-icon/zirconia_6577837">Dust icon created by Freepik</a>

app_cli/src/main.rs

@@ -74,14 +74,17 @@ async fn main() -> anyhow::Result<()> {
             // Verify that the item exists on-blob-space:
             // first get the merkle proof of item existence from the Synchronizer
             let item = RawValue::from(crafted_item.def.item_hash(&params)?);
-            let item_hex: String = format!("{item:#}");
+
+            // Single item => set containing one element
+            // TODO: Generalise.
+            let item_set_hex: String = format!("{item:#}");
             let (epoch, _): (u64, RawValue) =
                 reqwest::blocking::get(format!("{}/created_items_root", cfg.sync_url,))?.json()?;
             info!("Verifying commitment of item {item:#} via synchronizer at epoch {epoch}");
             let (epoch, mtp): (u64, MerkleProof) = reqwest::blocking::get(format!(
                 "{}/created_item/{}",
                 cfg.sync_url,
-                &item_hex[2..]
+                &item_set_hex[2..]
             ))?
             .json()?;
             info!("mtp at epoch {epoch}: {mtp:?}");

app_gui/src/crafting.rs

@@ -20,6 +20,7 @@ pub enum Process {
     Wood,
     Axe,
     WoodenAxe,
+    DisassembleStone,
     Mock(&'static str),
 }
 
@@ -97,6 +98,63 @@ IsWoodenAxe(item, private: ingredients, inputs, key, work, s1, wood1, wood2) = A
     // prove the ingredients are correct.
     IsWood(wood1)
     IsWood(wood2)
+)"#,
+        ..Default::default()
+    };
+    static ref DISASSEMBLE_STONE_DATA: ProcessData = ProcessData {
+        description: "Disassemble Stone into Dust+Gem.",
+        input_ingredients: &["Stone", "Stone"],
+        outputs: &["Dust", "Gem"],
+        predicate: r#"
+// inputs: 2 Stones
+StoneDisassembleInputs(inputs, private: s1, stone1, stone2) = AND(
+    SetInsert(s1, {}, stone1)
+    SetInsert(inputs, s1, stone2)
+
+    // prove the ingredients are correct
+    IsStone(stone1)
+    IsStone(stone2)
+)
+
+// outputs: 1 Dust, 1 Gem
+StoneDisassembleOutputs(batch, keys,
+        private: k1, dust, gem, _dust_key, _gem_key) = AND(
+    HashOf(dust, batch, "dust")
+    HashOf(gem, batch, "gem")
+    DictInsert(k1, {}, "dust", _dust_key)
+    DictInsert(keys, k1, "gem", _gem_key)
+)
+
+// helper to have a single predicate for the inputs & outputs
+StoneDisassembleInputsOutputs(inputs, batch, keys) = AND (
+    StoneDisassembleInputs(inputs)
+    StoneDisassembleOutputs(batch, keys)
+)
+
+StoneDisassemble(batch, keys, work,
+        private: inputs, ingredients) = AND(
+    BatchDef(batch, ingredients, inputs, keys, work)
+    DictContains(ingredients, "blueprint", "dust+gem")
+
+    StoneDisassembleInputsOutputs(inputs, batch, keys)
+)
+
+// can only obtain Dust from disassembling 2 stones
+IsDust(item, private: batch, ingredients, inputs, keys, key, work) = AND(
+    HashOf(item, batch, "dust")
+    DictContains(keys, "dust", key)
+    Equal(work, {})
+
+    StoneDisassemble(batch, keys, work)
+)
+
+// can only obtain Gem from disassembling 2 stones
+IsGem(item, private: batch, ingredients, inputs, keys, key, work) = AND(
+    HashOf(item, batch, "gem")
+    DictContains(keys, "gem", key)
+    Equal(work, {})
+
+    StoneDisassemble(batch, keys, work)
 )"#,
         ..Default::default()
     };
@@ -400,6 +458,7 @@ impl Process {
             Self::Wood => Some(Recipe::Wood),
             Self::Axe => Some(Recipe::Axe),
             Self::WoodenAxe => Some(Recipe::WoodenAxe),
+            Self::DisassembleStone => Some(Recipe::DustGem),
             Self::Mock(_) => None,
         }
     }
@@ -410,6 +469,7 @@ impl Process {
             Self::Wood => &WOOD_DATA,
             Self::Axe => &AXE_DATA,
             Self::WoodenAxe => &WOODEN_AXE_DATA,
+            Self::DisassembleStone => &DISASSEMBLE_STONE_DATA,
             Self::Mock("Destroy") => &DESTROY_DATA,
             Self::Mock("Tomato") => &TOMATO_DATA,
             Self::Mock("Steel Sword") => &STEEL_SWORD_DATA,
@@ -461,7 +521,7 @@ impl Verb {
             ],
             Self::Craft => vec![Axe, WoodenAxe, Mock("Tree House")],
             Self::Produce => vec![Mock("Tomato"), Mock("Steel Sword")],
-            Self::Disassemble => vec![Mock("Disassemble-H2O")],
+            Self::Disassemble => vec![DisassembleStone, Mock("Disassemble-H2O")],
             Self::Destroy => vec![Mock("Destroy")],
         }
     }

app_gui/src/main.rs

@@ -229,7 +229,7 @@ impl App {
                 // Mock toggle taken into account.
                 for verb in Verb::list()
                     .into_iter()
-                    .filter(|v| self.mock_mode || v == &Verb::Gather || v == &Verb::Craft)
+                    .filter(|v| self.mock_mode || v == &Verb::Gather || v == &Verb::Craft || v == &Verb::Disassemble)
                 {
                     if ui
                         .selectable_label(Some(verb) == self.crafting.selected_verb, verb.as_str())
@@ -280,6 +280,10 @@ impl App {
                     egui::include_image!("../assets/tomato.png")
                 } else if name.starts_with("Steel Sword") {
                     egui::include_image!("../assets/steel-sword.png")
+                } else if name.starts_with("Dust") {
+                    egui::include_image!("../assets/dust.png")
+                } else if name.starts_with("Gem") {
+                    egui::include_image!("../assets/gem.png")
                 } else {
                     egui::include_image!("../assets/empty.png")
                 })