@leofcoin/chain 1.8.0 → 1.8.2

package/exports/browser/chain.js

@@ -4128,6 +4128,7 @@ class ExecutionError extends LeofcoinError {
 class ContractDeploymentError extends LeofcoinError {
     name = 'ContractDeploymentError';
 }
+const isResolveError = (error) => error.name === 'ResolveError';
 const isExecutionError = (error) => error.name === 'ExecutionError';
 
 // import State from './state'
@@ -4630,34 +4631,42 @@ class Jobber {
 
 const debug$1 = createDebugger('leofcoin/state');
 class State extends Contract {
+    #resolveErrored;
+    #lastResolvedTime;
+    #lastResolved;
+    #resolving;
+    #resolveErrorCount;
+    #syncState;
+    #chainState;
+    #lastBlockInQue;
+    #syncErrorCount;
     #blockHashMap;
+    #chainSyncing;
     #blocks;
+    #totalSize;
     #machine;
     #loaded;
-    // Sync state
-    #syncing;
-    #syncErrorCount;
-    // Block resolution state
-    #resolvingBlocks;
-    #maxConcurrentResolves;
-    #totalSize;
-    #lastResolved;
-    #lastResolvedTime;
-    #blockResolveQueue;
-    #chainState;
     /**
      * contains transactions we need before we can successfully load
      */
     get wantList() {
         return this.#machine?.wantList ?? this._wantList;
     }
+    get state() {
+        return {
+            sync: this.#syncState,
+            chain: this.#chainState
+        };
+    }
+    get blockHashMap() {
+        return this.#blockHashMap.entries();
+    }
     get loaded() {
         return this.#loaded;
     }
-    get isSyncing() {
-        return this.#syncing;
+    get resolving() {
+        return this.#resolving;
     }
-    // Delegate to machine
     get contracts() {
         return this.#machine.contracts;
     }
@@ -4700,38 +4709,35 @@ class State extends Contract {
     get lastBlockHeight() {
         return this.#machine ? this.#machine.lastBlockHeight : 0;
     }
-    get totalSize() {
-        return this.#totalSize;
-    }
-    get machine() {
-        return this.#machine;
-    }
-    get blockHashMap() {
-        return this.#blockHashMap.entries();
-    }
     getBlock(index) {
         return this.#machine.getBlock(index);
     }
     getBlocks(from, to) {
         return this.#machine.getBlocks(from, to);
     }
+    get totalSize() {
+        return this.#totalSize;
+    }
+    get machine() {
+        return this.#machine;
+    }
     constructor(config) {
         super(config);
+        this.#lastResolvedTime = 0;
+        this.#resolving = false;
+        this.#resolveErrorCount = 0;
+        this.#chainState = 'loading';
+        this.#syncErrorCount = 0;
         this.#blockHashMap = new Map();
+        this.#chainSyncing = false;
         this.#blocks = [];
-        this.#loaded = false;
-        // Sync state
-        this.#syncing = false;
-        this.#syncErrorCount = 0;
-        // Block resolution state
-        this.#resolvingBlocks = new Set();
-        this.#maxConcurrentResolves = 10;
         this.knownBlocks = [];
         this.#totalSize = 0;
+        this.#loaded = false;
         this._wantList = [];
         this.#chainStateHandler = () => {
             return new globalThis.peernet.protos['peernet-response']({
-                response: { syncing: this.#syncing, loaded: this.#loaded }
+                response: this.#chainState
             });
         };
         this.#lastBlockHandler = async () => {
@@ -4773,45 +4779,67 @@ class State extends Contract {
     #lastBlockHandler;
     #knownBlocksHandler;
     async init() {
-        // Initialize jobber for timed, cancelable tasks
         this.jobber = new Jobber(this.resolveTimeout);
-        // Register request handlers
-        await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
-        await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
-        await globalThis.peernet.addRequestHandler('chainState', this.#chainStateHandler.bind(this));
+        await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler);
+        await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler);
+        await globalThis.peernet.addRequestHandler('chainState', this.#chainStateHandler);
+        let localBlockHash;
+        let blockMessage;
+        let localBlock;
         try {
-            // Load local block state
-            let localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
-            try {
-                const localBlockHash = new TextDecoder().decode(await globalThis.chainStore.get('lastBlock'));
-                if (localBlockHash && localBlockHash !== '0x0') {
-                    const blockMessage = await new BlockMessage(await globalThis.peernet.get(localBlockHash, 'block'));
+            const rawBlock = await globalThis.chainStore.has('lastBlock');
+            if (rawBlock) {
+                localBlockHash = new TextDecoder().decode(await globalThis.chainStore.get('lastBlock'));
+                if (localBlockHash !== '0x0') {
+                    blockMessage = await globalThis.peernet.get(localBlockHash, 'block');
+                    blockMessage = await new BlockMessage(blockMessage);
                     localBlock = { ...blockMessage.decoded, hash: localBlockHash };
                 }
             }
-            catch (error) {
-                debug$1('No local block found');
+            else {
+                localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
             }
-            // Load known blocks
-            try {
-                this.knownBlocks = await globalThis.blockStore.keys();
+        }
+        catch {
+            localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
+        }
+        try {
+            this.knownBlocks = await blockStore.keys();
+        }
+        catch (error) {
+            debug$1('no local known blocks found');
+        }
+        try {
+            if (localBlock.hash && localBlock.hash !== '0x0') {
+                try {
+                    const states = {
+                        lastBlock: JSON.parse(new TextDecoder().decode(await globalThis.stateStore.get('lastBlock')))
+                    };
+                    if (blockMessage.decoded.index > states.lastBlock.index)
+                        await this.resolveBlocks();
+                }
+                catch (error) {
+                    // no states found, try resolving blocks
+                    await this.resolveBlocks();
+                }
             }
-            catch (error) {
-                debug$1('No known blocks found');
+            else {
+                await this.resolveBlocks();
             }
-            // Initialize machine and resolve blocks if needed
             this.#machine = await new Machine(this.#blocks);
-            if (localBlock.hash !== '0x0') {
-                await this.resolveBlock(localBlock.hash);
-            }
             const lastBlock = await this.#machine.lastBlock;
             if (lastBlock.hash !== '0x0') {
-                await this.updateState(new BlockMessage(lastBlock));
+                this.updateState(new BlockMessage(lastBlock));
             }
             this.#loaded = true;
+            // await this.#loadBlocks(this.#blocks)
         }
         catch (error) {
-            console.error('Failed to initialize state:', error);
+            console.log('e');
+            if (isResolveError(error)) {
+                console.error(error);
+            }
+            console.log(error);
         }
     }
     async updateState(message) {
@@ -4845,40 +4873,41 @@ class State extends Contract {
         return block;
     }
     async #resolveBlock(hash) {
-        if (this.#resolvingBlocks.has(hash)) {
-            return; // Already resolving this block
-        }
-        this.#resolvingBlocks.add(hash);
+        let index = this.#blockHashMap.get(hash);
+        let localHash = '0x0';
         try {
-            let index = this.#blockHashMap.get(hash);
-            debug$1(`resolving block: ${hash} @${index !== undefined ? index : 'unknown'}`);
-            if (this.#blocks[index]) {
-                // Block already exists
+            localHash = await globalThis.stateStore.get('lastBlock');
+        }
+        catch (error) {
+            debug$1('no local state found');
+        }
+        if (this.#blocks[index]) {
+            // Block already exists, check if we need to resolve previous blocks
+            const previousHash = this.#blocks[index].previousHash;
+            if (previousHash === localHash)
                 return;
+            if (previousHash !== '0x0') {
+                // Previous block not in memory, recursively resolve it
+                return this.resolveBlock(previousHash);
             }
-            const block = await this.getAndPutBlock(hash);
-            index = block.decoded.index;
-            const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
-            // Batch transaction operations
-            const transactionsToFetch = [];
-            const transactionHashes = block.decoded.transactions || [];
-            for (const txHash of transactionHashes) {
-                if (!(await globalThis.transactionStore.has(txHash))) {
-                    transactionsToFetch.push(txHash);
-                }
-            }
-            // Fetch all missing transactions in parallel
-            if (transactionsToFetch.length > 0) {
-                const fetchedTransactions = await Promise.all(transactionsToFetch.map((txHash) => globalThis.peernet.get(txHash, 'transaction')));
-                // Batch store all transactions
-                await Promise.all(transactionsToFetch.map((txHash, i) => globalThis.transactionStore.put(txHash, fetchedTransactions[i])));
+            else {
+                // Previous block already exists or is genesis, stop resolving
+                return;
             }
-            // Remove from pool
-            await Promise.all(transactionHashes.map(async (txHash) => {
-                if (await globalThis.transactionPoolStore.has(txHash)) {
-                    await globalThis.transactionPoolStore.delete(txHash);
+        }
+        try {
+            const block = await this.getAndPutBlock(hash);
+            await Promise.all(block.decoded.transactions.map(async (hash) => {
+                // should be in a transaction store already
+                if (!(await transactionStore.has(hash))) {
+                    const data = await peernet.get(hash, 'transaction');
+                    await transactionStore.put(hash, data);
                 }
+                ;
+                (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
             }));
+            index = block.decoded.index;
+            const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
             this.#totalSize += size;
             this.#blocks[index] = { hash, ...block.decoded };
             this.#blockHashMap.set(hash, index);
@@ -4888,147 +4917,187 @@ class State extends Contract {
             this.#lastResolvedTime = Date.now();
         }
         catch (error) {
-            throw new ResolveError(`block: ${hash}`);
-        }
-        finally {
-            this.#resolvingBlocks.delete(hash);
-        }
-    }
-    async #buildBlockChain(latestHash, maxBlocks = 1000) {
-        const chain = [];
-        let currentHash = latestHash;
-        let attempts = 0;
-        while (currentHash !== '0x0' && chain.length < maxBlocks && attempts < maxBlocks + 5) {
-            attempts++;
-            // Check if we already have this block
-            if (this.#blockHashMap.has(currentHash)) {
-                const block = this.#blocks[this.#blockHashMap.get(currentHash)];
-                if (block) {
-                    chain.push(currentHash);
-                    currentHash = block.previousHash;
-                    continue;
-                }
-            }
-            chain.push(currentHash);
-            // Try to get the block to find previous hash
-            try {
-                const block = await this.getAndPutBlock(currentHash);
-                currentHash = block.decoded.previousHash;
-            }
-            catch (error) {
-                debug$1(`Could not fetch block ${currentHash} to determine chain: ${error}`);
-                break;
-            }
-        }
-        return chain;
-    }
-    async #resolveBlocksInParallel(hashes) {
-        // Resolve blocks in parallel with concurrency limit
-        const resolving = [];
-        let index = 0;
-        const resolveNext = async () => {
-            while (index < hashes.length) {
-                const hash = hashes[index++];
-                try {
-                    await this.#resolveBlock(hash);
-                }
-                catch (error) {
-                    debug$1(`Failed to resolve block ${hash}: ${error}`);
-                    this.#blockResolveQueue.push({ hash, retries: 0 });
-                }
-            }
-        };
-        // Start concurrent resolution tasks
-        for (let i = 0; i < Math.min(this.#maxConcurrentResolves, hashes.length); i++) {
-            resolving.push(resolveNext());
+            throw new ResolveError(`block: ${hash}@${index}`);
         }
-        await Promise.all(resolving);
+        return;
     }
     async resolveBlock(hash) {
-        if (!hash || hash === '0x0')
-            return;
-        if (this.#syncing)
+        if (!hash)
+            throw new Error(`expected hash, got: ${hash}`);
+        if (hash === '0x0')
             return;
-        this.#syncing = true;
-        this.#syncErrorCount = 0;
+        if (this.#resolving)
+            return 'already resolving';
+        this.#resolving = true;
+        if (this.jobber.busy && this.jobber.destroy)
+            await this.jobber.destroy();
         try {
-            debug$1(`Building block chain from ${hash}`);
-            const blockChain = await this.#buildBlockChain(hash);
-            debug$1(`Built chain of ${blockChain.length} blocks`);
-            if (blockChain.length > 0) {
-                // If a previous resolve job is still running, cancel it
-                if (this.jobber?.busy && this.jobber.destroy)
-                    await this.jobber.destroy();
-                // Run the parallel resolution inside a timed jobber task
-                await this.jobber.add(() => this.#resolveBlocksInParallel(blockChain));
+            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);
         }
         catch (error) {
-            console.error('Block resolution failed:', error);
+            console.log({ error });
+            this.#resolveErrorCount += 1;
+            this.#resolving = false;
+            if (this.#resolveErrorCount < 3)
+                return this.resolveBlock(hash);
+            this.#resolveErrorCount = 0;
             this.wantList.push(hash);
-        }
-        finally {
-            this.#syncing = false;
+            throw new ResolveError(`block: ${hash}`, { cause: error });
         }
     }
     async resolveBlocks() {
-        if (this.#syncing)
+        // 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();
+            }
+        }
+        catch (error) {
+            console.error(error);
+        }
         try {
             const localBlock = await globalThis.chainStore.get('lastBlock');
             const hash = new TextDecoder().decode(localBlock);
             if (hash && hash !== '0x0') {
-                // Cancel any in-flight job before starting a new one
-                if (this.jobber?.busy && this.jobber.destroy)
-                    await this.jobber.destroy();
-                // Build chain and resolve in parallel under jobber control
-                const run = async () => {
-                    const chain = await this.#buildBlockChain(hash);
-                    if (chain.length > 0) {
-                        await this.#resolveBlocksInParallel(chain);
-                    }
-                };
-                await this.jobber.add(run);
+                debug$1(`Resolving blocks from hash: ${hash}`);
+                await this.resolveBlock(hash);
             }
         }
         catch (error) {
-            debug$1('Failed to resolve blocks:', error);
+            console.log(error);
+            this.#chainSyncing = false;
+            this.#syncState = 'errored';
+            this.#resolveErrored = true;
+            return 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);
+            }
+        }
+        catch (error) {
+            console.log(error);
+            this.#resolveErrored = true;
+            this.#resolveErrorCount += 1;
+            this.#resolving = false;
+            return this.restoreChain();
+            // console.log(e);
         }
     }
     async syncChain(lastBlock) {
-        if (this.#syncing)
-            return 'syncing';
+        console.log('check if can sync');
+        if (!this.shouldSync)
+            return;
+        console.log('starting sync');
+        this.#syncState = 'syncing';
+        this.#chainSyncing = true;
+        try {
+            if (this.jobber.busy && this.jobber.destroy) {
+                await this.jobber.destroy();
+            }
+        }
+        catch (error) {
+            console.error(error);
+        }
         if (!lastBlock)
             lastBlock = await this.#getLatestBlock();
-        this.#syncing = true;
+        if (globalThis.peernet.peers.length === 0)
+            return 'connectionless';
         try {
-            if (globalThis.peernet.peers.length === 0) {
-                this.#syncing = false;
-                return 'connectionless';
+            await this.#syncChain(lastBlock);
+        }
+        catch (error) {
+            this.#syncErrorCount += 1;
+            if (this.#syncErrorCount < 3)
+                return this.syncChain(lastBlock);
+            this.#syncErrorCount = 0;
+            this.#chainSyncing = false;
+            this.#syncState = 'errored';
+            return this.#syncState;
+        }
+        if (lastBlock.index === this.#lastBlockInQue?.index)
+            this.#lastBlockInQue = undefined;
+        this.#syncErrorCount = 0;
+        this.#chainSyncing = false;
+        if (this.#lastBlockInQue)
+            return this.syncChain(this.#lastBlockInQue);
+        this.#syncState = 'synced';
+        return this.#syncState;
+    }
+    async #syncChain(lastBlock) {
+        try {
+            // if (this.knownBlocks?.length === Number(lastBlock.index) + 1) {
+            //   let promises = []
+            //   promises = await Promise.allSettled(
+            //     this.knownBlocks.map(async (address) => {
+            //       const has = await globalThis.peernet.has(address)
+            //       return { has, address }
+            //     })
+            //   )
+            //   promises = promises.filter(({ status, value }) => status === 'fulfilled' && !value.has)
+            //   await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)))
+            // }
+            const localBlock = await this.lastBlock;
+            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'));
             }
-            await this.resolveBlock(lastBlock.hash);
-            const blocks = this.#blocks;
-            const localIndex = (await this.lastBlock).index || -1;
-            const start = Math.max(0, localIndex + 1);
-            if (this.#machine && blocks.length > start) {
-                await this.#loadBlocks(blocks.slice(start));
+            catch (error) {
+                debug$1(`No local state hash found: ${error}`);
             }
-            if (blocks.length > 0) {
-                await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
+            debug$1(`Local block height: ${localIndex}, remote block height: ${remoteIndex}`);
+            debug$1(`Local state hash: ${localStateHash}, remote block hash: ${remoteBlockHash}`);
+            // Skip syncing if remote block hash is 0x0 (invalid state)
+            if (remoteBlockHash === '0x0') {
+                debug$1(`Remote block hash is 0x0, skipping sync`);
+                return;
+            }
+            // 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 && blocks.length > start) {
+                    await this.#loadBlocks(blocks.slice(start));
+                }
+                // 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`);
             }
-            this.#syncErrorCount = 0;
-            this.#syncing = false;
-            return 'synced';
         }
         catch (error) {
-            this.#syncErrorCount++;
-            if (this.#syncErrorCount < 3) {
-                this.#syncing = false;
-                return this.syncChain(lastBlock);
-            }
-            this.#syncErrorCount = 0;
-            this.#syncing = false;
-            return 'errored';
+            console.log(error);
+            throw error;
         }
     }
     async #getLatestBlock() {
@@ -5064,9 +5133,7 @@ class State extends Contract {
         debug$1(`Latest block from peers: ${latest.hash} @${latest.index}`);
         if (latest.hash && latest.hash !== '0x0') {
             let message = await globalThis.peernet.get(latest.hash, 'block');
-            debug$1({ message });
             message = await new BlockMessage(message);
-            debug$1({ message });
             const hash = await message.hash();
             if (hash !== latest.hash)
                 throw new Error('invalid block @getLatestBlock');
@@ -5079,7 +5146,7 @@ class State extends Contract {
                 let node = await globalThis.peernet.prepareMessage(data);
                 let message = await peer.request(node.encode());
                 message = await new globalThis.peernet.protos['peernet-response'](message);
-                this.wantList.push(...message.decoded.response);
+                this.wantList.push(...message.decoded.response.blocks.filter((block) => !this.knownBlocks.includes(block)));
             }
         }
         return latest;
@@ -5199,13 +5266,26 @@ class State extends Contract {
         });
     }
     get canSync() {
-        return !this.#syncing;
+        if (this.#chainSyncing)
+            return false;
+        return true;
     }
     get shouldSync() {
-        if (this.#syncing)
+        if (this.#chainSyncing)
             return false;
+        // Check if we have any connected peers with the same version
         const compatiblePeers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && peer.version === this.version);
-        return compatiblePeers.length > 0;
+        if (compatiblePeers.length === 0) {
+            debug$1('No compatible peers available for sync');
+            return false;
+        }
+        if (!this.#chainSyncing ||
+            this.#resolveErrored ||
+            this.#syncState === 'errored' ||
+            this.#syncState === 'connectionless' ||
+            this.#lastResolvedTime + this.resolveTimeout > Date.now())
+            return true;
+        return false;
     }
     async #waitForPeers(timeoutMs = 30000) {
         return new Promise((resolve) => {

package/exports/chain.js

@@ -6,7 +6,7 @@ import { calculateFee, createContractMessage, signTransaction, contractFactoryMe
 import semver from 'semver';
 import { randombytes } from '@leofcoin/crypto';
 import EasyWorker from '@vandeurenglenn/easy-worker';
-import { ContractDeploymentError, ExecutionError, ResolveError, isExecutionError } from '@leofcoin/errors';
+import { ContractDeploymentError, ExecutionError, isResolveError, ResolveError, isExecutionError } from '@leofcoin/errors';
 
 const limit = 1800;
 const transactionLimit = 1000;
@@ -771,34 +771,42 @@ class Jobber {
 
 const debug$1 = createDebugger('leofcoin/state');
 class State extends Contract {
+    #resolveErrored;
+    #lastResolvedTime;
+    #lastResolved;
+    #resolving;
+    #resolveErrorCount;
+    #syncState;
+    #chainState;
+    #lastBlockInQue;
+    #syncErrorCount;
     #blockHashMap;
+    #chainSyncing;
     #blocks;
+    #totalSize;
     #machine;
     #loaded;
-    // Sync state
-    #syncing;
-    #syncErrorCount;
-    // Block resolution state
-    #resolvingBlocks;
-    #maxConcurrentResolves;
-    #totalSize;
-    #lastResolved;
-    #lastResolvedTime;
-    #blockResolveQueue;
-    #chainState;
     /**
      * contains transactions we need before we can successfully load
      */
     get wantList() {
         return this.#machine?.wantList ?? this._wantList;
     }
+    get state() {
+        return {
+            sync: this.#syncState,
+            chain: this.#chainState
+        };
+    }
+    get blockHashMap() {
+        return this.#blockHashMap.entries();
+    }
     get loaded() {
         return this.#loaded;
     }
-    get isSyncing() {
-        return this.#syncing;
+    get resolving() {
+        return this.#resolving;
     }
-    // Delegate to machine
     get contracts() {
         return this.#machine.contracts;
     }
@@ -841,38 +849,35 @@ class State extends Contract {
     get lastBlockHeight() {
         return this.#machine ? this.#machine.lastBlockHeight : 0;
     }
-    get totalSize() {
-        return this.#totalSize;
-    }
-    get machine() {
-        return this.#machine;
-    }
-    get blockHashMap() {
-        return this.#blockHashMap.entries();
-    }
     getBlock(index) {
         return this.#machine.getBlock(index);
     }
     getBlocks(from, to) {
         return this.#machine.getBlocks(from, to);
     }
+    get totalSize() {
+        return this.#totalSize;
+    }
+    get machine() {
+        return this.#machine;
+    }
     constructor(config) {
         super(config);
+        this.#lastResolvedTime = 0;
+        this.#resolving = false;
+        this.#resolveErrorCount = 0;
+        this.#chainState = 'loading';
+        this.#syncErrorCount = 0;
         this.#blockHashMap = new Map();
+        this.#chainSyncing = false;
         this.#blocks = [];
-        this.#loaded = false;
-        // Sync state
-        this.#syncing = false;
-        this.#syncErrorCount = 0;
-        // Block resolution state
-        this.#resolvingBlocks = new Set();
-        this.#maxConcurrentResolves = 10;
         this.knownBlocks = [];
         this.#totalSize = 0;
+        this.#loaded = false;
         this._wantList = [];
         this.#chainStateHandler = () => {
             return new globalThis.peernet.protos['peernet-response']({
-                response: { syncing: this.#syncing, loaded: this.#loaded }
+                response: this.#chainState
             });
         };
         this.#lastBlockHandler = async () => {
@@ -914,45 +919,67 @@ class State extends Contract {
     #lastBlockHandler;
     #knownBlocksHandler;
     async init() {
-        // Initialize jobber for timed, cancelable tasks
         this.jobber = new Jobber(this.resolveTimeout);
-        // Register request handlers
-        await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
-        await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
-        await globalThis.peernet.addRequestHandler('chainState', this.#chainStateHandler.bind(this));
+        await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler);
+        await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler);
+        await globalThis.peernet.addRequestHandler('chainState', this.#chainStateHandler);
+        let localBlockHash;
+        let blockMessage;
+        let localBlock;
         try {
-            // Load local block state
-            let localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
-            try {
-                const localBlockHash = new TextDecoder().decode(await globalThis.chainStore.get('lastBlock'));
-                if (localBlockHash && localBlockHash !== '0x0') {
-                    const blockMessage = await new BlockMessage(await globalThis.peernet.get(localBlockHash, 'block'));
+            const rawBlock = await globalThis.chainStore.has('lastBlock');
+            if (rawBlock) {
+                localBlockHash = new TextDecoder().decode(await globalThis.chainStore.get('lastBlock'));
+                if (localBlockHash !== '0x0') {
+                    blockMessage = await globalThis.peernet.get(localBlockHash, 'block');
+                    blockMessage = await new BlockMessage(blockMessage);
                     localBlock = { ...blockMessage.decoded, hash: localBlockHash };
                 }
             }
-            catch (error) {
-                debug$1('No local block found');
+            else {
+                localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
             }
-            // Load known blocks
-            try {
-                this.knownBlocks = await globalThis.blockStore.keys();
+        }
+        catch {
+            localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
+        }
+        try {
+            this.knownBlocks = await blockStore.keys();
+        }
+        catch (error) {
+            debug$1('no local known blocks found');
+        }
+        try {
+            if (localBlock.hash && localBlock.hash !== '0x0') {
+                try {
+                    const states = {
+                        lastBlock: JSON.parse(new TextDecoder().decode(await globalThis.stateStore.get('lastBlock')))
+                    };
+                    if (blockMessage.decoded.index > states.lastBlock.index)
+                        await this.resolveBlocks();
+                }
+                catch (error) {
+                    // no states found, try resolving blocks
+                    await this.resolveBlocks();
+                }
             }
-            catch (error) {
-                debug$1('No known blocks found');
+            else {
+                await this.resolveBlocks();
             }
-            // Initialize machine and resolve blocks if needed
             this.#machine = await new Machine(this.#blocks);
-            if (localBlock.hash !== '0x0') {
-                await this.resolveBlock(localBlock.hash);
-            }
             const lastBlock = await this.#machine.lastBlock;
             if (lastBlock.hash !== '0x0') {
-                await this.updateState(new BlockMessage(lastBlock));
+                this.updateState(new BlockMessage(lastBlock));
             }
             this.#loaded = true;
+            // await this.#loadBlocks(this.#blocks)
         }
         catch (error) {
-            console.error('Failed to initialize state:', error);
+            console.log('e');
+            if (isResolveError(error)) {
+                console.error(error);
+            }
+            console.log(error);
         }
     }
     async updateState(message) {
@@ -986,40 +1013,41 @@ class State extends Contract {
         return block;
     }
     async #resolveBlock(hash) {
-        if (this.#resolvingBlocks.has(hash)) {
-            return; // Already resolving this block
-        }
-        this.#resolvingBlocks.add(hash);
+        let index = this.#blockHashMap.get(hash);
+        let localHash = '0x0';
         try {
-            let index = this.#blockHashMap.get(hash);
-            debug$1(`resolving block: ${hash} @${index !== undefined ? index : 'unknown'}`);
-            if (this.#blocks[index]) {
-                // Block already exists
+            localHash = await globalThis.stateStore.get('lastBlock');
+        }
+        catch (error) {
+            debug$1('no local state found');
+        }
+        if (this.#blocks[index]) {
+            // Block already exists, check if we need to resolve previous blocks
+            const previousHash = this.#blocks[index].previousHash;
+            if (previousHash === localHash)
                 return;
+            if (previousHash !== '0x0') {
+                // Previous block not in memory, recursively resolve it
+                return this.resolveBlock(previousHash);
             }
-            const block = await this.getAndPutBlock(hash);
-            index = block.decoded.index;
-            const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
-            // Batch transaction operations
-            const transactionsToFetch = [];
-            const transactionHashes = block.decoded.transactions || [];
-            for (const txHash of transactionHashes) {
-                if (!(await globalThis.transactionStore.has(txHash))) {
-                    transactionsToFetch.push(txHash);
-                }
-            }
-            // Fetch all missing transactions in parallel
-            if (transactionsToFetch.length > 0) {
-                const fetchedTransactions = await Promise.all(transactionsToFetch.map((txHash) => globalThis.peernet.get(txHash, 'transaction')));
-                // Batch store all transactions
-                await Promise.all(transactionsToFetch.map((txHash, i) => globalThis.transactionStore.put(txHash, fetchedTransactions[i])));
+            else {
+                // Previous block already exists or is genesis, stop resolving
+                return;
             }
-            // Remove from pool
-            await Promise.all(transactionHashes.map(async (txHash) => {
-                if (await globalThis.transactionPoolStore.has(txHash)) {
-                    await globalThis.transactionPoolStore.delete(txHash);
+        }
+        try {
+            const block = await this.getAndPutBlock(hash);
+            await Promise.all(block.decoded.transactions.map(async (hash) => {
+                // should be in a transaction store already
+                if (!(await transactionStore.has(hash))) {
+                    const data = await peernet.get(hash, 'transaction');
+                    await transactionStore.put(hash, data);
                 }
+                ;
+                (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
             }));
+            index = block.decoded.index;
+            const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
             this.#totalSize += size;
             this.#blocks[index] = { hash, ...block.decoded };
             this.#blockHashMap.set(hash, index);
@@ -1029,147 +1057,187 @@ class State extends Contract {
             this.#lastResolvedTime = Date.now();
         }
         catch (error) {
-            throw new ResolveError(`block: ${hash}`);
-        }
-        finally {
-            this.#resolvingBlocks.delete(hash);
-        }
-    }
-    async #buildBlockChain(latestHash, maxBlocks = 1000) {
-        const chain = [];
-        let currentHash = latestHash;
-        let attempts = 0;
-        while (currentHash !== '0x0' && chain.length < maxBlocks && attempts < maxBlocks + 5) {
-            attempts++;
-            // Check if we already have this block
-            if (this.#blockHashMap.has(currentHash)) {
-                const block = this.#blocks[this.#blockHashMap.get(currentHash)];
-                if (block) {
-                    chain.push(currentHash);
-                    currentHash = block.previousHash;
-                    continue;
-                }
-            }
-            chain.push(currentHash);
-            // Try to get the block to find previous hash
-            try {
-                const block = await this.getAndPutBlock(currentHash);
-                currentHash = block.decoded.previousHash;
-            }
-            catch (error) {
-                debug$1(`Could not fetch block ${currentHash} to determine chain: ${error}`);
-                break;
-            }
+            throw new ResolveError(`block: ${hash}@${index}`);
         }
-        return chain;
-    }
-    async #resolveBlocksInParallel(hashes) {
-        // Resolve blocks in parallel with concurrency limit
-        const resolving = [];
-        let index = 0;
-        const resolveNext = async () => {
-            while (index < hashes.length) {
-                const hash = hashes[index++];
-                try {
-                    await this.#resolveBlock(hash);
-                }
-                catch (error) {
-                    debug$1(`Failed to resolve block ${hash}: ${error}`);
-                    this.#blockResolveQueue.push({ hash, retries: 0 });
-                }
-            }
-        };
-        // Start concurrent resolution tasks
-        for (let i = 0; i < Math.min(this.#maxConcurrentResolves, hashes.length); i++) {
-            resolving.push(resolveNext());
-        }
-        await Promise.all(resolving);
+        return;
     }
     async resolveBlock(hash) {
-        if (!hash || hash === '0x0')
-            return;
-        if (this.#syncing)
+        if (!hash)
+            throw new Error(`expected hash, got: ${hash}`);
+        if (hash === '0x0')
             return;
-        this.#syncing = true;
-        this.#syncErrorCount = 0;
+        if (this.#resolving)
+            return 'already resolving';
+        this.#resolving = true;
+        if (this.jobber.busy && this.jobber.destroy)
+            await this.jobber.destroy();
         try {
-            debug$1(`Building block chain from ${hash}`);
-            const blockChain = await this.#buildBlockChain(hash);
-            debug$1(`Built chain of ${blockChain.length} blocks`);
-            if (blockChain.length > 0) {
-                // If a previous resolve job is still running, cancel it
-                if (this.jobber?.busy && this.jobber.destroy)
-                    await this.jobber.destroy();
-                // Run the parallel resolution inside a timed jobber task
-                await this.jobber.add(() => this.#resolveBlocksInParallel(blockChain));
+            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);
         }
         catch (error) {
-            console.error('Block resolution failed:', error);
+            console.log({ error });
+            this.#resolveErrorCount += 1;
+            this.#resolving = false;
+            if (this.#resolveErrorCount < 3)
+                return this.resolveBlock(hash);
+            this.#resolveErrorCount = 0;
             this.wantList.push(hash);
-        }
-        finally {
-            this.#syncing = false;
+            throw new ResolveError(`block: ${hash}`, { cause: error });
         }
     }
     async resolveBlocks() {
-        if (this.#syncing)
+        // 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();
+            }
+        }
+        catch (error) {
+            console.error(error);
+        }
         try {
             const localBlock = await globalThis.chainStore.get('lastBlock');
             const hash = new TextDecoder().decode(localBlock);
             if (hash && hash !== '0x0') {
-                // Cancel any in-flight job before starting a new one
-                if (this.jobber?.busy && this.jobber.destroy)
-                    await this.jobber.destroy();
-                // Build chain and resolve in parallel under jobber control
-                const run = async () => {
-                    const chain = await this.#buildBlockChain(hash);
-                    if (chain.length > 0) {
-                        await this.#resolveBlocksInParallel(chain);
-                    }
-                };
-                await this.jobber.add(run);
+                debug$1(`Resolving blocks from hash: ${hash}`);
+                await this.resolveBlock(hash);
+            }
+        }
+        catch (error) {
+            console.log(error);
+            this.#chainSyncing = false;
+            this.#syncState = 'errored';
+            this.#resolveErrored = true;
+            return 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);
             }
         }
         catch (error) {
-            debug$1('Failed to resolve blocks:', error);
+            console.log(error);
+            this.#resolveErrored = true;
+            this.#resolveErrorCount += 1;
+            this.#resolving = false;
+            return this.restoreChain();
+            // console.log(e);
         }
     }
     async syncChain(lastBlock) {
-        if (this.#syncing)
-            return 'syncing';
+        console.log('check if can sync');
+        if (!this.shouldSync)
+            return;
+        console.log('starting sync');
+        this.#syncState = 'syncing';
+        this.#chainSyncing = true;
+        try {
+            if (this.jobber.busy && this.jobber.destroy) {
+                await this.jobber.destroy();
+            }
+        }
+        catch (error) {
+            console.error(error);
+        }
         if (!lastBlock)
             lastBlock = await this.#getLatestBlock();
-        this.#syncing = true;
+        if (globalThis.peernet.peers.length === 0)
+            return 'connectionless';
         try {
-            if (globalThis.peernet.peers.length === 0) {
-                this.#syncing = false;
-                return 'connectionless';
+            await this.#syncChain(lastBlock);
+        }
+        catch (error) {
+            this.#syncErrorCount += 1;
+            if (this.#syncErrorCount < 3)
+                return this.syncChain(lastBlock);
+            this.#syncErrorCount = 0;
+            this.#chainSyncing = false;
+            this.#syncState = 'errored';
+            return this.#syncState;
+        }
+        if (lastBlock.index === this.#lastBlockInQue?.index)
+            this.#lastBlockInQue = undefined;
+        this.#syncErrorCount = 0;
+        this.#chainSyncing = false;
+        if (this.#lastBlockInQue)
+            return this.syncChain(this.#lastBlockInQue);
+        this.#syncState = 'synced';
+        return this.#syncState;
+    }
+    async #syncChain(lastBlock) {
+        try {
+            // if (this.knownBlocks?.length === Number(lastBlock.index) + 1) {
+            //   let promises = []
+            //   promises = await Promise.allSettled(
+            //     this.knownBlocks.map(async (address) => {
+            //       const has = await globalThis.peernet.has(address)
+            //       return { has, address }
+            //     })
+            //   )
+            //   promises = promises.filter(({ status, value }) => status === 'fulfilled' && !value.has)
+            //   await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)))
+            // }
+            const localBlock = await this.lastBlock;
+            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'));
             }
-            await this.resolveBlock(lastBlock.hash);
-            const blocks = this.#blocks;
-            const localIndex = (await this.lastBlock).index || -1;
-            const start = Math.max(0, localIndex + 1);
-            if (this.#machine && blocks.length > start) {
-                await this.#loadBlocks(blocks.slice(start));
+            catch (error) {
+                debug$1(`No local state hash found: ${error}`);
             }
-            if (blocks.length > 0) {
-                await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
+            debug$1(`Local block height: ${localIndex}, remote block height: ${remoteIndex}`);
+            debug$1(`Local state hash: ${localStateHash}, remote block hash: ${remoteBlockHash}`);
+            // Skip syncing if remote block hash is 0x0 (invalid state)
+            if (remoteBlockHash === '0x0') {
+                debug$1(`Remote block hash is 0x0, skipping sync`);
+                return;
+            }
+            // 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 && blocks.length > start) {
+                    await this.#loadBlocks(blocks.slice(start));
+                }
+                // 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`);
             }
-            this.#syncErrorCount = 0;
-            this.#syncing = false;
-            return 'synced';
         }
         catch (error) {
-            this.#syncErrorCount++;
-            if (this.#syncErrorCount < 3) {
-                this.#syncing = false;
-                return this.syncChain(lastBlock);
-            }
-            this.#syncErrorCount = 0;
-            this.#syncing = false;
-            return 'errored';
+            console.log(error);
+            throw error;
         }
     }
     async #getLatestBlock() {
@@ -1205,9 +1273,7 @@ class State extends Contract {
         debug$1(`Latest block from peers: ${latest.hash} @${latest.index}`);
         if (latest.hash && latest.hash !== '0x0') {
             let message = await globalThis.peernet.get(latest.hash, 'block');
-            debug$1({ message });
             message = await new BlockMessage(message);
-            debug$1({ message });
             const hash = await message.hash();
             if (hash !== latest.hash)
                 throw new Error('invalid block @getLatestBlock');
@@ -1220,7 +1286,7 @@ class State extends Contract {
                 let node = await globalThis.peernet.prepareMessage(data);
                 let message = await peer.request(node.encode());
                 message = await new globalThis.peernet.protos['peernet-response'](message);
-                this.wantList.push(...message.decoded.response);
+                this.wantList.push(...message.decoded.response.blocks.filter((block) => !this.knownBlocks.includes(block)));
             }
         }
         return latest;
@@ -1340,13 +1406,26 @@ class State extends Contract {
         });
     }
     get canSync() {
-        return !this.#syncing;
+        if (this.#chainSyncing)
+            return false;
+        return true;
     }
     get shouldSync() {
-        if (this.#syncing)
+        if (this.#chainSyncing)
             return false;
+        // Check if we have any connected peers with the same version
         const compatiblePeers = Object.values(globalThis.peernet.connections || {}).filter((peer) => peer.connected && peer.version === this.version);
-        return compatiblePeers.length > 0;
+        if (compatiblePeers.length === 0) {
+            debug$1('No compatible peers available for sync');
+            return false;
+        }
+        if (!this.#chainSyncing ||
+            this.#resolveErrored ||
+            this.#syncState === 'errored' ||
+            this.#syncState === 'connectionless' ||
+            this.#lastResolvedTime + this.resolveTimeout > Date.now())
+            return true;
+        return false;
     }
     async #waitForPeers(timeoutMs = 30000) {
         return new Promise((resolve) => {

package/exports/state.d.ts

@@ -3,17 +3,24 @@ import Contract from './contract.js';
 import Machine from './machine.js';
 import Jobber from './jobs/jobber.js';
 import { BlockHash } from './types.js';
+declare type SyncState = 'syncing' | 'synced' | 'errored' | 'connectionless';
+declare type ChainState = 'loading' | 'loaded';
 export default class State extends Contract {
     #private;
-    jobber: Jobber;
     knownBlocks: BlockHash[];
+    jobber: Jobber;
     _wantList: any[];
     /**
      * contains transactions we need before we can successfully load
      */
     get wantList(): string[];
+    get state(): {
+        sync: SyncState;
+        chain: ChainState;
+    };
+    get blockHashMap(): MapIterator<[any, any]>;
     get loaded(): boolean;
-    get isSyncing(): boolean;
+    get resolving(): boolean;
     get contracts(): Promise<any>;
     get totalContracts(): Promise<any>;
     get nativeCalls(): Promise<any>;
@@ -32,11 +39,10 @@ export default class State extends Contract {
         previousHash: string;
     };
     get lastBlockHeight(): Promise<any> | 0;
-    get totalSize(): number;
-    get machine(): Machine;
-    get blockHashMap(): MapIterator<[any, any]>;
     getBlock(index: any): Promise<any>;
     getBlocks(from?: any, to?: any): Promise<[]>;
+    get totalSize(): number;
+    get machine(): Machine;
     constructor(config: any);
     clearPool(): Promise<void>;
     /**
@@ -47,12 +53,14 @@ export default class State extends Contract {
     updateState(message: BlockMessage): Promise<void>;
     getLatestBlock(): Promise<BlockMessage['decoded']>;
     getAndPutBlock(hash: string): Promise<BlockMessage>;
-    resolveBlock(hash: string): Promise<void>;
-    resolveBlocks(): Promise<void>;
-    syncChain(lastBlock?: any): Promise<'syncing' | 'synced' | 'errored' | 'connectionless'>;
+    resolveBlock(hash: any): any;
+    resolveBlocks(): Promise<any>;
+    restoreChain(): any;
+    syncChain(lastBlock?: any): Promise<SyncState>;
     promiseRequests(promises: any): Promise<unknown>;
     get canSync(): boolean;
     get shouldSync(): boolean;
-    triggerSync(): Promise<"syncing" | "synced" | "errored" | "connectionless">;
+    triggerSync(): Promise<SyncState>;
     triggerLoad(): Promise<void>;
 }
+export {};

package/package.json

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