@leofcoin/chain 1.4.38 → 1.4.39

package/exports/browser/chain.js

@@ -8078,6 +8078,7 @@ class Chain extends Contract {
         //   let node = 
         //   globalThis.peernet.protos['peernet-response']({response: node.encoded})
         // })
+        await globalThis.peernet.addRequestHandler('transactionPool', this.#transactionPoolHandler.bind(this));
         await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
         globalThis.peernet.subscribe('add-block', this.#addBlock.bind(this));
@@ -8157,21 +8158,38 @@ class Chain extends Contract {
         }
         this.#chainSyncing = false;
     }
-    async #peerConnected(peer) {
-        let node = await new globalThis.peernet.protos['peernet-request']({ request: 'lastBlock' });
-        node = await globalThis.peernet.prepareMessage(node);
+    async #prepareRequest(request) {
+        let node = await new globalThis.peernet.protos['peernet-request']({ request });
+        return globalThis.peernet.prepareMessage(node);
+    }
+    async #makeRequest(peer, request) {
+        const node = await this.#prepareRequest(request);
         let response = await peer.request(node.encoded);
-        response = await new globalThis.globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
-        let lastBlock = response.decoded.response;
-        // try catch known blocks
-        node = await new globalThis.peernet.protos['peernet-request']({ request: 'knownBlocks' });
-        node = await globalThis.peernet.prepareMessage(node);
-        response = await peer.request(node.encoded);
-        response = await new globalThis.globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
-        this.#knownBlocks = response.decoded.response;
-        this.#syncChain(lastBlock);
+        response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
+        return response.decoded.response;
+    }
+    async #peerConnected(peer) {
+        const lastBlock = await this.#makeRequest(peer, 'lastBlock');
+        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);
+            await globalThis.peernet.put(hash, result);
+        }));
+        console.log(pool);
+        if (lastBlock)
+            this.#syncChain(lastBlock);
     }
     #epochTimeout;
+    async #transactionPoolHandler() {
+        const pool = await globalThis.transactionPoolStore.keys();
+        return new globalThis.peernet.protos['peernet-response']({ response: pool });
+    }
     async #lastBlockHandler() {
         return new globalThis.peernet.protos['peernet-response']({ response: { hash: this.#lastBlock?.hash, index: this.#lastBlock?.index } });
     }

package/exports/chain.js

@@ -673,6 +673,7 @@ class Chain extends Contract {
         //   let node = 
         //   globalThis.peernet.protos['peernet-response']({response: node.encoded})
         // })
+        await globalThis.peernet.addRequestHandler('transactionPool', this.#transactionPoolHandler.bind(this));
         await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
         globalThis.peernet.subscribe('add-block', this.#addBlock.bind(this));
@@ -752,21 +753,38 @@ class Chain extends Contract {
         }
         this.#chainSyncing = false;
     }
-    async #peerConnected(peer) {
-        let node = await new globalThis.peernet.protos['peernet-request']({ request: 'lastBlock' });
-        node = await globalThis.peernet.prepareMessage(node);
+    async #prepareRequest(request) {
+        let node = await new globalThis.peernet.protos['peernet-request']({ request });
+        return globalThis.peernet.prepareMessage(node);
+    }
+    async #makeRequest(peer, request) {
+        const node = await this.#prepareRequest(request);
         let response = await peer.request(node.encoded);
-        response = await new globalThis.globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
-        let lastBlock = response.decoded.response;
-        // try catch known blocks
-        node = await new globalThis.peernet.protos['peernet-request']({ request: 'knownBlocks' });
-        node = await globalThis.peernet.prepareMessage(node);
-        response = await peer.request(node.encoded);
-        response = await new globalThis.globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
-        this.#knownBlocks = response.decoded.response;
-        this.#syncChain(lastBlock);
+        response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
+        return response.decoded.response;
+    }
+    async #peerConnected(peer) {
+        const lastBlock = await this.#makeRequest(peer, 'lastBlock');
+        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);
+            await globalThis.peernet.put(hash, result);
+        }));
+        console.log(pool);
+        if (lastBlock)
+            this.#syncChain(lastBlock);
     }
     #epochTimeout;
+    async #transactionPoolHandler() {
+        const pool = await globalThis.transactionPoolStore.keys();
+        return new globalThis.peernet.protos['peernet-response']({ response: pool });
+    }
     async #lastBlockHandler() {
         return new globalThis.peernet.protos['peernet-response']({ response: { hash: this.#lastBlock?.hash, index: this.#lastBlock?.index } });
     }

package/package.json

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