trac-msb 0.0.89 → 0.0.91

package/Whitelist/pubkeys.csv

@@ -1,22 +1,3 @@
-e247a9ceefb8a83e28d3c5845055910bc61e0b418c7578d297354708f276af04
-580c44d7827fbeeb7778e4d2dce660b30f3ca3baa4de254ecd556dfb5b60fc35
-a3590854889d059927fed4dfdf329b75447bc9f5885b6a843b317d1c2d38258a
-dd2f83c9cb1d146c8be6c1d98822cbbb3f631a0659b765c9e4564960acf6e228
-726b2885e551a98c20b37675b113476390f57321768a303e1b6c029ffca509a9
-7da7f48e1c805b551fd69a2b6e59b99c00740dea699c66e10b88bd1efb932815
-b54b21197bc35c4c3da4900c39f6c6657ff4d7de03c6da7d5f72b87b26cae108
-b1226d4a4d9e44226a69c9109769c2437dfa3f7ee551bfd3e79226dd3c1706e3
-0771f4cb2e3bb22b8f6f91d4c2d0cf83dcef7f20499e773bd940c428caae99e9
-3f6e5959f61c2fca1704dbe03273d03729a7170e1a09515d2cdc302d47771ddd
-e74ea17cc6e05f0b09588a70d8573fca63de715a763420ff7e14b68a0c1d1d14
-9dedf2e9f8f63c2ffbdccba6a3e28ace22c3788fbdbcf71b030b8574eeaa92c1
-656c9a53cbed98f9e783b6fd53667a2793c4fd74975cd26971582ea3ab9955f1
-1184e8f926a2f76f12685c9e3fa6b3cd542277ab6c7a09fd02a7391240ceeb18
-744ac7add47923135928bd69a3bf448845338122ece2b9d86b1c53b025028fd1
-7bc277890f992bd006eb0609c61e2c35529baf65765e3e4310f99aa18205a7c6
-8888df74fe541631cedfcf27531d309a02a7915b7680bead4301c342082980b8
-e18e2f57285018c8521aee085fdbbb0a69cf2484a9eadd9022cc25913716427a
-b97c37985cc087d2512a97e00c3432542a2c874fb31543ba6a0c23ea7758cf39
-0ddf2d7b7144873a2027b784529a9f60d48d0aab859f691faf39fce338e123a2
-73f3dd2bda6d5904570751fad19c251186e04e18acaaf5a893404addcdabd9aa
-5937e8eb2e4a428967ce2866c189fccce23ca1ac9e42ecd195ce8e047d1849b1
+3e84de76f23d1f8f47aa5f133cb928ead44f91429df0b3f9761205049f2beeec
+bd3c9c5844187407baf418c3aa6329c364297b895f961a1f88a91bfe666f72c2
+17e1856a71e2aef8be3dcb6776316cf90d339f8cab9bcbb3c356be2da86fd2e7

package/msb.mjs

@@ -3,7 +3,7 @@ import {MainSettlementBus} from './src/index.js';
 const opts = {
     stores_directory : 'stores/',
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
-    bootstrap: '07814eb54b2a3ebf61506f056fa1235d11431fcfb6505dccfa880146938093a6',
+    bootstrap: '4577ebf1e84c06d48b2caa33fe54ae58be3a79cb30810129d58b725fae412e37',
     channel: '00axtracnetworkmainsettlementbus',
     tx : 'axtracnetworkmainsettlementbustx'
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.0.89",
+  "version": "0.0.91",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -57,7 +57,7 @@
     "hypercore": "11.1.2",
     "hypercore-crypto": "3.4.0",
     "hyperdht": "^6.20.1",
-    "hyperswarm": "4.11.1",
+    "hyperswarm": "4.11.4",
     "inspector": "npm:bare-node-inspector",
     "is-options": "1.0.2",
     "module": "npm:bare-node-module",

package/src/index.js

@@ -382,7 +382,7 @@ export class MainSettlementBus extends ReadyResource {
             this.#writerEventListener(); // only for writers
         }
 
-        await this.#setUpRoleAutomatically(adminEntry);
+        //await this.#setUpRoleAutomatically(adminEntry);
 
         if (this.#enable_updater) {
             this.updater();// TODO: NODE AFTER BECOMING A writer should start the updater
@@ -395,6 +395,7 @@ export class MainSettlementBus extends ReadyResource {
     }
 
     async close() {
+        console.log('Closing everything...');
         if (this.#swarm) {
             await this.#swarm.destroy();
         }
@@ -426,10 +427,11 @@ export class MainSettlementBus extends ReadyResource {
         if (!adminEntry || !message) {
             return;
         }
-        const stream = this.#dht_node.connect(b4a.from(adminEntry.tracPublicKey, 'hex'))
+        const node = new DHT({bootstrap:this.#dht_bootstrap})
+        const stream = node.connect(b4a.from(adminEntry.tracPublicKey, 'hex'))
         stream.on('connect', async function () {
             await stream.send(b4a.from(JSON.stringify({ op : 'add_writer', message : message })));
-            //await stream.destroy();
+            await stream.destroy();
         });
         stream.on('open', function () { });
         stream.on('close', () => { });

package/src/network.js

@@ -7,6 +7,7 @@ import {
     MAX_PEERS,
     MAX_PARALLEL,
     MAX_SERVER_CONNECTIONS,
+    MAX_CLIENT_CONNECTIONS,
     OperationType,
     EntryType
 } from './utils/constants.js';
@@ -36,7 +37,7 @@ class Network {
                 };
             }
 
-            swarm = new Hyperswarm({ keyPair, bootstrap, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS });
+            swarm = new Hyperswarm({ keyPair, bootstrap : bootstrap, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS, maxClientConnections :  MAX_CLIENT_CONNECTIONS});
 
             console.log(`Channel: ${b4a.toString(channel)}`);
             swarm.on('connection', async (connection) => {
@@ -53,9 +54,16 @@ class Network {
                 }
             });
 
-            swarm.join(channel, { server: true, client: true });
+            const discovery = swarm.join(channel, { server: true, client: true });
             await swarm.flush();
-            console.log('Joined channel for peer discovery');
+            console.log('Joined channel');
+            async function refresh(){
+                await discovery.refresh();
+                setTimeout(function(){
+                    refresh();
+                }, 30_000);
+            }
+            await refresh();
         }
         return swarm;
     }
@@ -71,9 +79,9 @@ class Network {
                         if(null === msg) return;
                         if(msg === 'get_writer_key'){
                             await connection.send(b4a.from(JSON.stringify({op:'writer_key', key : writingKey})));
-                            //await connection.destroy();
+                            await connection.destroy();
                         } else if(msg.op !== undefined && msg.message !== undefined && msg.op === 'add_writer'){
-                            //await connection.destroy();
+                            await connection.destroy();
                             msg = msg.message;
                             const adminEntry = await msb.getSigned(EntryType.ADMIN);
                             if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;

package/src/utils/constants.js

@@ -35,9 +35,10 @@ export const MAX_INDEXERS = 3;
 export const MIN_INDEXERS = 1;
 export const ACK_INTERVAL = 1000;
 export const WHITELIST_SLEEP_INTERVAL = 100;
-export const MAX_PEERS = 1024;
-export const MAX_PARALLEL = 512;
-export const MAX_SERVER_CONNECTIONS = 256;
+export const MAX_PEERS = 8;
+export const MAX_PARALLEL = 8;
+export const MAX_SERVER_CONNECTIONS = 4;
+export const MAX_CLIENT_CONNECTIONS = 4;
 export const UPDATER_INTERVAL = 10_000;
 
 const constants = {