trac-msb 0.0.99 → 0.1.0

package/Whitelist/pubkeys.csv

@@ -1 +1 @@
-dc799f7dc9b7e9912e78e1e5789cfe15fcc6b66b1351743675aa4cb35f6b8c0f
+dfb2944faf6db3ed72c2fb44a04f3e769577160357a664f036aa99220527d538

package/msb.mjs

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.0.99",
+  "version": "0.1.0",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -21,7 +21,7 @@
     "bare-crypto": "^1.4.3",
     "bare-events": "^2.5.4",
     "bare-fetch": "^2.2.1",
-    "bare-fs": "4.0.2",
+    "bare-fs": "^4.1.2",
     "bare-http1": "^4.0.2",
     "bare-https": "^2.0.0",
     "bare-inspector": "^4.0.1",

package/src/index.js

@@ -228,7 +228,7 @@ export class MainSettlementBus extends ReadyResource {
         const isWhitelisted = await this.#isWhitelisted2(op.key, batch);
         if (!isWhitelisted || op.key !== op.value.pub) return;
         // TODO: if the below is not a message signed by admin BUT this handler is supposed to be executed by the admin, then use admin signatures in apply!
-        const isMessageVerifed = await this.#verifyMessage(op.value.sig, op.key, MsgUtils.createMessage(op.key, op.value.pub, op.value.wk, op.value.nonce, op.type));
+        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);
         }
@@ -260,7 +260,7 @@ export class MainSettlementBus extends ReadyResource {
         const adminEntry = await batch.get(EntryType.ADMIN);
         if (null === adminEntry || !this.check.sanitizeAdminAndWritersOperations(op) || !this.#isAdmin(adminEntry.value, node)) return;
         // TODO: if the below is not a message signed by admin BUT this handler is supposed to be executed by the admin, then use admin signatures in apply!
-        const isMessageVerifed = await this.#verifyMessage(op.value.sig, op.key, MsgUtils.createMessage(op.key,op.value.pub, op.value.wk, op.value.nonce, op.type));
+        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.#removeWriter(op, batch, base);
         }
@@ -386,9 +386,9 @@ export class MainSettlementBus extends ReadyResource {
             this.#writerEventListener(); // only for writers
         }
 
-        //await this.#setUpRoleAutomatically(adminEntry);
+        await this.#setUpRoleAutomatically(adminEntry);
 
-        if (this.#enable_updater && this.#base.writable) {
+        if (this.#enable_updater) {
             this.updater();// TODO: NODE AFTER BECOMING A writer should start the updater
         }
 
@@ -421,9 +421,10 @@ export class MainSettlementBus extends ReadyResource {
     async #setUpRoleAutomatically() {
         if (!this.#base.writable) {
             await this.#requestWriterRole(false)
+            console.log('Wait please...');
             setTimeout(async () => {
                 await this.#requestWriterRole(true)
-            }, 10_000);
+            }, 5_000);
         }
     }
 
@@ -434,7 +435,7 @@ export class MainSettlementBus extends ReadyResource {
         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.send(b4a.from(JSON.stringify(message)));
             await stream.destroy();
         });
         stream.on('open', function () { });

package/src/network.js

@@ -80,19 +80,29 @@ class Network {
                         if(msg === 'get_writer_key'){
                             await connection.send(b4a.from(JSON.stringify({op:'writer_key', key : writingKey})));
                             await connection.destroy();
-                        } else if(msg.op !== undefined && msg.message !== undefined && msg.op === 'add_writer'){
+                        } else if(msg.type !== undefined && msg.key !== undefined && msg.value !== undefined && msg.type === 'addWriter'){
                             await connection.destroy();
-                            msg = msg.message;
                             const adminEntry = await msb.get(EntryType.ADMIN);
                             if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;
                             const nodeEntry = await msb.get(msg.value.pub);
                             const isAlreadyWriter = null !== nodeEntry && nodeEntry.isWriter;
-                            const isAllowedToRequestRole = await msb._isAllowedToRequestRole(msg.value.pub, adminEntry);
+                            const isAllowedToRequestRole = await msb._isAllowedToRequestRole(msg.key, adminEntry);
                             const canAddWriter = base.writable && !isAlreadyWriter && isAllowedToRequestRole;
-                            if(msg.value.pub !== wallet.publicKey && canAddWriter){
+                            if(msg.key !== wallet.publicKey && canAddWriter){
                                 await base.append(msg);
                             }
-                        } else {
+                        } else if (msg.type !== undefined && msg.key !== undefined && msg.value !== undefined && msg.type === 'removeWriter') {
+                            await connection.destroy();
+                            const adminEntry = await msb.get(EntryType.ADMIN);
+                            if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;
+                            const nodeEntry = await msb.get(msg.value.pub);
+                            const isAlreadyWriter = null !== nodeEntry && nodeEntry.isWriter;
+                            const canRemoveWriter = base.writable && isAlreadyWriter 
+                            if (msg.key !== wallet.publicKey && canRemoveWriter) {
+                                await base.append(msg);
+                            }
+                        }
+                        else {
                             //await connection.destroy();
                             if (base.isIndexer || !base.writable) return;
 
@@ -133,6 +143,7 @@ class Network {
                         }
                     }catch(e){
                         console.log(e);
+                        try{ await connection.destroy(); } catch (e){ }
                     }
                 });
                 connection.on('close', () => { });