@leofcoin/chain 1.4.34 → 1.4.35

package/exports/chain.js

@@ -457,6 +457,7 @@ class Chain extends Contract {
     #validators = [];
     /** {Block[]} */
     #blocks = [];
+    #blockHashMap = new Map();
     #machine;
     /** {Boolean} */
     #runningEpoch = false;
@@ -715,7 +716,7 @@ class Chain extends Contract {
                 return { has, address };
             }));
             promises = promises.filter(({ status, value }) => status === 'fulfilled' && !value.has);
-            await Promise.allSettled(promises.map(({ value }) => peernet.get(value.address, 'block')));
+            await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)));
         }
         if (!this.lastBlock || Number(this.lastBlock.index) < Number(lastBlock.index)) {
             // TODO: check if valid
@@ -724,7 +725,6 @@ class Chain extends Contract {
             await this.resolveBlock(lastBlock.hash);
             let blocksSynced = localIndex > 0 ? (localIndex > index ? localIndex - index : index - localIndex) : index;
             debug(`synced ${blocksSynced} ${blocksSynced > 1 ? 'blocks' : 'block'}`);
-            this.#blocks.length;
             const start = (this.#blocks.length - blocksSynced) - 1;
             await this.#loadBlocks(this.blocks.slice(start));
             await this.#updateState(new BlockMessage(this.#blocks[this.#blocks.length - 1]));
@@ -752,22 +752,40 @@ class Chain extends Contract {
     async #knownBlocksHandler() {
         return new peernet.protos['peernet-response']({ response: { blocks: this.#blocks.map((block) => block.hash) } });
     }
-    async resolveBlock(hash) {
-        if (!hash)
-            throw new Error(`expected hash, got: ${hash}`);
+    async getAndPutBlock(hash) {
         let block = await peernet.get(hash, 'block');
         block = await new BlockMessage(block);
+        const { index } = block.decoded;
+        if (this.#blocks[index] && this.#blocks[index].hash !== block.hash)
+            throw `invalid block ${hash} @${index}`;
         if (!await peernet.has(hash, 'block'))
             await peernet.put(hash, block.encoded, 'block');
-        const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
-        this.#totalSize += size;
-        block = { ...block.decoded, hash };
-        if (this.#blocks[block.index] && this.#blocks[block.index].hash !== block.hash)
-            throw `invalid block ${hash} @${block.index}`;
-        this.#blocks[block.index] = block;
-        console.log(`resolved block: ${hash} @${block.index} ${formatBytes(size)}`);
-        if (block.previousHash !== '0x0') {
-            return this.resolveBlock(block.previousHash);
+        return block;
+    }
+    async resolveBlock(hash) {
+        if (!hash)
+            throw new Error(`expected hash, got: ${hash}`);
+        const index = this.#blockHashMap.get(hash);
+        if (this.#blocks[index]) {
+            if (this.#blocks[index].previousHash !== '0x0') {
+                return this.resolveBlock(this.#blocks[index]);
+            }
+            return;
+        }
+        try {
+            const block = await this.getAndPutBlock(hash);
+            const { previousHash, index } = block.decoded;
+            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);
+            console.log(`resolved block: ${hash} @${index} ${formatBytes(size)}`);
+            if (previousHash !== '0x0') {
+                return this.resolveBlock(previousHash);
+            }
+        }
+        catch (error) {
+            console.error(error);
         }
     }
     async resolveBlocks() {

package/exports/typings/chain.d.ts

@@ -1,3 +1,4 @@
+import { BlockMessage } from '@leofcoin/messages';
 import Contract from './contract.js';
 import { BigNumberish } from '@ethersproject/bignumber';
 export default class Chain extends Contract {
@@ -25,6 +26,7 @@ export default class Chain extends Contract {
         hash: string;
         previousHash: string;
     }>;
+    getAndPutBlock(hash: string): BlockMessage;
     resolveBlock(hash: any): any;
     resolveBlocks(): any;
     participate(address: any): Promise<void>;

package/package.json

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