trac-msb 0.0.87 → 0.0.89

package/Whitelist/pubkeys.csv

@@ -18,4 +18,5 @@ e74ea17cc6e05f0b09588a70d8573fca63de715a763420ff7e14b68a0c1d1d14
 e18e2f57285018c8521aee085fdbbb0a69cf2484a9eadd9022cc25913716427a
 b97c37985cc087d2512a97e00c3432542a2c874fb31543ba6a0c23ea7758cf39
 0ddf2d7b7144873a2027b784529a9f60d48d0aab859f691faf39fce338e123a2
-73f3dd2bda6d5904570751fad19c251186e04e18acaaf5a893404addcdabd9aa
+73f3dd2bda6d5904570751fad19c251186e04e18acaaf5a893404addcdabd9aa
+5937e8eb2e4a428967ce2866c189fccce23ca1ac9e42ecd195ce8e047d1849b1

package/msb.mjs

@@ -4,8 +4,8 @@ const opts = {
     stores_directory : 'stores/',
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
     bootstrap: '07814eb54b2a3ebf61506f056fa1235d11431fcfb6505dccfa880146938093a6',
-    channel: '00ogtracnetworkmainsettlementbus',
-    tx : 'ogtracnetworkmainsettlementbustx'
+    channel: '00axtracnetworkmainsettlementbus',
+    tx : 'axtracnetworkmainsettlementbustx'
 };
 
 const msb = new MainSettlementBus(opts);

package/package.json

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

package/src/index.js

@@ -226,7 +226,7 @@ export class MainSettlementBus extends ReadyResource {
         if (null === adminEntry || !this.check.sanitizeAdminAndWritersOperations(op) || !this.#isAdmin(adminEntry.value, node)) return;
 
         const isWhitelisted = await this.#isWhitelisted(op.key);
-        if (!isWhitelisted) return;
+        if (!isWhitelisted || op.key !== op.value.pub) return;
         const isMessageVerifed = await this.#verifyMessage(op.value.sig, op.key, MsgUtils.createMessage(op.key, op.value.wk, op.value.nonce, op.type));
         if (isMessageVerifed) {
             await this.#addWriter(op, batch, base);
@@ -238,10 +238,19 @@ export class MainSettlementBus extends ReadyResource {
         if (nodeEntry === null || !nodeEntry.value.isWriter) {
             await base.addWriter(b4a.from(op.value.wk, 'hex'), { isIndexer: false })
             await batch.put(op.key, {
+                pub : op.value.pub,
                 wk: op.value.wk,
                 isWriter: true,
                 isIndexer: false
             });
+            let length = await batch.get('wrl');
+            if(null === length){
+                length = 0;
+            } else {
+                length = length.value;
+            }
+            await batch.put('wri/'+length, op.value.pub);
+            await batch.put('wrl', length + 1);
             console.log(`Writer added: ${op.key}:${op.value.wk}`);
         }
     }
@@ -420,7 +429,7 @@ export class MainSettlementBus extends ReadyResource {
         const stream = this.#dht_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

@@ -66,12 +66,14 @@ class Network {
                 connection.on('message', async (msg) =>  {
                     try{
                         msg = b4a.toString(msg, 'utf-8');
+                        //console.log(msg);
                         msg = JSON.parse(msg);
+                        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;
@@ -83,7 +85,7 @@ class Network {
                                 await base.append(msg);
                             }
                         } else {
-                            await connection.destroy();
+                            //await connection.destroy();
                             if (base.isIndexer || !base.writable) return;
 
                             // TODO: decide if a tx rejection should be responded with