@leofcoin/chain 1.8.29 → 1.8.30

package/exports/browser/chain.js

@@ -5016,6 +5016,7 @@ class State extends Contract {
     #totalSize;
     #machine;
     #loaded;
+    #resolvingHashes;
     /**
      * contains transactions we need before we can successfully load
      */
@@ -5104,6 +5105,7 @@ class State extends Contract {
         this.knownBlocks = [];
         this.#totalSize = 0;
         this.#loaded = false;
+        this.#resolvingHashes = new Set();
         this._wantList = [];
         this.#chainStateHandler = () => {
             return new globalThis.peernet.protos['peernet-response']({
@@ -5264,6 +5266,23 @@ class State extends Contract {
         }
         return block;
     }
+    async #resolveTransactions(transactions) {
+        await Promise.all(transactions
+            .filter((hash) => Boolean(hash))
+            .map(async (hash) => {
+            // should be in a transaction store already
+            const exists = await transactionStore.has(hash);
+            if (!exists) {
+                const data = await peernet.get(hash, 'transaction');
+                if (!data)
+                    throw new Error(`missing transaction data for ${hash}`);
+                await transactionStore.put(hash, data);
+            }
+            const inPool = await transactionPoolStore.has(hash);
+            if (inPool)
+                await transactionPoolStore.delete(hash);
+        }));
+    }
     async #resolveBlock(hash) {
         let index = this.#blockHashMap.get(hash);
         let localHash = '0x0';
@@ -5289,31 +5308,12 @@ class State extends Contract {
         }
         try {
             const block = await this.getAndPutBlock(hash);
+            const promises = [];
             if (block.decoded.previousHash !== '0x0' && block.decoded.previousHash !== localHash) {
-                setImmediate(async () => {
-                    try {
-                        await this.resolveBlock(block.decoded.previousHash);
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                });
+                promises.push(this.resolveBlock(block.decoded.previousHash));
             }
-            await Promise.all(block.decoded.transactions
-                .filter((hash) => Boolean(hash))
-                .map(async (hash) => {
-                // should be in a transaction store already
-                const exists = await transactionStore.has(hash);
-                if (!exists) {
-                    const data = await peernet.get(hash, 'transaction');
-                    if (!data)
-                        throw new Error(`missing transaction data for ${hash}`);
-                    await transactionStore.put(hash, data);
-                }
-                const inPool = await transactionPoolStore.has(hash);
-                if (inPool)
-                    await transactionPoolStore.delete(hash);
-            }));
+            promises.push(this.#resolveTransactions(block.decoded.transactions));
+            await Promise.all(promises);
             index = block.decoded.index;
             const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
             this.#totalSize += size;
@@ -5334,14 +5334,20 @@ class State extends Contract {
             throw new Error(`expected hash, got: ${hash}`);
         if (hash === '0x0')
             return;
-        if (this.#resolving)
-            return 'already resolving';
+        if (this.#resolvingHashes.has(hash))
+            return;
+        this.#resolvingHashes.add(hash);
+        const isEntering = this.#resolvingHashes.size === 1;
         this.#resolving = true;
-        if (this.jobber.busy && this.jobber.destroy)
-            await this.jobber.destroy();
         try {
-            await this.jobber.add(() => this.#resolveBlock(hash));
-            this.#resolving = false;
+            if (isEntering) {
+                if (this.jobber.busy && this.jobber.destroy)
+                    await this.jobber.destroy();
+                await this.jobber.add(() => this.#resolveBlock(hash));
+            }
+            else {
+                await this.#resolveBlock(hash);
+            }
             try {
                 const lastBlockHash = await globalThis.stateStore.get('lastBlock');
                 if (lastBlockHash === hash) {
@@ -5350,19 +5356,23 @@ class State extends Contract {
                 }
             }
             catch (error) { }
-            if (!this.#blockHashMap.has(this.#lastResolved.previousHash) && this.#lastResolved.previousHash !== '0x0')
-                return this.resolveBlock(this.#lastResolved.previousHash);
         }
         catch (error) {
             console.log({ error });
             this.#resolveErrorCount += 1;
-            this.#resolving = false;
-            if (this.#resolveErrorCount < 3)
+            if (this.#resolveErrorCount < 3) {
+                this.#resolvingHashes.delete(hash);
                 return this.resolveBlock(hash);
+            }
             this.#resolveErrorCount = 0;
             this.wantList.push(hash);
             throw new ResolveError(`block: ${hash}`, { cause: error });
         }
+        finally {
+            this.#resolvingHashes.delete(hash);
+            if (this.#resolvingHashes.size === 0)
+                this.#resolving = false;
+        }
     }
     async resolveBlocks() {
         // Don't re-resolve if already syncing or resolving
@@ -5484,14 +5494,21 @@ class State extends Contract {
                 debug$1(`Remote block hash is 0x0, skipping sync`);
                 return;
             }
+            // Skip if local machine is already ahead of remote
+            if (localIndex > remoteIndex) {
+                debug$1(`Local index ${localIndex} is ahead of remote ${remoteIndex}, skipping sync`);
+                return;
+            }
             // Use state hash comparison: only resolve if remote hash differs from local state hash
             if (localStateHash !== remoteBlockHash) {
                 if (this.wantList.length > 0) {
                     debug$1(`Fetching ${this.wantList.length} blocks before resolving`);
                     const getBatch = async (batch) => {
-                        return Promise.all(batch.map((hash) => this.getAndPutBlock(hash).catch((e) => {
+                        const blocks = await Promise.all(batch.map((hash) => this.getAndPutBlock(hash).catch((e) => {
                             console.warn(`failed to fetch block ${hash}`, e);
                         })));
+                        const transactions = blocks.filter((block) => Boolean(block)).flatMap((block) => block.decoded.transactions);
+                        return this.#resolveTransactions(transactions);
                     };
                     // Process in batches of 50 to avoid overwhelming network/memory
                     for (let i = 0; i < this.wantList.length; i += 50) {
@@ -5546,7 +5563,7 @@ class State extends Contract {
                 const task = async () => {
                     try {
                         const result = await peer.request(node.encoded);
-                        debug$1({ result });
+                        debug$1(`lastBlock result: ${JSON.stringify(result)}`);
                         console.log({ result });
                         return { result: new LastBlockMessage(result), peer };
                     }
@@ -5561,7 +5578,7 @@ class State extends Contract {
         }
         // @ts-ignore
         console.log({ promises });
-        promises = await this.promiseRequests(promises);
+        promises = (await this.promiseRequests(promises));
         console.log({ promises });
         let latest = { index: 0, hash: '0x0', previousHash: '0x0' };
         promises = promises.sort((a, b) => b.index - a.index);
@@ -5639,7 +5656,7 @@ class State extends Contract {
             if (block && !block.loaded) {
                 try {
                     debug$1(`loading block: ${Number(block.index)} ${block.hash}`);
-                    let transactions = await this.#loadBlockTransactions([...block.transactions] || []);
+                    let transactions = await this.#loadBlockTransactions(block.transactions || []);
                     // const lastTransactions = await this.#getLastTransactions()
                     debug$1(`loading transactions: ${transactions.length} for block ${block.index}`);
                     let priority = [];

package/exports/chain.js

@@ -1157,6 +1157,7 @@ class State extends Contract {
     #totalSize;
     #machine;
     #loaded;
+    #resolvingHashes;
     /**
      * contains transactions we need before we can successfully load
      */
@@ -1245,6 +1246,7 @@ class State extends Contract {
         this.knownBlocks = [];
         this.#totalSize = 0;
         this.#loaded = false;
+        this.#resolvingHashes = new Set();
         this._wantList = [];
         this.#chainStateHandler = () => {
             return new globalThis.peernet.protos['peernet-response']({
@@ -1405,6 +1407,23 @@ class State extends Contract {
         }
         return block;
     }
+    async #resolveTransactions(transactions) {
+        await Promise.all(transactions
+            .filter((hash) => Boolean(hash))
+            .map(async (hash) => {
+            // should be in a transaction store already
+            const exists = await transactionStore.has(hash);
+            if (!exists) {
+                const data = await peernet.get(hash, 'transaction');
+                if (!data)
+                    throw new Error(`missing transaction data for ${hash}`);
+                await transactionStore.put(hash, data);
+            }
+            const inPool = await transactionPoolStore.has(hash);
+            if (inPool)
+                await transactionPoolStore.delete(hash);
+        }));
+    }
     async #resolveBlock(hash) {
         let index = this.#blockHashMap.get(hash);
         let localHash = '0x0';
@@ -1430,31 +1449,12 @@ class State extends Contract {
         }
         try {
             const block = await this.getAndPutBlock(hash);
+            const promises = [];
             if (block.decoded.previousHash !== '0x0' && block.decoded.previousHash !== localHash) {
-                setImmediate(async () => {
-                    try {
-                        await this.resolveBlock(block.decoded.previousHash);
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                });
+                promises.push(this.resolveBlock(block.decoded.previousHash));
             }
-            await Promise.all(block.decoded.transactions
-                .filter((hash) => Boolean(hash))
-                .map(async (hash) => {
-                // should be in a transaction store already
-                const exists = await transactionStore.has(hash);
-                if (!exists) {
-                    const data = await peernet.get(hash, 'transaction');
-                    if (!data)
-                        throw new Error(`missing transaction data for ${hash}`);
-                    await transactionStore.put(hash, data);
-                }
-                const inPool = await transactionPoolStore.has(hash);
-                if (inPool)
-                    await transactionPoolStore.delete(hash);
-            }));
+            promises.push(this.#resolveTransactions(block.decoded.transactions));
+            await Promise.all(promises);
             index = block.decoded.index;
             const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
             this.#totalSize += size;
@@ -1475,14 +1475,20 @@ class State extends Contract {
             throw new Error(`expected hash, got: ${hash}`);
         if (hash === '0x0')
             return;
-        if (this.#resolving)
-            return 'already resolving';
+        if (this.#resolvingHashes.has(hash))
+            return;
+        this.#resolvingHashes.add(hash);
+        const isEntering = this.#resolvingHashes.size === 1;
         this.#resolving = true;
-        if (this.jobber.busy && this.jobber.destroy)
-            await this.jobber.destroy();
         try {
-            await this.jobber.add(() => this.#resolveBlock(hash));
-            this.#resolving = false;
+            if (isEntering) {
+                if (this.jobber.busy && this.jobber.destroy)
+                    await this.jobber.destroy();
+                await this.jobber.add(() => this.#resolveBlock(hash));
+            }
+            else {
+                await this.#resolveBlock(hash);
+            }
             try {
                 const lastBlockHash = await globalThis.stateStore.get('lastBlock');
                 if (lastBlockHash === hash) {
@@ -1491,19 +1497,23 @@ class State extends Contract {
                 }
             }
             catch (error) { }
-            if (!this.#blockHashMap.has(this.#lastResolved.previousHash) && this.#lastResolved.previousHash !== '0x0')
-                return this.resolveBlock(this.#lastResolved.previousHash);
         }
         catch (error) {
             console.log({ error });
             this.#resolveErrorCount += 1;
-            this.#resolving = false;
-            if (this.#resolveErrorCount < 3)
+            if (this.#resolveErrorCount < 3) {
+                this.#resolvingHashes.delete(hash);
                 return this.resolveBlock(hash);
+            }
             this.#resolveErrorCount = 0;
             this.wantList.push(hash);
             throw new ResolveError(`block: ${hash}`, { cause: error });
         }
+        finally {
+            this.#resolvingHashes.delete(hash);
+            if (this.#resolvingHashes.size === 0)
+                this.#resolving = false;
+        }
     }
     async resolveBlocks() {
         // Don't re-resolve if already syncing or resolving
@@ -1625,14 +1635,21 @@ class State extends Contract {
                 debug$1(`Remote block hash is 0x0, skipping sync`);
                 return;
             }
+            // Skip if local machine is already ahead of remote
+            if (localIndex > remoteIndex) {
+                debug$1(`Local index ${localIndex} is ahead of remote ${remoteIndex}, skipping sync`);
+                return;
+            }
             // Use state hash comparison: only resolve if remote hash differs from local state hash
             if (localStateHash !== remoteBlockHash) {
                 if (this.wantList.length > 0) {
                     debug$1(`Fetching ${this.wantList.length} blocks before resolving`);
                     const getBatch = async (batch) => {
-                        return Promise.all(batch.map((hash) => this.getAndPutBlock(hash).catch((e) => {
+                        const blocks = await Promise.all(batch.map((hash) => this.getAndPutBlock(hash).catch((e) => {
                             console.warn(`failed to fetch block ${hash}`, e);
                         })));
+                        const transactions = blocks.filter((block) => Boolean(block)).flatMap((block) => block.decoded.transactions);
+                        return this.#resolveTransactions(transactions);
                     };
                     // Process in batches of 50 to avoid overwhelming network/memory
                     for (let i = 0; i < this.wantList.length; i += 50) {
@@ -1687,7 +1704,7 @@ class State extends Contract {
                 const task = async () => {
                     try {
                         const result = await peer.request(node.encoded);
-                        debug$1({ result });
+                        debug$1(`lastBlock result: ${JSON.stringify(result)}`);
                         console.log({ result });
                         return { result: new LastBlockMessage(result), peer };
                     }
@@ -1702,7 +1719,7 @@ class State extends Contract {
         }
         // @ts-ignore
         console.log({ promises });
-        promises = await this.promiseRequests(promises);
+        promises = (await this.promiseRequests(promises));
         console.log({ promises });
         let latest = { index: 0, hash: '0x0', previousHash: '0x0' };
         promises = promises.sort((a, b) => b.index - a.index);
@@ -1780,7 +1797,7 @@ class State extends Contract {
             if (block && !block.loaded) {
                 try {
                     debug$1(`loading block: ${Number(block.index)} ${block.hash}`);
-                    let transactions = await this.#loadBlockTransactions([...block.transactions] || []);
+                    let transactions = await this.#loadBlockTransactions(block.transactions || []);
                     // const lastTransactions = await this.#getLastTransactions()
                     debug$1(`loading transactions: ${transactions.length} for block ${block.index}`);
                     let priority = [];

package/exports/types.d.ts

@@ -1,16 +1,6 @@
 import { base58String } from '@vandeurenglenn/base58';
 export type Address = base58String;
 export type BlockHash = base58String;
-interface Transaction {
-    to: Address;
-    from: Address;
-    method: String;
-    params: string[];
-    nonce: Number;
-}
-interface RawTransaction extends Transaction {
-    timestamp: Number;
-}
 export interface globalMessage {
     sender: Address;
     call: Function;
@@ -20,14 +10,15 @@ export interface globalMessage {
 }
 export declare type BlockInMemory = {
     index: number;
-    transactions: RawTransaction[];
-    loaded?: Boolean;
+    hash: string;
+    transactions: string[];
+    loaded?: boolean;
 };
 export declare type RawBlock = {
     index: number;
-    transactions: RawTransaction[];
+    hash: string;
+    transactions: string[];
 };
 export declare type ChainConfig = {
     resolveTimeout?: number;
 };
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.8.29",
+  "version": "1.8.30",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -65,11 +65,11 @@
     "@leofcoin/contracts": "^0.1.16",
     "@leofcoin/crypto": "^0.2.37",
     "@leofcoin/errors": "^1.0.25",
-    "@leofcoin/lib": "^1.2.73",
+    "@leofcoin/lib": "^1.2.74",
     "@leofcoin/messages": "^1.4.40",
     "@leofcoin/multi-wallet": "^3.1.8",
     "@leofcoin/networks": "^1.1.25",
-    "@leofcoin/peernet": "^1.2.15",
+    "@leofcoin/peernet": "^1.2.16",
     "@leofcoin/storage": "^3.5.38",
     "@leofcoin/utils": "^1.1.40",
     "@leofcoin/workers": "^1.5.27",