trac-msb 0.1.69 → 0.1.71

package/msb.mjs

@@ -3,10 +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: '0768953b234c79eccc6306fdcba2d7c1f0b05b9af6815a3502e96a83a8878ff7',
-    channel: '00abtracnetworkmainsettlementbus',
-    disable_rate_limit : true,
-    enable_txlogs : true
+    bootstrap: '19a12e9bdaf1cd9ae8169fd87f3d6d63d441c046e37e2ac6c3c36bcb87c59019',
+    channel: '0000tracnetworkmainsettlementbus',
 };
 
 const msb = new MainSettlementBus(opts);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.1.69",
+  "version": "0.1.71",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -9,7 +9,8 @@
   "type": "module",
   "scripts": {
     "dev": "pear run -d .",
-    "test": "brittle test/*.test.js"
+    "test:node": "brittle test/all.test.js",
+    "test:bare": "bare test/all.test.js"
   },
   "dependencies": {
     "autobase": "7.6.3",
@@ -18,6 +19,7 @@
     "b4a": "1.6.7",
     "bare-readline": "1.0.7",
     "bare-tty": "5.0.2",
+    "brittle": "^3.16.2",
     "compact-encoding": "^2.16.0",
     "fastest-validator": "1.19.0",
     "hyperbee": "2.24.2",

package/src/utils/constants.js

@@ -38,9 +38,9 @@ export const MIN_INDEXERS = 1;
 export const WHITELIST_SLEEP_INTERVAL = 1000;
 export const MAX_PEERS = 128;
 export const MAX_PARALLEL = 128;
-export const MAX_SERVER_CONNECTIONS = 64;
-export const MAX_CLIENT_CONNECTIONS = 64;
-export const UPDATER_INTERVAL = 1_000;
+export const MAX_SERVER_CONNECTIONS = Infinity;
+export const MAX_CLIENT_CONNECTIONS = Infinity;
+export const UPDATER_INTERVAL = 10_000;
 
 const constants = {
     EntryType,

package/src/utils/fileUtils.js

@@ -1,6 +1,9 @@
 import fs from 'fs';
 import {WHITELIST_FILEPATH} from '../utils/constants.js';
 
+// TODO: The methods in fileUtils need to be refactoed and generalized to improve code reusability
+// -- For example, the readPublicKeysFromFile method is specific to reading a whitelist file set in constants.
+// -- In the future, we might want to generalize this method to read any file and return its content.
 async function readPublicKeysFromFile() {
     try {
         const data = await fs.promises.readFile(WHITELIST_FILEPATH, 'utf8');

package/src/utils/functions.js

@@ -2,6 +2,8 @@ import b4a from 'b4a';
 import sodium from 'sodium-native';
 import {peer} from "hyperdht/lib/messages.js";
 
+// TODO: (?) Should we allow 0x prefix?
+// TODO: (?) Should an mepty string be considered valid?
 export function isHexString(string) {
     return typeof string === 'string' && /^[0-9a-fA-F]+$/.test(string) && string.length % 2 === 0;
 }

package/test/all.test.js

@@ -0,0 +1,18 @@
+// This runner is auto-generated by Brittle
+
+import { default as test } from 'brittle';
+
+async function runTests() {
+  test.pause();
+
+  await import('./check.test.js');
+  await import('./fileUtils.test.js');
+  await import('./functions.test.js');
+
+  //TODO add test MsgUtils
+  //TODO add test Apply function
+
+  test.resume();
+}
+
+runTests();

package/test/check.test.js

@@ -0,0 +1,21 @@
+import test from 'brittle'
+import Check from '../src/utils/check.js';
+
+test('preTx', function (t) {
+    const check = new Check();
+    const validData = {
+        op: 'pre-tx',
+        tx: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234',
+        is: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234',
+        wp: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234',
+        i: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234',
+        ipk: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234',
+        ch: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234',
+        in: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234',
+        bs: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234',
+        mbs: 'abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234'
+    }
+    const result = check.sanitizePreTx(validData)
+    t.ok(result, 'Valid data should pass the sanitization')
+
+})

package/test/fileUtils.test.js

@@ -0,0 +1,16 @@
+import test from 'brittle';
+import fileUtils from '../src/utils/fileUtils.js';
+
+test('readPublicKeysFromFile', async (t) => {
+    // TODO: This is reading the real whitelist file (which is not a good practice)
+    // -- In the future, this function should be generalized so we can mock the file reading
+    // -- and test the function without relying on the actual file.
+    // -- For now, we will just check if the file reading works and returns an array of public keys.
+    const pubKeys = await fileUtils.readPublicKeysFromFile(); 
+    t.ok(Array.isArray(pubKeys), 'Should return an array');
+    t.ok(pubKeys.length > 0, 'Should return a non-empty array'); // Assuming the file has at least one public key. Without being able to mock the file, we can't guarantee this.
+    pubKeys.forEach((key) => {
+        t.is(typeof key, 'string', 'Each public key should be a string');
+    });
+}
+);

package/test/functions.test.js

@@ -0,0 +1,22 @@
+import test from 'brittle';
+import * as functions from '../src/utils/functions.js';
+
+test('isHexString', (t) => {
+    // t.ok(functions.isHexString('0x1234567890abcdef'), 'Valid hex string should return true'); // Deactivated. See TODO in functions.js
+    t.ok(functions.isHexString('1234567890abcdef'), 'Valid hex string should return true');
+    t.ok(functions.isHexString('1234567890xyz') === false, 'Invalid hex string should return false');
+    t.ok(functions.isHexString('123456789') === false, 'Invalid size hex string should return false');
+    // t.ok(functions.isHexString('') === false, 'Empty string should return false'); // Deactivated. See TODO in functions.js
+});
+
+test('createHash', async (t) => {
+    // TODO: Add tests for other supported hash types
+    t.test('sha256', async (k) => {
+        const hash = await functions.createHash('sha256', 'test');
+        k.is(typeof hash, 'string', 'Hash should be a string');
+        k.ok(hash.length === 64, 'Hash should be 64 characters long');
+        k.ok(hash.match(/^[a-f0-9]+$/), 'Hash should be a hex string');
+        k.ok(hash !== await functions.createHash('sha256', 'Test'), 'Hash should be different for different inputs');
+        k.ok(hash === await functions.createHash('sha256', 'test'), 'Hash should be the same for the same input');
+    });
+});