@leofcoin/chain 1.5.58 → 1.5.60

package/exports/browser/chain.js

@@ -4933,14 +4933,18 @@ class Chain extends VersionControl {
         }
     }
     async #addBlock(block) {
+        console.log({ block });
         const blockMessage = await new BlockMessage(block);
         await Promise.all(blockMessage.decoded.transactions
             // @ts-ignore
             .map(async (transaction) => {
             let hash = transaction.hash;
-            if (!hash)
-                await new TransactionMessage(transaction).hash();
+            if (!hash) {
+                hash = await new TransactionMessage(transaction).hash();
+                transaction.hash = hash;
+            }
             (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
+            return transaction;
         }));
         const hash = await blockMessage.hash();
         await globalThis.blockStore.put(hash, blockMessage.encoded);
@@ -4951,13 +4955,11 @@ class Chain extends VersionControl {
         let contracts = [];
         for (let transaction of blockMessage.decoded.transactions) {
             // await transactionStore.put(transaction.hash, transaction.encoded)
-            // @ts-ignore
-            const index = contracts.indexOf(transaction.to);
-            // @ts-ignore
-            if (index === -1)
+            if (!contracts.includes(transaction.to)) {
                 contracts.push(transaction.to);
+            }
             // Todo: go trough all accounts
-            // @ts-ignore
+            //@ts-ignore
             promises.push(this.#executeTransaction(transaction));
         }
         try {

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

@@ -147,15 +147,14 @@ _.init = async (message) => {
 
     // }
     for (const block of blocks) {
-      // we only revalidate the latest 128 blocks
-      // every 128 blocks a snapshot is taken and stored in state
+      // we only revalidate the latest 24 blocks
+      // every 24 blocks a snapshot is taken and stored in state
       // this means contracts will be restored from this state
       // this also means devs NEED to make sure the state can be restored
       // on contract deploy an error will be thrown if state wasn't recoverable
-      if (block.index > 128) {
-        for (const transaction of blocks[block.index - 2].transactions) {
-          latestTransactions.splice(transaction, 1);
-        }
+      if (block.index > 24) {
+        const transactionCount = blocks[block.index - 1].transactions.length;
+        latestTransactions.splice(-(transactionCount - 1), latestTransactions.length);
       }
       await Promise.all(
         block.transactions.map(async (transaction) => {

package/exports/chain.js

@@ -1344,14 +1344,18 @@ class Chain extends VersionControl {
         }
     }
     async #addBlock(block) {
+        console.log({ block });
         const blockMessage = await new BlockMessage(block);
         await Promise.all(blockMessage.decoded.transactions
             // @ts-ignore
             .map(async (transaction) => {
             let hash = transaction.hash;
-            if (!hash)
-                await new TransactionMessage(transaction).hash();
+            if (!hash) {
+                hash = await new TransactionMessage(transaction).hash();
+                transaction.hash = hash;
+            }
             (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
+            return transaction;
         }));
         const hash = await blockMessage.hash();
         await globalThis.blockStore.put(hash, blockMessage.encoded);
@@ -1362,13 +1366,11 @@ class Chain extends VersionControl {
         let contracts = [];
         for (let transaction of blockMessage.decoded.transactions) {
             // await transactionStore.put(transaction.hash, transaction.encoded)
-            // @ts-ignore
-            const index = contracts.indexOf(transaction.to);
-            // @ts-ignore
-            if (index === -1)
+            if (!contracts.includes(transaction.to)) {
                 contracts.push(transaction.to);
+            }
             // Todo: go trough all accounts
-            // @ts-ignore
+            //@ts-ignore
             promises.push(this.#executeTransaction(transaction));
         }
         try {

package/exports/workers/machine-worker.js

@@ -147,15 +147,14 @@ _.init = async (message) => {
 
     // }
     for (const block of blocks) {
-      // we only revalidate the latest 128 blocks
-      // every 128 blocks a snapshot is taken and stored in state
+      // we only revalidate the latest 24 blocks
+      // every 24 blocks a snapshot is taken and stored in state
       // this means contracts will be restored from this state
       // this also means devs NEED to make sure the state can be restored
       // on contract deploy an error will be thrown if state wasn't recoverable
-      if (block.index > 128) {
-        for (const transaction of blocks[block.index - 2].transactions) {
-          latestTransactions.splice(transaction, 1);
-        }
+      if (block.index > 24) {
+        const transactionCount = blocks[block.index - 1].transactions.length;
+        latestTransactions.splice(-(transactionCount - 1), latestTransactions.length);
       }
       await Promise.all(
         block.transactions.map(async (transaction) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.5.58",
+  "version": "1.5.60",
   "description": "Official javascript implementation",
   "exports": {
     "./node": {