chore: keep the old behavior

Signed-off-by: Victor Yanev <victor.yanev@limechain.tech>
hashgraph · Dec 17, 2024 · e3fc142 · e3fc142
1 parent be1b4f8
commit e3fc142
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/packages/relay/src/lib/services/hapiService/hapiService.ts b/packages/relay/src/lib/services/hapiService/hapiService.ts
@@ -324,8 +324,10 @@ export default class HAPIService {
       client = Client.forNetwork(JSON.parse(hederaNetwork));
     }
 
-    const operator = Utils.getOperator(type);
-    client.setOperator(operator.accountId, operator.privateKey);
+    const operator = Utils.getOperator(logger, type);
+    if (operator) {
+      client.setOperator(operator.accountId, operator.privateKey);
+    }
 
     // @ts-ignore
     client.setTransportSecurity(ConfigService.get('CLIENT_TRANSPORT_SECURITY') ?? false);

diff --git a/packages/relay/src/lib/services/hbarLimitService/index.ts b/packages/relay/src/lib/services/hbarLimitService/index.ts
@@ -18,7 +18,7 @@
  *
  */
 
-import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
+import { zeroAddress } from '@ethereumjs/util';
 import { AccountId, Hbar } from '@hashgraph/sdk';
 import { Logger } from 'pino';
 import { Counter, Gauge, Registry } from 'prom-client';
@@ -99,8 +99,12 @@ export class HbarLimitService implements IHbarLimitService {
   ) {
     this.reset = this.getResetTimestamp();
 
-    const operator = Utils.getOperator();
-    this.operatorAddress = prepend0x(AccountId.fromString(operator.accountId.toString()).toSolidityAddress());
+    const operator = Utils.getOperator(logger);
+    if (operator) {
+      this.operatorAddress = prepend0x(AccountId.fromString(operator.accountId.toString()).toSolidityAddress());
+    } else {
+      this.operatorAddress = zeroAddress();
+    }
 
     const totalBudget = HbarLimitService.TIER_LIMITS[SubscriptionTier.OPERATOR];
     if (totalBudget.toTinybars().lte(0)) {

diff --git a/packages/relay/src/utils.ts b/packages/relay/src/utils.ts
@@ -141,10 +141,11 @@ export class Utils {
 
   /**
    * Gets operator credentials based on the provided type.
+   * @param {Logger} logger - The logger instance
    * @param {string | null} type - The type of operator (e.g. 'eth_sendRawTransaction')
-   * @returns {Operator} The operator credentials
+   * @returns {Operator | null} The operator credentials or null if not found
    */
-  public static getOperator(type: string | null = null): Operator {
+  public static getOperator(logger: Logger, type: string | null = null): Operator | null {
     let operatorId: string;
     let operatorKey: string;
 
@@ -157,7 +158,8 @@ export class Utils {
     }
 
     if (!operatorId || !operatorKey) {
-      throw new Error(`Invalid operatorId or operatorKey for ${type ?? 'main'} client.`);
+      logger.warn(`Invalid operatorId or operatorKey for ${type ?? 'main'} client.`);
+      return null;
     }
 
     return {