@leofcoin/chain 1.10.4 → 1.10.5

package/exports/browser/chain.js

@@ -8575,6 +8575,7 @@ class Machine {
         break;
       }
       case "machine-ready": {
+        this.readyResolve(this);
         pubsub.publish("machine.ready", true);
         break;
       }
@@ -8770,7 +8771,6 @@ class Machine {
         }
       };
       this.worker.postMessage(message);
-      this.readyResolve(this);
     });
   }
   async #runContract(contractMessage) {
@@ -9297,15 +9297,18 @@ class State extends Contract {
   }
   async getAndPutBlock(hash) {
     let block = await globalThis.peernet.get(hash, "block");
-    if (block !== void 0) {
-      if (!(block instanceof Uint8Array)) {
-        block = new Uint8Array(Object.values(block));
-      }
-      block = await new BlockMessage(block);
-      const { index } = block.decoded;
-      if (this.#blocks[index] && this.#blocks[index].hash !== block.hash) throw `invalid block ${hash} @${index}`;
-      if (!await globalThis.peernet.has(hash)) await globalThis.peernet.put(hash, block.encoded, "block");
-    }
+    if (block === void 0 || block === null) {
+      throw new ResolveError(`block data unavailable for ${hash}`);
+    }
+    if (!(block instanceof Uint8Array)) block = new Uint8Array(Object.values(block));
+    block = await new BlockMessage(block);
+    const resolvedHash = await block.hash();
+    if (resolvedHash !== hash) throw new ResolveError(`block hash mismatch: requested ${hash}, received ${resolvedHash}`);
+    const { index } = block.decoded;
+    if (this.#blocks[index] && this.#blocks[index].hash !== resolvedHash) {
+      throw new ResolveError(`conflicting block ${resolvedHash} @${index}`);
+    }
+    if (!await globalThis.peernet.has(hash)) await globalThis.peernet.put(hash, block.encoded, "block");
     return block;
   }
   async #resolveTransactions(transactions) {
@@ -10178,6 +10181,40 @@ const verifyConsensusMessage = async (validatorsAddress, type, message, network)
   }
 };
 
+const nextBlockIndex = (lastIndex) => Number(lastIndex ?? -1) + 1;
+const proposalDelay = ({
+  now,
+  lastBlockTimestamp = 0,
+  lastProposalAt = 0,
+  blockTime
+}) => {
+  const canonicalBase = Math.min(lastBlockTimestamp, now);
+  const nextFromCanonicalBlock = canonicalBase > 0 ? canonicalBase + blockTime : 0;
+  const nextFromLocalAttempt = lastProposalAt > 0 ? lastProposalAt + blockTime : 0;
+  return Math.max(0, Math.max(nextFromCanonicalBlock, nextFromLocalAttempt) - now);
+};
+
+const compareTransactionNonces = (left, right) => {
+  const leftNonce = BigInt(left ?? 0);
+  const rightNonce = BigInt(right ?? 0);
+  if (leftNonce < rightNonce) return -1;
+  if (leftNonce > rightNonce) return 1;
+  return 0;
+};
+const pruneCanonicalTransactions = async (transactions, latestTransactionHashes, isStored, removePending) => {
+  const latest = new Set(latestTransactionHashes);
+  const pending = [];
+  for (const transaction of transactions) {
+    const hash = await transaction.hash();
+    if (latest.has(hash) || await isStored(hash)) {
+      await removePending(hash);
+      continue;
+    }
+    pending.push({ transaction, hash });
+  }
+  return pending;
+};
+
 const debug = createDebugger("leofcoin/chain");
 class Chain extends VersionControl {
   constructor(config) {
@@ -10185,6 +10222,8 @@ class Chain extends VersionControl {
     this.#slotTime = 1e4;
     this.#blockTime = 6e3;
     // 6 second target block time
+    /** Wall-clock time of the last local proposal attempt. */
+    this.#lastProposalAt = 0;
     this.#epochLength = 10;
     this.utils = {};
     /** {Address[]} */
@@ -10400,6 +10439,7 @@ class Chain extends VersionControl {
   #state;
   #slotTime;
   #blockTime;
+  #lastProposalAt;
   #epochLength;
   #validators;
   #runningEpoch;
@@ -10473,10 +10513,10 @@ class Chain extends VersionControl {
       globalThis.peernet?.network || "leofcoin"
     );
   }
-  async #getConsensusValidators(nextBlockIndex) {
+  async #getConsensusValidators(nextBlockIndex2) {
     const localBlock = await this.lastBlock;
     const localIndex = localBlock?.index !== void 0 ? Number(localBlock.index) : -1;
-    if (Array.isArray(localBlock?.validators) && localBlock.validators.length > 0 && (nextBlockIndex === void 0 || nextBlockIndex === localIndex + 1)) {
+    if (Array.isArray(localBlock?.validators) && localBlock.validators.length > 0 && (nextBlockIndex2 === void 0 || nextBlockIndex2 === localIndex + 1)) {
       return [
         ...new Set(
           localBlock.validators.map((validator) => validator.address).filter((address) => Boolean(address))
@@ -10567,9 +10607,7 @@ class Chain extends VersionControl {
   async #runEpoch() {
     if (this.#runningEpoch) return;
     this.#runningEpoch = true;
-    console.log("epoch");
     const validators = await this.#getConsensusValidators();
-    console.log({ validators });
     if (this.#isJailed(peernet.selectedAccount)) {
       this.#runningEpoch = false;
       return;
@@ -10578,8 +10616,16 @@ class Chain extends VersionControl {
       this.#runningEpoch = false;
       return;
     }
-    const localBlock = await this.lastBlock;
-    const nextIndex = (localBlock?.index !== void 0 ? Number(localBlock.index) : -1) + 1;
+    let localBlock = await this.lastBlock;
+    const delay = proposalDelay({
+      now: Date.now(),
+      lastBlockTimestamp: Number(localBlock?.timestamp ?? 0),
+      lastProposalAt: this.#lastProposalAt,
+      blockTime: this.#blockTime
+    });
+    if (delay > 0) await this.#sleep(delay);
+    localBlock = await this.lastBlock;
+    const nextIndex = nextBlockIndex(localBlock?.index);
     const proposerIdx = (nextIndex + this.#consensusRound) % validators.length;
     const isProposer = validators[proposerIdx] === peernet.selectedAccount;
     if (!isProposer) {
@@ -10599,18 +10645,13 @@ class Chain extends VersionControl {
       clearTimeout(this.#roundTimer);
       this.#roundTimer = null;
     }
-    const start = Date.now();
+    this.#lastProposalAt = Date.now();
     try {
       await this.#createBlock();
     } catch (error) {
       console.error(error);
     }
-    const end = Date.now();
-    console.log((end - start) / 1e3 + " s");
-    const elapsed = end - start;
-    const remaining = this.#blockTime - elapsed;
     const hasMore = await this.hasTransactionToHandle();
-    if (!hasMore && remaining > 0) await this.#sleep(remaining);
     this.#runningEpoch = false;
     if (hasMore && !this.#proposalInFlight) return this.#runEpoch();
   }
@@ -10889,6 +10930,10 @@ class Chain extends VersionControl {
     return Promise.all(transactionsToGet);
   }
   async #peerConnected(peerId) {
+    if (typeof peerId !== "string" || !peerId.trim() || peerId === "undefined") {
+      debug("ignored peer connection without a valid peer id");
+      return;
+    }
     debug(`peer connected: ${peerId}`);
     const peer = peernet.getConnection(peerId);
     if (!peer) {
@@ -11100,7 +11145,7 @@ class Chain extends VersionControl {
       if (a.decoded.priority !== b.decoded.priority) {
         return (b.decoded.priority ? 1 : 0) - (a.decoded.priority ? 1 : 0);
       }
-      const nonceDiff = (a.decoded?.nonce ?? 0) - (b.decoded?.nonce ?? 0);
+      const nonceDiff = compareTransactionNonces(a.decoded?.nonce, b.decoded?.nonce);
       if (nonceDiff !== 0) return nonceDiff;
       return 0;
     });
@@ -11198,7 +11243,6 @@ class Chain extends VersionControl {
   // todo filter tx that need to wait on prev nonce
   async #createBlock(limit = this.transactionLimit) {
     if (this.#proposalInFlight) return;
-    console.log(await globalThis.transactionPoolStore.size());
     if (await globalThis.transactionPoolStore.size() === 0) return;
     let transactions = await globalThis.transactionPoolStore.values(this.transactionLimit);
     if (Object.keys(transactions)?.length === 0) return;
@@ -11217,29 +11261,29 @@ class Chain extends VersionControl {
     };
     const latestTransactions = await this.machine.latestTransactions();
     transactions = await this.promiseTransactions(transactions);
-    const allTransactions = transactions.sort((a, b) => {
-      if (a.decoded.priority !== b.decoded.priority) {
-        return (b.decoded.priority ? 1 : 0) - (a.decoded.priority ? 1 : 0);
+    const pendingTransactions = await pruneCanonicalTransactions(
+      transactions,
+      latestTransactions,
+      (hash) => globalThis.transactionStore.has(hash),
+      (hash) => globalThis.transactionPoolStore.delete(hash)
+    );
+    const allTransactions = pendingTransactions.sort((a, b) => {
+      if (a.transaction.decoded.priority !== b.transaction.decoded.priority) {
+        return (b.transaction.decoded.priority ? 1 : 0) - (a.transaction.decoded.priority ? 1 : 0);
       }
-      const nonceDiff = (a.decoded?.nonce ?? 0) - (b.decoded?.nonce ?? 0);
+      const nonceDiff = compareTransactionNonces(a.transaction.decoded?.nonce, b.transaction.decoded?.nonce);
       if (nonceDiff !== 0) return nonceDiff;
       return 0;
     });
-    for (const transaction of allTransactions) {
+    for (const { transaction, hash } of allTransactions) {
       await this.validateTransactionSignature(transaction);
-      const hash = await transaction.hash();
-      if (latestTransactions.includes(hash) || await globalThis.transactionStore.has(hash)) {
-        continue;
-      }
       block.transactions.push(hash);
       block.fees += BigInt(await calculateFee(transaction.decoded));
       await globalThis.peernet.put(hash, transaction.encoded, "transaction");
     }
     if (block.transactions.length === 0) return;
     const localBlock = await this.lastBlock;
-    block.index = localBlock.index;
-    if (block.index === void 0) block.index = 0;
-    else block.index += 1;
+    block.index = nextBlockIndex(localBlock?.index);
     block.previousHash = localBlock.hash || "0x0";
     const canonicalValidators = await this.staticCall(addresses.validators, "validators");
     const sortedValidators = [...canonicalValidators].sort();

package/exports/chain.js

@@ -670,6 +670,7 @@ class Machine {
         break;
       }
       case "machine-ready": {
+        this.readyResolve(this);
         pubsub.publish("machine.ready", true);
         break;
       }
@@ -865,7 +866,6 @@ class Machine {
         }
       };
       this.worker.postMessage(message);
-      this.readyResolve(this);
     });
   }
   async #runContract(contractMessage) {
@@ -1392,15 +1392,18 @@ class State extends Contract {
   }
   async getAndPutBlock(hash) {
     let block = await globalThis.peernet.get(hash, "block");
-    if (block !== void 0) {
-      if (!(block instanceof Uint8Array)) {
-        block = new Uint8Array(Object.values(block));
-      }
-      block = await new BlockMessage(block);
-      const { index } = block.decoded;
-      if (this.#blocks[index] && this.#blocks[index].hash !== block.hash) throw `invalid block ${hash} @${index}`;
-      if (!await globalThis.peernet.has(hash)) await globalThis.peernet.put(hash, block.encoded, "block");
-    }
+    if (block === void 0 || block === null) {
+      throw new ResolveError(`block data unavailable for ${hash}`);
+    }
+    if (!(block instanceof Uint8Array)) block = new Uint8Array(Object.values(block));
+    block = await new BlockMessage(block);
+    const resolvedHash = await block.hash();
+    if (resolvedHash !== hash) throw new ResolveError(`block hash mismatch: requested ${hash}, received ${resolvedHash}`);
+    const { index } = block.decoded;
+    if (this.#blocks[index] && this.#blocks[index].hash !== resolvedHash) {
+      throw new ResolveError(`conflicting block ${resolvedHash} @${index}`);
+    }
+    if (!await globalThis.peernet.has(hash)) await globalThis.peernet.put(hash, block.encoded, "block");
     return block;
   }
   async #resolveTransactions(transactions) {
@@ -2273,6 +2276,40 @@ const verifyConsensusMessage = async (validatorsAddress, type, message, network)
   }
 };
 
+const nextBlockIndex = (lastIndex) => Number(lastIndex ?? -1) + 1;
+const proposalDelay = ({
+  now,
+  lastBlockTimestamp = 0,
+  lastProposalAt = 0,
+  blockTime
+}) => {
+  const canonicalBase = Math.min(lastBlockTimestamp, now);
+  const nextFromCanonicalBlock = canonicalBase > 0 ? canonicalBase + blockTime : 0;
+  const nextFromLocalAttempt = lastProposalAt > 0 ? lastProposalAt + blockTime : 0;
+  return Math.max(0, Math.max(nextFromCanonicalBlock, nextFromLocalAttempt) - now);
+};
+
+const compareTransactionNonces = (left, right) => {
+  const leftNonce = BigInt(left ?? 0);
+  const rightNonce = BigInt(right ?? 0);
+  if (leftNonce < rightNonce) return -1;
+  if (leftNonce > rightNonce) return 1;
+  return 0;
+};
+const pruneCanonicalTransactions = async (transactions, latestTransactionHashes, isStored, removePending) => {
+  const latest = new Set(latestTransactionHashes);
+  const pending = [];
+  for (const transaction of transactions) {
+    const hash = await transaction.hash();
+    if (latest.has(hash) || await isStored(hash)) {
+      await removePending(hash);
+      continue;
+    }
+    pending.push({ transaction, hash });
+  }
+  return pending;
+};
+
 const debug = createDebugger("leofcoin/chain");
 class Chain extends VersionControl {
   constructor(config) {
@@ -2280,6 +2317,8 @@ class Chain extends VersionControl {
     this.#slotTime = 1e4;
     this.#blockTime = 6e3;
     // 6 second target block time
+    /** Wall-clock time of the last local proposal attempt. */
+    this.#lastProposalAt = 0;
     this.#epochLength = 10;
     this.utils = {};
     /** {Address[]} */
@@ -2495,6 +2534,7 @@ class Chain extends VersionControl {
   #state;
   #slotTime;
   #blockTime;
+  #lastProposalAt;
   #epochLength;
   #validators;
   #runningEpoch;
@@ -2568,10 +2608,10 @@ class Chain extends VersionControl {
       globalThis.peernet?.network || "leofcoin"
     );
   }
-  async #getConsensusValidators(nextBlockIndex) {
+  async #getConsensusValidators(nextBlockIndex2) {
     const localBlock = await this.lastBlock;
     const localIndex = localBlock?.index !== void 0 ? Number(localBlock.index) : -1;
-    if (Array.isArray(localBlock?.validators) && localBlock.validators.length > 0 && (nextBlockIndex === void 0 || nextBlockIndex === localIndex + 1)) {
+    if (Array.isArray(localBlock?.validators) && localBlock.validators.length > 0 && (nextBlockIndex2 === void 0 || nextBlockIndex2 === localIndex + 1)) {
       return [
         ...new Set(
           localBlock.validators.map((validator) => validator.address).filter((address) => Boolean(address))
@@ -2662,9 +2702,7 @@ class Chain extends VersionControl {
   async #runEpoch() {
     if (this.#runningEpoch) return;
     this.#runningEpoch = true;
-    console.log("epoch");
     const validators = await this.#getConsensusValidators();
-    console.log({ validators });
     if (this.#isJailed(peernet.selectedAccount)) {
       this.#runningEpoch = false;
       return;
@@ -2673,8 +2711,16 @@ class Chain extends VersionControl {
       this.#runningEpoch = false;
       return;
     }
-    const localBlock = await this.lastBlock;
-    const nextIndex = (localBlock?.index !== void 0 ? Number(localBlock.index) : -1) + 1;
+    let localBlock = await this.lastBlock;
+    const delay = proposalDelay({
+      now: Date.now(),
+      lastBlockTimestamp: Number(localBlock?.timestamp ?? 0),
+      lastProposalAt: this.#lastProposalAt,
+      blockTime: this.#blockTime
+    });
+    if (delay > 0) await this.#sleep(delay);
+    localBlock = await this.lastBlock;
+    const nextIndex = nextBlockIndex(localBlock?.index);
     const proposerIdx = (nextIndex + this.#consensusRound) % validators.length;
     const isProposer = validators[proposerIdx] === peernet.selectedAccount;
     if (!isProposer) {
@@ -2694,18 +2740,13 @@ class Chain extends VersionControl {
       clearTimeout(this.#roundTimer);
       this.#roundTimer = null;
     }
-    const start = Date.now();
+    this.#lastProposalAt = Date.now();
     try {
       await this.#createBlock();
     } catch (error) {
       console.error(error);
     }
-    const end = Date.now();
-    console.log((end - start) / 1e3 + " s");
-    const elapsed = end - start;
-    const remaining = this.#blockTime - elapsed;
     const hasMore = await this.hasTransactionToHandle();
-    if (!hasMore && remaining > 0) await this.#sleep(remaining);
     this.#runningEpoch = false;
     if (hasMore && !this.#proposalInFlight) return this.#runEpoch();
   }
@@ -2984,6 +3025,10 @@ class Chain extends VersionControl {
     return Promise.all(transactionsToGet);
   }
   async #peerConnected(peerId) {
+    if (typeof peerId !== "string" || !peerId.trim() || peerId === "undefined") {
+      debug("ignored peer connection without a valid peer id");
+      return;
+    }
     debug(`peer connected: ${peerId}`);
     const peer = peernet.getConnection(peerId);
     if (!peer) {
@@ -3195,7 +3240,7 @@ class Chain extends VersionControl {
       if (a.decoded.priority !== b.decoded.priority) {
         return (b.decoded.priority ? 1 : 0) - (a.decoded.priority ? 1 : 0);
       }
-      const nonceDiff = (a.decoded?.nonce ?? 0) - (b.decoded?.nonce ?? 0);
+      const nonceDiff = compareTransactionNonces(a.decoded?.nonce, b.decoded?.nonce);
       if (nonceDiff !== 0) return nonceDiff;
       return 0;
     });
@@ -3293,7 +3338,6 @@ class Chain extends VersionControl {
   // todo filter tx that need to wait on prev nonce
   async #createBlock(limit = this.transactionLimit) {
     if (this.#proposalInFlight) return;
-    console.log(await globalThis.transactionPoolStore.size());
     if (await globalThis.transactionPoolStore.size() === 0) return;
     let transactions = await globalThis.transactionPoolStore.values(this.transactionLimit);
     if (Object.keys(transactions)?.length === 0) return;
@@ -3312,29 +3356,29 @@ class Chain extends VersionControl {
     };
     const latestTransactions = await this.machine.latestTransactions();
     transactions = await this.promiseTransactions(transactions);
-    const allTransactions = transactions.sort((a, b) => {
-      if (a.decoded.priority !== b.decoded.priority) {
-        return (b.decoded.priority ? 1 : 0) - (a.decoded.priority ? 1 : 0);
+    const pendingTransactions = await pruneCanonicalTransactions(
+      transactions,
+      latestTransactions,
+      (hash) => globalThis.transactionStore.has(hash),
+      (hash) => globalThis.transactionPoolStore.delete(hash)
+    );
+    const allTransactions = pendingTransactions.sort((a, b) => {
+      if (a.transaction.decoded.priority !== b.transaction.decoded.priority) {
+        return (b.transaction.decoded.priority ? 1 : 0) - (a.transaction.decoded.priority ? 1 : 0);
       }
-      const nonceDiff = (a.decoded?.nonce ?? 0) - (b.decoded?.nonce ?? 0);
+      const nonceDiff = compareTransactionNonces(a.transaction.decoded?.nonce, b.transaction.decoded?.nonce);
       if (nonceDiff !== 0) return nonceDiff;
       return 0;
     });
-    for (const transaction of allTransactions) {
+    for (const { transaction, hash } of allTransactions) {
       await this.validateTransactionSignature(transaction);
-      const hash = await transaction.hash();
-      if (latestTransactions.includes(hash) || await globalThis.transactionStore.has(hash)) {
-        continue;
-      }
       block.transactions.push(hash);
       block.fees += BigInt(await calculateFee(transaction.decoded));
       await globalThis.peernet.put(hash, transaction.encoded, "transaction");
     }
     if (block.transactions.length === 0) return;
     const localBlock = await this.lastBlock;
-    block.index = localBlock.index;
-    if (block.index === void 0) block.index = 0;
-    else block.index += 1;
+    block.index = nextBlockIndex(localBlock?.index);
     block.previousHash = localBlock.hash || "0x0";
     const canonicalValidators = await this.staticCall(addresses.validators, "validators");
     const sortedValidators = [...canonicalValidators].sort();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -62,19 +62,19 @@
     "tslib": "^2.8.1"
   },
   "dependencies": {
-    "@leofcoin/addresses": "^1.0.59",
+    "@leofcoin/addresses": "^1.0.60",
     "@leofcoin/codecs": "^1.1.4",
     "@leofcoin/contracts": "^0.1.21",
     "@leofcoin/crypto": "^0.2.41",
     "@leofcoin/errors": "^1.0.30",
-    "@leofcoin/lib": "^1.3.3",
+    "@leofcoin/lib": "^1.3.4",
     "@leofcoin/messages": "^1.6.1",
     "@leofcoin/multi-wallet": "^3.1.9",
     "@leofcoin/networks": "^1.1.30",
     "@leofcoin/peernet": "^1.2.26",
     "@leofcoin/storage": "^3.5.38",
-    "@leofcoin/utils": "^1.1.44",
-    "@leofcoin/workers": "^1.5.33",
+    "@leofcoin/utils": "^1.1.45",
+    "@leofcoin/workers": "^1.5.34",
     "@vandeurenglenn/base58": "^1.1.9",
     "@vandeurenglenn/easy-worker": "^1.0.3",
     "@vandeurenglenn/typed-array-utils": "^1.2.0",