@leofcoin/chain 1.4.46 → 1.4.48

package/exports/browser/chain.js

@@ -7860,6 +7860,7 @@ class Contract extends Transaction {
 globalThis.BigNumber = BigNumber;
 // check if browser or local
 class Chain extends Contract {
+    version;
     #state;
     #lastResolved;
     #slotTime = 10000;
@@ -8024,7 +8025,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) {
+            if (peer.connected && peer.version === this.version) {
                 promises.push(async () => {
                     try {
                         const result = await peer.request(node.encoded);
@@ -8035,11 +8036,6 @@ class Chain extends Contract {
                     }
                 });
             }
-            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' };
@@ -8056,7 +8052,7 @@ class Chain extends Contract {
             let node = await globalThis.peernet.prepareMessage(data);
             const peer = promises[0].peer;
             latest = { ...message.decoded, hash };
-            if (peer.connected && peer.readyState === 'open' && peer.peerId !== this.id) {
+            if (peer.connected && peer.version === this.version) {
                 let message = await peer.request(node);
                 message = await new globalThis.peernet.protos['peernet-response'](message);
                 this.#knownBlocks = message.decoded.response;
@@ -8064,7 +8060,23 @@ class Chain extends Contract {
         }
         return latest;
     }
+    async #clearPool() {
+        await globalThis.transactionPoolStore.clear();
+    }
     async #init() {
+        try {
+            const version = await globalThis.chainStore.get('version');
+            this.version = version;
+            // if (version)
+        }
+        catch {
+            this.version = '1.0.0';
+            await globalThis.chainStore.clear();
+            await globalThis.blockStore.clear();
+            await globalThis.transactionPoolStore.clear();
+            await globalThis.chainStore.put('version', this.version);
+        }
+        await this.#clearPool();
         // this.node = await new Node()
         this.#participants = [];
         this.#participating = false;
@@ -8081,6 +8093,7 @@ class Chain extends Contract {
         //   globalThis.peernet.protos['peernet-response']({response: node.encoded})
         // })
         await globalThis.peernet.addRequestHandler('transactionPool', this.#transactionPoolHandler.bind(this));
+        await globalThis.peernet.addRequestHandler('version', this.#versionHandler.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));
@@ -8190,6 +8203,8 @@ class Chain extends Contract {
         return response.decoded.response;
     }
     async #peerConnected(peer) {
+        if (!peer.version || peer.version !== this.version)
+            return;
         const lastBlock = await this.#makeRequest(peer, 'lastBlock');
         this.#knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
         let pool = await this.#makeRequest(peer, 'transactionPool');
@@ -8214,6 +8229,9 @@ class Chain extends Contract {
         const pool = await globalThis.transactionPoolStore.keys();
         return new globalThis.peernet.protos['peernet-response']({ response: pool });
     }
+    async #versionHandler() {
+        return new globalThis.peernet.protos['peernet-response']({ response: { version: this.version } });
+    }
     async #lastBlockHandler() {
         return new globalThis.peernet.protos['peernet-response']({ response: { hash: this.#lastBlock?.hash, index: this.#lastBlock?.index } });
     }
@@ -8465,7 +8483,7 @@ class Chain extends Contract {
         for (const validator of Object.keys(validators)) {
             if (validators[validator].active) {
                 const peer = peers[validator];
-                if (peer && peer.connected) {
+                if (peer && peer.connected && peer.version === this.version) {
                     let data = await new BWRequestMessage();
                     const node = await globalThis.peernet.prepareMessage(validator, data.encoded);
                     try {

package/exports/browser/{client-31b62450-447815f7.js → client-345f1d43-a7ba559a.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-5de1f022.js';
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-8791470c.js';
 import './contract-f76383c3.js';
 
 function commonjsRequire(path) {

package/exports/browser/{index-e407f1a3-a07c9df0.js → index-5ed49438-539fe0fa.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-5de1f022.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-8791470c.js';
 import './contract-f76383c3.js';
 
 /**

package/exports/browser/{messages-2465e07d-6cd91c3d.js → messages-c26f8e97-a3403983.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-5de1f022.js';
+import { F as FormatInterface } from './node-browser-8791470c.js';
 import './contract-f76383c3.js';
 
 var proto$b = {

package/exports/browser/{node-browser-5de1f022.js → node-browser-8791470c.js}

@@ -6286,8 +6286,7 @@ const lastFetched = {
 const fetchedCoordinates = {};
 const getAddress = async () => {
     const { address } = lastFetched;
-    const now = Math.round(new Date().getTime() / 1000);
-    if (now - address.timestamp > 1200000) {
+    if (address) {
         address.value = await fetch('https://icanhazip.com/');
         address.value = await address.value.text();
         address.timestamp = Math.round(new Date().getTime() / 1000);
@@ -20268,7 +20267,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-e407f1a3-a07c9df0.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-5ed49438-539fe0fa.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -20333,6 +20332,7 @@ class Peernet {
     #starting = false;
     #started = false;
     #connections = {};
+    requestProtos = {};
     /**
      * @access public
      * @param {Object} options
@@ -20434,12 +20434,11 @@ class Peernet {
      * @return {Promise} instance of Peernet
      */
     async _init(options, password) {
-        this.requestProtos = {};
         this.storePrefix = options.storePrefix;
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-2465e07d-6cd91c3d.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-c26f8e97-a3403983.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -20478,6 +20477,13 @@ class Peernet {
         });
         pubsub.subscribe('peer:discovered', async (peer) => {
             // console.log(peer);
+            if (this.requestProtos['version']) {
+                let data = await new globalThis.peernet.protos['peernet-request']({ request: 'version' });
+                let node = await globalThis.peernet.prepareMessage(data);
+                let response = await peer.request(node.encoded);
+                response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
+                peer.version = response.decoded.response.version;
+            }
             let data = await new globalThis.peernet.protos['peernet-request']({ request: 'handshake' });
             let node = await globalThis.peernet.prepareMessage(data);
             let response = await peer.request(node.encoded);
@@ -20511,7 +20517,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-31b62450-447815f7.js');
+        const importee = await import('./client-345f1d43-a7ba559a.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -20696,7 +20702,7 @@ class Peernet {
             throw nothingFoundError(hash);
         debug(`found ${providers.size} provider(s) for ${hash}`);
         // get closest peer on earth
-        const closestPeer = await this.dht.closestPeer(providers);
+        const closestPeer = Array.from(providers)[0];
         // get peer instance by id
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);

package/exports/browser/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-5de1f022.js';
+export { N as default } from './node-browser-8791470c.js';
 import './contract-f76383c3.js';

package/exports/chain.js

@@ -455,6 +455,7 @@ class Contract extends Transaction {
 globalThis.BigNumber = BigNumber;
 // check if browser or local
 class Chain extends Contract {
+    version;
     #state;
     #lastResolved;
     #slotTime = 10000;
@@ -619,7 +620,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) {
+            if (peer.connected && peer.version === this.version) {
                 promises.push(async () => {
                     try {
                         const result = await peer.request(node.encoded);
@@ -630,11 +631,6 @@ class Chain extends Contract {
                     }
                 });
             }
-            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' };
@@ -651,7 +647,7 @@ class Chain extends Contract {
             let node = await globalThis.peernet.prepareMessage(data);
             const peer = promises[0].peer;
             latest = { ...message.decoded, hash };
-            if (peer.connected && peer.readyState === 'open' && peer.peerId !== this.id) {
+            if (peer.connected && peer.version === this.version) {
                 let message = await peer.request(node);
                 message = await new globalThis.peernet.protos['peernet-response'](message);
                 this.#knownBlocks = message.decoded.response;
@@ -659,7 +655,23 @@ class Chain extends Contract {
         }
         return latest;
     }
+    async #clearPool() {
+        await globalThis.transactionPoolStore.clear();
+    }
     async #init() {
+        try {
+            const version = await globalThis.chainStore.get('version');
+            this.version = version;
+            // if (version)
+        }
+        catch {
+            this.version = '1.0.0';
+            await globalThis.chainStore.clear();
+            await globalThis.blockStore.clear();
+            await globalThis.transactionPoolStore.clear();
+            await globalThis.chainStore.put('version', this.version);
+        }
+        await this.#clearPool();
         // this.node = await new Node()
         this.#participants = [];
         this.#participating = false;
@@ -676,6 +688,7 @@ class Chain extends Contract {
         //   globalThis.peernet.protos['peernet-response']({response: node.encoded})
         // })
         await globalThis.peernet.addRequestHandler('transactionPool', this.#transactionPoolHandler.bind(this));
+        await globalThis.peernet.addRequestHandler('version', this.#versionHandler.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));
@@ -785,6 +798,8 @@ class Chain extends Contract {
         return response.decoded.response;
     }
     async #peerConnected(peer) {
+        if (!peer.version || peer.version !== this.version)
+            return;
         const lastBlock = await this.#makeRequest(peer, 'lastBlock');
         this.#knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
         let pool = await this.#makeRequest(peer, 'transactionPool');
@@ -809,6 +824,9 @@ class Chain extends Contract {
         const pool = await globalThis.transactionPoolStore.keys();
         return new globalThis.peernet.protos['peernet-response']({ response: pool });
     }
+    async #versionHandler() {
+        return new globalThis.peernet.protos['peernet-response']({ response: { version: this.version } });
+    }
     async #lastBlockHandler() {
         return new globalThis.peernet.protos['peernet-response']({ response: { hash: this.#lastBlock?.hash, index: this.#lastBlock?.index } });
     }
@@ -1060,7 +1078,7 @@ class Chain extends Contract {
         for (const validator of Object.keys(validators)) {
             if (validators[validator].active) {
                 const peer = peers[validator];
-                if (peer && peer.connected) {
+                if (peer && peer.connected && peer.version === this.version) {
                     let data = await new BWRequestMessage();
                     const node = await globalThis.peernet.prepareMessage(validator, data.encoded);
                     try {

package/exports/typings/chain.d.ts

@@ -3,6 +3,7 @@ import Contract from './contract.js';
 import { BigNumberish } from '@ethersproject/bignumber';
 export default class Chain extends Contract {
     #private;
+    version: String;
     id: string;
     utils: {};
     constructor();

package/package.json

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