trac-msb 0.0.65 → 0.0.67

package/Whitelist/pubkeys.csv

@@ -1 +1 @@
-f46776c2cbdc14938b72d19a257d24c680040158d7b0a0bfc2437b8c6a1bf59c
+e247a9ceefb8a83e28d3c5845055910bc61e0b418c7578d297354708f276af04

package/package.json

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

package/src/index.js

@@ -67,7 +67,7 @@ export class MainSettlementBus extends ReadyResource {
         this.#enable_txchannel = options.enable_txchannel !== false;
         this.#enable_updater = options.enable_updater !== false;
         this.#enable_wallet = options.enable_wallet !== false;
-        this.#wallet = this.#enable_wallet ? new PeerWallet(options) : null;
+        this.#wallet = new PeerWallet(options);
         this.#replicate = options.replicate !== false;
         this.#opts = options;
     }
@@ -152,7 +152,7 @@ export class MainSettlementBus extends ReadyResource {
             b4a.byteLength(JSON.stringify(postTx)) <= 4096
         ) {
             await batch.put(op.key, op.value);
-            //console.log(`TX: ${op.key} appended. Signed length: `, this.#base.view.core.signedLength);
+            console.log(`TX: ${op.key} appended. Signed length: `, this.#base.view.core.signedLength);
         }
     }
 
@@ -414,10 +414,10 @@ export class MainSettlementBus extends ReadyResource {
     }
 
     #isAdmin(adminEntry, node = null) {
+        if(this.#enable_wallet === false) return false;
         if (!adminEntry) return false;
         if (node) return adminEntry.wk === b4a.from(node.from.key).toString('hex');
         return !!(this.#wallet.publicKey === adminEntry.tracPublicKey && adminEntry.wk === this.#writingKey);
-
     }
 
     async #isAllowedToRequestRole(key, adminEntry) {
@@ -463,7 +463,7 @@ export class MainSettlementBus extends ReadyResource {
             const parsedRequest = JSON.parse(bufferData);
             if (parsedRequest && parsedRequest.type && parsedRequest.key && parsedRequest.value) {
                 if (parsedRequest.type === OperationType.ADD_WRITER || parsedRequest.type === OperationType.REMOVE_WRITER) {
-                    //This request must be hanlded by ADMIN 
+                    //This request must be hanlded by ADMIN
                     this.emit(EventType.ADMIN_EVENT, parsedRequest);
                 } else if (parsedRequest.type === OperationType.ADD_ADMIN) {
                     //This request must be handled by WRITER
@@ -502,6 +502,10 @@ export class MainSettlementBus extends ReadyResource {
         });
 
         this.#base.on(EventType.UNWRITABLE, async () => {
+            if(this.#enable_wallet === false) {
+                console.log('Current node is unwritable');
+                return;
+            }
             const updatedNodeEntry = await this.getSigned(this.#wallet.publicKey);
             const canDisableWriterEvents = updatedNodeEntry &&
                 !updatedNodeEntry.isWriter &&
@@ -517,6 +521,7 @@ export class MainSettlementBus extends ReadyResource {
 
     async #adminEventListener() {
         this.on(EventType.ADMIN_EVENT, async (parsedRequest) => {
+            if(this.#enable_wallet === false) return;
             const isWhitelisted = await this.#isWhitelisted(parsedRequest.key);
             const isEventMessageVerifed = await MsgUtils.verifyEventMessage(parsedRequest, this.#wallet)
             if (isWhitelisted && isEventMessageVerifed) {
@@ -527,6 +532,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 isEventMessageVerifed = await MsgUtils.verifyEventMessage(parsedRequest, this.#wallet)
             if (adminEntry && adminEntry.tracPublicKey === parsedRequest.key && isEventMessageVerifed) {
@@ -549,7 +555,7 @@ export class MainSettlementBus extends ReadyResource {
         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);
-        } else if (adminEntry && adminEntry.tracPublicKey === this.#wallet.publicKey && this.#writingKey && this.#writingKey !== adminEntry.wk) {
+        } else if (adminEntry && this.#wallet && adminEntry.tracPublicKey === this.#wallet.publicKey && this.#writingKey && this.#writingKey !== adminEntry.wk) {
             let connections = [];
             for (const conn of this.#swarm.connections) {
 
@@ -569,7 +575,7 @@ export class MainSettlementBus extends ReadyResource {
             if (connections.length > 0) {
                 connections[Math.floor(Math.random() * connections.length)].write(JSON.stringify(addAdminMessage));
             }
-            //TODO: Implement an algorithm to search a new writer and connect/send the request for it. 
+            //TODO: Implement an algorithm to search a new writer and connect/send the request for it.
         }
 
         setTimeout(async () => {
@@ -583,6 +589,7 @@ export class MainSettlementBus extends ReadyResource {
     }
 
     async #handleWhitelistOperations() {
+        if(this.#enable_wallet === false) return;
         const adminEntry = await this.getSigned(EntryType.ADMIN);
         if (!this.#isAdmin(adminEntry)) return;
 
@@ -614,6 +621,7 @@ 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 isAlreadyWriter = !!(nodeEntry && nodeEntry.isWriter)
@@ -638,6 +646,7 @@ export class MainSettlementBus extends ReadyResource {
     }
 
     async #updateIndexerRole(tracPublicKey, toAdd) {
+        if(this.#enable_wallet === false) return;
         const adminEntry = await this.getSigned(EntryType.ADMIN);
         if (!this.#isAdmin(adminEntry) && !this.#base.writable) return;
 
@@ -737,7 +746,6 @@ export class MainSettlementBus extends ReadyResource {
                 default:
                     if (input.startsWith('/get_node_info')) {
                         const splitted = input.split(' ');
-                        console.log("address:", await this.getSigned(splitted[1]))
                         console.log("whitelist entry:", await this.#isWhitelisted(splitted[1]))
                     } else if (input.startsWith('/add_indexer')) {
                         const splitted = input.split(' ');

package/src/network.js

@@ -20,18 +20,17 @@ class Network {
             let keyPair;
             if (!walletEnabled) {
                 keyPair = await store.createKeyPair(TRAC_NAMESPACE);
+            } else {
+                keyPair = {
+                    publicKey: b4a.from(wallet.publicKey, 'hex'),
+                    secretKey: b4a.from(wallet.secretKey, 'hex')
+                };
             }
 
-            keyPair = {
-                publicKey: b4a.from(wallet.publicKey, 'hex'),
-                secretKey: b4a.from(wallet.secretKey, 'hex')
-            };
-
             swarm = new Hyperswarm({ keyPair, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS });
 
             console.log(`Channel: ${b4a.toString(channel)}`);
             swarm.on('connection', async (connection) => {
-
                 wakeup.addStream(connection);
                 store.replicate(connection);
                 connection.on('close', () => { });
@@ -75,7 +74,7 @@ class Network {
                     try {
 
                         const parsedPreTx = JSON.parse(msg);
-                        
+
                         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 &&