trac-msb 0.1.34 → 0.1.36

package/msb.mjs

@@ -4,7 +4,7 @@ const opts = {
     stores_directory : 'stores/',
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
     bootstrap: '19a12e9bdaf1cd9ae8169fd87f3d6d63d441c046e37e2ac6c3c36bcb87c59019',
-    channel: '0000tracnetworkmainsettlementbus',
+    channel: '0000tracnetworkmainsettlementbus'
 };
 
 const msb = new MainSettlementBus(opts);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -12,7 +12,7 @@
     "test": "brittle test/*.test.js"
   },
   "dependencies": {
-    "trac-wallet": "^0.0.43",
+    "trac-wallet": "0.0.43",
     "hyperbee": "2.24.2",
     "hypercore": "11.6.2",
     "corestore": "7.4.1",
@@ -21,7 +21,7 @@
     "hyperdht": "6.20.5",
     "hyperswarm": "4.11.5",
     "b4a": "1.6.7",
-    "ready-resource": "^1.0.0",
+    "ready-resource": "1.1.2",
     "bare-readline": "1.0.7",
     "readline": "npm:bare-node-readline",
     "bare-tty": "5.0.2",

package/src/index.js

@@ -55,6 +55,7 @@ export class MainSettlementBus extends ReadyResource {
     #signature_whitelist;
     #readline_instance;
     #enable_txlogs;
+    #disable_rate_limit;
 
     constructor(options = {}) {
         super();
@@ -85,6 +86,7 @@ export class MainSettlementBus extends ReadyResource {
         this.#enable_txlogs = options.enable_txlogs === true;
         this.#enable_updater = options.enable_updater !== false;
         this.#enable_wallet = options.enable_wallet !== false;
+        this.#disable_rate_limit = options.disable_rate_limit === true;
         this.#wallet = new PeerWallet(options);
         this.#replicate = options.replicate !== false;
         this.#signature_whitelist = options.signature_whitelist !== undefined && Array.isArray(options.signature_whitelist) ? options.signature_whitelist : [];
@@ -423,7 +425,7 @@ export class MainSettlementBus extends ReadyResource {
 
         console.log('');
         if (this.#replicate) {
-            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.#swarm = await Network.replicate(this.#disable_rate_limit, 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

@@ -25,7 +25,7 @@ class Network {
     }
 
 
-    static async replicate(msb, network, enable_txchannel, base, writingKey, bootstrap, swarm, walletEnabled, store, wallet, channel, isStreaming, handleIncomingEvent, emit) {
+    static async replicate(disable_rate_limit, msb, network, enable_txchannel, base, writingKey, bootstrap, swarm, walletEnabled, store, wallet, channel, isStreaming, handleIncomingEvent, emit) {
         if (!swarm) {
 
             let keyPair;
@@ -38,6 +38,9 @@ class Network {
                 };
             }
 
+            let clean = Date.now();
+            let conns = {};
+
             swarm = new Hyperswarm({ keyPair, bootstrap : bootstrap, maxPeers: MAX_PEERS, maxParallel: MAX_PARALLEL, maxServerConnections: MAX_SERVER_CONNECTIONS, maxClientConnections :  MAX_CLIENT_CONNECTIONS});
 
             console.log(`Channel: ${b4a.toString(channel)}`);
@@ -86,6 +89,33 @@ class Network {
                             else {
                                 if (base.isIndexer || !base.writable) return;
 
+                                if(true !== disable_rate_limit)
+                                {
+                                    const peer = b4a.toString(connection.remotePublicKey, 'hex');
+                                    const _now = Date.now();
+
+                                    if(_now - clean >= 120_000) {
+                                        clean = _now;
+                                        conns = {};
+                                    }
+
+                                    if(conns[peer] === undefined){
+                                        conns[peer] = { prev : _now, now: 0, tx_cnt : 0 }
+                                    }
+
+                                    conns[peer].now = _now;
+                                    conns[peer].tx_cnt += 1;
+
+                                    if(conns[peer].now - conns[peer].prev >= 60_000){
+                                        delete conns[peer];
+                                    }
+
+                                    if(conns[peer] !== undefined && conns[peer].now - conns[peer].prev >= 1000 && conns[peer].tx_cnt >= 50){
+                                        swarm.leavePeer(connection.remotePublicKey);
+                                        connection.end()
+                                    }
+                                }
+
                                 if (network.tx_pool.length >= 1000) {
                                     console.log('pool full');
                                     return
@@ -143,13 +173,13 @@ class Network {
                 const length = this.tx_pool.length;
                 const batch = [];
                 for (let i = 0; i < length; i++) {
-                    if (i >= 100) break;
+                    if (i >= 10) break;
                     batch.push({ type: OperationType.TX, key: this.tx_pool[i].tx, value: this.tx_pool[i].append_tx });
                 }
                 await base.append(batch);
                 this.tx_pool.splice(0, batch.length);
             }
-            await sleep(10);
+            await sleep(5);
         }
     }
 }