@leofcoin/chain 1.4.59 → 1.4.60

package/exports/browser/chain.js

@@ -8188,20 +8188,26 @@ class Chain extends Contract {
         if (!lastBlock)
             lastBlock = await this.#getLatestBlock();
         if (this.#chainSyncing) {
+            console.log('already syncing');
             if (!this.#lastBlockInQue || lastBlock.index > this.#lastBlockInQue.index)
                 this.#lastBlockInQue = lastBlock;
             return 'syncing';
         }
+        console.log('starting sync');
         this.#chainSyncing = true;
         const syncPromise = (lastBlock) => new Promise(async (resolve, reject) => {
-            setTimeout(() => {
+            const timeout = setTimeout(() => {
+                this.#chainSyncing = false;
+                this.#syncErrorCount = 0;
                 reject('timedOut');
-            }, 10000);
+            }, 60000);
             try {
                 await this.#syncChain(lastBlock);
+                clearTimeout(timeout);
                 resolve(true);
             }
             catch (error) {
+                clearTimeout(timeout);
                 reject(error);
             }
         });
@@ -8209,12 +8215,16 @@ class Chain extends Contract {
             return 'connectionless';
         try {
             await syncPromise(lastBlock);
+            if (lastBlock.index === this.#lastBlockInQue?.index || lastBlock.index > this.#lastBlockInQue?.index)
+                this.#lastBlockInQue = undefined;
         }
         catch (error) {
             console.log(error);
             this.#syncErrorCount += 1;
-            if (this.#syncErrorCount <= 3)
-                return this.syncChain(this.#lastBlockInQue);
+            if (this.#syncErrorCount < 3)
+                await syncPromise(lastBlock);
+            this.#chainSyncing = false;
+            this.#syncErrorCount = 0;
             return 'errored';
         }
         this.#syncErrorCount = 0;
@@ -8224,9 +8234,6 @@ class Chain extends Contract {
         return 'synced';
     }
     async #syncChain(lastBlock) {
-        if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.index)
-            return;
-        this.#chainSyncing = true;
         if (this.#knownBlocks?.length === Number(lastBlock.index) + 1) {
             let promises = [];
             promises = await Promise.allSettled(this.#knownBlocks.map(async (address) => {
@@ -8248,8 +8255,6 @@ class Chain extends Contract {
                 await this.#loadBlocks(this.blocks.slice(start));
             await this.#updateState(new BlockMessage(this.#blocks[this.#blocks.length - 1]));
         }
-        clearTimeout(current);
-        this.#chainSyncing = false;
     }
     async #prepareRequest(request) {
         let node = await new globalThis.peernet.protos['peernet-request']({ request });

package/exports/browser/{client-4d80940e-a63ca03c.js → client-10cfc17d-c47b062b.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-79442920.js';
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-39985c71.js';
 import './index-640d9f36.js';
 
 function commonjsRequire(path) {

package/exports/browser/{index-4464b87e-d39e42fc.js → index-cf8b44ca-a27c61c1.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-79442920.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-39985c71.js';
 import './index-640d9f36.js';
 
 /**

package/exports/browser/{messages-27279443-8ccccaf2.js → messages-d292642b-e5aa934c.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-79442920.js';
+import { F as FormatInterface } from './node-browser-39985c71.js';
 import './index-640d9f36.js';
 
 var proto$b = {

package/exports/browser/{node-browser-79442920.js → node-browser-39985c71.js}

@@ -20266,7 +20266,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-4464b87e-d39e42fc.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-cf8b44ca-a27c61c1.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -20307,7 +20307,7 @@ class Identity {
 globalThis.LeofcoinStorage = LeofcoinStorage;
 globalThis.leofcoin = globalThis.leofcoin || {};
 globalThis.pubsub = globalThis.pubsub || new LittlePubSub();
-globalThis.globalSub = globalThis.globalSub || new LittlePubSub(true);
+globalThis.globalSub = globalThis.globalSub || new LittlePubSub();
 /**
  * @access public
  * @example
@@ -20437,7 +20437,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-27279443-8ccccaf2.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-d292642b-e5aa934c.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -20516,7 +20516,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-4d80940e-a63ca03c.js');
+        const importee = await import('./client-10cfc17d-c47b062b.js');
         /**
          * @access public
          * @type {PeernetClient}

package/exports/browser/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-79442920.js';
+export { N as default } from './node-browser-39985c71.js';
 import './index-640d9f36.js';

package/exports/chain.js

@@ -774,20 +774,26 @@ class Chain extends Contract {
         if (!lastBlock)
             lastBlock = await this.#getLatestBlock();
         if (this.#chainSyncing) {
+            console.log('already syncing');
             if (!this.#lastBlockInQue || lastBlock.index > this.#lastBlockInQue.index)
                 this.#lastBlockInQue = lastBlock;
             return 'syncing';
         }
+        console.log('starting sync');
         this.#chainSyncing = true;
         const syncPromise = (lastBlock) => new Promise(async (resolve, reject) => {
-            setTimeout(() => {
+            const timeout = setTimeout(() => {
+                this.#chainSyncing = false;
+                this.#syncErrorCount = 0;
                 reject('timedOut');
-            }, 10000);
+            }, 60000);
             try {
                 await this.#syncChain(lastBlock);
+                clearTimeout(timeout);
                 resolve(true);
             }
             catch (error) {
+                clearTimeout(timeout);
                 reject(error);
             }
         });
@@ -795,12 +801,16 @@ class Chain extends Contract {
             return 'connectionless';
         try {
             await syncPromise(lastBlock);
+            if (lastBlock.index === this.#lastBlockInQue?.index || lastBlock.index > this.#lastBlockInQue?.index)
+                this.#lastBlockInQue = undefined;
         }
         catch (error) {
             console.log(error);
             this.#syncErrorCount += 1;
-            if (this.#syncErrorCount <= 3)
-                return this.syncChain(this.#lastBlockInQue);
+            if (this.#syncErrorCount < 3)
+                await syncPromise(lastBlock);
+            this.#chainSyncing = false;
+            this.#syncErrorCount = 0;
             return 'errored';
         }
         this.#syncErrorCount = 0;
@@ -810,9 +820,6 @@ class Chain extends Contract {
         return 'synced';
     }
     async #syncChain(lastBlock) {
-        if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.index)
-            return;
-        this.#chainSyncing = true;
         if (this.#knownBlocks?.length === Number(lastBlock.index) + 1) {
             let promises = [];
             promises = await Promise.allSettled(this.#knownBlocks.map(async (address) => {
@@ -834,8 +841,6 @@ class Chain extends Contract {
                 await this.#loadBlocks(this.blocks.slice(start));
             await this.#updateState(new BlockMessage(this.#blocks[this.#blocks.length - 1]));
         }
-        clearTimeout(current);
-        this.#chainSyncing = false;
     }
     async #prepareRequest(request) {
         let node = await new globalThis.peernet.protos['peernet-request']({ request });

package/package.json

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