trac-msb 0.0.72 → 0.0.74

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"

package/src/index.js

@@ -34,6 +34,7 @@ export class MainSettlementBus extends ReadyResource {
     #bee;
     #swarm;
     #dht_server;
+    #dht_node;
     #base;
     #writingKey;
     #enable_txchannel;
@@ -65,7 +66,8 @@ export class MainSettlementBus extends ReadyResource {
         this.#store = new Corestore(this.STORES_DIRECTORY + options.store_name);
         this.#bee = null;
         this.#swarm = null;
-        this.#dht_server = null;
+        this.#dht_node = new DHT();
+        this.#dht_server = this.#dht_node.createServer();
         this.#base = null;
         this.#writingKey = null;
         this.#enable_txchannel = options.enable_txchannel !== false;
@@ -356,7 +358,7 @@ export class MainSettlementBus extends ReadyResource {
         }
 
         if (this.#enable_txchannel) {
-            this.#dht_server = await Network.dhtServer(this.#base, this.#wallet, this.#writingKey, this.#network);
+            await Network.dhtServer(this.#dht_server, this.#base, this.#wallet, this.#writingKey, this.#network);
         }
 
         const adminEntry = await this.getSigned(EntryType.ADMIN);
@@ -387,12 +389,16 @@ export class MainSettlementBus extends ReadyResource {
         }
         if (this.#dht_server) {
             try{
-                await this.#dht_server.server.close();
-                await this.#dht_server.node.destroy();
+                await this.#dht_server.close();
             } catch(e){
                 console.log(e.message);
             }
         }
+        try{
+            this.#dht_node.destroy();
+        } catch(e){
+            console.log(e.message);
+        }
         await this.#base.close();
     }
 

package/src/network.js

@@ -52,17 +52,15 @@ class Network {
         return swarm;
     }
 
-    static async dhtServer(base, wallet, writingKey, networkInstance){
+    static async dhtServer(dhtServer, base, wallet, writingKey, networkInstance){
         try{
-            const _this = this;
-            const node = new DHT()
-            const server = node.createServer()
-            server.on('connection', function (connection) {
+            dhtServer.on('connection', function (connection) {
                 connection.on('message', async (msg) =>  {
-                    const cmd = b4a.toString(msg, 'utf-8');
-                    if(cmd === 'get_writer_key'){
+                    msg = b4a.toString(msg, 'utf-8');
+                    if(msg === 'get_writer_key'){
                         await connection.send(b4a.from(JSON.stringify({op:'writer_key', key : writingKey})));
                     } else {
+
                         if (base.isIndexer || !base.writable) return;
 
                         // TODO: decide if a tx rejection should be responded with
@@ -77,6 +75,13 @@ class Network {
 
                             const parsedPreTx = JSON.parse(msg);
 
+                            console.log(networkInstance.check.sanitizePreTx(parsedPreTx),
+                                wallet.verify(b4a.from(parsedPreTx.is, 'hex'), b4a.from(parsedPreTx.tx + parsedPreTx.in), b4a.from(parsedPreTx.ipk, 'hex')),
+                                parsedPreTx.w === writingKey,
+                                parsedPreTx.wp === wallet.publicKey,
+                                null === await base.view.get(parsedPreTx.tx)
+                            );
+
                             if (networkInstance.check.sanitizePreTx(parsedPreTx) &&
                                 wallet.verify(b4a.from(parsedPreTx.is, 'hex'), b4a.from(parsedPreTx.tx + parsedPreTx.in), b4a.from(parsedPreTx.ipk, 'hex')) &&
                                 parsedPreTx.w === writingKey &&
@@ -103,21 +108,20 @@ class Network {
                                 networkInstance.tx_pool.push({ tx: parsedPreTx.tx, append_tx: append_tx });
                             }
                         } catch (e) {
-                            //console.log(e)
+                            console.log(e)
                         }
                     }
-                    await connection.destroy();
+                    //await connection.destroy();
                 });
-                connection.on('close', () => { console.log('remote closing'); });
+                connection.on('close', () => { });
                 connection.on('error', (error) => { });
             })
             const keyPair = {
                 publicKey: b4a.from(wallet.publicKey, 'hex'),
                 secretKey: b4a.from(wallet.secretKey, 'hex')
             };
-            await server.listen(keyPair)
+            await dhtServer.listen(keyPair)
             console.log('DHT node is listening on public key', wallet.publicKey);
-            return { server, node }
         } catch(e) { }
     }
 

package/src/utils/check.js

@@ -108,6 +108,7 @@ class Check {
             op: { type: 'string', enum: ['pre-tx'], required: true },
             tx: { type: 'is_hex_string', required: true }, // TODO: if we will use only 256 bit hash then change to length: 64
             is: { type: 'is_hex_string', length: 128, required: true },
+            wp: { type: 'is_hex_string', length: 64, required: true },
             w: { type: 'is_hex_string', length: 64, required: true },
             i: { type: 'is_hex_string', length: 64, required: true },
             ipk: { type: 'is_hex_string', length: 64, required: true },