trac-msb 0.1.1 → 0.1.2

package/Whitelist/pubkeys.csv

@@ -1 +1 @@
-f95bfb8ef84d4cc3ee074765fb1e2a69af846df4309782fc4bc5bb6e18b944f5
+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.1",
+  "version": "0.1.2",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"

package/src/index.js

@@ -71,7 +71,6 @@ 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;
@@ -376,7 +375,7 @@ export class MainSettlementBus extends ReadyResource {
         console.log('Writer Key:', this.#writingKey);
 
         if (this.#replicate) {
-            this.#swarm = await Network.replicate(this, 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.#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;
         }
 

package/src/network.js

@@ -24,11 +24,9 @@ class Network {
     }
 
 
-    static async replicate(msb, enable_txchannel, base, writingKey, 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) {
 
-            const _this = this;
-
             let keyPair;
             if (!walletEnabled) {
                 keyPair = await store.createKeyPair(TRAC_NAMESPACE);
@@ -87,7 +85,7 @@ class Network {
                                 if (base.isIndexer || !base.writable) return;
 
                                 // TODO: decide if a tx rejection should be responded with
-                                if (_this.tx_pool.length >= 1000) {
+                                if (network.tx_pool.length >= 1000) {
                                     console.log('pool full');
                                     return
                                 }
@@ -96,7 +94,7 @@ class Network {
 
                                 const parsedPreTx = msg;
 
-                                if (_this.check.sanitizePreTx(parsedPreTx) &&
+                                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)
@@ -118,7 +116,7 @@ class Network {
                                         wp: wallet.publicKey,
                                         wn: nonce
                                     };
-                                    _this.tx_pool.push({ tx: parsedPreTx.tx, append_tx: append_tx });
+                                    network.tx_pool.push({ tx: parsedPreTx.tx, append_tx: append_tx });
                                 }
                             }
                         }catch(e){
@@ -133,16 +131,8 @@ class Network {
                 }
             });
 
-            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;
     }