From ce6bdf404abc3b266130d382dfa398cbbc5c2cb5 Mon Sep 17 00:00:00 2001
From: igneum-josh <337424239+igneum-josh@users.noreply.github.com>
Date: Mon, 5 Oct 2026 17:44:16 +0100
Subject: [PATCH] site: conflict markers removed from the generated journey
 data, every page rebuilt

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
---
 site/index.html   |  2 +-
 site/journey.json | 37 +++++++++++++------------------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/site/index.html b/site/index.html
index edf76cf65..152868300 100644
--- a/site/index.html
+++ b/site/index.html
@@ -662,7 +662,7 @@ pre{margin:0;font-family:var(--f-mono);font-size:13px;line-height:1.6;color:var(
 <!-- footer:end -->
 
 <!-- journey:start -->
-<script type="application/json" id="journey-data">{"updated":"2026-10-05","stage":"phase-3","phases":[{"id":"phase-1","name":"Specification","when":"Oct to Nov 2026","status":"active","line":"Mining generator, shard proving, finality rules, written for external review"},{"id":"phase-2","name":"Prove the proving","when":"Nov 2026 to Jan 2027","status":"active","line":"Mining program proven on Apple, NVIDIA and AMD; shard proving benchmark on consumer cards still to run","gate":"A fixed published workload, job received to accepted proof on a declared consumer card, sustained with no growing backlog, reproduced by three independent operators"},{"id":"phase-3","name":"Devnet","when":"Started 3 Oct 2026, 20 nodes by Mar 2027","status":"active","line":"BlockDAG node mining on the new program, GPU miners on three vendors, EVM execution in build","gate":"1 block a second held with proofs under 60 s behind the tip"},{"id":"phase-4","name":"Finality and job market","when":"Apr to Jul 2027","status":"next","line":"Sustained-mining finality, external proving jobs, miner client with auto-switching","gate":"Finality design passes external review and one rollup signs for testnet"},{"id":"phase-5","name":"Public testnet","when":"Aug to Oct 2027","status":"next","line":"One-click miner app on Windows, macOS and Linux, HiveOS, pools, the first rollup as a proving customer, no coin yet","gate":"1,000 independent miners run 30 days and rollup proofs are delivered on time"},{"id":"phase-6","name":"Mainnet fair launch","when":"Nov 2027","status":"next","line":"Genesis with no premine, 30-day ramp. No listing is arranged, promised or sought by the project"}],"log":[{"date":"2026-10-05","text":"Live devnet: real transactions, the first non-empty shard proven and paid, and the exporter's block structure fixed","short":"Live devnet: real transactions, the first non-empty shard proven and…"},{"date":"2026-10-05","text":"FUD ledger sweep round 6","short":"FUD ledger sweep round 6"},{"date":"2026-10-05","text":"The program id split: why the Apple M5 Max rejected PC 2's proofs, and the verifier at 114 s","short":"The program id split"},{"date":"2026-10-05","text":"Live devnet: the first shards proven, verified and paid","short":"Live devnet: the first shards proven, verified and paid"},{"date":"2026-10-04","text":"Ledger M30: the block and transaction floods grew the node by 256 MiB per epoch roll, fixed by sharing the PoW cache across the epochs of a day","short":"Ledger M30: the block and transaction floods grew the node by 256…"},{"date":"2026-10-04","text":"Round-4 consensus items F23, F24, G12, X18 and M31: unit tests and fast-time 3-node runs against the control","short":"Round-4 consensus items F23, F24, G12, X18 and M31"},{"date":"2026-10-04","text":"The software dev fee measured on a test network: 9 fee blocks in 785, the chain and the miners' counters agree","short":"The software dev fee measured on a test network"},{"date":"2026-10-04","text":"Miner fault guards and the app watchdog measured against a fake worker","short":"Miner fault guards and the app watchdog measured against a fake worker"},{"date":"2026-10-04","text":"Miner performance: variant racing","short":"Miner performance"},{"date":"2026-10-04","text":"Finality rule v3: the frozen weight table and the certificate fold , simulator, unit tests, fast-time 3-node network with 300-ms links","short":"Finality rule v3"},{"date":"2026-10-04","text":"First machine in the United States: a Windows laptop on an Intel integrated GPU, synced and voting","short":"First machine in the United States: a laptop on an integrated GPU, synced and voting"},{"date":"2026-10-04","text":"Shard proving on the RTX 5090: a full shard compressed in 10.9 s, a two-shard block aggregated in 2.2 s, all verified","short":"Shard layer on the RTX 5090: a full shard proven in 10.9 s, a block aggregated in 2.2 s"},{"date":"2026-10-04","text":"Cloud devnet: 12 igneumd nodes in 5 locations, inter-region latency, two Singapore partitions, hash-rate steps","short":"Cloud devnet: 12 igneumd nodes in 5 locations, inter-region latency"},{"date":"2026-10-04","text":"Correction: the 78-minute observer gap was the Apple M5 Max hibernating","short":"Correction: the 78-minute observer gap was the Apple M5 Max hibernating"},{"date":"2026-10-04","text":"Difficulty v2 rollout rehearsal on the 12-node the cloud provider network, binaries for the devnet, the devnet plan","short":"Difficulty v2 rollout rehearsal on the 12-node the cloud provider…"},{"date":"2026-10-04","text":"Difficulty rule v2 activated on the live devnet at DAA 33,000 by height switch, no fresh chain","short":"Difficulty rule v2 switched on the live devnet by height, no fresh chain"},{"date":"2026-10-04","text":"First outside machine on the devnet: an Apple silicon laptop through the Igneum Miner app","short":"First outside machine: a friend's Mac mining through the app"},{"date":"2026-10-04","text":"One-click Windows workers: what the Apple M5 Max could measure","short":"One-click Windows workers"},{"date":"2026-10-04","text":"The gfx1036 worker fault and what the Apple M5 Max could and could not reproduce","short":"The gfx1036 worker fault and what the Apple M5 Max could and could…"},{"date":"2026-10-04","text":"Difficulty rule v2: the live oscillation, its cause, the DAG replay, the fix behind a height switch","short":"Difficulty rule v2"},{"date":"2026-10-04","text":"The observer stored nothing for 78 minutes, then 7,022 blocks in two minutes","short":"The observer stored nothing for 78 minutes, then 7,022 blocks in two…"},{"date":"2026-10-04","text":"PC 2 at the 14:20 boundary: a worker stuck on the previous epoch","short":"PC 2 at the 14:20 boundary: a worker stuck on the previous epoch"},{"date":"2026-10-04","text":"The gfx1036 worker fault and what the Mac could and could not reproduce","short":"The gfx1036 worker fault and what the Mac could and could not reproduce"},{"date":"2026-10-04","text":"A node 60 s behind the clock is silently dead","short":"A node 60 s behind the clock is silently dead"},{"date":"2026-10-04","text":"First machine on the Igneum Miner app: PC 2's RTX 5090 at 118 MH/s, via Setup.exe","short":"First machine on the one-click app: a 5090 at 118 MH/s"},{"date":"2026-10-04","text":"First finality lock on the live devnet: checkpoint 242 at 77.4% of all weight, two hours after genesis","short":"First live finality lock: 77.4% of weight, 17 voters"},{"date":"2026-10-04","text":"Proving: devnet v4 shards on the Apple M5 Max CPU, loaded machine","short":"Proving: devnet v4 shards on the Apple M5 Max CPU, loaded machine"},{"date":"2026-10-04","text":"One-click Windows workers: what the Mac could measure","short":"One-click Windows workers"},{"date":"2026-10-04","text":"First hourly program swap on the live devnet: compile-ahead, no pause, two cards","short":"First live hourly swap: no pause on Mac, NVIDIA or AMD"},{"date":"2026-10-04","text":"Proving v0 on the RTX 5090: first GPU proof of an Igneum block","short":"First GPU proof of an Igneum block: 1.4 s on an RTX 5090"},{"date":"2026-10-04","text":"Devnet v4 cut-over: generator v2, 2/3 floor, three nodes and a seed on a fresh chain","short":"Devnet v4 live: generator v2, two-thirds floor, fresh chain"},{"date":"2026-10-04","text":"Generator version 2 adopted: exact load count, fresh-source loads, program acceptance; every vector re-cut, three workers re-checked, 20,000-program census, devnet-v4 binaries rebuilt","short":"Generator v2 adopted: every hash does 128 distinct reads"},{"date":"2026-10-04","text":"Sim/economy: mining versus proving under stress, agent-based","short":"Economy simulation: mining versus proving under stress"},{"date":"2026-10-04","text":"Difficulty rule under attack: pool hopping, pulsed rental, timestamp stretching, short-lane oscillation, epoch games, polluted window, block flood","short":"Difficulty rule attacked seven ways"},{"date":"2026-10-04","text":"Difficulty rule: timestamp attack fixed , simulator regression, 3-node forger test","short":"Timestamp attack on the difficulty rule fixed"},{"date":"2026-10-04","text":"Devnet-v4 integration: nine branches merged, 3-node test network on the merged node, Windows cross-build","short":"Devnet v4: nine branches merged into one node"},{"date":"2026-10-03","text":"RTX 5090 first run","short":"RTX 5090 first run"},{"date":"2026-10-03","text":"AMD gfx1036 , AMD OpenCL 2.1 driver 3652.0","short":"AMD integrated GPU runs the hash through OpenCL"},{"date":"2026-10-03","text":"First devnet blocks on the real lottery hash: CPU, then Metal GPU, three worker implementations","short":"First devnet blocks on the real lottery hash"},{"date":"2026-10-03","text":"Windows node package: igneumd cross-compiled for x86_64-pc-windows-gnu, two-peer sync test","short":"Windows node package: cross-compiled, two-peer sync"}]}</script>
+<script type="application/json" id="journey-data">{"updated":"2026-10-05","stage":"phase-3","phases":[{"id":"phase-1","name":"Specification","when":"Oct to Nov 2026","status":"active","line":"Mining generator, shard proving, finality rules, written for external review"},{"id":"phase-2","name":"Prove the proving","when":"Nov 2026 to Jan 2027","status":"active","line":"Mining program proven on Apple, NVIDIA and AMD; shard proving benchmark on consumer cards still to run","gate":"A fixed published workload, job received to accepted proof on a declared consumer card, sustained with no growing backlog, reproduced by three independent operators"},{"id":"phase-3","name":"Devnet","when":"Started 3 Oct 2026, 20 nodes by Mar 2027","status":"active","line":"BlockDAG node mining on the new program, GPU miners on three vendors, EVM execution in build","gate":"1 block a second held with proofs under 60 s behind the tip"},{"id":"phase-4","name":"Finality and job market","when":"Apr to Jul 2027","status":"next","line":"Sustained-mining finality, external proving jobs, miner client with auto-switching","gate":"Finality design passes external review and one rollup signs for testnet"},{"id":"phase-5","name":"Public testnet","when":"Aug to Oct 2027","status":"next","line":"One-click miner app on Windows, macOS and Linux, HiveOS, pools, the first rollup as a proving customer, no coin yet","gate":"1,000 independent miners run 30 days and rollup proofs are delivered on time"},{"id":"phase-6","name":"Mainnet fair launch","when":"Nov 2027","status":"next","line":"Genesis with no premine, 30-day ramp. No listing is arranged, promised or sought by the project"}],"log":[{"date":"2026-10-05","text":"FUD ledger sweep round 6","short":"FUD ledger sweep round 6"},{"date":"2026-10-05","text":"Live devnet: real transactions, the first non-empty shard proven and paid, and the exporter's block structure fixed","short":"Live devnet: real transactions, the first non-empty shard proven and…"},{"date":"2026-10-05","text":"The program id split: why the Apple M5 Max rejected PC 2's proofs, and the verifier at 114 s","short":"The program id split"},{"date":"2026-10-05","text":"Live devnet: the first shards proven, verified and paid","short":"Live devnet: the first shards proven, verified and paid"},{"date":"2026-10-04","text":"Ledger M30: the block and transaction floods grew the node by 256 MiB per epoch roll, fixed by sharing the PoW cache across the epochs of a day","short":"Ledger M30: the block and transaction floods grew the node by 256…"},{"date":"2026-10-04","text":"Round-4 consensus items F23, F24, G12, X18 and M31: unit tests and fast-time 3-node runs against the control","short":"Round-4 consensus items F23, F24, G12, X18 and M31"},{"date":"2026-10-04","text":"The software dev fee measured on a test network: 9 fee blocks in 785, the chain and the miners' counters agree","short":"The software dev fee measured on a test network"},{"date":"2026-10-04","text":"Miner fault guards and the app watchdog measured against a fake worker","short":"Miner fault guards and the app watchdog measured against a fake worker"},{"date":"2026-10-04","text":"Miner performance: variant racing","short":"Miner performance"},{"date":"2026-10-04","text":"Finality rule v3: the frozen weight table and the certificate fold , simulator, unit tests, fast-time 3-node network with 300-ms links","short":"Finality rule v3"},{"date":"2026-10-04","text":"First machine in the United States: a Windows laptop on an Intel integrated GPU, synced and voting","short":"First machine in the United States: a laptop on an integrated GPU, synced and voting"},{"date":"2026-10-04","text":"Shard proving on the RTX 5090: a full shard compressed in 10.9 s, a two-shard block aggregated in 2.2 s, all verified","short":"Shard layer on the RTX 5090: a full shard proven in 10.9 s, a block aggregated in 2.2 s"},{"date":"2026-10-04","text":"Cloud devnet: 12 igneumd nodes in 5 locations, inter-region latency, two Singapore partitions, hash-rate steps","short":"Cloud devnet: 12 igneumd nodes in 5 locations, inter-region latency"},{"date":"2026-10-04","text":"Correction: the 78-minute observer gap was the Apple M5 Max hibernating","short":"Correction: the 78-minute observer gap was the Apple M5 Max hibernating"},{"date":"2026-10-04","text":"Difficulty v2 rollout rehearsal on the 12-node the cloud provider network, binaries for the devnet, the devnet plan","short":"Difficulty v2 rollout rehearsal on the 12-node the cloud provider…"},{"date":"2026-10-04","text":"Difficulty rule v2 activated on the live devnet at DAA 33,000 by height switch, no fresh chain","short":"Difficulty rule v2 switched on the live devnet by height, no fresh chain"},{"date":"2026-10-04","text":"First outside machine on the devnet: an Apple silicon laptop through the Igneum Miner app","short":"First outside machine: a friend's Mac mining through the app"},{"date":"2026-10-04","text":"One-click Windows workers: what the Apple M5 Max could measure","short":"One-click Windows workers"},{"date":"2026-10-04","text":"The gfx1036 worker fault and what the Apple M5 Max could and could not reproduce","short":"The gfx1036 worker fault and what the Apple M5 Max could and could…"},{"date":"2026-10-04","text":"Difficulty rule v2: the live oscillation, its cause, the DAG replay, the fix behind a height switch","short":"Difficulty rule v2"},{"date":"2026-10-04","text":"The observer stored nothing for 78 minutes, then 7,022 blocks in two minutes","short":"The observer stored nothing for 78 minutes, then 7,022 blocks in two…"},{"date":"2026-10-04","text":"PC 2 at the 14:20 boundary: a worker stuck on the previous epoch","short":"PC 2 at the 14:20 boundary: a worker stuck on the previous epoch"},{"date":"2026-10-04","text":"The gfx1036 worker fault and what the Mac could and could not reproduce","short":"The gfx1036 worker fault and what the Mac could and could not reproduce"},{"date":"2026-10-04","text":"A node 60 s behind the clock is silently dead","short":"A node 60 s behind the clock is silently dead"},{"date":"2026-10-04","text":"First machine on the Igneum Miner app: PC 2's RTX 5090 at 118 MH/s, via Setup.exe","short":"First machine on the one-click app: a 5090 at 118 MH/s"},{"date":"2026-10-04","text":"First finality lock on the live devnet: checkpoint 242 at 77.4% of all weight, two hours after genesis","short":"First live finality lock: 77.4% of weight, 17 voters"},{"date":"2026-10-04","text":"Proving: devnet v4 shards on the Apple M5 Max CPU, loaded machine","short":"Proving: devnet v4 shards on the Apple M5 Max CPU, loaded machine"},{"date":"2026-10-04","text":"One-click Windows workers: what the Mac could measure","short":"One-click Windows workers"},{"date":"2026-10-04","text":"First hourly program swap on the live devnet: compile-ahead, no pause, two cards","short":"First live hourly swap: no pause on Mac, NVIDIA or AMD"},{"date":"2026-10-04","text":"Proving v0 on the RTX 5090: first GPU proof of an Igneum block","short":"First GPU proof of an Igneum block: 1.4 s on an RTX 5090"},{"date":"2026-10-04","text":"Devnet v4 cut-over: generator v2, 2/3 floor, three nodes and a seed on a fresh chain","short":"Devnet v4 live: generator v2, two-thirds floor, fresh chain"},{"date":"2026-10-04","text":"Generator version 2 adopted: exact load count, fresh-source loads, program acceptance; every vector re-cut, three workers re-checked, 20,000-program census, devnet-v4 binaries rebuilt","short":"Generator v2 adopted: every hash does 128 distinct reads"},{"date":"2026-10-04","text":"Sim/economy: mining versus proving under stress, agent-based","short":"Economy simulation: mining versus proving under stress"},{"date":"2026-10-04","text":"Difficulty rule under attack: pool hopping, pulsed rental, timestamp stretching, short-lane oscillation, epoch games, polluted window, block flood","short":"Difficulty rule attacked seven ways"},{"date":"2026-10-04","text":"Difficulty rule: timestamp attack fixed , simulator regression, 3-node forger test","short":"Timestamp attack on the difficulty rule fixed"},{"date":"2026-10-04","text":"Devnet-v4 integration: nine branches merged, 3-node test network on the merged node, Windows cross-build","short":"Devnet v4: nine branches merged into one node"},{"date":"2026-10-03","text":"RTX 5090 first run","short":"RTX 5090 first run"},{"date":"2026-10-03","text":"AMD gfx1036 , AMD OpenCL 2.1 driver 3652.0","short":"AMD integrated GPU runs the hash through OpenCL"},{"date":"2026-10-03","text":"First devnet blocks on the real lottery hash: CPU, then Metal GPU, three worker implementations","short":"First devnet blocks on the real lottery hash"},{"date":"2026-10-03","text":"R3.26 / M15: PoW checked after the cheap checks, cache-build cap, attack before and after","short":"Cache-build attack closed: 10.6 s of rebuilds to 14 ms"}]}</script>
 <!-- journey:end -->
 <script>
 (function(){
diff --git a/site/journey.json b/site/journey.json
index 2700b155f..a2bcf9330 100644
--- a/site/journey.json
+++ b/site/journey.json
@@ -52,19 +52,16 @@
   "log": [
     {
       "date": "2026-10-05",
-      "text": "Live devnet: real transactions, the first non-empty shard proven and paid, and the exporter's block structure fixed",
-      "short": "Live devnet: real transactions, the first non-empty shard proven and…"
-    },
-    {
-      "date": "2026-10-05",
-<<<<<<< HEAD
       "text": "FUD ledger sweep round 6",
       "short": "FUD ledger sweep round 6"
     },
     {
       "date": "2026-10-05",
-=======
->>>>>>> entity
+      "text": "Live devnet: real transactions, the first non-empty shard proven and paid, and the exporter's block structure fixed",
+      "short": "Live devnet: real transactions, the first non-empty shard proven and…"
+    },
+    {
+      "date": "2026-10-05",
       "text": "The program id split: why the Apple M5 Max rejected PC 2's proofs, and the verifier at 114 s",
       "short": "The program id split"
     },
@@ -235,31 +232,23 @@
     },
     {
       "date": "2026-10-03",
-      "text": "RTX 5090, memory-hard dataset",
-      "short": "RTX 5090 on the memory-hard dataset"
+      "text": "RTX 5090 first run",
+      "short": "RTX 5090 first run"
     },
     {
       "date": "2026-10-03",
-      "text": "Proto-opencl: OpenCL path built and proven without AMD silicon",
-      "short": "OpenCL worker built and proven without AMD silicon"
+      "text": "AMD gfx1036 , AMD OpenCL 2.1 driver 3652.0",
+      "short": "AMD integrated GPU runs the hash through OpenCL"
     },
     {
       "date": "2026-10-03",
-      "text": "RTX 5090 through NVIDIA OpenCL",
-      "short": "RTX 5090 through NVIDIA OpenCL"
+      "text": "First devnet blocks on the real lottery hash: CPU, then Metal GPU, three worker implementations",
+      "short": "First devnet blocks on the real lottery hash"
     },
     {
       "date": "2026-10-03",
-<<<<<<< HEAD
-=======
-      "text": "Igneum-node devnet v0: 3-node igneum-devnet at 1 BPS with the 80/20 coinbase and vote_key_hash",
-      "short": "Devnet v0: three nodes at one block per second"
-    },
-    {
-      "date": "2026-10-03",
->>>>>>> entity
-      "text": "Windows node package: igneumd cross-compiled for x86_64-pc-windows-gnu, two-peer sync test",
-      "short": "Windows node package: cross-compiled, two-peer sync"
+      "text": "R3.26 / M15: PoW checked after the cheap checks, cache-build cap, attack before and after",
+      "short": "Cache-build attack closed: 10.6 s of rebuilds to 14 ms"
     }
   ]
 }