@leofcoin/chain 1.4.37 → 1.4.39

package/exports/browser/chain.js

@@ -8022,7 +8022,7 @@ class Chain extends Contract {
         let data = await new globalThis.peernet.protos['peernet-request']({ request: 'lastBlock' });
         let node = await globalThis.peernet.prepareMessage(data);
         for (const peer of globalThis.peernet?.connections) {
-            if (peer.connected && peer.readyState === 'open' && peer.peerId !== this.id) {
+            if (peer.connected) {
                 promises.push(async () => {
                     try {
                         const result = await peer.request(node.encoded);
@@ -8033,7 +8033,11 @@ class Chain extends Contract {
                     }
                 });
             }
-            else if (!peer.connected || peer.readyState !== 'open') ;
+            else if (!peer.connected) {
+                globalThis.peernet.removePeer(peer);
+                // todo: remove peer
+                // reinitiate channel?
+            }
         }
         promises = await this.promiseRequests(promises);
         let latest = { index: 0, hash: '0x0', previousHash: '0x0' };
@@ -8074,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));
@@ -8119,6 +8124,13 @@ class Chain extends Contract {
         }, validatorInfo.timeout);
         this.#jail.push(validatorInfo.address);
     }
+    async triggerSync() {
+        if (this.#chainSyncing)
+            return 'already syncing';
+        const latest = await this.#getLatestBlock();
+        await this.#syncChain(latest);
+        return 'synced';
+    }
     async #syncChain(lastBlock) {
         if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.hash)
             return;
@@ -8146,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/browser/{client-033977a1-60f68d3b.js → client-de444350-a666f9b6.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-c95add6b.js';
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-bd6a5de3.js';
 import './contract-32687834.js';
 
 function commonjsRequire(path) {
@@ -10624,6 +10624,29 @@ var p2pt_umd = {
 	    }
 	  }
 
+	  _trySend(peer, data) {
+	    let shouldTry = data.msg.length > 0;
+	    let chunks = 0;
+	    let remaining = '';
+
+	    while (shouldTry) {
+	      data.c = chunks;
+
+	      remaining = data.msg.slice(MAX_MESSAGE_LENGTH);
+	      data.msg = data.msg.slice(0, MAX_MESSAGE_LENGTH);
+
+	      if (!remaining) { data.last = true; }
+	      if (peer.connected) {
+	        peer.send(JSON_MESSAGE_IDENTIFIER + JSON.stringify(data));  
+	        data.msg = remaining;
+	        chunks++;
+	        shouldTry = data.msg.length > 0;
+	      } else {
+	        shouldTry = false;
+	        this._removePeer(peer);
+	      }
+	    }
+	  }
 	  /**
 	   * Send a msg and get response for it
 	   * @param Peer peer simple-peer object to send msg to
@@ -10664,21 +10687,7 @@ var p2pt_umd = {
 	        return reject(Error('Connection to peer closed' + e))
 	      }
 
-	      let chunks = 0;
-	      let remaining = '';
-	      while (data.msg.length > 0) {
-	        data.c = chunks;
-
-	        remaining = data.msg.slice(MAX_MESSAGE_LENGTH);
-	        data.msg = data.msg.slice(0, MAX_MESSAGE_LENGTH);
-
-	        if (!remaining) { data.last = true; }
-
-	        peer.send(JSON_MESSAGE_IDENTIFIER + JSON.stringify(data));
-
-	        data.msg = remaining;
-	        chunks++;
-	      }
+	      this._trySend(peer, data);
 
 	      debug$2('sent a message to ' + peer.id);
 	    })

package/exports/browser/{index-123daa04-05013cc5.js → index-712688fc-ad40bdec.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-c95add6b.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-bd6a5de3.js';
 import './contract-32687834.js';
 
 /**

package/exports/browser/{messages-5ddc1083-1bd0ab64.js → messages-3f370680-fb7e5b5b.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-c95add6b.js';
+import { F as FormatInterface } from './node-browser-bd6a5de3.js';
 import './contract-32687834.js';
 
 var proto$b = {