@leofcoin/chain 1.10.17 → 1.10.18

package/exports/browser/chain.js

@@ -3696,6 +3696,12 @@ class Machine {
         pubsub.publish(data.id, { error: data.message });
         break;
       }
+      case "addLoadedBlockError":
+      case "collectFeeError":
+      case "settleRewardsError": {
+        pubsub.publish(data.id, { error: new Error(data.message) });
+        break;
+      }
       case "debug": {
         if (data.message.includes("loaded transactions for block:")) {
           pubsub.publish("block-loaded", data.message.replace("loaded transactions for block: ", "").split(" @")[0]);
@@ -3745,9 +3751,9 @@ class Machine {
       }
     }
   }
-  async updateState() {
+  async updateState(strict = false) {
     try {
-      const lastBlock = await this.lastBlock;
+      const lastBlock = strict ? await this.getCanonicalTip() : await this.lastBlock;
       const lastBlockIndex = Number(lastBlock.index);
       const statesLastBlockIndex = Number(this.states.lastBlock.index);
       if (lastBlockIndex > statesLastBlockIndex || lastBlock.hash !== this.states.lastBlock.hash && Number(lastBlockIndex) === 0) {
@@ -3806,7 +3812,7 @@ class Machine {
           return JSON.stringify(sorted, replacer);
         };
         const tasks = [
-          stateStore.put("lastBlock", sortedStringify(await this.lastBlock, jsonStringifyBigInt)),
+          stateStore.put("lastBlock", sortedStringify(lastBlock, jsonStringifyBigInt)),
           stateStore.put("states", sortedStringify(state, jsonStringifyBigInt)),
           stateStore.put("accounts", sortedStringify(accounts, jsonStringifyBigInt)),
           stateStore.put(
@@ -3833,6 +3839,7 @@ class Machine {
       }
     } catch (error) {
       console.error(error);
+      if (strict) throw error;
     }
   }
   async #init(blocks) {
@@ -4099,6 +4106,9 @@ ${error.message}`);
       return this.states.lastBlock;
     });
   }
+  getCanonicalTip() {
+    return this.#askWorker("lastBlock");
+  }
   get lastBlockHeight() {
     return this.#askWorker("lastBlockHeight").catch((error) => {
       debug$2("lastBlockHeight fallback after worker timeout:", error?.message ?? error);
@@ -4243,6 +4253,56 @@ const decodeResponsePayload = async (result, depth = 0) => {
   return result;
 };
 
+class CanonicalStateQueue {
+  #tail = Promise.resolve();
+  #failed = false;
+  #failure;
+  run(operation) {
+    const result = this.#tail.then(async () => {
+      if (this.#failed) {
+        throw new Error("Canonical state application halted after a failed mutation; restart and recover state", {
+          cause: this.#failure
+        });
+      }
+      let mutating = false;
+      try {
+        return await operation({ markMutating: () => {
+          mutating = true;
+        } });
+      } catch (error) {
+        if (mutating) {
+          this.#failed = true;
+          this.#failure = error;
+        }
+        throw error;
+      }
+    });
+    this.#tail = result.then(() => void 0, () => void 0);
+    return result;
+  }
+}
+
+const validateChainLink = (localTip, incoming) => {
+  const localHash = localTip?.hash || "0x0";
+  const localIndex = Number(localTip?.index ?? -1);
+  const hasCanonicalTip = localHash !== "0x0";
+  if (hasCanonicalTip && incoming.index < localIndex) return "stale";
+  if (hasCanonicalTip && incoming.index === localIndex) {
+    if (incoming.hash === localHash) return "duplicate";
+    throw new Error(`Block conflict detected at index ${incoming.index}`);
+  }
+  const expectedIndex = hasCanonicalTip ? localIndex + 1 : 0;
+  if (incoming.index !== expectedIndex) {
+    throw new Error(`Unexpected block index ${incoming.index}; expected ${expectedIndex}`);
+  }
+  if (incoming.previousHash !== localHash) {
+    throw new Error(
+      `previousHash mismatch at index ${incoming.index}: expected ${localHash}, got ${incoming.previousHash}`
+    );
+  }
+  return "append";
+};
+
 const debug$1 = createDebugger("leofcoin/state");
 class State extends Contract {
   constructor(config) {
@@ -4257,6 +4317,7 @@ class State extends Contract {
     this.#blocks = [];
     this.knownBlocks = [];
     this.#totalSize = 0;
+    this.#canonicalStateQueue = new CanonicalStateQueue();
     this.#loaded = false;
     this.#resolvingHashes = /* @__PURE__ */ new Set();
     this._wantList = [];
@@ -4299,6 +4360,13 @@ class State extends Contract {
   #blocks;
   #totalSize;
   #machine;
+  #canonicalStateQueue;
+  withCanonicalState(operation) {
+    return this.#canonicalStateQueue.run(operation);
+  }
+  canonicalTip() {
+    return this.#machine ? this.#machine.getCanonicalTip() : Promise.resolve({ index: -1, hash: "0x0", previousHash: "0x0" });
+  }
   #loaded;
   #resolvingHashes;
   /**
@@ -4451,7 +4519,7 @@ class State extends Contract {
       this.#machine = machine;
       const lastBlock = await this.#machine.lastBlock;
       if (lastBlock.hash !== "0x0") {
-        this.updateState(new BlockMessage(lastBlock));
+        await this.updateState(new BlockMessage(lastBlock));
       }
       this.#loaded = true;
       this.#chainState = "loaded";
@@ -4474,9 +4542,10 @@ class State extends Contract {
         await machine.ready;
         this.#machine = machine;
       }
-      await this.#machine.updateState();
+      await this.#machine.updateState(true);
     } catch (error) {
       console.error(error);
+      throw error;
     }
   }
   getLatestBlock() {
@@ -4665,11 +4734,16 @@ class State extends Contract {
       console.error(error);
     }
     if (!lastBlock) lastBlock = await this.#getLatestBlock();
-    if (globalThis.peernet.peers.length === 0) return "connectionless";
+    if (globalThis.peernet.peers.length === 0) {
+      this.#chainSyncing = false;
+      this.#syncState = "connectionless";
+      return this.#syncState;
+    }
     try {
-      await this.#syncChain(lastBlock);
+      await this.withCanonicalState((transition) => this.#syncChain(lastBlock, transition));
     } catch (error) {
       this.#syncErrorCount += 1;
+      this.#chainSyncing = false;
       if (this.#syncErrorCount < 3) return this.syncChain(lastBlock);
       this.#syncErrorCount = 0;
       this.#chainSyncing = false;
@@ -4683,9 +4757,9 @@ class State extends Contract {
     this.#syncState = "synced";
     return this.#syncState;
   }
-  async #syncChain(lastBlock) {
+  async #syncChain(lastBlock, transition) {
     try {
-      const localBlock = await this.lastBlock;
+      const localBlock = await this.canonicalTip();
       const localIndex = localBlock ? Number(localBlock.index) : -1;
       const remoteIndex = Number(lastBlock.index);
       const remoteBlockHash = lastBlock.hash;
@@ -4707,6 +4781,9 @@ class State extends Contract {
         debug$1(`Remote block hash is 0x0, skipping sync`);
         return;
       }
+      if (localBlock?.hash !== "0x0" && localIndex === remoteIndex && localBlock.hash !== remoteBlockHash) {
+        throw new Error(`Block conflict detected at index ${remoteIndex}`);
+      }
       if (localIndex > remoteIndex) {
         const MAX_REORG_DEPTH = 6;
         const reorgDepth = localIndex - remoteIndex;
@@ -4746,9 +4823,14 @@ class State extends Contract {
         debug$1(`Loading blocks from index ${localIndex + 1} to ${remoteIndex}`);
         const start = localIndex + 1;
         if (this.#machine && blocks.length > start) {
-          await this.#loadBlocks(blocks.slice(start));
+          await this.#loadBlocks(blocks.slice(start), transition);
         }
         if (blocks.length > 0) {
+          const appliedTip = await this.canonicalTip();
+          if (appliedTip.hash !== remoteBlockHash || Number(appliedTip.index) !== remoteIndex) {
+            throw new Error(`Sync did not apply canonical target ${remoteBlockHash} at index ${remoteIndex}`);
+          }
+          transition.markMutating();
           await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
         }
       } else {
@@ -4868,14 +4950,14 @@ class State extends Contract {
         console.log(error);
       }
       console.log(error);
-      return false;
+      throw error;
     }
   }
   /**
    *
    * @param {Block[]} blocks
    */
-  async #loadBlocks(blocks) {
+  async #loadBlocks(blocks, transition) {
     this.#chainState = "loading";
     if (blocks.some((block) => !block)) {
       throw new Error("missing block data during load; chain resolution incomplete");
@@ -4886,10 +4968,21 @@ class State extends Contract {
     for (const block of blocks) {
       if (block && !block.loaded) {
         try {
+          const link = validateChainLink(await this.canonicalTip(), {
+            index: Number(block.index),
+            hash: block.hash,
+            previousHash: String(block.previousHash)
+          });
+          if (link !== "append") {
+            this.#blocks[block.index].loaded = true;
+            debug$1(`Ignoring ${link} loaded block ${block.hash} at height ${block.index}`);
+            continue;
+          }
           debug$1(`loading block: ${Number(block.index)} ${block.hash}`);
           let transactions = await this.#loadBlockTransactions(block.transactions || []);
           const validators = block.validators.map(({ address }) => address);
           debug$1(`loading transactions: ${transactions.length} for block ${block.index}`);
+          transition.markMutating();
           for (const transaction of transactions) {
             const hash = await transaction.hash();
             if (poolTransactionKeys.has(hash)) await globalThis.transactionPoolStore.delete(hash);
@@ -4922,10 +5015,11 @@ class State extends Contract {
               ...distributeAmount(policy.subsidy, validators, Number(block.index) % validators.length)
             ]);
           }
-          this.#blocks[block.index].loaded = true;
           debug$1(`executed transactions for block ${block.index}`);
+          const registered = await this.#machine.addLoadedBlock({ ...block, loaded: true });
+          if (registered !== true) throw new Error(`Loaded block registration failed after execution: ${block.hash}`);
+          this.#blocks[block.index].loaded = true;
           if (Number(block.index) === 0) this.#loaded = true;
-          await this.#machine.addLoadedBlock(block);
           debug$1(`loaded block: ${block.hash} @${Number(block.index)}`);
           globalThis.pubsub.publish("block-loaded", { ...block });
         } catch (error) {
@@ -4933,6 +5027,7 @@ class State extends Contract {
           for (const transaction of block.transactions) {
             this.wantList.push(transaction);
           }
+          throw error;
         }
       }
     }
@@ -5046,27 +5141,6 @@ class VersionControl extends State {
   }
 }
 
-const validateChainLink = (localTip, incoming) => {
-  const localHash = localTip?.hash || "0x0";
-  const localIndex = Number(localTip?.index ?? -1);
-  const hasCanonicalTip = localHash !== "0x0";
-  if (hasCanonicalTip && incoming.index < localIndex) return "stale";
-  if (hasCanonicalTip && incoming.index === localIndex) {
-    if (incoming.hash === localHash) return "duplicate";
-    throw new Error(`Block conflict detected at index ${incoming.index}`);
-  }
-  const expectedIndex = hasCanonicalTip ? localIndex + 1 : 0;
-  if (incoming.index !== expectedIndex) {
-    throw new Error(`Unexpected block index ${incoming.index}; expected ${expectedIndex}`);
-  }
-  if (incoming.previousHash !== localHash) {
-    throw new Error(
-      `previousHash mismatch at index ${incoming.index}: expected ${localHash}, got ${incoming.previousHash}`
-    );
-  }
-  return "append";
-};
-
 const validateCanonicalValidatorSet = (blockIndex, expectedValidators, validators) => {
   const actualValidators = validators.map(({ address }) => address);
   const canonicalExpected = [...new Set(expectedValidators)].sort();
@@ -5642,7 +5716,9 @@ class Chain extends VersionControl {
       `[consensus] Epoch boundary at block ${blockHeight}: new epoch starts at height ${this.#currentEpochStartHeight}`
     );
     if (this.#participating && !this.#runningEpoch) {
-      await this.#runEpoch();
+      void this.#runEpoch().catch((error) => {
+        debug(`epoch scheduling failed: ${error?.message ?? error}`);
+      });
     }
   }
   async #runEpoch() {
@@ -6111,11 +6187,14 @@ class Chain extends VersionControl {
     }
   }
   async #addBlock(block) {
+    return this.withCanonicalState((transition) => this.#applyBlock(block, transition));
+  }
+  async #applyBlock(block, transition) {
     const receivedEncoded = block instanceof BlockMessage ? block.encoded : block;
     const blockMessage = await new BlockMessage(block);
     const hash = await blockMessage.hash();
     const blockIndex = Number(blockMessage.decoded.index);
-    const linkResult = validateChainLink(await this.lastBlock, {
+    const linkResult = validateChainLink(await this.canonicalTip(), {
       index: blockIndex,
       hash,
       previousHash: String(blockMessage.decoded.previousHash)
@@ -6144,6 +6223,7 @@ class Chain extends VersionControl {
     console.log(`[chain] \u2705 Block data integrity verified: ${hash}`);
     await this.#validateBlockValidators(blockMessage);
     const transactions = await this.#resolveBlockTransactions(blockMessage);
+    transition.markMutating();
     await Promise.all(
       blockMessage.decoded.transactions.map(async (transactionHash) => {
         if (await transactionPoolStore.has(transactionHash)) await transactionPoolStore.delete(transactionHash);
@@ -6154,9 +6234,6 @@ class Chain extends VersionControl {
       hash,
       ...blockMessage.decoded
     };
-    debug(`added block: ${hash}`);
-    let promises = [];
-    let contracts = [];
     const allTransactions = transactions.sort((a, b) => {
       if (a.decoded.priority !== b.decoded.priority) {
         return (b.decoded.priority ? 1 : 0) - (a.decoded.priority ? 1 : 0);
@@ -6167,7 +6244,6 @@ class Chain extends VersionControl {
     });
     const monetaryPolicy = await this.#monetaryPolicy(blockMessage.decoded.protocolVersion);
     for (const transaction of allTransactions) {
-      if (!contracts.includes(transaction.decoded.to)) contracts.push(transaction.decoded.to);
       this.removePendingNonce(transaction.decoded.from, transaction.decoded.nonce);
       const transactionHash = await transaction.hash();
       const validatorAddresses = blockMessage.decoded.validators.map(({ address }) => address);
@@ -6185,36 +6261,36 @@ class Chain extends VersionControl {
         ...distributeAmount(monetaryPolicy.subsidy, validators, blockIndex % validators.length)
       ]);
     }
-    try {
-      promises = await Promise.allSettled(promises);
-      const noncesByAddress = {};
-      for (let transaction of transactions) {
-        globalThis.pubsub.publish("transaction-processed", transaction.encoded);
-        if (transaction.decoded.to === globalThis.peernet.selectedAccount)
-          globalThis.pubsub.publish("account-transaction-processed", transaction.encoded);
-        if (!noncesByAddress[transaction.decoded.from] || noncesByAddress?.[transaction.decoded.from] < transaction.decoded.nonce) {
-          noncesByAddress[transaction.decoded.from] = transaction.decoded.nonce;
-        }
-      }
-      await Promise.all(
-        Object.entries(noncesByAddress).map(([from, nonce]) => globalThis.accountsStore.put(from, String(nonce)))
-      );
-      if ((await this.lastBlock).index < Number(blockMessage.decoded.index)) {
-        await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() });
-        try {
-          await this.call(addresses.validators, "recordValidatorSnapshot", [blockMessage.decoded.index]);
-        } catch (snapshotError) {
-          debug(`failed to record validator snapshot: ${snapshotError?.message ?? snapshotError}`);
-        }
-        await this.#handleEpochBoundary(Number(blockMessage.decoded.index));
-        await this.updateState(blockMessage);
+    const noncesByAddress = {};
+    for (let transaction of transactions) {
+      globalThis.pubsub.publish("transaction-processed", transaction.encoded);
+      if (transaction.decoded.to === globalThis.peernet.selectedAccount)
+        globalThis.pubsub.publish("account-transaction-processed", transaction.encoded);
+      if (!noncesByAddress[transaction.decoded.from] || noncesByAddress?.[transaction.decoded.from] < transaction.decoded.nonce) {
+        noncesByAddress[transaction.decoded.from] = transaction.decoded.nonce;
       }
-      globalThis.pubsub.publish("block-processed", blockMessage.decoded);
-    } catch (error) {
-      console.log(error.hash);
-      console.log("errrrr");
-      await transactionPoolStore.delete(error.hash);
     }
+    await Promise.all(
+      Object.entries(noncesByAddress).map(([from, nonce]) => globalThis.accountsStore.put(from, String(nonce)))
+    );
+    if (validateChainLink(await this.canonicalTip(), {
+      index: blockIndex,
+      hash,
+      previousHash: String(blockMessage.decoded.previousHash)
+    }) !== "append") {
+      throw new Error(`Canonical tip changed during block application: ${hash}`);
+    }
+    const registered = await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash });
+    if (registered !== true) throw new Error(`Block registration failed after execution: ${hash}`);
+    try {
+      await this.call(addresses.validators, "recordValidatorSnapshot", [blockMessage.decoded.index]);
+    } catch (snapshotError) {
+      debug(`failed to record validator snapshot: ${snapshotError?.message ?? snapshotError}`);
+    }
+    await this.updateState(blockMessage);
+    debug(`added block: ${hash}`);
+    globalThis.pubsub.publish("block-processed", blockMessage.decoded);
+    await this.#handleEpochBoundary(blockIndex);
   }
   async participate(address) {
     try {
@@ -6278,10 +6354,6 @@ class Chain extends VersionControl {
         executionTimestamp: block?.timestamp ?? transaction.decoded.timestamp,
         feePayments
       });
-      if (block) {
-        block.transactions.push(hash);
-        block.fees = block.fees += await calculateFee(transaction.decoded);
-      }
       await globalThis.accountsStore.put(
         transaction.decoded.from,
         new TextEncoder().encode(String(transaction.decoded.nonce))
@@ -6293,6 +6365,7 @@ class Chain extends VersionControl {
       console.log(hash);
       peernet.publish("invalid-transaction", hash);
       await globalThis.transactionPoolStore.delete(e.hash);
+      if (block) throw e;
     }
   }
   // todo filter tx that need to wait on prev nonce

package/exports/browser/workers/machine-worker.js

@@ -8847,11 +8847,25 @@ const _ = {
     addLoadedBlock: (block) => {
         const size = formatBytes(block.length);
         block = JSON.parse(block, jsonParseBigInt$1);
-        // if (block.decoded) block = { ...block.decoded, hash: await new BlockMessage(block).hash() }
-        // if (blocks[block.index - 1]) {
-        //   console.warn(`block ${block.index} already loaded, skipping`)
-        //   return false
-        // }
+        const index = Number(block.index);
+        const tipIndex = Number(lastBlock.index);
+        if (!['number', 'bigint'].includes(typeof block.index) ||
+            !Number.isSafeInteger(index) || index < 0 || typeof block.hash !== 'string' || !block.hash) {
+            throw new Error('Invalid loaded block identity');
+        }
+        if (lastBlock.hash !== '0x0') {
+            if (index < tipIndex)
+                return false;
+            if (index === tipIndex) {
+                if (block.hash === lastBlock.hash)
+                    return false;
+                throw new Error(`Loaded block conflict at index ${index}`);
+            }
+        }
+        const expectedIndex = lastBlock.hash === '0x0' ? 0 : tipIndex + 1;
+        if (index !== expectedIndex || block.previousHash !== lastBlock.hash) {
+            throw new Error(`Loaded block does not extend canonical tip at index ${index}`);
+        }
         blocks[block.index.toString()] = block;
         lastBlock = blocks[blocks.length - 1];
         totalBlocks += 1n;

package/exports/chain.js

@@ -659,6 +659,12 @@ class Machine {
         pubsub.publish(data.id, { error: data.message });
         break;
       }
+      case "addLoadedBlockError":
+      case "collectFeeError":
+      case "settleRewardsError": {
+        pubsub.publish(data.id, { error: new Error(data.message) });
+        break;
+      }
       case "debug": {
         if (data.message.includes("loaded transactions for block:")) {
           pubsub.publish("block-loaded", data.message.replace("loaded transactions for block: ", "").split(" @")[0]);
@@ -708,9 +714,9 @@ class Machine {
       }
     }
   }
-  async updateState() {
+  async updateState(strict = false) {
     try {
-      const lastBlock = await this.lastBlock;
+      const lastBlock = strict ? await this.getCanonicalTip() : await this.lastBlock;
       const lastBlockIndex = Number(lastBlock.index);
       const statesLastBlockIndex = Number(this.states.lastBlock.index);
       if (lastBlockIndex > statesLastBlockIndex || lastBlock.hash !== this.states.lastBlock.hash && Number(lastBlockIndex) === 0) {
@@ -769,7 +775,7 @@ class Machine {
           return JSON.stringify(sorted, replacer);
         };
         const tasks = [
-          stateStore.put("lastBlock", sortedStringify(await this.lastBlock, jsonStringifyBigInt)),
+          stateStore.put("lastBlock", sortedStringify(lastBlock, jsonStringifyBigInt)),
           stateStore.put("states", sortedStringify(state, jsonStringifyBigInt)),
           stateStore.put("accounts", sortedStringify(accounts, jsonStringifyBigInt)),
           stateStore.put(
@@ -796,6 +802,7 @@ class Machine {
       }
     } catch (error) {
       console.error(error);
+      if (strict) throw error;
     }
   }
   async #init(blocks) {
@@ -1062,6 +1069,9 @@ ${error.message}`);
       return this.states.lastBlock;
     });
   }
+  getCanonicalTip() {
+    return this.#askWorker("lastBlock");
+  }
   get lastBlockHeight() {
     return this.#askWorker("lastBlockHeight").catch((error) => {
       debug$2("lastBlockHeight fallback after worker timeout:", error?.message ?? error);
@@ -1206,6 +1216,56 @@ const decodeResponsePayload = async (result, depth = 0) => {
   return result;
 };
 
+class CanonicalStateQueue {
+  #tail = Promise.resolve();
+  #failed = false;
+  #failure;
+  run(operation) {
+    const result = this.#tail.then(async () => {
+      if (this.#failed) {
+        throw new Error("Canonical state application halted after a failed mutation; restart and recover state", {
+          cause: this.#failure
+        });
+      }
+      let mutating = false;
+      try {
+        return await operation({ markMutating: () => {
+          mutating = true;
+        } });
+      } catch (error) {
+        if (mutating) {
+          this.#failed = true;
+          this.#failure = error;
+        }
+        throw error;
+      }
+    });
+    this.#tail = result.then(() => void 0, () => void 0);
+    return result;
+  }
+}
+
+const validateChainLink = (localTip, incoming) => {
+  const localHash = localTip?.hash || "0x0";
+  const localIndex = Number(localTip?.index ?? -1);
+  const hasCanonicalTip = localHash !== "0x0";
+  if (hasCanonicalTip && incoming.index < localIndex) return "stale";
+  if (hasCanonicalTip && incoming.index === localIndex) {
+    if (incoming.hash === localHash) return "duplicate";
+    throw new Error(`Block conflict detected at index ${incoming.index}`);
+  }
+  const expectedIndex = hasCanonicalTip ? localIndex + 1 : 0;
+  if (incoming.index !== expectedIndex) {
+    throw new Error(`Unexpected block index ${incoming.index}; expected ${expectedIndex}`);
+  }
+  if (incoming.previousHash !== localHash) {
+    throw new Error(
+      `previousHash mismatch at index ${incoming.index}: expected ${localHash}, got ${incoming.previousHash}`
+    );
+  }
+  return "append";
+};
+
 const debug$1 = createDebugger("leofcoin/state");
 class State extends Contract {
   constructor(config) {
@@ -1220,6 +1280,7 @@ class State extends Contract {
     this.#blocks = [];
     this.knownBlocks = [];
     this.#totalSize = 0;
+    this.#canonicalStateQueue = new CanonicalStateQueue();
     this.#loaded = false;
     this.#resolvingHashes = /* @__PURE__ */ new Set();
     this._wantList = [];
@@ -1262,6 +1323,13 @@ class State extends Contract {
   #blocks;
   #totalSize;
   #machine;
+  #canonicalStateQueue;
+  withCanonicalState(operation) {
+    return this.#canonicalStateQueue.run(operation);
+  }
+  canonicalTip() {
+    return this.#machine ? this.#machine.getCanonicalTip() : Promise.resolve({ index: -1, hash: "0x0", previousHash: "0x0" });
+  }
   #loaded;
   #resolvingHashes;
   /**
@@ -1414,7 +1482,7 @@ class State extends Contract {
       this.#machine = machine;
       const lastBlock = await this.#machine.lastBlock;
       if (lastBlock.hash !== "0x0") {
-        this.updateState(new BlockMessage(lastBlock));
+        await this.updateState(new BlockMessage(lastBlock));
       }
       this.#loaded = true;
       this.#chainState = "loaded";
@@ -1437,9 +1505,10 @@ class State extends Contract {
         await machine.ready;
         this.#machine = machine;
       }
-      await this.#machine.updateState();
+      await this.#machine.updateState(true);
     } catch (error) {
       console.error(error);
+      throw error;
     }
   }
   getLatestBlock() {
@@ -1628,11 +1697,16 @@ class State extends Contract {
       console.error(error);
     }
     if (!lastBlock) lastBlock = await this.#getLatestBlock();
-    if (globalThis.peernet.peers.length === 0) return "connectionless";
+    if (globalThis.peernet.peers.length === 0) {
+      this.#chainSyncing = false;
+      this.#syncState = "connectionless";
+      return this.#syncState;
+    }
     try {
-      await this.#syncChain(lastBlock);
+      await this.withCanonicalState((transition) => this.#syncChain(lastBlock, transition));
     } catch (error) {
       this.#syncErrorCount += 1;
+      this.#chainSyncing = false;
       if (this.#syncErrorCount < 3) return this.syncChain(lastBlock);
       this.#syncErrorCount = 0;
       this.#chainSyncing = false;
@@ -1646,9 +1720,9 @@ class State extends Contract {
     this.#syncState = "synced";
     return this.#syncState;
   }
-  async #syncChain(lastBlock) {
+  async #syncChain(lastBlock, transition) {
     try {
-      const localBlock = await this.lastBlock;
+      const localBlock = await this.canonicalTip();
       const localIndex = localBlock ? Number(localBlock.index) : -1;
       const remoteIndex = Number(lastBlock.index);
       const remoteBlockHash = lastBlock.hash;
@@ -1670,6 +1744,9 @@ class State extends Contract {
         debug$1(`Remote block hash is 0x0, skipping sync`);
         return;
       }
+      if (localBlock?.hash !== "0x0" && localIndex === remoteIndex && localBlock.hash !== remoteBlockHash) {
+        throw new Error(`Block conflict detected at index ${remoteIndex}`);
+      }
       if (localIndex > remoteIndex) {
         const MAX_REORG_DEPTH = 6;
         const reorgDepth = localIndex - remoteIndex;
@@ -1709,9 +1786,14 @@ class State extends Contract {
         debug$1(`Loading blocks from index ${localIndex + 1} to ${remoteIndex}`);
         const start = localIndex + 1;
         if (this.#machine && blocks.length > start) {
-          await this.#loadBlocks(blocks.slice(start));
+          await this.#loadBlocks(blocks.slice(start), transition);
         }
         if (blocks.length > 0) {
+          const appliedTip = await this.canonicalTip();
+          if (appliedTip.hash !== remoteBlockHash || Number(appliedTip.index) !== remoteIndex) {
+            throw new Error(`Sync did not apply canonical target ${remoteBlockHash} at index ${remoteIndex}`);
+          }
+          transition.markMutating();
           await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
         }
       } else {
@@ -1831,14 +1913,14 @@ class State extends Contract {
         console.log(error);
       }
       console.log(error);
-      return false;
+      throw error;
     }
   }
   /**
    *
    * @param {Block[]} blocks
    */
-  async #loadBlocks(blocks) {
+  async #loadBlocks(blocks, transition) {
     this.#chainState = "loading";
     if (blocks.some((block) => !block)) {
       throw new Error("missing block data during load; chain resolution incomplete");
@@ -1849,10 +1931,21 @@ class State extends Contract {
     for (const block of blocks) {
       if (block && !block.loaded) {
         try {
+          const link = validateChainLink(await this.canonicalTip(), {
+            index: Number(block.index),
+            hash: block.hash,
+            previousHash: String(block.previousHash)
+          });
+          if (link !== "append") {
+            this.#blocks[block.index].loaded = true;
+            debug$1(`Ignoring ${link} loaded block ${block.hash} at height ${block.index}`);
+            continue;
+          }
           debug$1(`loading block: ${Number(block.index)} ${block.hash}`);
           let transactions = await this.#loadBlockTransactions(block.transactions || []);
           const validators = block.validators.map(({ address }) => address);
           debug$1(`loading transactions: ${transactions.length} for block ${block.index}`);
+          transition.markMutating();
           for (const transaction of transactions) {
             const hash = await transaction.hash();
             if (poolTransactionKeys.has(hash)) await globalThis.transactionPoolStore.delete(hash);
@@ -1885,10 +1978,11 @@ class State extends Contract {
               ...distributeAmount(policy.subsidy, validators, Number(block.index) % validators.length)
             ]);
           }
-          this.#blocks[block.index].loaded = true;
           debug$1(`executed transactions for block ${block.index}`);
+          const registered = await this.#machine.addLoadedBlock({ ...block, loaded: true });
+          if (registered !== true) throw new Error(`Loaded block registration failed after execution: ${block.hash}`);
+          this.#blocks[block.index].loaded = true;
           if (Number(block.index) === 0) this.#loaded = true;
-          await this.#machine.addLoadedBlock(block);
           debug$1(`loaded block: ${block.hash} @${Number(block.index)}`);
           globalThis.pubsub.publish("block-loaded", { ...block });
         } catch (error) {
@@ -1896,6 +1990,7 @@ class State extends Contract {
           for (const transaction of block.transactions) {
             this.wantList.push(transaction);
           }
+          throw error;
         }
       }
     }
@@ -2009,27 +2104,6 @@ class VersionControl extends State {
   }
 }
 
-const validateChainLink = (localTip, incoming) => {
-  const localHash = localTip?.hash || "0x0";
-  const localIndex = Number(localTip?.index ?? -1);
-  const hasCanonicalTip = localHash !== "0x0";
-  if (hasCanonicalTip && incoming.index < localIndex) return "stale";
-  if (hasCanonicalTip && incoming.index === localIndex) {
-    if (incoming.hash === localHash) return "duplicate";
-    throw new Error(`Block conflict detected at index ${incoming.index}`);
-  }
-  const expectedIndex = hasCanonicalTip ? localIndex + 1 : 0;
-  if (incoming.index !== expectedIndex) {
-    throw new Error(`Unexpected block index ${incoming.index}; expected ${expectedIndex}`);
-  }
-  if (incoming.previousHash !== localHash) {
-    throw new Error(
-      `previousHash mismatch at index ${incoming.index}: expected ${localHash}, got ${incoming.previousHash}`
-    );
-  }
-  return "append";
-};
-
 const validateCanonicalValidatorSet = (blockIndex, expectedValidators, validators) => {
   const actualValidators = validators.map(({ address }) => address);
   const canonicalExpected = [...new Set(expectedValidators)].sort();
@@ -2592,7 +2666,9 @@ class Chain extends VersionControl {
       `[consensus] Epoch boundary at block ${blockHeight}: new epoch starts at height ${this.#currentEpochStartHeight}`
     );
     if (this.#participating && !this.#runningEpoch) {
-      await this.#runEpoch();
+      void this.#runEpoch().catch((error) => {
+        debug(`epoch scheduling failed: ${error?.message ?? error}`);
+      });
     }
   }
   async #runEpoch() {
@@ -3061,11 +3137,14 @@ class Chain extends VersionControl {
     }
   }
   async #addBlock(block) {
+    return this.withCanonicalState((transition) => this.#applyBlock(block, transition));
+  }
+  async #applyBlock(block, transition) {
     const receivedEncoded = block instanceof BlockMessage ? block.encoded : block;
     const blockMessage = await new BlockMessage(block);
     const hash = await blockMessage.hash();
     const blockIndex = Number(blockMessage.decoded.index);
-    const linkResult = validateChainLink(await this.lastBlock, {
+    const linkResult = validateChainLink(await this.canonicalTip(), {
       index: blockIndex,
       hash,
       previousHash: String(blockMessage.decoded.previousHash)
@@ -3094,6 +3173,7 @@ class Chain extends VersionControl {
     console.log(`[chain] \u2705 Block data integrity verified: ${hash}`);
     await this.#validateBlockValidators(blockMessage);
     const transactions = await this.#resolveBlockTransactions(blockMessage);
+    transition.markMutating();
     await Promise.all(
       blockMessage.decoded.transactions.map(async (transactionHash) => {
         if (await transactionPoolStore.has(transactionHash)) await transactionPoolStore.delete(transactionHash);
@@ -3104,9 +3184,6 @@ class Chain extends VersionControl {
       hash,
       ...blockMessage.decoded
     };
-    debug(`added block: ${hash}`);
-    let promises = [];
-    let contracts = [];
     const allTransactions = transactions.sort((a, b) => {
       if (a.decoded.priority !== b.decoded.priority) {
         return (b.decoded.priority ? 1 : 0) - (a.decoded.priority ? 1 : 0);
@@ -3117,7 +3194,6 @@ class Chain extends VersionControl {
     });
     const monetaryPolicy = await this.#monetaryPolicy(blockMessage.decoded.protocolVersion);
     for (const transaction of allTransactions) {
-      if (!contracts.includes(transaction.decoded.to)) contracts.push(transaction.decoded.to);
       this.removePendingNonce(transaction.decoded.from, transaction.decoded.nonce);
       const transactionHash = await transaction.hash();
       const validatorAddresses = blockMessage.decoded.validators.map(({ address }) => address);
@@ -3135,36 +3211,36 @@ class Chain extends VersionControl {
         ...distributeAmount(monetaryPolicy.subsidy, validators, blockIndex % validators.length)
       ]);
     }
-    try {
-      promises = await Promise.allSettled(promises);
-      const noncesByAddress = {};
-      for (let transaction of transactions) {
-        globalThis.pubsub.publish("transaction-processed", transaction.encoded);
-        if (transaction.decoded.to === globalThis.peernet.selectedAccount)
-          globalThis.pubsub.publish("account-transaction-processed", transaction.encoded);
-        if (!noncesByAddress[transaction.decoded.from] || noncesByAddress?.[transaction.decoded.from] < transaction.decoded.nonce) {
-          noncesByAddress[transaction.decoded.from] = transaction.decoded.nonce;
-        }
-      }
-      await Promise.all(
-        Object.entries(noncesByAddress).map(([from, nonce]) => globalThis.accountsStore.put(from, String(nonce)))
-      );
-      if ((await this.lastBlock).index < Number(blockMessage.decoded.index)) {
-        await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() });
-        try {
-          await this.call(addresses.validators, "recordValidatorSnapshot", [blockMessage.decoded.index]);
-        } catch (snapshotError) {
-          debug(`failed to record validator snapshot: ${snapshotError?.message ?? snapshotError}`);
-        }
-        await this.#handleEpochBoundary(Number(blockMessage.decoded.index));
-        await this.updateState(blockMessage);
+    const noncesByAddress = {};
+    for (let transaction of transactions) {
+      globalThis.pubsub.publish("transaction-processed", transaction.encoded);
+      if (transaction.decoded.to === globalThis.peernet.selectedAccount)
+        globalThis.pubsub.publish("account-transaction-processed", transaction.encoded);
+      if (!noncesByAddress[transaction.decoded.from] || noncesByAddress?.[transaction.decoded.from] < transaction.decoded.nonce) {
+        noncesByAddress[transaction.decoded.from] = transaction.decoded.nonce;
       }
-      globalThis.pubsub.publish("block-processed", blockMessage.decoded);
-    } catch (error) {
-      console.log(error.hash);
-      console.log("errrrr");
-      await transactionPoolStore.delete(error.hash);
     }
+    await Promise.all(
+      Object.entries(noncesByAddress).map(([from, nonce]) => globalThis.accountsStore.put(from, String(nonce)))
+    );
+    if (validateChainLink(await this.canonicalTip(), {
+      index: blockIndex,
+      hash,
+      previousHash: String(blockMessage.decoded.previousHash)
+    }) !== "append") {
+      throw new Error(`Canonical tip changed during block application: ${hash}`);
+    }
+    const registered = await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash });
+    if (registered !== true) throw new Error(`Block registration failed after execution: ${hash}`);
+    try {
+      await this.call(addresses.validators, "recordValidatorSnapshot", [blockMessage.decoded.index]);
+    } catch (snapshotError) {
+      debug(`failed to record validator snapshot: ${snapshotError?.message ?? snapshotError}`);
+    }
+    await this.updateState(blockMessage);
+    debug(`added block: ${hash}`);
+    globalThis.pubsub.publish("block-processed", blockMessage.decoded);
+    await this.#handleEpochBoundary(blockIndex);
   }
   async participate(address) {
     try {
@@ -3228,10 +3304,6 @@ class Chain extends VersionControl {
         executionTimestamp: block?.timestamp ?? transaction.decoded.timestamp,
         feePayments
       });
-      if (block) {
-        block.transactions.push(hash);
-        block.fees = block.fees += await calculateFee(transaction.decoded);
-      }
       await globalThis.accountsStore.put(
         transaction.decoded.from,
         new TextEncoder().encode(String(transaction.decoded.nonce))
@@ -3243,6 +3315,7 @@ class Chain extends VersionControl {
       console.log(hash);
       peernet.publish("invalid-transaction", hash);
       await globalThis.transactionPoolStore.delete(e.hash);
+      if (block) throw e;
     }
   }
   // todo filter tx that need to wait on prev nonce

package/exports/workers/machine-worker.js

@@ -8847,11 +8847,25 @@ const _ = {
     addLoadedBlock: (block) => {
         const size = formatBytes(block.length);
         block = JSON.parse(block, jsonParseBigInt$1);
-        // if (block.decoded) block = { ...block.decoded, hash: await new BlockMessage(block).hash() }
-        // if (blocks[block.index - 1]) {
-        //   console.warn(`block ${block.index} already loaded, skipping`)
-        //   return false
-        // }
+        const index = Number(block.index);
+        const tipIndex = Number(lastBlock.index);
+        if (!['number', 'bigint'].includes(typeof block.index) ||
+            !Number.isSafeInteger(index) || index < 0 || typeof block.hash !== 'string' || !block.hash) {
+            throw new Error('Invalid loaded block identity');
+        }
+        if (lastBlock.hash !== '0x0') {
+            if (index < tipIndex)
+                return false;
+            if (index === tipIndex) {
+                if (block.hash === lastBlock.hash)
+                    return false;
+                throw new Error(`Loaded block conflict at index ${index}`);
+            }
+        }
+        const expectedIndex = lastBlock.hash === '0x0' ? 0 : tipIndex + 1;
+        if (index !== expectedIndex || block.previousHash !== lastBlock.hash) {
+            throw new Error(`Loaded block does not extend canonical tip at index ${index}`);
+        }
         blocks[block.index.toString()] = block;
         lastBlock = blocks[blocks.length - 1];
         totalBlocks += 1n;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {