@leofcoin/chain 1.5.0 → 1.5.2

package/exports/browser/chain.js

@@ -1034,14 +1034,34 @@ class Jobber {
                 this.busy = false;
                 resolve('stopped');
             };
-            const result = await fn();
-            clearTimeout(timeout);
-            this.busy = false;
-            resolve(result);
+            try {
+                const result = await fn();
+                clearTimeout(timeout);
+                this.busy = false;
+                resolve(result);
+            }
+            catch (error) {
+                reject(error);
+            }
         });
     }
 }
 
+class LeofcoinError extends Error {
+    #message;
+    constructor(message, options) {
+        super(message, options);
+        this.#message = message;
+    }
+    get message() {
+        return `${this.name}: ${this.#message}`;
+    }
+}
+class ResolveError extends LeofcoinError {
+    name = 'ResolveError';
+}
+const isResolveError = (error) => error.name === 'ResolveError';
+
 class State extends Contract {
     #resolveErrored;
     #lastResolvedTime;
@@ -1201,9 +1221,17 @@ class State extends Contract {
             console.error(error);
             throw error;
         }
-        await this.resolveBlocks();
-        this.#machine = await new Machine(this.#blocks);
-        await this.#loadBlocks(this.#blocks);
+        try {
+            await this.resolveBlocks();
+            this.#machine = await new Machine(this.#blocks);
+            await this.#loadBlocks(this.#blocks);
+        }
+        catch (error) {
+            if (isResolveError(error)) {
+                console.error(error);
+            }
+            console.log(error);
+        }
     }
     async updateState(message) {
         const hash = await message.hash();
@@ -1258,13 +1286,11 @@ class State extends Contract {
         catch (error) {
             this.#resolving = false;
             this.#chainSyncing = false;
-            throw new Error('resolve error');
+            throw new ResolveError(`block: ${hash}@${index}`);
         }
         return;
     }
     async resolveBlock(hash) {
-        if (this.#resolveErrorCount === 3)
-            this.#resolveErrorCount = 0;
         if (!hash)
             throw new Error(`expected hash, got: ${hash}`);
         if (hash === '0x0')
@@ -1279,11 +1305,12 @@ class State extends Contract {
                 return this.resolveBlock(this.#lastResolved.previousHash);
         }
         catch (error) {
+            console.log({ error });
             this.#resolveErrorCount += 1;
             if (this.#resolveErrorCount < 3)
                 return this.resolveBlock(hash);
-            else
-                throw new Error('resolve errored');
+            this.#resolveErrorCount = 0;
+            throw new ResolveError(`block: ${hash}`, { cause: error });
         }
     }
     async resolveBlocks() {
@@ -1303,10 +1330,30 @@ class State extends Contract {
                 this.#lastBlock = this.#blocks[this.#blocks.length - 1];
             }
         }
-        catch {
+        catch (error) {
+            console.log(error);
+            this.#resolveErrored = true;
+            this.#resolveErrorCount += 1;
+            this.#resolving = false;
+            this.restoreChain();
+            // console.log(e);
+        }
+    }
+    async restoreChain() {
+        try {
+            const { hash } = await this.#getLatestBlock();
+            await globalThis.chainStore.put('lastBlock', hash);
+            if (hash && hash !== '0x0') {
+                await this.resolveBlock(hash);
+                this.#lastBlock = this.#blocks[this.#blocks.length - 1];
+            }
+        }
+        catch (error) {
+            console.log(error);
             this.#resolveErrored = true;
             this.#resolveErrorCount += 1;
             this.#resolving = false;
+            this.restoreChain();
             // console.log(e);
         }
     }

package/exports/chain.js

@@ -4,6 +4,7 @@ import addresses, { contractFactory, nativeToken, validators, nameService } from
 import { calculateFee, createContractMessage, contractFactoryMessage, nativeTokenMessage, validatorsMessage, nameServiceMessage, signTransaction } from '@leofcoin/lib';
 import { randombytes } from '@leofcoin/crypto';
 import EasyWorker from '@vandeurenglenn/easy-worker';
+import { isResolveError, ResolveError } from '@leofcoin/errors';
 
 const limit = 1800;
 const transactionLimit = 1800;
@@ -488,10 +489,15 @@ class Jobber {
                 this.busy = false;
                 resolve('stopped');
             };
-            const result = await fn();
-            clearTimeout(timeout);
-            this.busy = false;
-            resolve(result);
+            try {
+                const result = await fn();
+                clearTimeout(timeout);
+                this.busy = false;
+                resolve(result);
+            }
+            catch (error) {
+                reject(error);
+            }
         });
     }
 }
@@ -655,9 +661,17 @@ class State extends Contract {
             console.error(error);
             throw error;
         }
-        await this.resolveBlocks();
-        this.#machine = await new Machine(this.#blocks);
-        await this.#loadBlocks(this.#blocks);
+        try {
+            await this.resolveBlocks();
+            this.#machine = await new Machine(this.#blocks);
+            await this.#loadBlocks(this.#blocks);
+        }
+        catch (error) {
+            if (isResolveError(error)) {
+                console.error(error);
+            }
+            console.log(error);
+        }
     }
     async updateState(message) {
         const hash = await message.hash();
@@ -712,13 +726,11 @@ class State extends Contract {
         catch (error) {
             this.#resolving = false;
             this.#chainSyncing = false;
-            throw new Error('resolve error');
+            throw new ResolveError(`block: ${hash}@${index}`);
         }
         return;
     }
     async resolveBlock(hash) {
-        if (this.#resolveErrorCount === 3)
-            this.#resolveErrorCount = 0;
         if (!hash)
             throw new Error(`expected hash, got: ${hash}`);
         if (hash === '0x0')
@@ -733,11 +745,12 @@ class State extends Contract {
                 return this.resolveBlock(this.#lastResolved.previousHash);
         }
         catch (error) {
+            console.log({ error });
             this.#resolveErrorCount += 1;
             if (this.#resolveErrorCount < 3)
                 return this.resolveBlock(hash);
-            else
-                throw new Error('resolve errored');
+            this.#resolveErrorCount = 0;
+            throw new ResolveError(`block: ${hash}`, { cause: error });
         }
     }
     async resolveBlocks() {
@@ -757,10 +770,30 @@ class State extends Contract {
                 this.#lastBlock = this.#blocks[this.#blocks.length - 1];
             }
         }
-        catch {
+        catch (error) {
+            console.log(error);
+            this.#resolveErrored = true;
+            this.#resolveErrorCount += 1;
+            this.#resolving = false;
+            this.restoreChain();
+            // console.log(e);
+        }
+    }
+    async restoreChain() {
+        try {
+            const { hash } = await this.#getLatestBlock();
+            await globalThis.chainStore.put('lastBlock', hash);
+            if (hash && hash !== '0x0') {
+                await this.resolveBlock(hash);
+                this.#lastBlock = this.#blocks[this.#blocks.length - 1];
+            }
+        }
+        catch (error) {
+            console.log(error);
             this.#resolveErrored = true;
             this.#resolveErrorCount += 1;
             this.#resolving = false;
+            this.restoreChain();
             // console.log(e);
         }
     }

package/exports/types/state.d.ts

@@ -31,6 +31,7 @@ export default class State extends Contract {
     getAndPutBlock(hash: string): BlockMessage;
     resolveBlock(hash: any): any;
     resolveBlocks(): Promise<void>;
+    restoreChain(): Promise<void>;
     syncChain(lastBlock?: any): Promise<SyncState>;
     promiseRequests(promises: any): Promise<unknown>;
     get canSync(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Official javascript implementation",
   "exports": {
     "./node": "./exports/node.js",
@@ -66,7 +66,7 @@
     "@leofcoin/storage": "^3.0.6",
     "@leofcoin/utils": "^1.1.4",
     "@leofcoin/workers": "^1.3.13",
-    "@netpeer/p2pt-swarm": "^1.3.3",
+    "@netpeer/p2pt-swarm": "^1.3.5",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/easy-worker": "^1.0.2",
     "@vandeurenglenn/queue": "^1.0.0",