Fix deterministic crafting state flow

web3blind · web3blind · commit 89ede059baa0 · 2026-06-21T07:06:57.000Z
diff --git a/app/index.html b/app/index.html
@@ -137,7 +137,7 @@
     <script src="js/protocols/market-protocol.js"></script>
 
     <!-- Game data -->
-    <script src="js/data/creatures.js"></script>
+    <script src="js/data/creatures.js?v=20260621i"></script>
     <script src="js/data/spells.js"></script>
     <script src="js/data/recipes.js"></script>
     <script src="js/data/regions.js"></script>
@@ -154,7 +154,7 @@
     <script src="js/engine/validator.js"></script>
     <script src="js/engine/guild.js?v=20260621d"></script>
     <script src="js/engine/territory.js"></script>
-    <script src="js/engine/crafting.js"></script>
+    <script src="js/engine/crafting.js?v=20260621i"></script>
     <script src="js/engine/enchanting.js"></script>
     <script src="js/engine/marketplace.js"></script>
     <script src="js/engine/checkpoint.js"></script>
@@ -164,7 +164,7 @@
     <script src="js/engine/quest-system.js?v=20260621e"></script>
     <script src="js/engine/loci.js"></script>
     <script src="js/engine/npc-framework.js"></script>
-    <script src="js/engine/state-engine.js?v=20260621h"></script>
+    <script src="js/engine/state-engine.js?v=20260621i"></script>
     <script src="js/engine/daily-leaderboard-storage.js"></script>
     <script src="js/engine/daily-leaderboard.js"></script>
 
@@ -190,7 +190,7 @@
     <script src="js/ui/screens/guild.js?v=20260621d"></script>
     <script src="js/ui/screens/map.js?v=20260621h"></script>
     <script src="js/ui/screens/marketplace.js"></script>
-    <script src="js/ui/screens/crafting.js"></script>
+    <script src="js/ui/screens/crafting.js?v=20260621i"></script>
     <script src="js/ui/screens/quests.js?v=20260621e"></script>
     <script src="js/ui/screens/world-boss.js"></script>
     <script src="js/ui/screens/settings.js"></script>
diff --git a/app/js/data/creatures.js b/app/js/data/creatures.js
@@ -27,6 +27,8 @@ var GameCreatures = (function() {
             zone: 'commons_first_light',
             lootTable: [
                 { itemType: 'fire_dust',     name: 'Fire Dust',     dropRate: 400 },
+                { itemType: 'sparkdust',     name: 'Sparkdust',     dropRate: 250 },
+                { itemType: 'sealwax',       name: 'Sealwax',       dropRate: 90 },
                 { itemType: 'health_scroll', name: 'Health Scroll', dropRate: 150 }
             ]
         },
@@ -45,6 +47,7 @@ var GameCreatures = (function() {
             zone: 'commons_first_light',
             lootTable: [
                 { itemType: 'shadow_shard',  name: 'Shadow Shard',  dropRate: 350 },
+                { itemType: 'chronicle_ink', name: 'Chronicle Ink', dropRate: 120 },
                 { itemType: 'health_scroll', name: 'Health Scroll', dropRate: 200 },
                 { itemType: 'lucky_charm',   name: 'Lucky Charm',   dropRate: 50 },
                 { itemType: 'echo_shards',   name: 'Echo Shards',   dropRate: 120 }
@@ -65,6 +68,7 @@ var GameCreatures = (function() {
             zone: 'commons_first_light',
             lootTable: [
                 { itemType: 'thorn_essence',    name: 'Thorn Essence',    dropRate: 300 },
+                { itemType: 'veilstone',         name: 'Veilstone',         dropRate: 140 },
                 { itemType: 'cloth_robe',       name: 'Cloth Robe',       dropRate: 100 },
                 { itemType: 'oak_wand',         name: 'Oak Wand',         dropRate: 80 },
                 { itemType: 'armageddon_stone', name: 'Armageddon Stone', dropRate: 5 }
@@ -86,6 +90,7 @@ var GameCreatures = (function() {
            lootTable: [
                 { itemType: 'ancient_shard', name: 'Ancient Echo Shard', dropRate: 300 },
                 { itemType: 'stone_tablet',  name: 'Weathered Stone Tablet', dropRate: 140 },
+                { itemType: 'aether_ore',    name: 'Aether Ore', dropRate: 80 },
                 { itemType: 'spirit_tunic',  name: 'Spirit Tunic', dropRate: 70 }
            ]
         },
diff --git a/app/js/engine/crafting.js b/app/js/engine/crafting.js
@@ -159,24 +159,63 @@ var CraftingSystem = (function() {
         };
     }
 
-    /**
-     * Execute a craft action
-     * @param {string} recipeId - recipe identifier
-     * @param {Object} character - CharacterState (will be mutated)
-     * @param {Array} inventory - inventory array (will be mutated)
-     * @param {string} location - current zone
-     * @param {string} blockHash - block hash for quality roll
-     * @param {number} blockNum - block number
-     * @param {string} account - crafter account
-     * @returns {Object} {success, item, quality, error, consumedIds}
-     */
-    function craft(recipeId, character, inventory, location, blockHash, blockNum, account) {
-        // Validate recipe
+    function _validateRecipeWithMaterialIds(recipeId, character, inventory, location, materialIds) {
         var validation = validateRecipe(recipeId, character, inventory, location);
         if (!validation.valid) {
-            return { success: false, error: validation.error, missing: validation.missing };
+            return validation;
+        }
+
+        var recipe = validation.recipe;
+        var required = {};
+        var remaining = 0;
+        for (var r = 0; r < recipe.materials.length; r++) {
+            required[recipe.materials[r].type] = (required[recipe.materials[r].type] || 0) + recipe.materials[r].quantity;
+            remaining += recipe.materials[r].quantity;
+        }
+
+        if (!materialIds || materialIds.length !== remaining) {
+            return { valid: false, error: 'missing_materials', recipe: recipe };
+        }
+
+        var matchedMaterials = [];
+        var used = {};
+        for (var i = 0; i < materialIds.length; i++) {
+            var id = materialIds[i];
+            if (used[id]) {
+                return { valid: false, error: 'missing_materials', recipe: recipe };
+            }
+            used[id] = true;
+
+            var item = null;
+            for (var j = 0; j < inventory.length; j++) {
+                if (inventory[j].id === id) {
+                    item = inventory[j];
+                    break;
+                }
+            }
+
+            if (!item || item.consumed || item.equipped || !required[item.type]) {
+                return { valid: false, error: 'missing_materials', recipe: recipe };
+            }
+
+            required[item.type]--;
+            matchedMaterials.push(item);
+        }
+
+        for (var type in required) {
+            if (required.hasOwnProperty(type) && required[type] !== 0) {
+                return { valid: false, error: 'missing_materials', recipe: recipe };
+            }
         }
 
+        return {
+            valid: true,
+            recipe: recipe,
+            matchedMaterials: matchedMaterials
+        };
+    }
+
+    function _craftFromValidation(validation, character, inventory, blockHash, blockNum, account) {
         var recipe = validation.recipe;
         var materials = validation.matchedMaterials;
 
@@ -220,6 +259,38 @@ var CraftingSystem = (function() {
         };
     }
 
+    /**
+     * Execute a craft action using any matching materials.
+     * @param {string} recipeId - recipe identifier
+     * @param {Object} character - CharacterState (will be mutated)
+     * @param {Array} inventory - inventory array (will be mutated)
+     * @param {string} location - current zone
+     * @param {string} blockHash - block hash for quality roll
+     * @param {number} blockNum - block number
+     * @param {string} account - crafter account
+     * @returns {Object} {success, item, quality, error, consumedIds}
+     */
+    function craft(recipeId, character, inventory, location, blockHash, blockNum, account) {
+        var validation = validateRecipe(recipeId, character, inventory, location);
+        if (!validation.valid) {
+            return { success: false, error: validation.error, missing: validation.missing };
+        }
+        return _craftFromValidation(validation, character, inventory, blockHash, blockNum, account);
+    }
+
+    /**
+     * Execute a craft action using the exact material item IDs recorded on-chain.
+     * This keeps replay deterministic and prevents a later replay from consuming a
+     * second set of matching materials after the live UI already applied the craft.
+     */
+    function craftWithMaterialIds(recipeId, character, inventory, location, blockHash, blockNum, account, materialIds) {
+        var validation = _validateRecipeWithMaterialIds(recipeId, character, inventory, location, materialIds || []);
+        if (!validation.valid) {
+            return { success: false, error: validation.error, missing: validation.missing };
+        }
+        return _craftFromValidation(validation, character, inventory, blockHash, blockNum, account);
+    }
+
     /**
      * Get available recipes for a character (filtered by class, level, materials)
      * @param {Object} character - CharacterState
@@ -284,6 +355,7 @@ var CraftingSystem = (function() {
         calculateQuality: calculateQuality,
         validateRecipe: validateRecipe,
         craft: craft,
+        craftWithMaterialIds: craftWithMaterialIds,
         getAvailableRecipes: getAvailableRecipes,
         countMaterial: countMaterial
     };
diff --git a/app/js/engine/state-engine.js b/app/js/engine/state-engine.js
@@ -848,10 +848,19 @@ var StateEngine = (function() {
         var inventory = worldState.inventories[sender];
         if (!character || !inventory) return [];
 
-        var result = CraftingSystem.craft(
-            data.recipe, character, inventory,
-            data.location || '', blockHash, blockNum, sender
-        );
+        var result;
+        if (typeof CraftingSystem.craftWithMaterialIds === 'function') {
+            result = CraftingSystem.craftWithMaterialIds(
+                data.recipe, character, inventory,
+                data.location || '', blockHash, blockNum, sender,
+                data.materials || []
+            );
+        } else {
+            result = CraftingSystem.craft(
+                data.recipe, character, inventory,
+                data.location || '', blockHash, blockNum, sender
+            );
+        }
 
         if (!result.success) {
             console.log('StateEngine: Craft failed for', sender, ':', result.error);
@@ -1226,6 +1235,27 @@ var StateEngine = (function() {
         return events[0];
     }
 
+    /**
+     * Process crafting for live UI — same authoritative mutation path as replay.
+     * @param {string} account
+     * @param {string} recipeId
+     * @param {Array} materialIds
+     * @param {string} location
+     * @param {string} blockHash
+     * @param {number} blockNum
+     * @returns {Object|null}
+     */
+    function processCraftResult(account, recipeId, materialIds, location, blockHash, blockNum) {
+        var data = {
+            recipe: recipeId,
+            materials: materialIds || [],
+            location: location || ''
+        };
+        var events = _handleCraft(account, data, blockNum || 0, blockHash || '');
+        if (!events.length) return null;
+        return events[0];
+    }
+
     /**
      * Process Armageddon for live UI — same logic as _handleHuntArmageddon.
      * @param {string} account
@@ -1262,6 +1292,7 @@ var StateEngine = (function() {
         getInventory: getInventory,
         processHuntResult: processHuntResult,
         processMoveResult: processMoveResult,
+        processCraftResult: processCraftResult,
         processArmageddonResult: processArmageddonResult,
         reset: reset
     };
diff --git a/app/js/ui/screens/crafting.js b/app/js/ui/screens/crafting.js
@@ -497,22 +497,40 @@ var CraftingScreen = (function() {
                 return;
             }
 
-            // Simulate local craft result (actual state updated from block processing)
+            // Apply local craft result through StateEngine so live play and replay share one mutation path.
             var worldState = StateEngine.getState();
-            var blockHash = 'sim_' + Date.now().toString(16);
-            var blockNum = worldState.headBlock + 1;
-
-            var craftRes = CraftingSystem.craft(
-                selectedRecipe, character, inventory,
-                character.currentZone || '', blockHash, blockNum, user
-            );
-
-            if (craftRes.success) {
-                craftResult = craftRes;
+            var blockNum = (result && result.block_num) || (result && result.action && result.action.block_num) || (worldState.headBlock + 1);
+            var blockHash = (result && (result.block_id || result.id || result.transaction_id)) ||
+                (result && result.action && (result.action.block_id || result.action.id || result.action.transaction_id)) ||
+                ('sim_' + Date.now().toString(16));
+
+            var craftEvent = StateEngine.processCraftResult(user, selectedRecipe, materialIds, character.currentZone || '', blockHash, blockNum);
+
+            if (craftEvent) {
+                craftResult = {
+                    item: {
+                        id: craftEvent.itemId,
+                        type: craftEvent.itemType,
+                        rarity: craftEvent.rarity,
+                        stats: (function() {
+                            var inv = StateEngine.getInventory(user);
+                            for (var ii = 0; ii < inv.length; ii++) {
+                                if (inv[ii].id === craftEvent.itemId) return inv[ii].stats || null;
+                            }
+                            return null;
+                        })()
+                    },
+                    quality: {
+                        rarity: craftEvent.rarity,
+                        rarityName: craftEvent.rarityName
+                    },
+                    consumedIds: craftEvent.consumedIds || []
+                };
+                StateEngine.saveCheckpoint(function() {});
                 SoundManager.play('victory');
                 SoundManager.vibrate('loot');
             } else {
-                Toast.error(t('craft_error_' + (craftRes.error || 'unknown')));
+                Toast.error(t('craft_error_unknown'));
                 SoundManager.play('error');
             }
 
diff --git a/app/sw.js b/app/sw.js
@@ -1,5 +1,5 @@
 // Viz Magic — Service Worker
-var CACHE_NAME = 'viz-magic-v21';
+var CACHE_NAME = 'viz-magic-v22';
 var ASSETS = [
     '/',
     '/index.html',
diff --git a/plan.md b/plan.md
@@ -1,6 +1,6 @@
 # Viz Magic — remaining QA and hardening plan
 
-Updated: 2026-06-21 06:48 UTC
+Updated: 2026-06-21 07:32 UTC
 
 This file is the canonical handoff plan for the next Hermes session. It intentionally replaces the old `plan.md` contents.
 
@@ -107,7 +107,14 @@ PY
 
 ## Remaining work item 1 — Crafting E2E
 
-Status: not fully covered E2E.
+Status: locally covered with regression tests and browser fixture smoke; live VIZ broadcast not executed.
+
+2026-06-21 update:
+
+- Live crafting no longer mutates inventory directly in `CraftingScreen`; after successful `MarketProtocol.broadcastCraft(...)` it routes through `StateEngine.processCraftResult(...)` and saves a checkpoint.
+- Replay crafting now consumes the exact material item IDs from action data via `CraftingSystem.craftWithMaterialIds(...)`, preventing different matching materials from being consumed during later replay.
+- Recipe output templates and recipe material obtainability are covered by `tests/player-bug-regressions.test.js`.
+- Browser fixture smoke crafted one `mana_potion`, marked the three selected material IDs consumed, added exactly one crafted item, and confirmed checkpoint save was called. This was a local stubbed broadcast smoke, not a live-chain spend.
 
 Goal: verify crafting from UI through state-engine, inventory, material consumption, messages, and checkpoint persistence.
 
@@ -419,7 +426,7 @@ Suggested prompt for a new Hermes session:
 
 Mark items here as the next session completes them:
 
-- [ ] Crafting E2E
+- [x] Crafting E2E — local fixture + regression coverage; live-chain broadcast intentionally not spent
 - [ ] Marketplace E2E
 - [ ] Two-browser Guild smoke
 - [ ] Two-browser Arena smoke
diff --git a/tests/player-bug-regressions.test.js b/tests/player-bug-regressions.test.js
