@leofcoin/chain 1.4.30 → 1.4.32

package/exports/chain.js

@@ -656,6 +656,16 @@ class Chain extends Contract {
             await this.#setup();
         this.utils = { BigNumber, formatUnits, parseUnits };
         this.state = new State();
+        await peernet.addRequestHandler('bw-request-message', () => {
+            return new BWMessage(peernet.client.bw) || { up: 0, down: 0 };
+        });
+        await peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
+        await peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
+        peernet.subscribe('add-block', this.#addBlock.bind(this));
+        peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
+        peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
+        pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
+        // todo some functions rely on state
         try {
             let localBlock;
             try {
@@ -679,19 +689,11 @@ class Chain extends Contract {
         catch (error) {
             console.log({ e: error });
         }
-        await peernet.addRequestHandler('bw-request-message', () => {
-            return new BWMessage(peernet.client.bw) || { up: 0, down: 0 };
-        });
-        await peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
-        await peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
-        peernet.subscribe('add-block', this.#addBlock.bind(this));
-        peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
-        peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
-        pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
         // load local blocks
         await this.resolveBlocks();
         this.#machine = await new Machine(this.#blocks);
         await this.#loadBlocks(this.#blocks);
+        globalThis.pubsub.publish('chain:ready', true);
         return this;
     }
     async #validatorTimeout(validatorInfo) {
@@ -703,6 +705,7 @@ class Chain extends Contract {
     async #syncChain(lastBlock) {
         if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.hash)
             return;
+        this.#chainSyncing = true;
         if (this.#knownBlocks?.length === Number(lastBlock.index) + 1) {
             let promises = [];
             promises = await Promise.allSettled(this.#knownBlocks.map(async (address) => {
@@ -713,7 +716,6 @@ class Chain extends Contract {
             await Promise.allSettled(promises.map(({ value }) => peernet.get(value.address, 'block')));
         }
         if (!this.lastBlock || Number(this.lastBlock.index) < Number(lastBlock.index)) {
-            this.#chainSyncing = true;
             // TODO: check if valid
             const localIndex = this.lastBlock ? this.lastBlock.index : 0;
             const index = lastBlock.index;
@@ -724,8 +726,8 @@ class Chain extends Contract {
             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]));
-            this.#chainSyncing = false;
         }
+        this.#chainSyncing = false;
     }
     async #peerConnected(peer) {
         let node = await new peernet.protos['peernet-request']({ request: 'lastBlock' });
@@ -733,6 +735,12 @@ class Chain extends Contract {
         let response = await peer.request(node.encoded);
         response = await new globalThis.peernet.protos['peernet-response'](response);
         let lastBlock = response.decoded.response;
+        // try catch known blocks
+        node = await new peernet.protos['peernet-request']({ request: 'knownBlocks' });
+        node = await peernet.prepareMessage(node);
+        response = await peer.request(node.encoded);
+        response = await new globalThis.peernet.protos['peernet-response'](response);
+        this.#knownBlocks = response.decoded.response;
         this.#syncChain(lastBlock);
     }
     #epochTimeout;

package/exports/node.js

@@ -4,6 +4,7 @@ import networks from '@leofcoin/networks';
 
 // import config from './config/config'
 class Node {
+    #node;
     constructor(config, password) {
         return this._init(config, password);
     }
@@ -13,8 +14,11 @@ class Node {
         networkVersion: 'peach',
         stars: networks.leofcoin.peach.stars
     }, password) {
-        globalThis.Peernet ? await new globalThis.Peernet(config, password) : await new Peernet(config, password);
+        this.#node = globalThis.Peernet ? await new globalThis.Peernet(config, password) : await new Peernet(config, password);
         await nodeConfig(config);
+        globalThis.pubsub.subscribe('chain:ready', () => {
+            this.#node.start();
+        });
         return this;
         // this.config = await config()
     }

package/exports/typings/node.d.ts

@@ -1,4 +1,5 @@
 export default class Node {
+    #private;
     constructor(config: any, password: string);
     _init(config: {
         network: string;

package/package.json

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