@leofcoin/chain 1.7.122 → 1.7.124

package/exports/browser/chain.js

@@ -4933,6 +4933,11 @@ class State extends Contract {
         try {
             await this.jobber.add(() => this.#resolveBlock(hash));
             this.#resolving = false;
+            const lastBlockHash = await globalThis.stateStore.get('lastBlock');
+            if (lastBlockHash === hash) {
+                this.#resolveErrored = false;
+                return;
+            }
             if (!this.#blockHashMap.has(this.#lastResolved.previousHash) && this.#lastResolved.previousHash !== '0x0')
                 return this.resolveBlock(this.#lastResolved.previousHash);
         }
@@ -4948,6 +4953,11 @@ class State extends Contract {
         }
     }
     async resolveBlocks() {
+        // Don't re-resolve if already syncing or resolving
+        if (this.#chainSyncing || this.#resolving) {
+            debug$1('Already syncing or resolving, skipping resolveBlocks()');
+            return;
+        }
         try {
             if (this.jobber.busy && this.jobber.destroy) {
                 await this.jobber.destroy();
@@ -4960,6 +4970,7 @@ class State extends Contract {
             const localBlock = await globalThis.chainStore.get('lastBlock');
             const hash = new TextDecoder().decode(localBlock);
             if (hash && hash !== '0x0') {
+                debug$1(`Resolving blocks from hash: ${hash}`);
                 await this.resolveBlock(hash);
             }
         }
@@ -5043,20 +5054,39 @@ class State extends Contract {
             //   await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)))
             // }
             const localBlock = await this.lastBlock;
-            if (!localBlock || Number(localBlock.index) < Number(lastBlock.index)) {
-                // TODO: check if valid
-                const localIndex = localBlock ? Number(localBlock.index) : 0;
-                const index = Number(lastBlock.index);
-                await this.resolveBlock(lastBlock.hash);
-                console.log('ok');
-                let blocksSynced = localIndex > 0 ? (localIndex > index ? localIndex - index + 1 : index + -localIndex + 1) : index + 1;
-                debug$1(`synced ${blocksSynced} ${blocksSynced > 1 ? 'blocks' : 'block'}`);
+            const localIndex = localBlock ? Number(localBlock.index) : -1;
+            const remoteIndex = Number(lastBlock.index);
+            const remoteBlockHash = lastBlock.hash;
+            // Get the local state hash from chainStore
+            let localStateHash = '0x0';
+            try {
+                localStateHash = new TextDecoder().decode(await globalThis.chainStore.get('lastBlock'));
+            }
+            catch (error) {
+                debug$1(`No local state hash found: ${error}`);
+            }
+            debug$1(`Local block height: ${localIndex}, remote block height: ${remoteIndex}`);
+            debug$1(`Local state hash: ${localStateHash}, remote block hash: ${remoteBlockHash}`);
+            // Use state hash comparison: only resolve if remote hash differs from local state hash
+            if (localStateHash !== remoteBlockHash) {
+                // Remote block hash differs from our local state, need to resolve
+                debug$1(`Resolving remote block: ${remoteBlockHash} @${remoteIndex} (differs from local state)`);
+                await this.resolveBlock(remoteBlockHash);
+                const blocksSynced = remoteIndex - localIndex;
+                debug$1(`Resolved ${blocksSynced} new block(s)`);
                 const blocks = this.#blocks;
+                debug$1(`Loading blocks from index ${localIndex + 1} to ${remoteIndex}`);
                 const start = localIndex + 1;
-                if (this.#machine) {
+                if (this.#machine && blocks.length > start) {
                     await this.#loadBlocks(blocks.slice(start));
                 }
-                await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
+                // Update state with the latest block
+                if (blocks.length > 0) {
+                    await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
+                }
+            }
+            else {
+                debug$1(`Block already in local state. Remote hash: ${remoteBlockHash} matches local state`);
             }
         }
         catch (error) {

package/exports/chain.js

@@ -1060,6 +1060,11 @@ class State extends Contract {
         try {
             await this.jobber.add(() => this.#resolveBlock(hash));
             this.#resolving = false;
+            const lastBlockHash = await globalThis.stateStore.get('lastBlock');
+            if (lastBlockHash === hash) {
+                this.#resolveErrored = false;
+                return;
+            }
             if (!this.#blockHashMap.has(this.#lastResolved.previousHash) && this.#lastResolved.previousHash !== '0x0')
                 return this.resolveBlock(this.#lastResolved.previousHash);
         }
@@ -1075,6 +1080,11 @@ class State extends Contract {
         }
     }
     async resolveBlocks() {
+        // Don't re-resolve if already syncing or resolving
+        if (this.#chainSyncing || this.#resolving) {
+            debug$1('Already syncing or resolving, skipping resolveBlocks()');
+            return;
+        }
         try {
             if (this.jobber.busy && this.jobber.destroy) {
                 await this.jobber.destroy();
@@ -1087,6 +1097,7 @@ class State extends Contract {
             const localBlock = await globalThis.chainStore.get('lastBlock');
             const hash = new TextDecoder().decode(localBlock);
             if (hash && hash !== '0x0') {
+                debug$1(`Resolving blocks from hash: ${hash}`);
                 await this.resolveBlock(hash);
             }
         }
@@ -1170,20 +1181,39 @@ class State extends Contract {
             //   await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)))
             // }
             const localBlock = await this.lastBlock;
-            if (!localBlock || Number(localBlock.index) < Number(lastBlock.index)) {
-                // TODO: check if valid
-                const localIndex = localBlock ? Number(localBlock.index) : 0;
-                const index = Number(lastBlock.index);
-                await this.resolveBlock(lastBlock.hash);
-                console.log('ok');
-                let blocksSynced = localIndex > 0 ? (localIndex > index ? localIndex - index + 1 : index + -localIndex + 1) : index + 1;
-                debug$1(`synced ${blocksSynced} ${blocksSynced > 1 ? 'blocks' : 'block'}`);
+            const localIndex = localBlock ? Number(localBlock.index) : -1;
+            const remoteIndex = Number(lastBlock.index);
+            const remoteBlockHash = lastBlock.hash;
+            // Get the local state hash from chainStore
+            let localStateHash = '0x0';
+            try {
+                localStateHash = new TextDecoder().decode(await globalThis.chainStore.get('lastBlock'));
+            }
+            catch (error) {
+                debug$1(`No local state hash found: ${error}`);
+            }
+            debug$1(`Local block height: ${localIndex}, remote block height: ${remoteIndex}`);
+            debug$1(`Local state hash: ${localStateHash}, remote block hash: ${remoteBlockHash}`);
+            // Use state hash comparison: only resolve if remote hash differs from local state hash
+            if (localStateHash !== remoteBlockHash) {
+                // Remote block hash differs from our local state, need to resolve
+                debug$1(`Resolving remote block: ${remoteBlockHash} @${remoteIndex} (differs from local state)`);
+                await this.resolveBlock(remoteBlockHash);
+                const blocksSynced = remoteIndex - localIndex;
+                debug$1(`Resolved ${blocksSynced} new block(s)`);
                 const blocks = this.#blocks;
+                debug$1(`Loading blocks from index ${localIndex + 1} to ${remoteIndex}`);
                 const start = localIndex + 1;
-                if (this.#machine) {
+                if (this.#machine && blocks.length > start) {
                     await this.#loadBlocks(blocks.slice(start));
                 }
-                await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
+                // Update state with the latest block
+                if (blocks.length > 0) {
+                    await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
+                }
+            }
+            else {
+                debug$1(`Block already in local state. Remote hash: ${remoteBlockHash} matches local state`);
             }
         }
         catch (error) {

package/package.json

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