trac-msb 0.0.67 → 0.0.69

package/Whitelist/pubkeys.csv

@@ -1 +1,2 @@
-e247a9ceefb8a83e28d3c5845055910bc61e0b418c7578d297354708f276af04
+e247a9ceefb8a83e28d3c5845055910bc61e0b418c7578d297354708f276af04
+580c44d7827fbeeb7778e4d2dce660b30f3ca3baa4de254ecd556dfb5b60fc35

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -12,32 +12,15 @@
     "test": "brittle test/*.test.js"
   },
   "dependencies": {
-    "trac-wallet": "^0.0.36",
+    "assert": "npm:bare-node-assert",
     "autobase": "7.2.2",
     "b4a": "1.6.7",
-    "hyperbee": "2.24.1",
-    "corestore": "7.1.0",
-    "hypercore": "11.1.2",
-    "hypercore-crypto": "3.4.0",
-    "hyperdht": "6.20.1",
-    "hyperswarm": "4.11.1",
-    "brittle": "3.0.0",
-    "xache": "1.2.0",
-    "debounceify": "1.1.0",
-    "ready-resource": "^1.0.0",
-    "is-options": "1.0.2",
-    "safety-catch": "1.0.2",
-    "sodium-native": "^5.0.1",
-    "pear-interface": "1.0.0",
-    "protomux-wakeup": "^2.2.1",
-
-
-    "bare-fetch": "^2.2.1",
     "bare-assert": "^1.0.2",
     "bare-buffer": "^3.1.2",
     "bare-console": "^6.0.1",
     "bare-crypto": "^1.4.3",
     "bare-events": "^2.5.4",
+    "bare-fetch": "^2.2.1",
     "bare-fs": "^4.0.2",
     "bare-http1": "^4.0.2",
     "bare-https": "^2.0.0",
@@ -57,31 +40,46 @@
     "bare-utils": "^1.2.0",
     "bare-worker": "^3.0.0",
     "bare-zlib": "^1.2.5",
-    "fetch": "npm:bare-node-fetch",
-    "assert": "npm:bare-node-assert",
+    "brittle": "3.0.0",
     "buffer": "npm:bare-node-buffer",
     "child_process": "npm:bare-node-child-process",
     "console": "npm:bare-node-console",
+    "corestore": "7.1.0",
     "crypto": "npm:bare-node-crypto",
+    "debounceify": "1.1.0",
     "events": "npm:bare-node-events",
     "fastest-validator": "^1.19.0",
+    "fetch": "npm:bare-node-fetch",
     "fs": "npm:bare-node-fs",
     "http": "npm:bare-node-http",
     "https": "npm:bare-node-https",
+    "hyperbee": "2.24.1",
+    "hypercore": "11.1.2",
+    "hypercore-crypto": "3.4.0",
+    "hyperdht": "^6.20.1",
+    "hyperswarm": "4.11.1",
     "inspector": "npm:bare-node-inspector",
+    "is-options": "1.0.2",
     "module": "npm:bare-node-module",
     "os": "npm:bare-node-os",
     "path": "npm:bare-node-path",
+    "pear-interface": "1.0.0",
     "process": "npm:bare-node-process",
+    "protomux-wakeup": "^2.2.1",
     "readline": "npm:bare-node-readline",
+    "ready-resource": "^1.0.0",
     "repl": "npm:bare-node-repl",
+    "safety-catch": "1.0.2",
+    "sodium-native": "^5.0.1",
     "stream": "npm:bare-node-stream",
     "timers": "npm:bare-node-timers",
     "tls": "npm:bare-node-tls",
+    "trac-wallet": "^0.0.36",
     "tty": "npm:bare-node-tty",
     "url": "npm:bare-node-url",
     "util": "npm:bare-node-util",
     "worker_threads": "npm:bare-node-worker-threads",
+    "xache": "1.2.0",
     "zlib": "npm:bare-node-zlib"
   },
   "publishConfig": {

package/src/index.js

@@ -12,6 +12,9 @@ import MsgUtils from './utils/msgUtils.js';
 import { LISTENER_TIMEOUT, EntryType, OperationType, EventType, ACK_INTERVAL, WHITELIST_SLEEP_INTERVAL, UPDATER_INTERVAL, MAX_INDEXERS, MIN_INDEXERS, WHITELIST_PREFIX } from './utils/constants.js';
 import Network from './network.js';
 import Check from './utils/check.js';
+
+import DHT from 'hyperdht'
+
 //TODO: CHANGE NONCE.
 
 export class MainSettlementBus extends ReadyResource {
@@ -335,6 +338,26 @@ export class MainSettlementBus extends ReadyResource {
         }
     }
 
+    async dhtNode(wallet){
+        const node = new DHT()
+        const server = node.createServer()
+
+        server.on('connection', function (socket) {
+            // socket is E2E encrypted between you and the other peer
+            console.log('Remote public key', socket)
+            process.stdin.pipe(socket).pipe(process.stdout)
+        })
+
+        const keyPair = {
+            publicKey: b4a.from(wallet.publicKey, 'hex'),
+            secretKey: b4a.from(wallet.secretKey, 'hex')
+        };
+
+        // this makes the server accept connections on this keypair
+        await server.listen(keyPair)
+        console.log('DHT node is listening');
+    }
+
     async _open() {
         await this.#base.ready();
         if (this.#enable_wallet) {
@@ -355,6 +378,8 @@ export class MainSettlementBus extends ReadyResource {
             this.#tx_swarm = await Network.txChannel(this.#tx_swarm, this.#tx, this.#base, this.#wallet, this.#writingKey, this.#network);
         }
 
+        this.dhtNode(this.#wallet);
+
         const adminEntry = await this.getSigned(EntryType.ADMIN);
 
         if (this.#isAdmin(adminEntry)) {

package/src/network.js

@@ -106,8 +106,7 @@ class Network {
 
             });
 
-            const channelBuffer = tx_channel;
-            tx_swarm.join(channelBuffer, { server: true, client: true });
+            tx_swarm.join(tx_channel, { server: true, client: true });
             await tx_swarm.flush();
             console.log('Joined MSB TX channel');
         }