trac-msb 0.1.0 → 0.1.2

package/Whitelist/pubkeys.csv

@@ -1 +1 @@
-dfb2944faf6db3ed72c2fb44a04f3e769577160357a664f036aa99220527d538
+23cf5527fb3186628e944d007aeeaa3b21297182f027ae2e5afc820ccd72e08b

package/msb.mjs

@@ -5,7 +5,6 @@ const opts = {
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
     bootstrap: '4577ebf1e84c06d48b2caa33fe54ae58be3a79cb30810129d58b725fae412e37',
     channel: '00axtracnetworkmainsettlementbus',
-    tx : 'axtracnetworkmainsettlementbustx',
     enable_updater : true
 };
 
@@ -13,5 +12,5 @@ const msb = new MainSettlementBus(opts);
 
 msb.ready().then(() => {
     console.log('MSB is ready.');
-    try { msb.interactiveMode(); } catch(e) { console.log('Interactive mode not running. Not necessarily an error.') }
+    msb.interactiveMode();
 });

package/package.json

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

package/src/index.js

@@ -9,12 +9,22 @@ import PeerWallet from "trac-wallet"
 import tty from 'tty';
 import Corestore from 'corestore';
 import MsgUtils from './utils/msgUtils.js';
-import { LISTENER_TIMEOUT, EntryType, OperationType, EventType, ACK_INTERVAL, WHITELIST_SLEEP_INTERVAL, UPDATER_INTERVAL, MAX_INDEXERS, MIN_INDEXERS, WHITELIST_PREFIX } from './utils/constants.js';
+import {
+    LISTENER_TIMEOUT,
+    EntryType,
+    OperationType,
+    EventType,
+    ACK_INTERVAL,
+    WHITELIST_SLEEP_INTERVAL,
+    UPDATER_INTERVAL,
+    MAX_INDEXERS,
+    MIN_INDEXERS,
+    WHITELIST_PREFIX,
+    TRAC_NAMESPACE
+} from './utils/constants.js';
 import Network from './network.js';
 import Check from './utils/check.js';
-
 import DHT from 'hyperdht'
-import process from 'process'
 
 //TODO: CHANGE NONCE.
 
@@ -33,7 +43,6 @@ export class MainSettlementBus extends ReadyResource {
     #store;
     #bee;
     #swarm;
-    #dht_server;
     #dht_node;
     #dht_bootstrap;
     #base;
@@ -52,9 +61,9 @@ export class MainSettlementBus extends ReadyResource {
         this.#initInternalAttributes(options);
         this.msbListener();
         this.#boot();
-        this.ready().catch(noop);
         this.#setupInternalListeners();
         this.#network = new Network(this.#base);
+        this.ready().catch(noop);
     }
 
     #initInternalAttributes(options) {
@@ -62,13 +71,11 @@ export class MainSettlementBus extends ReadyResource {
         this.#KEY_PAIR_PATH = `${this.STORES_DIRECTORY}${options.store_name}/db/keypair.json`
         this.#bootstrap = options.bootstrap || null;
         this.#channel = b4a.alloc(32).fill(options.channel) || null;
-        this.#tx = b4a.alloc(32).fill(options.tx) || null;
         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_node = new DHT({ bootstrap: this.#dht_bootstrap });
-        this.#dht_server = null;
+        this.#dht_node = null;
         this.#base = null;
         this.#writingKey = null;
         this.#enable_txchannel = options.enable_txchannel !== false;
@@ -368,12 +375,8 @@ export class MainSettlementBus extends ReadyResource {
         console.log('Writer Key:', this.#writingKey);
 
         if (this.#replicate) {
-            this.#swarm = await Network.replicate(this.#dht_bootstrap, this.#swarm, this.#enable_wallet, this.#store, this.#wallet, this.#channel, this.#isStreaming, this.#handleIncomingEvent.bind(this), this.emit.bind(this));
-        }
-
-        if (this.#enable_txchannel) {
-            this.#dht_server = this.#dht_node.createServer();
-            await Network.dhtServer(this, this.#dht_server, this.#base, this.#wallet, this.#writingKey, this.#network);
+            this.#swarm = await Network.replicate(this, this.#network, this.#enable_txchannel, this.#base, this.#writingKey, this.#dht_bootstrap, this.#swarm, this.#enable_wallet, this.#store, this.#wallet, this.#channel, this.#isStreaming, this.#handleIncomingEvent.bind(this), this.emit.bind(this));
+            this.#dht_node = this.#swarm.dht;
         }
 
         const adminEntry = await this.get(EntryType.ADMIN);
@@ -403,18 +406,6 @@ export class MainSettlementBus extends ReadyResource {
         if (this.#swarm) {
             await this.#swarm.destroy();
         }
-        if (this.#dht_server) {
-            try{
-                await this.#dht_server.close();
-            } catch(e){
-                console.log(e.message);
-            }
-        }
-        try{
-            this.#dht_node.destroy();
-        } catch(e){
-            console.log(e.message);
-        }
         await this.#base.close();
     }
 
@@ -432,15 +423,15 @@ export class MainSettlementBus extends ReadyResource {
         if (!adminEntry || !message) {
             return;
         }
-        const node = new DHT({bootstrap:this.#dht_bootstrap})
-        const stream = node.connect(b4a.from(adminEntry.tracPublicKey, 'hex'))
+        const stream = this.#dht_node.connect(b4a.from(adminEntry.tracPublicKey, 'hex'))
         stream.on('connect', async function () {
+            console.log('Trying to send message to admin.');
             await stream.send(b4a.from(JSON.stringify(message)));
-            await stream.destroy();
+            await stream.end();
         });
-        stream.on('open', function () { });
-        stream.on('close', () => { });
-        stream.on('error', (error) => { });
+        stream.on('open', function () { console.log('Message channel opened') });
+        stream.on('close', () => { console.log('Message channel closed') });
+        stream.on('error', (error) => { console.log('Message send error', error) });
     }
 
     async #verifyMessage(signature, publicKey, bufferMessage) {

package/src/network.js

@@ -14,7 +14,6 @@ import {
 import {sleep } from './utils/functions.js';
 import MsgUtils from './utils/msgUtils.js';
 import Check from './utils/check.js';
-import DHT from "hyperdht";
 const wakeup = new w();
 
 class Network {
@@ -25,8 +24,9 @@ class Network {
     }
 
 
-    static async replicate(bootstrap, swarm, walletEnabled, store, wallet, channel, isStreaming, handleIncomingEvent, emit) {
+    static async replicate(msb, network, enable_txchannel, base, writingKey, bootstrap, swarm, walletEnabled, store, wallet, channel, isStreaming, handleIncomingEvent, emit) {
         if (!swarm) {
+
             let keyPair;
             if (!walletEnabled) {
                 keyPair = await store.createKeyPair(TRAC_NAMESPACE);
@@ -49,115 +49,94 @@ class Network {
                     await handleIncomingEvent(data);
                 });
 
+                if(enable_txchannel){
+                    connection.on('message', async (msg) =>  {
+                        try{
+                            msg = b4a.toString(msg, 'utf-8');
+                            msg = JSON.parse(msg);
+                            if(null === msg) return;
+                            if(msg === 'get_writer_key'){
+                                await connection.send(b4a.from(JSON.stringify({op:'writer_key', key : writingKey})));
+                                await connection.end();
+                            } else if(msg.type !== undefined && msg.key !== undefined && msg.value !== undefined && msg.type === 'addWriter'){
+                                await connection.end();
+                                const adminEntry = await msb.get(EntryType.ADMIN);
+                                if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;
+                                const nodeEntry = await msb.get(msg.value.pub);
+                                const isAlreadyWriter = null !== nodeEntry && nodeEntry.isWriter;
+                                const isAllowedToRequestRole = await msb._isAllowedToRequestRole(msg.key, adminEntry);
+                                const canAddWriter = base.writable && !isAlreadyWriter && isAllowedToRequestRole;
+                                if(msg.key !== wallet.publicKey && canAddWriter){
+                                    await base.append(msg);
+                                }
+                            } else if (msg.type !== undefined && msg.key !== undefined && msg.value !== undefined && msg.type === 'removeWriter') {
+                                await connection.end();
+                                const adminEntry = await msb.get(EntryType.ADMIN);
+                                if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;
+                                const nodeEntry = await msb.get(msg.value.pub);
+                                const isAlreadyWriter = null !== nodeEntry && nodeEntry.isWriter;
+                                const canRemoveWriter = base.writable && isAlreadyWriter
+                                if (msg.key !== wallet.publicKey && canRemoveWriter) {
+                                    await base.append(msg);
+                                }
+                            }
+                            else {
+                                //await connection.destroy();
+                                if (base.isIndexer || !base.writable) return;
+
+                                // TODO: decide if a tx rejection should be responded with
+                                if (network.tx_pool.length >= 1000) {
+                                    console.log('pool full');
+                                    return
+                                }
+
+                                if (b4a.byteLength(msg) > 3072) return;
+
+                                const parsedPreTx = msg;
+
+                                if (network.check.sanitizePreTx(parsedPreTx) &&
+                                    wallet.verify(b4a.from(parsedPreTx.is, 'hex'), b4a.from(parsedPreTx.tx + parsedPreTx.in), b4a.from(parsedPreTx.ipk, 'hex')) &&
+                                    parsedPreTx.wp === wallet.publicKey &&
+                                    null === await base.view.get(parsedPreTx.tx)
+                                ) {
+                                    const nonce = MsgUtils.generateNonce();
+                                    const signature = wallet.sign(b4a.from(parsedPreTx.tx + nonce), b4a.from(wallet.secretKey, 'hex'));
+                                    const append_tx = {
+                                        op: OperationType.POST_TX,
+                                        tx: parsedPreTx.tx,
+                                        is: parsedPreTx.is,
+                                        w: writingKey,
+                                        i: parsedPreTx.i,
+                                        ipk: parsedPreTx.ipk,
+                                        ch: parsedPreTx.ch,
+                                        in: parsedPreTx.in,
+                                        bs: parsedPreTx.bs,
+                                        mbs: parsedPreTx.mbs,
+                                        ws: signature.toString('hex'),
+                                        wp: wallet.publicKey,
+                                        wn: nonce
+                                    };
+                                    network.tx_pool.push({ tx: parsedPreTx.tx, append_tx: append_tx });
+                                }
+                            }
+                        }catch(e){
+                            console.log(e);
+                            try{ await connection.end(); } catch (e){ }
+                        }
+                    });
+                }
+
                 if (!isStreaming) {
                     emit(EventType.READY_MSB);
                 }
             });
 
-            const discovery = swarm.join(channel, { server: true, client: true });
+            swarm.join(channel, { server: true, client: true });
             await swarm.flush();
-            console.log('Joined channel');
-            async function refresh(){
-                await discovery.refresh();
-                setTimeout(function(){
-                    refresh();
-                }, 30_000);
-            }
-            await refresh();
         }
         return swarm;
     }
 
-    static async dhtServer(msb, dhtServer, base, wallet, writingKey, networkInstance){
-        try{
-            dhtServer.on('connection', function (connection) {
-                connection.on('message', async (msg) =>  {
-                    try{
-                        msg = b4a.toString(msg, 'utf-8');
-                        //console.log(msg);
-                        msg = JSON.parse(msg);
-                        if(null === msg) return;
-                        if(msg === 'get_writer_key'){
-                            await connection.send(b4a.from(JSON.stringify({op:'writer_key', key : writingKey})));
-                            await connection.destroy();
-                        } else if(msg.type !== undefined && msg.key !== undefined && msg.value !== undefined && msg.type === 'addWriter'){
-                            await connection.destroy();
-                            const adminEntry = await msb.get(EntryType.ADMIN);
-                            if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;
-                            const nodeEntry = await msb.get(msg.value.pub);
-                            const isAlreadyWriter = null !== nodeEntry && nodeEntry.isWriter;
-                            const isAllowedToRequestRole = await msb._isAllowedToRequestRole(msg.key, adminEntry);
-                            const canAddWriter = base.writable && !isAlreadyWriter && isAllowedToRequestRole;
-                            if(msg.key !== wallet.publicKey && canAddWriter){
-                                await base.append(msg);
-                            }
-                        } else if (msg.type !== undefined && msg.key !== undefined && msg.value !== undefined && msg.type === 'removeWriter') {
-                            await connection.destroy();
-                            const adminEntry = await msb.get(EntryType.ADMIN);
-                            if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;
-                            const nodeEntry = await msb.get(msg.value.pub);
-                            const isAlreadyWriter = null !== nodeEntry && nodeEntry.isWriter;
-                            const canRemoveWriter = base.writable && isAlreadyWriter 
-                            if (msg.key !== wallet.publicKey && canRemoveWriter) {
-                                await base.append(msg);
-                            }
-                        }
-                        else {
-                            //await connection.destroy();
-                            if (base.isIndexer || !base.writable) return;
-
-                            // TODO: decide if a tx rejection should be responded with
-                            if (networkInstance.tx_pool.length >= 1000) {
-                                console.log('pool full');
-                                return
-                            }
-
-                            if (b4a.byteLength(msg) > 3072) return;
-
-                            const parsedPreTx = 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.wp === wallet.publicKey &&
-                                null === await base.view.get(parsedPreTx.tx)
-                            ) {
-                                const nonce = MsgUtils.generateNonce();
-                                const signature = wallet.sign(b4a.from(parsedPreTx.tx + nonce), b4a.from(wallet.secretKey, 'hex'));
-                                const append_tx = {
-                                    op: OperationType.POST_TX,
-                                    tx: parsedPreTx.tx,
-                                    is: parsedPreTx.is,
-                                    w: writingKey,
-                                    i: parsedPreTx.i,
-                                    ipk: parsedPreTx.ipk,
-                                    ch: parsedPreTx.ch,
-                                    in: parsedPreTx.in,
-                                    bs: parsedPreTx.bs,
-                                    mbs: parsedPreTx.mbs,
-                                    ws: signature.toString('hex'),
-                                    wp: wallet.publicKey,
-                                    wn: nonce
-                                };
-                                networkInstance.tx_pool.push({ tx: parsedPreTx.tx, append_tx: append_tx });
-                            }
-                        }
-                    }catch(e){
-                        console.log(e);
-                        try{ await connection.destroy(); } catch (e){ }
-                    }
-                });
-                connection.on('close', () => { });
-                connection.on('error', (error) => { });
-            })
-            const keyPair = {
-                publicKey: b4a.from(wallet.publicKey, 'hex'),
-                secretKey: b4a.from(wallet.secretKey, 'hex')
-            };
-            await dhtServer.listen(keyPair)
-            console.log('DHT node is listening on public key', wallet.publicKey);
-        } catch(e) { console.log(e) }
-    }
-
     async pool(base) {
         while (true) {
             if (this.tx_pool.length > 0) {