@leofcoin/chain 1.4.51 → 1.4.52

package/exports/browser/chain.js

@@ -7646,9 +7646,23 @@ class State {
     }
 }
 
+const limit = 1800;
+const transactionLimit = 1800;
+const requestTimeout = 30_000;
+const syncTimeout = 30_000;
 class Protocol {
-    limit = 1800;
-    transactionLimit = 10_000;
+    get limit() {
+        return limit;
+    }
+    get transactionLimit() {
+        return transactionLimit;
+    }
+    get requestTimeout() {
+        return requestTimeout;
+    }
+    get syncTimeout() {
+        return syncTimeout;
+    }
 }
 
 class Transaction extends Protocol {
@@ -8009,7 +8023,7 @@ class Chain extends Contract {
             const timeout = setTimeout(() => {
                 resolve([{ index: 0, hash: '0x0' }]);
                 globalThis.debug('sync timed out');
-            }, 10_000);
+            }, this.requestTimeout);
             promises = await Promise.allSettled(promises);
             promises = promises.filter(({ status }) => status === 'fulfilled');
             clearTimeout(timeout);
@@ -8057,11 +8071,11 @@ class Chain extends Contract {
             const hash = await message.hash();
             if (hash !== latest.hash)
                 throw new Error('invalid block @getLatestBlock');
-            let data = await new globalThis.peernet.protos['peernet-request']({ request: 'knownBlocks' });
-            let node = await globalThis.peernet.prepareMessage(data);
-            const peer = promises[0].peer;
             latest = { ...message.decoded, hash };
+            const peer = promises[0].peer;
             if (peer.connected && peer.version === this.version) {
+                let data = await new globalThis.peernet.protos['peernet-request']({ request: 'knownBlocks' });
+                let node = await globalThis.peernet.prepareMessage(data);
                 let message = await peer.request(node);
                 message = await new globalThis.peernet.protos['peernet-response'](message);
                 this.#knownBlocks = message.decoded.response;
@@ -8171,7 +8185,7 @@ class Chain extends Contract {
         let current;
         const timeout = () => current = setTimeout(() => {
             if (this.#chainSyncing) {
-                if (this.#lastResolved + 10000 > Date.now())
+                if (this.#lastResolved + this.syncTimeout > Date.now())
                     timeout();
                 else {
                     this.#chainSyncing = false;
@@ -8179,7 +8193,7 @@ class Chain extends Contract {
                     this.#syncChain(lastBlock);
                 }
             }
-        }, 10000);
+        }, this.syncTimeout);
         timeout();
         if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.hash)
             return;
@@ -8219,28 +8233,36 @@ class Chain extends Contract {
         return response.decoded.response;
     }
     async #peerConnected(peer) {
-        console.log(peer);
         if (!peer.version || peer.version !== this.version)
             return;
         const lastBlock = await this.#makeRequest(peer, 'lastBlock');
-        if (!this.#lastBlock || lastBlock && lastBlock.index > this.#lastBlock.index && lastBlock.hash === this.#lastBlock?.hash) {
-            this.#knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
-            let pool = await this.#makeRequest(peer, 'transactionPool');
-            pool = await Promise.all(pool.map(async (hash) => {
-                const has = await globalThis.peernet.has(hash);
-                return { has, hash };
-            }));
-            pool = pool.filter(item => !item.has);
-            await Promise.all(pool.map(async ({ hash }) => {
-                const result = await globalThis.peernet.get(hash);
-                // result could be undefined cause invalid/double transactions could be deleted already
-                if (!result)
-                    console.log(result);
-                if (result) {
-                    const node = await new TransactionMessage(result);
-                    await globalThis.transactionPoolStore.put(await node.hash(), node.encoded);
-                }
-            }));
+        if (lastBlock.index > this.#lastBlock?.index) {
+            // this.#knownBlocks = await this.#makeRequest(peer, 'knownBlocks')
+            try {
+                console.log('getting pool');
+                let pool = await this.#makeRequest(peer, 'transactionPool');
+                console.log('got pool');
+                pool = await Promise.all(pool.map(async (hash) => {
+                    const has = await globalThis.peernet.has(hash);
+                    return { has, hash };
+                }));
+                pool = pool.filter(item => !item.has);
+                await Promise.all(pool.map(async ({ hash }) => {
+                    const result = await globalThis.peernet.get(hash);
+                    // result could be undefined cause invalid/double transactions could be deleted already
+                    if (!result)
+                        console.log(result);
+                    if (result) {
+                        const node = await new TransactionMessage(result);
+                        await globalThis.transactionPoolStore.put(await node.hash(), node.encoded);
+                    }
+                }));
+            }
+            catch (error) {
+                console.log(error);
+                console.log('error fetching transactionPool');
+            }
+            console.log(lastBlock);
             if (lastBlock)
                 await this.#syncChain(lastBlock);
             if (await this.hasTransactionToHandle())
@@ -8262,13 +8284,16 @@ class Chain extends Contract {
         return new globalThis.peernet.protos['peernet-response']({ response: { blocks: this.#blocks.map((block) => block.hash) } });
     }
     async getAndPutBlock(hash) {
+        // todo peernet resolves undefined blocks....
         let block = await globalThis.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 globalThis.peernet.has(hash, 'block'))
-            await globalThis.peernet.put(hash, block.encoded, 'block');
+        if (block !== undefined) {
+            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 globalThis.peernet.has(hash, 'block'))
+                await globalThis.peernet.put(hash, block.encoded, 'block');
+        }
         return block;
     }
     async resolveBlock(hash) {
@@ -8342,12 +8367,14 @@ class Chain extends Contract {
                     }
                     catch (error) {
                         console.log(error);
+                        return false;
                     }
                 }
                 this.#blocks[block.index].loaded = true;
                 globalThis.debug(`loaded block: ${block.hash} @${block.index}`);
             }
         }
+        return true;
     }
     async #executeTransaction({ hash, from, to, method, params, nonce }) {
         try {
@@ -8439,7 +8466,6 @@ class Chain extends Contract {
         let transactions = await globalThis.transactionPoolStore.values(this.transactionLimit);
         if (Object.keys(transactions)?.length === 0)
             return;
-        await globalThis.transactionPoolStore.keys();
         const timestamp = Date.now();
         let block = {
             transactions: [],

package/exports/chain.js

@@ -232,9 +232,23 @@ class State {
     }
 }
 
+const limit = 1800;
+const transactionLimit = 1800;
+const requestTimeout = 30_000;
+const syncTimeout = 30_000;
 class Protocol {
-    limit = 1800;
-    transactionLimit = 10_000;
+    get limit() {
+        return limit;
+    }
+    get transactionLimit() {
+        return transactionLimit;
+    }
+    get requestTimeout() {
+        return requestTimeout;
+    }
+    get syncTimeout() {
+        return syncTimeout;
+    }
 }
 
 class Transaction extends Protocol {
@@ -595,7 +609,7 @@ class Chain extends Contract {
             const timeout = setTimeout(() => {
                 resolve([{ index: 0, hash: '0x0' }]);
                 globalThis.debug('sync timed out');
-            }, 10_000);
+            }, this.requestTimeout);
             promises = await Promise.allSettled(promises);
             promises = promises.filter(({ status }) => status === 'fulfilled');
             clearTimeout(timeout);
@@ -643,11 +657,11 @@ class Chain extends Contract {
             const hash = await message.hash();
             if (hash !== latest.hash)
                 throw new Error('invalid block @getLatestBlock');
-            let data = await new globalThis.peernet.protos['peernet-request']({ request: 'knownBlocks' });
-            let node = await globalThis.peernet.prepareMessage(data);
-            const peer = promises[0].peer;
             latest = { ...message.decoded, hash };
+            const peer = promises[0].peer;
             if (peer.connected && peer.version === this.version) {
+                let data = await new globalThis.peernet.protos['peernet-request']({ request: 'knownBlocks' });
+                let node = await globalThis.peernet.prepareMessage(data);
                 let message = await peer.request(node);
                 message = await new globalThis.peernet.protos['peernet-response'](message);
                 this.#knownBlocks = message.decoded.response;
@@ -757,7 +771,7 @@ class Chain extends Contract {
         let current;
         const timeout = () => current = setTimeout(() => {
             if (this.#chainSyncing) {
-                if (this.#lastResolved + 10000 > Date.now())
+                if (this.#lastResolved + this.syncTimeout > Date.now())
                     timeout();
                 else {
                     this.#chainSyncing = false;
@@ -765,7 +779,7 @@ class Chain extends Contract {
                     this.#syncChain(lastBlock);
                 }
             }
-        }, 10000);
+        }, this.syncTimeout);
         timeout();
         if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.hash)
             return;
@@ -805,28 +819,36 @@ class Chain extends Contract {
         return response.decoded.response;
     }
     async #peerConnected(peer) {
-        console.log(peer);
         if (!peer.version || peer.version !== this.version)
             return;
         const lastBlock = await this.#makeRequest(peer, 'lastBlock');
-        if (!this.#lastBlock || lastBlock && lastBlock.index > this.#lastBlock.index && lastBlock.hash === this.#lastBlock?.hash) {
-            this.#knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
-            let pool = await this.#makeRequest(peer, 'transactionPool');
-            pool = await Promise.all(pool.map(async (hash) => {
-                const has = await globalThis.peernet.has(hash);
-                return { has, hash };
-            }));
-            pool = pool.filter(item => !item.has);
-            await Promise.all(pool.map(async ({ hash }) => {
-                const result = await globalThis.peernet.get(hash);
-                // result could be undefined cause invalid/double transactions could be deleted already
-                if (!result)
-                    console.log(result);
-                if (result) {
-                    const node = await new TransactionMessage(result);
-                    await globalThis.transactionPoolStore.put(await node.hash(), node.encoded);
-                }
-            }));
+        if (lastBlock.index > this.#lastBlock?.index) {
+            // this.#knownBlocks = await this.#makeRequest(peer, 'knownBlocks')
+            try {
+                console.log('getting pool');
+                let pool = await this.#makeRequest(peer, 'transactionPool');
+                console.log('got pool');
+                pool = await Promise.all(pool.map(async (hash) => {
+                    const has = await globalThis.peernet.has(hash);
+                    return { has, hash };
+                }));
+                pool = pool.filter(item => !item.has);
+                await Promise.all(pool.map(async ({ hash }) => {
+                    const result = await globalThis.peernet.get(hash);
+                    // result could be undefined cause invalid/double transactions could be deleted already
+                    if (!result)
+                        console.log(result);
+                    if (result) {
+                        const node = await new TransactionMessage(result);
+                        await globalThis.transactionPoolStore.put(await node.hash(), node.encoded);
+                    }
+                }));
+            }
+            catch (error) {
+                console.log(error);
+                console.log('error fetching transactionPool');
+            }
+            console.log(lastBlock);
             if (lastBlock)
                 await this.#syncChain(lastBlock);
             if (await this.hasTransactionToHandle())
@@ -848,13 +870,16 @@ class Chain extends Contract {
         return new globalThis.peernet.protos['peernet-response']({ response: { blocks: this.#blocks.map((block) => block.hash) } });
     }
     async getAndPutBlock(hash) {
+        // todo peernet resolves undefined blocks....
         let block = await globalThis.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 globalThis.peernet.has(hash, 'block'))
-            await globalThis.peernet.put(hash, block.encoded, 'block');
+        if (block !== undefined) {
+            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 globalThis.peernet.has(hash, 'block'))
+                await globalThis.peernet.put(hash, block.encoded, 'block');
+        }
         return block;
     }
     async resolveBlock(hash) {
@@ -928,12 +953,14 @@ class Chain extends Contract {
                     }
                     catch (error) {
                         console.log(error);
+                        return false;
                     }
                 }
                 this.#blocks[block.index].loaded = true;
                 globalThis.debug(`loaded block: ${block.hash} @${block.index}`);
             }
         }
+        return true;
     }
     async #executeTransaction({ hash, from, to, method, params, nonce }) {
         try {
@@ -1025,7 +1052,6 @@ class Chain extends Contract {
         let transactions = await globalThis.transactionPoolStore.values(this.transactionLimit);
         if (Object.keys(transactions)?.length === 0)
             return;
-        await globalThis.transactionPoolStore.keys();
         const timestamp = Date.now();
         let block = {
             transactions: [],

package/exports/typings/protocol.d.ts

@@ -1,4 +1,11 @@
-export default class Protocol {
-    limit: number;
-    transactionLimit: number;
+export declare const limit = 1800;
+export declare const transactionLimit = 1800;
+export declare const requestTimeout = 30000;
+export declare const syncTimeout = 30000;
+export declare class Protocol {
+    get limit(): number;
+    get transactionLimit(): number;
+    get requestTimeout(): number;
+    get syncTimeout(): number;
 }
+export { Protocol as default };

package/package.json

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