trac-msb 0.0.85 → 0.0.87

package/Whitelist/pubkeys.csv

@@ -11,4 +11,11 @@ b1226d4a4d9e44226a69c9109769c2437dfa3f7ee551bfd3e79226dd3c1706e3
 e74ea17cc6e05f0b09588a70d8573fca63de715a763420ff7e14b68a0c1d1d14
 9dedf2e9f8f63c2ffbdccba6a3e28ace22c3788fbdbcf71b030b8574eeaa92c1
 656c9a53cbed98f9e783b6fd53667a2793c4fd74975cd26971582ea3ab9955f1
-1184e8f926a2f76f12685c9e3fa6b3cd542277ab6c7a09fd02a7391240ceeb18
+1184e8f926a2f76f12685c9e3fa6b3cd542277ab6c7a09fd02a7391240ceeb18
+744ac7add47923135928bd69a3bf448845338122ece2b9d86b1c53b025028fd1
+7bc277890f992bd006eb0609c61e2c35529baf65765e3e4310f99aa18205a7c6
+8888df74fe541631cedfcf27531d309a02a7915b7680bead4301c342082980b8
+e18e2f57285018c8521aee085fdbbb0a69cf2484a9eadd9022cc25913716427a
+b97c37985cc087d2512a97e00c3432542a2c874fb31543ba6a0c23ea7758cf39
+0ddf2d7b7144873a2027b784529a9f60d48d0aab859f691faf39fce338e123a2
+73f3dd2bda6d5904570751fad19c251186e04e18acaaf5a893404addcdabd9aa

package/package.json

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

package/src/index.js

@@ -35,6 +35,7 @@ export class MainSettlementBus extends ReadyResource {
     #swarm;
     #dht_server;
     #dht_node;
+    #dht_bootstrap;
     #base;
     #writingKey;
     #enable_txchannel;
@@ -66,7 +67,8 @@ export class MainSettlementBus extends ReadyResource {
         this.#store = new Corestore(this.STORES_DIRECTORY + options.store_name);
         this.#bee = null;
         this.#swarm = null;
-        this.#dht_node = new DHT();
+        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.#base = null;
         this.#writingKey = null;
@@ -353,7 +355,7 @@ export class MainSettlementBus extends ReadyResource {
         console.log('Writer Key:', this.#writingKey);
 
         if (this.#replicate) {
-            this.#swarm = await Network.replicate(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.#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) {
@@ -418,6 +420,7 @@ export class MainSettlementBus extends ReadyResource {
         const stream = this.#dht_node.connect(b4a.from(adminEntry.tracPublicKey, 'hex'))
         stream.on('connect', async function () {
             await stream.send(b4a.from(JSON.stringify({ op : 'add_writer', message : message })));
+            await stream.destroy();
         });
         stream.on('open', function () { });
         stream.on('close', () => { });
@@ -721,6 +724,7 @@ export class MainSettlementBus extends ReadyResource {
         console.log('- /add_admin: register admin entry with bootstrap key.');
         console.log('- /add_whitelist: add a list of Trac public keys. Nodes that own these public keys can become writers.');
         console.log('- /add_indexer <trac_public_key>: change a role of the selected writer node to indexer role');
+        console.log('- /push_writer_add: try to enforce adding this peer as writer after whitelisting.');
         console.log('- /remove_indexer <trac_public_key>: change a role of the selected indexer node to default role');
         console.log('- /get_node_info <trac_public_key>: get information about a node with the given Trac public key');
         console.log('- /dag: check system properties such as writing key, DAG, etc.');
@@ -734,6 +738,9 @@ export class MainSettlementBus extends ReadyResource {
                     await this.close();
                     typeof process !== "undefined" ? process.exit(0) : Pear.exit(0);
                     break;
+                case '/push_writer_add':
+                    await this.#requestWriterRole(true)
+                    break;
                 case '/add_admin':
                     await this.#handleAdminOperations();
                     break;

package/src/network.js

@@ -24,7 +24,7 @@ class Network {
     }
 
 
-    static async replicate(swarm, walletEnabled, store, wallet, channel, isStreaming, handleIncomingEvent, emit) {
+    static async replicate(bootstrap, swarm, walletEnabled, store, wallet, channel, isStreaming, handleIncomingEvent, emit) {
         if (!swarm) {
             let keyPair;
             if (!walletEnabled) {
@@ -36,7 +36,7 @@ class Network {
                 };
             }
 
-            swarm = new Hyperswarm({ keyPair, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS });
+            swarm = new Hyperswarm({ keyPair, bootstrap, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS });
 
             console.log(`Channel: ${b4a.toString(channel)}`);
             swarm.on('connection', async (connection) => {
@@ -69,7 +69,9 @@ class Network {
                         msg = JSON.parse(msg);
                         if(msg === 'get_writer_key'){
                             await connection.send(b4a.from(JSON.stringify({op:'writer_key', key : writingKey})));
+                            await connection.destroy();
                         } else if(msg.op !== undefined && msg.message !== undefined && msg.op === 'add_writer'){
+                            await connection.destroy();
                             msg = msg.message;
                             const adminEntry = await msb.getSigned(EntryType.ADMIN);
                             if(null === adminEntry || (adminEntry.tracPublicKey !== wallet.publicKey)) return;
@@ -81,6 +83,7 @@ class Network {
                                 await base.append(msg);
                             }
                         } else {
+                            await connection.destroy();
                             if (base.isIndexer || !base.writable) return;
 
                             // TODO: decide if a tx rejection should be responded with
@@ -118,7 +121,6 @@ class Network {
                                 networkInstance.tx_pool.push({ tx: parsedPreTx.tx, append_tx: append_tx });
                             }
                         }
-                        //await connection.destroy();
                     }catch(e){
                         console.log(e);
                     }