trac-msb 0.1.21 → 0.1.23

package/Whitelist/pubkeys.csv

@@ -1 +1 @@
-a5713131ba9b19ceb8154451e490a9bdb23a804a2f83f102b2ff0ea19e5db8d9
+bcda78165dd38ca98045a6f4b0d19f2e1a465d83c7fc6ac052a64802ca163986

package/msb.mjs

@@ -3,8 +3,8 @@ import {MainSettlementBus} from './src/index.js';
 const opts = {
     stores_directory : 'stores/',
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
-    bootstrap: '4577ebf1e84c06d48b2caa33fe54ae58be3a79cb30810129d58b725fae412e37',
-    channel: '00axtracnetworkmainsettlementbus'
+    bootstrap: '1e8bf2005085e3730c4869ebc1c0564aad34fb16e98dd2242921cb6a02a2d845',
+    channel: '00axtracnetworkmainsettlementbut'
 };
 
 const msb = new MainSettlementBus(opts);

package/package.json

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

package/src/index.js

@@ -856,6 +856,8 @@ export class MainSettlementBus extends ReadyResource {
             const lengthEntry = await this.#base.view.get('wrl');
             const length = lengthEntry?.value ?? 0;
 
+            console.log('Looking for available writers, please wait...');
+
             async function findValidator(_this) {
                 if (_this.#validator_stream !== null) return;
 
@@ -891,29 +893,28 @@ export class MainSettlementBus extends ReadyResource {
                     _this.#validator_stream = existing_stream;
                     _this.#validator = pubKey;
                     _this.#validator_stream.on('close', () => {
-                        if(_this.#validator_stream !== null && b4a.toString(_this.#validator_stream.publicKey, 'hex') === pubKey){
-                            _this.#validator_stream = null;
-                            _this.#validator = null;
-                            console.log('Exissting Stream closed', pubKey);
-                        }
+                        _this.#validator_stream = null;
+                        _this.#validator = null;
+                        console.log('Existing Stream closed', pubKey);
                     });
                     console.log('Existing Stream established', pubKey);
                 } else {
                     _this.#validator_stream = _this.#dht_node.connect(b4a.from(pubKey, 'hex'));
-                    _this.#validator = pubKey;
+
+                    _this.#validator_stream.on('open', () => {
+                        _this.#validator = pubKey;
+                        console.log('Stream established', pubKey);
+                    });
+
                     _this.#validator_stream.on('close', () => {
-                        if(_this.#validator_stream !== null && b4a.toString(_this.#validator_stream.publicKey, 'hex') === pubKey){
-                            _this.#validator_stream = null;
-                            _this.#validator = null;
-                            console.log('Stream closed', pubKey);
-                        }
+                        _this.#validator_stream = null;
+                        _this.#validator = null;
+                        console.log('Stream closed', pubKey);
                     });
 
                     _this.#validator_stream.on('error', (err) => {
-                        if(_this.#validator_stream !== null && b4a.toString(_this.#validator_stream.publicKey, 'hex') === pubKey) {
-                            _this.#validator_stream = null;
-                            _this.#validator = null;
-                        }
+                        _this.#validator_stream = null;
+                        _this.#validator = null;
                     });
                 }
             }

package/src/utils/constants.js

@@ -6,7 +6,7 @@ export const EntryType = Object.freeze({
 
 export const OperationType = Object.freeze({
     ADD_ADMIN: 'addAdmin',
-    APPEND_WHITELIST: 'AppendWhitelist',
+    APPEND_WHITELIST: 'appendWhitelist',
     ADD_WRITER: 'addWriter',
     REMOVE_WRITER: 'removeWriter',
     ADD_INDEXER: 'addIndexer',

package/src/utils/msgUtils.js

@@ -3,12 +3,7 @@ import { OperationType } from './constants.js';
 import fileUtils from './fileUtils.js';
 import b4a from 'b4a';
 import Wallet from 'trac-wallet';
-// TODO: This class is trying to solve too many problems at once.
-//       It is responsible for creating messages, verifying them, reading public keys from a file, etc.
-//       It would be better to separate these concerns into different classes or modules.
-//       For example, we could have a separate class for file operations, another for message creation, etc.
-//       This would make the code more modular and easier to maintain.
-//       It would also make it easier to create tests and mocks in the future.
+
 class MsgUtils {
 
     static createMessage(...args) {