@leofcoin/chain 1.7.9 → 1.7.11

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

@@ -150,10 +150,6 @@ const get = ({ contract, method, params }) => {
   return result
 };
 
-const resolveContract = (hash) => askFor('contract', hash);
-
-const resolveTransaction = (hash) => askFor('transaction', hash);
-
 const respond = (id, value) => {
   worker.postMessage({
     type: 'response',
@@ -255,6 +251,13 @@ const _executeTransaction = async (transaction) => {
   }
 };
 
+const addToWantList = (hash) => {
+  worker.postMessage({
+    type: 'addToWantList',
+    hash
+  });
+};
+
 _.init = async (message) => {
   let { peerid, fromState, state, info } = message;
   globalThis.peerid = peerid;
@@ -272,6 +275,10 @@ _.init = async (message) => {
     lastBlock = message.lastBlock;
     const setState = async (address, state) => {
       const contractBytes = await resolveContract(address);
+      if (contractBytes === address) {
+        addToWantList(address);
+        return
+      }
       const contract = await new ContractMessage(contractBytes);
 
       await _.runContract({ hash: address, decoded: contract.decoded, encoded: contract.encoded }, state);
@@ -341,30 +348,42 @@ _.init = async (message) => {
           latestTransactions.splice(-transactionCount, latestTransactions.length);
         }
         if (!block.loaded && !fromState) {
-          const transactions = await Promise.all(
-            block.transactions.map(async (transaction) =>
-              new TransactionMessage(await resolveTransaction(transaction)).decode()
-            )
-          );
-          const priority = transactions.filter((transaction) => transaction.priority)?.sort((a, b) => a.nonce - b.nonce);
-          if (priority.length > 0)
-            for (const transaction of priority) {
-              await _executeTransaction(transaction);
-            }
-
-          await Promise.all(
-            transactions
-              .filter((transaction) => !transaction.priority)
-              .map(async (transaction) => _executeTransaction(transaction))
-          );
+          try {
+            const transactions = await Promise.all(
+              block.transactions.map(async (transaction) => {
+                const message = new TransactionMessage(await resolveTransaction(transaction)).decode();
+                if (message === transaction) {
+                  throw new Error(`nothing found for ${transaction}`)
+                }
+              })
+            );
+            const priority = transactions
+              .filter((transaction) => transaction.priority)
+              ?.sort((a, b) => a.nonce - b.nonce);
+            if (priority.length > 0)
+              for (const transaction of priority) {
+                await _executeTransaction(transaction);
+              }
+
+            await Promise.all(
+              transactions
+                .filter((transaction) => !transaction.priority)
+                .map(async (transaction) => _executeTransaction(transaction))
+            );
+            block.loaded = true;
+            worker.postMessage({
+              type: 'debug',
+              message: `loaded transactions for block: ${block.hash} @${block.index}`
+            });
+          } catch (error) {
+            // just tell chain it's ready so we can get this node sync
+            // when a node connects this node will try to resolve the wantList
+            // this should result in the node beeing sync
+            if (error.message.includes('nothing found for')) worker.postMessage({ type: 'machine-ready', lastBlock });
+            else console.error(error);
+          }
         }
-        block.loaded = true;
-        worker.postMessage({
-          type: 'debug',
-          message: `loaded transactions for block: ${block.hash} @${block.index}`
-        });
       }
-
       if (blocks.length > 0) {
         lastBlock = blocks[blocks.length - 1];
       }
@@ -373,8 +392,6 @@ _.init = async (message) => {
   }
 
   worker.postMessage({ type: 'machine-ready', lastBlock });
-
-  // worker.postMessage({blocks});
 };
 
 _.addLoadedBlock = (block) => {
@@ -399,6 +416,10 @@ const askFor = (question, input) =>
     });
   });
 
+const resolveContract = (hash) => askFor('contract', hash);
+
+const resolveTransaction = (hash) => askFor('transaction', hash);
+
 const runTask = async (id, taskName, input) => {
   try {
     const result = await _[taskName](input);

package/exports/chain.js

@@ -346,6 +346,9 @@ class Machine {
                 pubsub.publish(data.id, data.value || false);
                 break;
             }
+            case 'addToWantList': {
+                this.wantList.push(data.hash);
+            }
             case 'ask': {
                 if (data.question === 'contract' || data.question === 'transaction') {
                     try {
@@ -354,6 +357,7 @@ class Machine {
                     }
                     catch (error) {
                         console.error(error);
+                        this.worker.postMessage({ id: data.id, input: data.input });
                         this.wantList.push(data.input);
                     }
                 }
@@ -720,7 +724,7 @@ class State extends Contract {
      * contains transactions we need before we can successfully load
      */
     get wantList() {
-        return this.#machine.wantList;
+        return this.#machine.wantList ?? this._wantList;
     }
     get state() {
         return {
@@ -783,6 +787,7 @@ class State extends Contract {
         this.knownBlocks = [];
         this.#totalSize = 0;
         this.#loaded = false;
+        this._wantList = [];
         this.#chainStateHandler = () => {
             return new globalThis.peernet.protos['peernet-response']({
                 response: this.#chainState
@@ -966,6 +971,7 @@ class State extends Contract {
             if (this.#resolveErrorCount < 3)
                 return this.resolveBlock(hash);
             this.#resolveErrorCount = 0;
+            this.wantList.push(hash);
             throw new ResolveError(`block: ${hash}`, { cause: error });
         }
     }

package/exports/state.d.ts

@@ -9,6 +9,7 @@ export default class State extends Contract {
     #private;
     knownBlocks: BlockHash[];
     jobber: Jobber;
+    _wantList: any[];
     /**
      * contains transactions we need before we can successfully load
      */

package/exports/workers/machine-worker.js

@@ -150,10 +150,6 @@ const get = ({ contract, method, params }) => {
   return result
 };
 
-const resolveContract = (hash) => askFor('contract', hash);
-
-const resolveTransaction = (hash) => askFor('transaction', hash);
-
 const respond = (id, value) => {
   worker.postMessage({
     type: 'response',
@@ -255,6 +251,13 @@ const _executeTransaction = async (transaction) => {
   }
 };
 
+const addToWantList = (hash) => {
+  worker.postMessage({
+    type: 'addToWantList',
+    hash
+  });
+};
+
 _.init = async (message) => {
   let { peerid, fromState, state, info } = message;
   globalThis.peerid = peerid;
@@ -272,6 +275,10 @@ _.init = async (message) => {
     lastBlock = message.lastBlock;
     const setState = async (address, state) => {
       const contractBytes = await resolveContract(address);
+      if (contractBytes === address) {
+        addToWantList(address);
+        return
+      }
       const contract = await new ContractMessage(contractBytes);
 
       await _.runContract({ hash: address, decoded: contract.decoded, encoded: contract.encoded }, state);
@@ -341,30 +348,42 @@ _.init = async (message) => {
           latestTransactions.splice(-transactionCount, latestTransactions.length);
         }
         if (!block.loaded && !fromState) {
-          const transactions = await Promise.all(
-            block.transactions.map(async (transaction) =>
-              new TransactionMessage(await resolveTransaction(transaction)).decode()
-            )
-          );
-          const priority = transactions.filter((transaction) => transaction.priority)?.sort((a, b) => a.nonce - b.nonce);
-          if (priority.length > 0)
-            for (const transaction of priority) {
-              await _executeTransaction(transaction);
-            }
-
-          await Promise.all(
-            transactions
-              .filter((transaction) => !transaction.priority)
-              .map(async (transaction) => _executeTransaction(transaction))
-          );
+          try {
+            const transactions = await Promise.all(
+              block.transactions.map(async (transaction) => {
+                const message = new TransactionMessage(await resolveTransaction(transaction)).decode();
+                if (message === transaction) {
+                  throw new Error(`nothing found for ${transaction}`)
+                }
+              })
+            );
+            const priority = transactions
+              .filter((transaction) => transaction.priority)
+              ?.sort((a, b) => a.nonce - b.nonce);
+            if (priority.length > 0)
+              for (const transaction of priority) {
+                await _executeTransaction(transaction);
+              }
+
+            await Promise.all(
+              transactions
+                .filter((transaction) => !transaction.priority)
+                .map(async (transaction) => _executeTransaction(transaction))
+            );
+            block.loaded = true;
+            worker.postMessage({
+              type: 'debug',
+              message: `loaded transactions for block: ${block.hash} @${block.index}`
+            });
+          } catch (error) {
+            // just tell chain it's ready so we can get this node sync
+            // when a node connects this node will try to resolve the wantList
+            // this should result in the node beeing sync
+            if (error.message.includes('nothing found for')) worker.postMessage({ type: 'machine-ready', lastBlock });
+            else console.error(error);
+          }
         }
-        block.loaded = true;
-        worker.postMessage({
-          type: 'debug',
-          message: `loaded transactions for block: ${block.hash} @${block.index}`
-        });
       }
-
       if (blocks.length > 0) {
         lastBlock = blocks[blocks.length - 1];
       }
@@ -373,8 +392,6 @@ _.init = async (message) => {
   }
 
   worker.postMessage({ type: 'machine-ready', lastBlock });
-
-  // worker.postMessage({blocks});
 };
 
 _.addLoadedBlock = (block) => {
@@ -399,6 +416,10 @@ const askFor = (question, input) =>
     });
   });
 
+const resolveContract = (hash) => askFor('contract', hash);
+
+const resolveTransaction = (hash) => askFor('transaction', hash);
+
 const runTask = async (id, taskName, input) => {
   try {
     const result = await _[taskName](input);

package/package.json

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