@leofcoin/chain 1.10.8 → 1.10.9

package/exports/chain.js

@@ -3,7 +3,7 @@ import { Codec } from '@leofcoin/codec-format-interface';
 import { jsonStringifyBigInt, jsonParseBigInt, formatBytes, parseUnits, formatUnits } from '@leofcoin/utils';
 import { TransactionMessage, BlockMessage, ContractMessage, LastBlockMessage, PrevoteMessage, PrecommitMessage, ProposalMessage, BWMessage, StateMessage } from '@leofcoin/messages';
 import addresses, { contractFactory } from '@leofcoin/addresses';
-import { createTransactionHash, calculateFee, createContractMessage, signTransaction, contractFactoryMessage, nativeTokenMessage, validatorsMessage, nameServiceMessage } from '@leofcoin/lib';
+import { createTransactionHash, calculateFee, createContractMessage, signTransaction, distributeTransactionFee, supportsTransactionFees, aggregateValidatorFees, contractFactoryMessage, nativeTokenMessage, validatorsMessage, nameServiceMessage } from '@leofcoin/lib';
 import MultiWallet from '@leofcoin/multi-wallet';
 import { fromBase58 } from '@vandeurenglenn/typed-array-utils';
 import semver from 'semver';
@@ -896,7 +896,7 @@ class Machine {
    * @param {Array} parameters
    * @returns Promise<message>
    */
-  async execute(contract, method, parameters) {
+  async execute(contract, method, parameters, sender) {
     try {
       if (contract === contractFactory && method === "registerContract") {
         if (await this.has(parameters[0])) throw new Error(`duplicate contract @${parameters[0]}`);
@@ -937,11 +937,15 @@ ${error.message}`);
           to: contract,
           contract,
           method,
-          params: parameters
+          params: parameters,
+          sender
         }
       });
     });
   }
+  collectFee(from, payments, burned) {
+    return this.#askWorker("collectFee", { from, payments, burned });
+  }
   get(contract, method, parameters) {
     return new Promise((resolve, reject) => {
       const id = randombytes(20).toString();
@@ -1785,9 +1789,20 @@ class State extends Contract {
   #loadBlockTransactions;
   #getLastTransactions;
   // todo throw error
-  async #_executeTransaction(transaction) {
+  async #_executeTransaction(transaction, validators, feesEnabled) {
     try {
-      await this.#machine.execute(transaction.decoded.to, transaction.decoded.method, transaction.decoded.params);
+      const hash = await transaction.hash();
+      if (feesEnabled) {
+        const fee = BigInt(await calculateFee(transaction.decoded));
+        const { payments, burned } = distributeTransactionFee(fee, hash, validators);
+        await this.#machine.collectFee(transaction.decoded.from, payments, burned);
+      }
+      await this.#machine.execute(
+        transaction.decoded.to,
+        transaction.decoded.method,
+        transaction.decoded.params,
+        transaction.decoded.from
+      );
     } catch (error) {
       console.log(error);
       await globalThis.transactionPoolStore.delete(await transaction.hash());
@@ -1816,23 +1831,21 @@ class State extends Contract {
         try {
           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}`);
-          let priority = [];
           for (const transaction of transactions) {
             const hash = await transaction.hash();
-            if (transaction.decoded.priority) priority.push(transaction);
             if (poolTransactionKeys.has(hash)) await globalThis.transactionPoolStore.delete(hash);
           }
-          if (priority.length > 0) {
-            debug$1(`executing ${priority.length} priority transactions for block ${block.index}`);
-            priority = priority.sort((a, b) => a.nonce - b.nonce);
-            for (const transaction of priority) {
-              await this.#_executeTransaction(transaction);
-            }
-          }
-          transactions = transactions.filter((transaction) => !transaction.decoded.priority);
+          transactions = transactions.sort((a, b) => {
+            if (a.decoded.priority !== b.decoded.priority) return a.decoded.priority ? -1 : 1;
+            const left = BigInt(a.decoded.nonce);
+            const right = BigInt(b.decoded.nonce);
+            return left < right ? -1 : left > right ? 1 : 0;
+          });
           debug$1(`executing ${transactions.length} transactions for block ${block.index}`);
-          await Promise.all(transactions.map((transaction) => this.#_executeTransaction(transaction)));
+          const feesEnabled = supportsTransactionFees(block.protocolVersion);
+          for (const transaction of transactions) await this.#_executeTransaction(transaction, validators, feesEnabled);
           this.#blocks[block.index].loaded = true;
           debug$1(`executed transactions for block ${block.index}`);
           if (Number(block.index) === 0) this.#loaded = true;
@@ -2286,7 +2299,7 @@ const validateCanonicalValidatorSet = (blockIndex, expectedValidators, validator
     );
   }
 };
-const validateBlockEconomics = (block, calculatedFees) => {
+const validateBlockEconomics = (block, calculatedFees, validatorFees = /* @__PURE__ */ new Map()) => {
   if (block.validators.length === 0) {
     throw new Error(`Block ${block.index} cannot distribute rewards without validators`);
   }
@@ -2297,8 +2310,9 @@ const validateBlockEconomics = (block, calculatedFees) => {
     throw new Error(`Block ${block.index} has invalid fees: expected ${calculatedFees}, got ${block.fees}`);
   }
   const validatorCount = BigInt(block.validators.length);
-  const expectedReward = calculatedFees / validatorCount + BLOCK_REWARD / validatorCount;
+  const baseReward = BLOCK_REWARD / validatorCount;
   for (const validator of block.validators) {
+    const expectedReward = baseReward + (validatorFees.get(validator.address) || 0n);
     if (validator.reward !== expectedReward) {
       throw new Error(
         `Block ${block.index} has an invalid reward for validator ${validator.address}: expected ${expectedReward}, got ${validator.reward}`
@@ -2766,10 +2780,42 @@ class Chain extends VersionControl {
         return transaction;
       })
     );
-    const calculatedFees = (await Promise.all(transactions.map((transaction) => calculateFee(transaction.decoded)))).reduce((total, fee) => total + BigInt(fee), 0n);
-    validateBlockEconomics(blockMessage.decoded, calculatedFees);
+    const feesEnabled = supportsTransactionFees(blockMessage.decoded.protocolVersion);
+    if (feesEnabled) await this.#assertFeeBurnSupported();
+    const calculatedFees = feesEnabled ? (await Promise.all(transactions.map((transaction) => calculateFee(transaction.decoded)))).reduce((total, fee) => total + BigInt(fee), 0n) : 0n;
+    const feeEntries = feesEnabled ? await Promise.all(
+      transactions.map(async (transaction) => ({
+        fee: BigInt(await calculateFee(transaction.decoded)),
+        transactionHash: await transaction.hash()
+      }))
+    ) : [];
+    const validatorAddresses = blockMessage.decoded.validators.map(({ address }) => address);
+    const validatorFees = feesEnabled ? aggregateValidatorFees(feeEntries, validatorAddresses) : new Map(validatorAddresses.map((address) => [address, 0n]));
+    validateBlockEconomics(blockMessage.decoded, calculatedFees, validatorFees);
+    if (feesEnabled) {
+      const feesBySender = /* @__PURE__ */ new Map();
+      for (let index = 0; index < transactions.length; index += 1) {
+        const sender = transactions[index].decoded.from;
+        feesBySender.set(sender, (feesBySender.get(sender) || 0n) + feeEntries[index].fee);
+      }
+      await Promise.all(
+        [...feesBySender].map(async ([sender, required]) => {
+          const balance = BigInt(await this.balanceOf(sender) || 0n);
+          if (balance < required) {
+            throw new Error(`insufficient balance for transaction fees from ${sender}: need ${required}, got ${balance}`);
+          }
+        })
+      );
+    }
     return transactions;
   }
+  async #assertFeeBurnSupported() {
+    const creator = await this.staticCall(addresses.nativeToken, "creator");
+    const canBurn = await this.staticCall(addresses.nativeToken, "hasRole", [creator, "BURN"]);
+    if (!canBurn) {
+      throw new Error("native token genesis does not support protocol fee burning");
+    }
+  }
   /** Check if the next block will cross an epoch boundary (block-based timing) */
   #isEpochBoundary(blockHeight) {
     return (blockHeight + 1) % this.#epochLength === 0;
@@ -3218,9 +3264,12 @@ class Chain extends VersionControl {
   async #versionHandler() {
     return new globalThis.peernet.protos["peernet-response"]({ response: this.version });
   }
-  async #executeTransaction({ hash, from, to, method, params, nonce }) {
+  async #executeTransaction({ hash, from, to, method, params, nonce, feePayments = { payments: [], burned: 0n } }) {
     try {
-      let result = await this.machine.execute(to, method, params);
+      if (feePayments.payments.length > 0 || feePayments.burned > 0n) {
+        await this.machine.collectFee(from, feePayments.payments, feePayments.burned);
+      }
+      let result = await this.machine.execute(to, method, params, from);
       globalThis.pubsub.publish(`transaction.completed.${hash}`, { status: "fulfilled", hash });
       return result || "no state change";
     } catch (error) {
@@ -3292,7 +3341,10 @@ class Chain extends VersionControl {
     for (const transaction of allTransactions) {
       if (!contracts.includes(transaction.decoded.to)) contracts.push(transaction.decoded.to);
       this.removePendingNonce(transaction.decoded.from, transaction.decoded.nonce);
-      await this.#handleTransaction(transaction, []);
+      const transactionHash = await transaction.hash();
+      const validatorAddresses = blockMessage.decoded.validators.map(({ address }) => address);
+      const feeDistribution = supportsTransactionFees(blockMessage.decoded.protocolVersion) ? distributeTransactionFee(BigInt(await calculateFee(transaction.decoded)), transactionHash, validatorAddresses) : { payments: [], burned: 0n };
+      await this.#handleTransaction(transaction, [], void 0, feeDistribution);
     }
     try {
       promises = await Promise.allSettled(promises);
@@ -3349,7 +3401,7 @@ class Chain extends VersionControl {
     if (await this.hasTransactionToHandle() && !this.#runningEpoch && this.#participating) await this.#runEpoch();
     return true;
   }
-  async #handleTransaction(transaction, latestTransactions, block) {
+  async #handleTransaction(transaction, latestTransactions, block, feePayments = { payments: [], burned: 0n }) {
     await this.validateTransactionSignature(transaction);
     const hash = await transaction.hash();
     const doubleTransactions = [];
@@ -3362,7 +3414,7 @@ class Chain extends VersionControl {
       return;
     }
     try {
-      const result = await this.#executeTransaction({ ...transaction.decoded, hash });
+      const result = await this.#executeTransaction({ ...transaction.decoded, hash, feePayments });
       if (block) {
         block.transactions.push(hash);
         block.fees = block.fees += await calculateFee(transaction.decoded);
@@ -3418,7 +3470,7 @@ class Chain extends VersionControl {
     for (const { transaction, hash } of allTransactions) {
       await this.validateTransactionSignature(transaction);
       block.transactions.push(hash);
-      block.fees += BigInt(await calculateFee(transaction.decoded));
+      if (supportsTransactionFees(this.version)) block.fees += BigInt(await calculateFee(transaction.decoded));
       await globalThis.peernet.put(hash, transaction.encoded, "transaction");
     }
     if (block.transactions.length === 0) return;
@@ -3428,9 +3480,17 @@ class Chain extends VersionControl {
     const canonicalValidators = await this.staticCall(addresses.validators, "validators");
     const sortedValidators = [...canonicalValidators].sort();
     if (sortedValidators.length === 0) throw new Error("cannot produce a block without validators");
+    if (supportsTransactionFees(this.version)) await this.#assertFeeBurnSupported();
+    const feeEntries = supportsTransactionFees(this.version) ? await Promise.all(
+      allTransactions.map(async ({ transaction, hash }) => ({
+        fee: BigInt(await calculateFee(transaction.decoded)),
+        transactionHash: hash
+      }))
+    ) : [];
+    const validatorFees = supportsTransactionFees(this.version) ? aggregateValidatorFees(feeEntries, sortedValidators) : new Map(sortedValidators.map((address) => [address, 0n]));
     block.validators = sortedValidators.map((validatorAddress) => ({
       address: validatorAddress,
-      reward: block.fees / BigInt(sortedValidators.length) + block.reward / BigInt(sortedValidators.length)
+      reward: (validatorFees.get(validatorAddress) || 0n) + block.reward / BigInt(sortedValidators.length)
     }));
     try {
       block.producer = globalThis.peernet.selectedAccount || "";
@@ -3555,7 +3615,7 @@ class Chain extends VersionControl {
    * @returns
    */
   internalCall(sender, contract, method, parameters) {
-    return this.machine.execute(contract, method, parameters);
+    return this.machine.execute(contract, method, parameters, sender);
   }
   /**
    *
@@ -3565,7 +3625,7 @@ class Chain extends VersionControl {
    * @returns
    */
   call(contract, method, parameters) {
-    return this.machine.execute(contract, method, parameters);
+    return this.machine.execute(contract, method, parameters, globalThis.peernet.selectedAccount);
   }
   staticCall(contract, method, parameters) {
     return this.machine.get(contract, method, parameters);