trac-msb 0.0.91 → 0.0.93

package/Whitelist/pubkeys.csv

@@ -1,3 +1,13 @@
 3e84de76f23d1f8f47aa5f133cb928ead44f91429df0b3f9761205049f2beeec
 bd3c9c5844187407baf418c3aa6329c364297b895f961a1f88a91bfe666f72c2
-17e1856a71e2aef8be3dcb6776316cf90d339f8cab9bcbb3c356be2da86fd2e7
+17e1856a71e2aef8be3dcb6776316cf90d339f8cab9bcbb3c356be2da86fd2e7
+ea866411e7d377efeae2eb1d243956e6a122330e697ff33d8312d1db48976658
+30149ac3be7ab7c35c047f64cfa76c59ad7a3373fdc2ac568a05c3ed4169bb4f
+49fd8429f26e61c7ae9382c763585c8085ac4d0c47649b3cb4b435f4b04f3a59
+0e3831a32bd8b955be4050d7bcdacb38ec3b33cefd8e4f3c9921c98e1989f179
+eb3f93f89694374f5caabebb7499a218631e67e857197531e8422a70b038e992
+b675e900dce3d2d191a847230750ed98f86253888bc3ddd05c15de4f64c00881
+714c6a9c4af41bfcf2c42a5f79ef85655ce398c4bbd070a03629d0a03d97dca5
+35f12e13e447038d07e9ee2a1750084ca006368fced4e8e0c55d354e99b9571a
+0fd54a89ea654011b800ed9f006deefdbdb68ddf1f0a392478cf7956f362adfe
+1961a27b204d9bf8f1d0483103b3b510ed401d502e0b6b41dce399894f6924f1

package/package.json

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

package/src/index.js

@@ -208,10 +208,13 @@ export class MainSettlementBus extends ReadyResource {
 
     async #handleApplyAppendWhitelistOperation(op, view, base, node, batch) {
         const adminEntry = await batch.get(EntryType.ADMIN);
-        if (null === adminEntry || !this.check.sanitizeIndexerOrWhitelistOperations(op) || !this.#isAdmin(adminEntry.value, node)) return;
+        if (null === adminEntry || !this.check.sanitizeIndexerOrWhitelistOperations(op) /* TODO: This cannot work, needs to be signed, not checked against wallet!!! || !this.#isAdmin(adminEntry.value, node)*/) return;
+        // TODO: is the below an admin signature?
         const isMessageVerifed = await this.#verifyMessage(op.value.sig, adminEntry.value.tracPublicKey, MsgUtils.createMessage(op.key, op.value.nonce, op.type));
+        console.log('isMessageVerifed', isMessageVerifed);
         if (!isMessageVerifed) return;
-        const isWhitelisted = await this.#isWhitelisted(op.key);
+        const isWhitelisted = await this.#isWhitelisted2(op.key, batch);
+        console.log('iswhitelisted', isWhitelisted);
         if (isWhitelisted) return;
         await this.#createWhitelistEntry(batch, op.key);
     }
@@ -223,10 +226,11 @@ export class MainSettlementBus extends ReadyResource {
 
     async #handleApplyAddWriterOperation(op, view, base, node, batch) {
         const adminEntry = await batch.get(EntryType.ADMIN);
-        if (null === adminEntry || !this.check.sanitizeAdminAndWritersOperations(op) || !this.#isAdmin(adminEntry.value, node)) return;
+        if (null === adminEntry || !this.check.sanitizeAdminAndWritersOperations(op) /*TODO: this cannot work, needs to be signed, not checked against wallet!!! || !this.#isAdmin(adminEntry.value, node)*/) return;
 
-        const isWhitelisted = await this.#isWhitelisted(op.key);
+        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.wk, op.value.nonce, op.type));
         if (isMessageVerifed) {
             await this.#addWriter(op, batch, base);
@@ -257,7 +261,8 @@ export class MainSettlementBus extends ReadyResource {
 
     async #handleApplyRemoveWriterOperation(op, view, base, node, batch) {
         const adminEntry = await batch.get(EntryType.ADMIN);
-        if (null === adminEntry || !this.check.sanitizeAdminAndWritersOperations(op) || !this.#isAdmin(adminEntry.value, node)) return;
+        if (null === adminEntry || !this.check.sanitizeAdminAndWritersOperations(op) /*TODO: this cannot work, needs to be signed, not checked against wallet!!! || !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.wk, op.value.nonce, op.type));
         if (isMessageVerifed) {
             await this.#removeWriter(op, batch, base);
@@ -293,15 +298,16 @@ export class MainSettlementBus extends ReadyResource {
         }
 
         const adminEntry = await batch.get(EntryType.ADMIN);
-        if (null === adminEntry || !this.#isAdmin(adminEntry.value, node)) return;
+        if (null === adminEntry /* TODO: this cannot work!!!! || !this.#isAdmin(adminEntry.value, node)*/) return;
 
-        if (!this.#isWhitelisted(op.key)) return;
+        if (!this.#isWhitelisted2(op.key, batch)) return;
 
         const indexersEntry = await batch.get(EntryType.INDEXERS);
         if (null === indexersEntry || Array.from(indexersEntry.value).includes(op.key) ||
             Array.from(indexersEntry.value).length >= MAX_INDEXERS) {
             return;
         }
+        // TODO: is the below an admin signature?
         const isMessageVerifed = await this.#verifyMessage(op.value.sig, adminEntry.value.tracPublicKey, MsgUtils.createMessage(op.key, op.value.nonce, op.type))
         if (isMessageVerifed) {
             await this.#addIndexer(indexersEntry.value, op, batch, base);
@@ -327,7 +333,8 @@ export class MainSettlementBus extends ReadyResource {
         if (!this.check.sanitizeIndexerOrWhitelistOperations(op)) return;
         const adminEntry = await batch.get(EntryType.ADMIN);
         let indexersEntry = await batch.get(EntryType.INDEXERS);
-        if (null === adminEntry || !this.#isAdmin(adminEntry.value, node) || null === indexersEntry || !Array.from(indexersEntry.value).includes(op.key) || Array.from(indexersEntry.value).length <= 1) return;
+        if (null === adminEntry /* TODO: this cannot work!!! || !this.#isAdmin(adminEntry.value, node) */ || null === indexersEntry || !Array.from(indexersEntry.value).includes(op.key) || Array.from(indexersEntry.value).length <= 1) return;
+        // TODO: is the below an admin signature?
         const isMessageVerifed = await this.#verifyMessage(op.value.sig, adminEntry.value.tracPublicKey, MsgUtils.createMessage(op.key, op.value.nonce, op.type))
         if (isMessageVerifed) {
             let nodeEntry = await batch.get(op.key);
@@ -466,6 +473,11 @@ export class MainSettlementBus extends ReadyResource {
         return !!whitelistEntry;
     }
 
+    async #isWhitelisted2(key, batch) {
+        const whitelistEntry = await this.getWhitelistEntry2(key, batch)
+        return !!whitelistEntry;
+    }
+
     async updater() {
         while (true) {
             if (this.#base.writable) {
@@ -493,6 +505,11 @@ export class MainSettlementBus extends ReadyResource {
         return entry
     }
 
+    async getWhitelistEntry2(key, batch) {
+        const entry = await batch.get(WHITELIST_PREFIX + key);
+        return entry !== null ? entry.value : null
+    }
+
     async #handleIncomingEvent(data) {
         try {
             const bufferData = data.toString();