Merge branch 'develop'

Author: rsoury

src/helpers/index.ts

@@ -295,24 +295,37 @@ export function loadPolicy(policyPath: string): PolicyConfig {
 			);
 		}
 
-		const normalizedPolicy = value as PolicyConfig;
-		normalizedPolicy.withdraw.rule = normalizedPolicy.withdraw.rule.map(
-			(rule) => ({
-				...rule,
-				exchange: rule.exchange.trim().toUpperCase(),
-				network: rule.network.trim().toUpperCase(),
-				whitelist: rule.whitelist.map((a) => a.trim().toLowerCase()),
-			}),
-		);
-		normalizedPolicy.order.rule.limits =
-			normalizedPolicy.order.rule.limits ?? [];
-		return normalizedPolicy;
+		return normalizePolicyConfig(value as PolicyConfig);
 	} catch (error) {
 		console.error("Failed to load policy:", error);
 		throw new Error("Policy configuration could not be loaded");
 	}
 }
 
+export function normalizePolicyConfig(policy: PolicyConfig): PolicyConfig {
+	return {
+		...policy,
+		withdraw: {
+			...policy.withdraw,
+			rule: policy.withdraw.rule.map((rule) => ({
+				...rule,
+				exchange: rule.exchange.trim().toUpperCase(),
+				network: rule.network.trim().toUpperCase(),
+				whitelist: rule.whitelist.map((address) =>
+					address.trim().toLowerCase(),
+				),
+			})),
+		},
+		order: {
+			...policy.order,
+			rule: {
+				...policy.order.rule,
+				limits: policy.order.rule.limits ?? [],
+			},
+		},
+	};
+}
+
 /**
  * Validates withdraw request against policy rules
  */
@@ -346,9 +359,10 @@ export function validateWithdraw(
 	_amount: number,
 	_ticker: string,
 ): { valid: boolean; error?: string } {
+	const normalizedPolicy = normalizePolicyConfig(policy);
 	const exchangeNorm = exchange.trim().toUpperCase();
 	const networkNorm = network.trim().toUpperCase();
-	const matchingRules = policy.withdraw.rule
+	const matchingRules = normalizedPolicy.withdraw.rule
 		.map((rule) => ({
 			rule,
 			priority: getWithdrawRulePriority(rule, exchangeNorm, networkNorm),
@@ -358,7 +372,7 @@ export function validateWithdraw(
 	const withdrawRule = matchingRules[0]?.rule;
 
 	if (!withdrawRule) {
-		const allowedPairs = policy.withdraw.rule.map(
+		const allowedPairs = normalizedPolicy.withdraw.rule.map(
 			(r) => `${r.exchange}:${r.network}`,
 		);
 		return {

src/index.ts

@@ -2,7 +2,7 @@ import * as grpc from "@grpc/grpc-js";
 import ccxt, { type Exchange } from "@usherlabs/ccxt";
 import { unwatchFile, watchFile } from "fs";
 import Joi from "joi";
-import { createBrokerPool, loadPolicy } from "./helpers";
+import { createBrokerPool, loadPolicy, normalizePolicyConfig } from "./helpers";
 import { log } from "./helpers/logger";
 import {
 	createOtelLogsFromEnv,
@@ -164,7 +164,7 @@ export default class CEXBroker {
 			this.policy = loadPolicy(policies);
 			this.port = config?.port ?? 8086;
 		} else {
-			this.policy = policies;
+			this.policy = normalizePolicyConfig(policies);
 		}
 
 		// If monitoring a file, start watcher