@leofcoin/chain 1.6.6 → 1.6.8

package/exports/browser/chain.js

@@ -3939,7 +3939,7 @@ class Machine {
                 console.error(`init error: ${data.message}`);
                 break;
             }
-            case 'executionError': {
+            case 'executeError': {
                 // console.warn(`error executing transaction ${data.message}`);
                 pubsub.publish(data.id, { error: data.message });
                 break;
@@ -4979,6 +4979,7 @@ class Chain extends VersionControl {
         return this;
     }
     async #invalidTransaction(hash) {
+        hash = new TextDecoder().decode(hash);
         await globalThis.transactionPoolStore.delete(hash);
         console.log(`removed invalid transaction: ${hash}`);
     }
@@ -5072,6 +5073,9 @@ class Chain extends VersionControl {
                 // @ts-ignore
                 transaction.hash = hash;
             }
+            if (!(await transactionStore.has(hash))) {
+                transactionStore.put(hash, await blockMessage.hash());
+            }
             (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
             return transaction;
         }));
@@ -5090,12 +5094,16 @@ class Chain extends VersionControl {
         }
         try {
             promises = await Promise.allSettled(promises);
+            const noncesByAddress = {};
             for (let transaction of blockMessage.decoded.transactions) {
                 globalThis.pubsub.publish('transaction-processed', transaction);
                 if (transaction.to === globalThis.peernet.selectedAccount)
                     globalThis.pubsub.publish('account-transaction-processed', transaction);
-                await globalThis.accountsStore.put(transaction.from, String(transaction.nonce));
+                if (!noncesByAddress[transaction.from] || noncesByAddress?.[transaction.from] < transaction.nonce) {
+                    noncesByAddress[transaction.from] = transaction.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() });
                 await this.updateState(blockMessage);
@@ -5183,15 +5191,18 @@ class Chain extends VersionControl {
         console.log({ latestTransactions });
         // exclude failing tx
         transactions = await this.promiseTransactions(transactions);
-        const priority = transactions
-            .filter((transaction) => transaction.decoded.priority)
-            .sort((a, b) => a.decoded.nonce - b.decoded.nonce);
-        for (const transaction of priority) {
+        const normalTransactions = [];
+        const priorityransactions = [];
+        for (const transaction of transactions) {
+            if (transaction.decoded.priority)
+                priorityransactions.push(transaction);
+            else
+                normalTransactions.push(transaction);
+        }
+        for (const transaction of priorityransactions.sort((a, b) => a.decoded.nonce - b.decoded.nonce)) {
             await this.#handleTransaction(transaction, latestTransactions, block);
         }
-        await Promise.all(transactions
-            .filter((transaction) => !transaction.decoded.priority)
-            .map((transaction) => this.#handleTransaction(transaction, latestTransactions, block)));
+        await Promise.all(normalTransactions.map((transaction) => this.#handleTransaction(transaction, latestTransactions, block)));
         // don't add empty block
         if (block.transactions.length === 0)
             return;
@@ -5271,7 +5282,7 @@ class Chain extends VersionControl {
         const hash = await transaction.hash();
         try {
             const has = await globalThis.transactionPoolStore.has(hash);
-            if (!has) {
+            if (!has && !(await transactionStore.has(hash))) {
                 await globalThis.transactionPoolStore.put(hash, transaction.encoded);
             }
             if (this.#participating && !this.#runningEpoch)

package/exports/chain.js

@@ -307,7 +307,7 @@ class Machine {
                 console.error(`init error: ${data.message}`);
                 break;
             }
-            case 'executionError': {
+            case 'executeError': {
                 // console.warn(`error executing transaction ${data.message}`);
                 pubsub.publish(data.id, { error: data.message });
                 break;
@@ -1347,6 +1347,7 @@ class Chain extends VersionControl {
         return this;
     }
     async #invalidTransaction(hash) {
+        hash = new TextDecoder().decode(hash);
         await globalThis.transactionPoolStore.delete(hash);
         console.log(`removed invalid transaction: ${hash}`);
     }
@@ -1440,6 +1441,9 @@ class Chain extends VersionControl {
                 // @ts-ignore
                 transaction.hash = hash;
             }
+            if (!(await transactionStore.has(hash))) {
+                transactionStore.put(hash, await blockMessage.hash());
+            }
             (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
             return transaction;
         }));
@@ -1458,12 +1462,16 @@ class Chain extends VersionControl {
         }
         try {
             promises = await Promise.allSettled(promises);
+            const noncesByAddress = {};
             for (let transaction of blockMessage.decoded.transactions) {
                 globalThis.pubsub.publish('transaction-processed', transaction);
                 if (transaction.to === globalThis.peernet.selectedAccount)
                     globalThis.pubsub.publish('account-transaction-processed', transaction);
-                await globalThis.accountsStore.put(transaction.from, String(transaction.nonce));
+                if (!noncesByAddress[transaction.from] || noncesByAddress?.[transaction.from] < transaction.nonce) {
+                    noncesByAddress[transaction.from] = transaction.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() });
                 await this.updateState(blockMessage);
@@ -1551,15 +1559,18 @@ class Chain extends VersionControl {
         console.log({ latestTransactions });
         // exclude failing tx
         transactions = await this.promiseTransactions(transactions);
-        const priority = transactions
-            .filter((transaction) => transaction.decoded.priority)
-            .sort((a, b) => a.decoded.nonce - b.decoded.nonce);
-        for (const transaction of priority) {
+        const normalTransactions = [];
+        const priorityransactions = [];
+        for (const transaction of transactions) {
+            if (transaction.decoded.priority)
+                priorityransactions.push(transaction);
+            else
+                normalTransactions.push(transaction);
+        }
+        for (const transaction of priorityransactions.sort((a, b) => a.decoded.nonce - b.decoded.nonce)) {
             await this.#handleTransaction(transaction, latestTransactions, block);
         }
-        await Promise.all(transactions
-            .filter((transaction) => !transaction.decoded.priority)
-            .map((transaction) => this.#handleTransaction(transaction, latestTransactions, block)));
+        await Promise.all(normalTransactions.map((transaction) => this.#handleTransaction(transaction, latestTransactions, block)));
         // don't add empty block
         if (block.transactions.length === 0)
             return;
@@ -1639,7 +1650,7 @@ class Chain extends VersionControl {
         const hash = await transaction.hash();
         try {
             const has = await globalThis.transactionPoolStore.has(hash);
-            if (!has) {
+            if (!has && !(await transactionStore.has(hash))) {
                 await globalThis.transactionPoolStore.put(hash, transaction.encoded);
             }
             if (this.#participating && !this.#runningEpoch)

package/package.json

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