trac-msb 0.2.8 → 0.2.10

package/src/core/network/services/TransactionRateLimiterService.js

@@ -1,24 +1,23 @@
 import b4a from 'b4a';
-import {
-    CLEANUP_INTERVAL_MS,
-    CONNECTION_TIMEOUT_MS,
-    MAX_TRANSACTIONS_PER_SECOND
-} from '../../../utils/constants.js';
 
 class TransactionRateLimiterService {
     #lastCleanup;
     #connectionsStatistics;
+    #swarm;
+    #config;
 
-    constructor() {
+    constructor(swarm, config) {
         this.#lastCleanup = Date.now();
         this.#connectionsStatistics = new Map();
+        this.#swarm = swarm
+        this.#config = config
     }
 
     /*
         Checks if the peer has exceeded the rate limit.
         A peer is considered to have exceeded the rate limit if:
         - The time since the last activity is greater than or equal to 1000 ms (1 second)
-        - The number of transactions in the current session is greater than or equal to MAX_TRANSACTIONS_PER_SECOND
+        - The number of transactions in the current session is greater than or equal to rateLimitMaxTransactionsPerSecond
         If the rate limit is exceeded, the peer is disconnected.
     */
     #hasExceededRateLimit(peer) {
@@ -31,7 +30,7 @@ class TransactionRateLimiterService {
             this.#connectionsStatistics.set(peer, peerData);
         }
         
-        return peerData.transactionCount >= MAX_TRANSACTIONS_PER_SECOND;
+        return peerData.transactionCount >= this.#config.rateLimitMaxTransactionsPerSecond;
     }
 
     /*
@@ -39,7 +38,7 @@ class TransactionRateLimiterService {
         If the peer has exceeded the rate limit, it disconnects the peer.
         Otherwise, it updates the connection info with the current timestamp.
     */
-    handleRateLimit(connection, network) {
+    handleRateLimit(connection) {
         const peer = b4a.toString(connection.remotePublicKey, 'hex');
         const currentTime = Date.now();
 
@@ -53,7 +52,7 @@ class TransactionRateLimiterService {
 
         if (this.#hasExceededRateLimit(peer)) {
             console.warn(`Rate limit exceeded for peer ${peer}. Disconnecting...`);
-            network.swarm.leavePeer(connection.remotePublicKey);
+            this.#swarm.leavePeer(connection.remotePublicKey);
             connection.end();
             return true;
         }
@@ -63,13 +62,13 @@ class TransactionRateLimiterService {
     }
 
     #shouldCleanupConnections(currentTime) {
-        return currentTime - this.#lastCleanup >= CLEANUP_INTERVAL_MS;
+        return currentTime - this.#lastCleanup >= this.#config.rateLimitCleanupIntervalMs;
     }
 
     /**
         Cleans up old connections that have timed out.
         Condition for cleanup based on #shouldCleanupConnections:
-        - If the last cleanup was more than CLEANUP_INTERVAL_MS ago
+        - If the last cleanup was more than rateLimitCleanupIntervalMs ago
     */
     #cleanUpOldConnections(currentTime) {
         if (!this.#shouldCleanupConnections(currentTime)) {
@@ -123,7 +122,7 @@ class TransactionRateLimiterService {
     */
     #isConnectionExpired(peer) {
         const peerData = this.#connectionsStatistics.get(peer);
-        return peerData.lastActivityTime - peerData.sessionStartTime >= CONNECTION_TIMEOUT_MS;
+        return peerData.lastActivityTime - peerData.sessionStartTime >= this.#config.rateLimitConnectionTimeoutMs;
     }
 }
 

package/src/core/network/services/ValidatorObserverService.js

@@ -1,6 +1,5 @@
 import PeerWallet from "trac-wallet";
 import b4a from "b4a";
-import { MAX_WRITERS_FOR_ADMIN_INDEXER_CONNECTION } from '../../../utils/constants.js';
 import { bufferToAddress } from '../../state/utils/address.js';
 import { sleep } from '../../../utils/helpers.js';
 import Scheduler from "../../../utils/Scheduler.js";
@@ -31,7 +30,7 @@ class ValidatorObserverService {
      * @param {Network} network
      * @param {State} state
      * @param {string} address
-     * @param {object} config
+     * @param {Config} config
      **/
     constructor(network, state, address, config) {
         this.#config = config
@@ -132,7 +131,7 @@ class ValidatorObserverService {
         const validatorPubKeyHex = validatorPubKeyBuffer.toString('hex');
         const adminEntry = await this.state.getAdminEntry();
 
-        if (validatorAddress !== adminEntry?.address || validatorListLength < MAX_WRITERS_FOR_ADMIN_INDEXER_CONNECTION) {
+        if (validatorAddress !== adminEntry?.address || validatorListLength < this.#config.maxWritersForAdminIndexerConnection) {
             this.#network.tryConnect(validatorPubKeyHex, 'validator');
         }
     };
@@ -151,7 +150,7 @@ class ValidatorObserverService {
             return false;
         }
 
-        if (validatorAddress === adminEntry?.address && validatorListLength >= MAX_WRITERS_FOR_ADMIN_INDEXER_CONNECTION) {
+        if (validatorAddress === adminEntry?.address && validatorListLength >= this.#config.maxWritersForAdminIndexerConnection) {
             if (this.#network.validatorConnectionManager.exists(validatorPubKeyBuffer)) {
                 this.#network.validatorConnectionManager.remove(validatorPubKeyBuffer)
             }
@@ -161,12 +160,12 @@ class ValidatorObserverService {
         // - Cannot connect if already connected to a validator
         // - Validator must exist and be a writer
         // - Cannot connect to indexers, except for admin-indexer
-        // - Admin-indexer connection is allowed only when writers length has less than 10 writers
+        // - Admin-indexer connection is allowed only when writers length is below maxWritersForAdminIndexerConnection
         if (this.#network.validatorConnectionManager.connected(validatorPubKeyBuffer) ||
             this.#network.validatorConnectionManager.maxConnectionsReached() ||
             validatorEntry === null ||
             !validatorEntry.isWriter ||
-            (validatorEntry.isIndexer && (validatorAddress !== adminEntry?.address || validatorListLength >= MAX_WRITERS_FOR_ADMIN_INDEXER_CONNECTION))
+            (validatorEntry.isIndexer && (validatorAddress !== adminEntry?.address || validatorListLength >= this.#config.maxWritersForAdminIndexerConnection))
         ) {
             return false;
         }

package/src/core/state/State.js

@@ -12,7 +12,6 @@ import {
     HYPERBEE_VALUE_ENCODING,
     BATCH_SIZE,
     ADMIN_INITIAL_STAKED_BALANCE,
-    MAX_WRITERS_FOR_ADMIN_INDEXER_CONNECTION,
     TRAC_NAMESPACE,
     CustomEventType
 } from '../../utils/constants.js';
@@ -58,7 +57,7 @@ class State extends ReadyResource {
     /**
      * @param {Corestore} store
      * @param {PeerWallet} wallet
-     * @param {object} config
+     * @param {Config} config
      **/
     constructor(store, wallet, config) {
         super();
@@ -178,7 +177,7 @@ class State extends ReadyResource {
     async isAdminAllowedToValidate() {
         const isAdmin = this.writingKey.toString('hex') === this.#config.bootstrap.toString('hex');
         const isIndexer = this.isIndexer();
-        const lengthCondition = await this.getWriterLength() <= MAX_WRITERS_FOR_ADMIN_INDEXER_CONNECTION;
+        const lengthCondition = await this.getWriterLength() <= this.#config.maxWritersForAdminIndexerConnection;
         return !!(isAdmin && isIndexer && lengthCondition);
     }
 
@@ -201,8 +200,7 @@ class State extends ReadyResource {
     }
 
     async getIndexersEntry() {
-        const indexersEntry = Object.values(this.#base.system.indexers);
-        return indexersEntry
+        return Object.values(this.#base.system.indexers);
     }
 
     async isWkInIndexersEntry(wk) {