trac-msb 0.0.93 → 0.0.95

package/Whitelist/pubkeys.csv

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

package/msb.mjs

@@ -4,6 +4,7 @@ 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'
 };

package/package.json

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

package/src/index.js

@@ -58,7 +58,6 @@ export class MainSettlementBus extends ReadyResource {
     }
 
     #initInternalAttributes(options) {
-        //TODO: change visibility of the attributes to private. Most of them should be internal.
         this.#STORES_DIRECTORY = options.stores_directory;
         this.#KEY_PAIR_PATH = `${this.STORES_DIRECTORY}${options.store_name}/db/keypair.json`
         this.#bootstrap = options.bootstrap || null;
@@ -67,7 +66,7 @@ export class MainSettlementBus extends ReadyResource {
         this.#store = new Corestore(this.STORES_DIRECTORY + options.store_name);
         this.#bee = null;
         this.#swarm = null;
-        this.#dht_bootstrap = ['116.202.214.143:10001','116.202.214.149:10001', 'node1.hyperdht.org:49737', 'node2.hyperdht.org:49737', 'node3.hyperdht.org:49737'];
+        this.#dht_bootstrap = [/*'116.202.214.143:10001','116.202.214.149:10001', */'node1.hyperdht.org:49737', 'node2.hyperdht.org:49737', 'node3.hyperdht.org:49737'];
         this.#dht_node = new DHT({ bootstrap: this.#dht_bootstrap });
         this.#dht_server = null;
         this.#base = null;
@@ -208,13 +207,11 @@ 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) /* 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?
+        if (null === adminEntry || !this.check.sanitizeIndexerOrWhitelistOperations(op) || !this.#isAdmin(adminEntry.value, node)) return;
+        // TODO: is the below an admin signature? - yes
         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.#isWhitelisted2(op.key, batch);
-        console.log('iswhitelisted', isWhitelisted);
         if (isWhitelisted) return;
         await this.#createWhitelistEntry(batch, op.key);
     }
@@ -226,12 +223,12 @@ 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) /*TODO: this cannot work, needs to be signed, not checked against wallet!!! || !this.#isAdmin(adminEntry.value, node)*/) return;
+        if (null === adminEntry || !this.check.sanitizeAdminAndWritersOperations(op) || !this.#isAdmin(adminEntry.value, node)) return;
 
         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));
+        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));
         if (isMessageVerifed) {
             await this.#addWriter(op, batch, base);
         }
@@ -261,9 +258,9 @@ 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) /*TODO: this cannot work, needs to be signed, not checked against wallet!!! || !this.#isAdmin(adminEntry.value, node)*/) return;
+        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.wk, op.value.nonce, op.type));
+        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));
         if (isMessageVerifed) {
             await this.#removeWriter(op, batch, base);
         }
@@ -298,7 +295,7 @@ export class MainSettlementBus extends ReadyResource {
         }
 
         const adminEntry = await batch.get(EntryType.ADMIN);
-        if (null === adminEntry /* TODO: this cannot work!!!! || !this.#isAdmin(adminEntry.value, node)*/) return;
+        if (null === adminEntry || !this.#isAdmin(adminEntry.value, node)) return;
 
         if (!this.#isWhitelisted2(op.key, batch)) return;
 
@@ -307,7 +304,7 @@ export class MainSettlementBus extends ReadyResource {
             Array.from(indexersEntry.value).length >= MAX_INDEXERS) {
             return;
         }
-        // TODO: is the below an admin signature?
+        // TODO: is the below an admin signature? -yes
         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);
@@ -333,8 +330,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 /* 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?
+        if (null === adminEntry  || !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? -yes
         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);
@@ -379,7 +376,7 @@ export class MainSettlementBus extends ReadyResource {
             await Network.dhtServer(this, this.#dht_server, this.#base, this.#wallet, this.#writingKey, this.#network);
         }
 
-        const adminEntry = await this.getSigned(EntryType.ADMIN);
+        const adminEntry = await this.get(EntryType.ADMIN);
 
         if (this.#isAdmin(adminEntry)) {
             this.#shouldListenToAdminEvents = true;
@@ -391,7 +388,7 @@ export class MainSettlementBus extends ReadyResource {
 
         //await this.#setUpRoleAutomatically(adminEntry);
 
-        if (this.#enable_updater) {
+        if (this.#enable_updater && this.#base.writable) {
             this.updater();// TODO: NODE AFTER BECOMING A writer should start the updater
         }
 
@@ -452,9 +449,11 @@ export class MainSettlementBus extends ReadyResource {
     }
 
     #isAdmin(adminEntry, node = null) {
-        if(this.#enable_wallet === false) return false;
+        //on-chain
         if (!adminEntry) return false;
         if (node) return adminEntry.wk === b4a.from(node.from.key).toString('hex');
+        //off-chain
+        if (this.#enable_wallet === false) return false;
         return !!(this.#wallet.publicKey === adminEntry.tracPublicKey && adminEntry.wk === this.#writingKey);
     }
 
@@ -501,7 +500,7 @@ export class MainSettlementBus extends ReadyResource {
     }
 
     async getWhitelistEntry(key) {
-        const entry = await this.getSigned(WHITELIST_PREFIX + key);
+        const entry = await this.get(WHITELIST_PREFIX + key);
         return entry
     }
 
@@ -542,7 +541,7 @@ export class MainSettlementBus extends ReadyResource {
         });
 
         this.#base.on(EventType.WRITABLE, async () => {
-            const updatedNodeEntry = await this.getSigned(this.#wallet.publicKey);
+            const updatedNodeEntry = await this.get(this.#wallet.publicKey);
             const canEnableWriterEvents = updatedNodeEntry &&
                 updatedNodeEntry.wk === this.#writingKey &&
                 !this.#shouldListenToWriterEvents;
@@ -559,7 +558,7 @@ export class MainSettlementBus extends ReadyResource {
                 console.log('Current node is unwritable');
                 return;
             }
-            const updatedNodeEntry = await this.getSigned(this.#wallet.publicKey);
+            const updatedNodeEntry = await this.get(this.#wallet.publicKey);
             const canDisableWriterEvents = updatedNodeEntry &&
                 !updatedNodeEntry.isWriter &&
                 this.#shouldListenToWriterEvents;
@@ -586,7 +585,7 @@ export class MainSettlementBus extends ReadyResource {
     async #writerEventListener() {
         this.on(EventType.WRITER_EVENT, async (parsedRequest) => {
             if(this.#enable_wallet === false) return;
-            const adminEntry = await this.getSigned(EntryType.ADMIN);
+            const adminEntry = await this.get(EntryType.ADMIN);
             const isEventMessageVerifed = await MsgUtils.verifyEventMessage(parsedRequest, this.#wallet)
             if (adminEntry && adminEntry.tracPublicKey === parsedRequest.key && isEventMessageVerifed) {
                 await this.#base.append(parsedRequest);
@@ -604,7 +603,7 @@ export class MainSettlementBus extends ReadyResource {
 
     async #handleAdminOperations() {
         //TODO: ADJUST FOR WHITELIST STRUCTURE
-        const adminEntry = await this.getSigned(EntryType.ADMIN);
+        const adminEntry = await this.get(EntryType.ADMIN);
         const addAdminMessage = await MsgUtils.assembleAdminMessage(adminEntry, this.#writingKey, this.#wallet, this.#bootstrap);
         if (!adminEntry && this.#wallet && this.#writingKey && this.#writingKey === this.#bootstrap) {
             await this.#base.append(addAdminMessage);
@@ -613,7 +612,7 @@ export class MainSettlementBus extends ReadyResource {
             for (const conn of this.#swarm.connections) {
 
                 const remotePublicKeyHex = b4a.from(conn.remotePublicKey).toString('hex');
-                const remotePublicKeyEntry = await this.getSigned(remotePublicKeyHex);
+                const remotePublicKeyEntry = await this.get(remotePublicKeyHex);
                 const isWhitelisted = await this.#isWhitelisted(remotePublicKeyHex);
 
                 if (conn.connected &&
@@ -632,7 +631,7 @@ export class MainSettlementBus extends ReadyResource {
         }
 
         setTimeout(async () => {
-            const updatedAdminEntry = await this.getSigned(EntryType.ADMIN);
+            const updatedAdminEntry = await this.get(EntryType.ADMIN);
             if (this.#isAdmin(updatedAdminEntry) && !this.#shouldListenToAdminEvents) {
                 this.#shouldListenToAdminEvents = true;
                 this.#adminEventListener();
@@ -643,7 +642,7 @@ export class MainSettlementBus extends ReadyResource {
 
     async #handleWhitelistOperations() {
         if(this.#enable_wallet === false) return;
-        const adminEntry = await this.getSigned(EntryType.ADMIN);
+        const adminEntry = await this.get(EntryType.ADMIN);
         if (!this.#isAdmin(adminEntry)) return;
 
         const assembledWhitelistMessages = await MsgUtils.assembleWhitelistMessages(adminEntry, this.#wallet);
@@ -675,8 +674,8 @@ export class MainSettlementBus extends ReadyResource {
 
     async #requestWriterRole(toAdd) {
         if(this.#enable_wallet === false) return;
-        const adminEntry = await this.getSigned(EntryType.ADMIN);
-        const nodeEntry = await this.getSigned(this.#wallet.publicKey);
+        const adminEntry = await this.get(EntryType.ADMIN);
+        const nodeEntry = await this.get(this.#wallet.publicKey);
         const isAlreadyWriter = !!(nodeEntry && nodeEntry.isWriter)
         let assembledMessage = null;
         if (toAdd) {
@@ -699,16 +698,16 @@ export class MainSettlementBus extends ReadyResource {
 
     async #updateIndexerRole(tracPublicKey, toAdd) {
         if(this.#enable_wallet === false) return;
-        const adminEntry = await this.getSigned(EntryType.ADMIN);
+        const adminEntry = await this.get(EntryType.ADMIN);
         if (!this.#isAdmin(adminEntry) && !this.#base.writable) return;
 
         const isWhitelisted = await this.#isWhitelisted(tracPublicKey);
         if (!isWhitelisted) return;
 
-        const nodeEntry = await this.getSigned(tracPublicKey);
+        const nodeEntry = await this.get(tracPublicKey);
         if (!nodeEntry || !nodeEntry.isWriter) return;
 
-        const indexersEntry = await this.getSigned(EntryType.INDEXERS);
+        const indexersEntry = await this.get(EntryType.INDEXERS);
 
         if (toAdd) {
             const canAddIndexer = !nodeEntry.isIndexer && indexersEntry.length <= MAX_INDEXERS;
@@ -791,9 +790,9 @@ export class MainSettlementBus extends ReadyResource {
                 case '/show':
                     // /get_node_info 9da99d98f02f24bdb13d46ba5d346c9a3eda03c18ab6e1441b7bac9743cf0bcc1
                     // Only for DEBUG
-                    const admin = await this.getSigned(EntryType.ADMIN);
+                    const admin = await this.get(EntryType.ADMIN);
                     console.log('Admin:', admin);
-                    const indexers = await this.getSigned(EntryType.INDEXERS);
+                    const indexers = await this.get(EntryType.INDEXERS);
                     console.log('Indexers:', indexers);
                     break;
                 case '/dag':

package/src/network.js

@@ -83,9 +83,9 @@ class Network {
                         } else if(msg.op !== undefined && msg.message !== undefined && msg.op === 'add_writer'){
                             await connection.destroy();
                             msg = msg.message;
-                            const adminEntry = await msb.getSigned(EntryType.ADMIN);
+                            const adminEntry = await msb.get(EntryType.ADMIN);
                             if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;
-                            const nodeEntry = await msb.getSigned(msg.value.pub);
+                            const nodeEntry = await msb.get(msg.value.pub);
                             const isAlreadyWriter = null !== nodeEntry && nodeEntry.isWriter;
                             const isAllowedToRequestRole = await msb._isAllowedToRequestRole(msg.value.pub, adminEntry);
                             const canAddWriter = base.writable && !isAlreadyWriter && isAllowedToRequestRole;

package/src/writerManager.js

@@ -13,7 +13,7 @@ export class WriterManager extends ReadyResource {
 
     async addAdmin() {
         // case where admin entry doesn't exist yet and we have to autorize Admin public key only with bootstrap writing key
-        const adminEntry = await this.msbInstance.getSigned('admin');
+        const adminEntry = await this.msbInstance.get('admin');
         if (!adminEntry && this.msbInstance.writingKey && this.msbInstance.writingKey === this.msbInstance.bootstrap) {
 
             const nonce = Math.random() + '-' + Date.now();
@@ -44,7 +44,7 @@ export class WriterManager extends ReadyResource {
         try {
             //TODO: IMPORTANT -  IF WE GONNA STORE ~ 2K-10K PUBLIC KEYS IN THE LIST, WE NEED TO SPLIT IT INTO CHUNKS
             // ONE CHUNK WILL BE ~100 PUBLIC KEYS + NONCE + SIG AND ADDITIONAL BYTES < 4096 BYTES. ADMIN WILL NEED TO PERFORM MULTIPLE APPENDS. FOR NOW THIS IS NOT IMPLEMENTED.
-            const adminEntry = await this.msbInstance.getSigned('admin');
+            const adminEntry = await this.msbInstance.get('admin');
             
             if (adminEntry && this.msbInstance.wallet.publicKey === Buffer.from(adminEntry.tpk.data).toString('hex')) {