@leofcoin/chain 1.7.7 → 1.7.9

package/exports/chain.js

@@ -292,6 +292,7 @@ class Machine {
                 totalBlocks: 0
             }
         };
+        this.wantList = [];
         // @ts-ignore
         return this.#init(blocks);
     }
@@ -347,8 +348,14 @@ class Machine {
             }
             case 'ask': {
                 if (data.question === 'contract' || data.question === 'transaction') {
-                    const input = await peernet.get(data.input);
-                    this.worker.postMessage({ id: data.id, input });
+                    try {
+                        const input = await peernet.get(data.input);
+                        this.worker.postMessage({ id: data.id, input });
+                    }
+                    catch (error) {
+                        console.error(error);
+                        this.wantList.push(data.input);
+                    }
                 }
             }
         }
@@ -709,6 +716,12 @@ class State extends Contract {
     #totalSize;
     #machine;
     #loaded;
+    /**
+     * contains transactions we need before we can successfully load
+     */
+    get wantList() {
+        return this.#machine.wantList;
+    }
     get state() {
         return {
             sync: this.#syncState,
@@ -1160,38 +1173,46 @@ class State extends Contract {
         let poolTransactionKeys = await globalThis.transactionPoolStore.keys();
         for (const block of blocks) {
             if (block && !block.loaded) {
-                if (block.index === 0)
-                    this.#loaded = true;
-                let transactions = await this.#loadBlockTransactions([...block.transactions] || []);
-                const lastTransactions = await this.#getLastTransactions();
-                let priority = [];
-                for (const transaction of transactions) {
-                    const hash = await transaction.hash();
-                    if (lastTransactions.includes(hash)) {
-                        console.log('removing invalid block');
-                        await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash());
-                        blocks.splice(block.index - 1, 1);
-                        return this.#loadBlocks(blocks);
+                try {
+                    let transactions = await this.#loadBlockTransactions([...block.transactions] || []);
+                    const lastTransactions = await this.#getLastTransactions();
+                    let priority = [];
+                    for (const transaction of transactions) {
+                        const hash = await transaction.hash();
+                        if (lastTransactions.includes(hash)) {
+                            console.log('removing invalid block');
+                            await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash());
+                            blocks.splice(block.index - 1, 1);
+                            return this.#loadBlocks(blocks);
+                        }
+                        if (transaction.decoded.priority)
+                            priority.push(transaction);
+                        if (poolTransactionKeys.includes(hash))
+                            await globalThis.transactionPoolStore.delete(hash);
+                    }
+                    // prority blocks execution from the rest so result in higher fees.
+                    if (priority.length > 0) {
+                        priority = priority.sort((a, b) => a.nonce - b.nonce);
+                        for (const transaction of priority) {
+                            await this.#_executeTransaction(transaction);
+                        }
                     }
-                    if (transaction.decoded.priority)
-                        priority.push(transaction);
-                    if (poolTransactionKeys.includes(hash))
-                        await globalThis.transactionPoolStore.delete(hash);
+                    transactions = transactions.filter((transaction) => !transaction.decoded.priority);
+                    await Promise.all(transactions.map((transaction) => this.#_executeTransaction(transaction)));
+                    this.#blocks[block.index].loaded = true;
+                    if (block.index === 0)
+                        this.#loaded = true;
+                    await this.#machine.addLoadedBlock(block);
+                    // @ts-ignore
+                    debug$1(`loaded block: ${block.hash} @${block.index}`);
+                    globalThis.pubsub.publish('block-loaded', { ...block });
                 }
-                // prority blocks execution from the rest so result in higher fees.
-                if (priority.length > 0) {
-                    priority = priority.sort((a, b) => a.nonce - b.nonce);
-                    for (const transaction of priority) {
-                        await this.#_executeTransaction(transaction);
+                catch (error) {
+                    console.error(error);
+                    for (const transaction of block.transactions) {
+                        this.wantList.push(transaction);
                     }
                 }
-                transactions = transactions.filter((transaction) => !transaction.decoded.priority);
-                await Promise.all(transactions.map((transaction) => this.#_executeTransaction(transaction)));
-                this.#blocks[block.index].loaded = true;
-                await this.#machine.addLoadedBlock(block);
-                // @ts-ignore
-                debug$1(`loaded block: ${block.hash} @${block.index}`);
-                globalThis.pubsub.publish('block-loaded', { ...block });
             }
         }
         this.#chainState = 'loaded';
@@ -1464,6 +1485,17 @@ class Chain extends VersionControl {
             else if (!this.knownBlocks)
                 this.knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
         }
+        if (this.wantList.length > 0) {
+            const promises = await Promise.allSettled(this.wantList.map((hash) => peernet.get(hash)));
+            for (let i = 0; i < promises.length; i++) {
+                const result = promises[i];
+                if (result.status === 'fulfilled')
+                    this.wantList.splice(i, 1);
+            }
+            // todo trigger load instead?
+            if (this.wantList.length === 0)
+                await this.triggerSync();
+        }
         setTimeout(async () => {
             const peerTransactionPool = (higherThenCurrentLocal && (await this.getPeerTransactionPool(peer))) || [];
             if (this.#participating && peerTransactionPool.length > 0)

package/exports/machine.d.ts

@@ -18,6 +18,7 @@ export default class Machine {
             totalBlocks: number;
         };
     };
+    wantList: string[];
     constructor(blocks: any);
     updateState(): Promise<void>;
     /**

package/exports/state.d.ts

@@ -9,6 +9,10 @@ export default class State extends Contract {
     #private;
     knownBlocks: BlockHash[];
     jobber: Jobber;
+    /**
+     * contains transactions we need before we can successfully load
+     */
+    get wantList(): string[];
     get state(): {
         sync: SyncState;
         chain: ChainState;

package/package.json

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