redact update

biome.json

@@ -7,7 +7,7 @@
 	},
 	"files": {
 		"ignoreUnknown": true,
-		"includes": ["src/*", "config/*", "policy/*"]
+		"includes": ["src/**", "config/**", "policy/**"]
 	},
 	"formatter": {
 		"enabled": true,

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@usherlabs/cex-broker",
-	"version": "0.1.11",
+	"version": "0.1.14",
 	"description": "Unified gRPC API to CEXs by Usher Labs.",
 	"repository": "git@gitlab.com:usherlabs/cex-broker.git",
 	"homepage": "https://usher.so/",
@@ -30,7 +30,8 @@
 		"start": "bun run ./src/index.ts",
 		"build": "bun run ./build.ts && bun run build:ts && bun run copy:dts && bun run copy:proto",
 		"start-broker": "bun run ./src/cli.ts",
-		"start-broker-server": "bunx nodemon --watch src --watch policy --ext ts,js,json --exec 'bun run start-broker --policy policy/policy.json --port 8086 --whitelist * --verityProverUrl http://localhost:8080'",
+		"start-broker-server": "bunx nodemon --watch src --watch policy --ext ts,js,json --exec 'bun run start-broker --policy policy/policy.json --port 8086 --whitelistAll'",
+		"start-broker-server-with-verity": "bunx nodemon --watch src --watch policy --ext ts,js,json --exec 'bun run start-broker --policy policy/policy.json --port 8086 --whitelistAll --verityProverUrl http://localhost:8080'",
 		"build:ts": "bunx tsc",
 		"test": "bun test",
 		"format": "bunx biome format --write",
@@ -40,7 +41,6 @@
 		"check:fix": "bunx biome check --write",
 		"copy:dts": "cpx \"build/*.d.ts\" ./dist/",
 		"copy:proto": "cpx \"src/proto/*.proto\" ./dist/proto",
-
 		"prepare": "bunx husky",
 		"postinstall": "./proto-gen.sh"
 	},
@@ -50,7 +50,6 @@
 	"dependencies": {
 		"@grpc/grpc-js": "^1.13.4",
 		"@grpc/proto-loader": "^0.7.15",
-		"@usherlabs/ccxt": "latest",
 		"commander": "^14.0.0",
 		"joi": "^17.13.3",
 		"tslog": "^4.9.3"

src/cli.ts

@@ -14,18 +14,23 @@ program
 		"-w, --whitelist <addresses...>",
 		"IPv4 address whitelist (space-separated list)",
 	)
+	.option("--whitelistAll", "Allow all IPv4 addresses (development mode)")
 	.option("--verityProverUrl <url>", "Verity Prover Url")
 	.action(async (options) => {
 		try {
-			// Optional: Validate IPv4 addresses
-			if (options.whitelist) {
+			const whitelist: string[] = options.whitelistAll
+				? ["*"]
+				: (options.whitelist ?? []);
+
+			// Optional: Validate IPv4 addresses unless wildcard is used
+			if (whitelist.length > 0 && !whitelist.includes("*")) {
 				const isValidIPv4 = (ip: string) =>
 					/^(\d{1,3}\.){3}\d{1,3}$/.test(ip) &&
 					ip
 						.split(".")
 						.every((part) => Number(part) >= 0 && Number(part) <= 255);
 
-				for (const ip of options.whitelist) {
+				for (const ip of whitelist) {
 					if (!isValidIPv4(ip)) {
 						console.error(`❌ Invalid IPv4 address: ${ip}`);
 						process.exit(1);
@@ -36,7 +41,7 @@ program
 			await startBrokerCommand(
 				options.policy,
 				parseInt(options.port, 10),
-				options.whitelist ?? [], // Pass whitelist to your command,
+				whitelist, // Pass whitelist to your command,
 				options.verityProverUrl,
 			);
 		} catch (err) {

src/client.dev.ts

@@ -31,14 +31,14 @@ const client = new grpcObj.cex_broker.cex_service(
 config();
 
 const broker = new CEXBroker({}, loadPolicy("./policy/policy.json"), {
-	useVerity: false,
+	useVerity: true,
 });
 broker.loadEnvConfig();
 broker.run();
 
 const metadata = new grpc.Metadata();
-metadata.add("api-key", process.env.BYBIT_API_KEY ?? ""); // Example header
-metadata.add("api-secret", process.env.BYBIT_API_SECRET ?? "");
+// metadata.add("api-key", process.env.BYBIT_API_KEY ?? ""); // Example header
+// metadata.add("api-secret", process.env.BYBIT_API_SECRET ?? "");
 
 const deadline = new Date();
 deadline.setSeconds(deadline.getSeconds() + 5);
@@ -54,7 +54,7 @@ function onClientReady() {
 	// Test ExecuteAction for ticker
 	client.executeAction(
 		{
-			cex: "binance",
+			cex: "mexc",
 			symbol: "ETHUSDT",
 			action: Action.FetchTicker,
 		},
@@ -71,10 +71,10 @@ function onClientReady() {
 	// Test ExecuteAction for balance
 	client.executeAction(
 		{
-			cex: "bybit",
-			symbol: "USDT",
+			cex: "binance",
+			symbol: "USDT,BTC,ETH",
 			payload: { type: "spot" },
-			action: Action.FetchBalance,
+			action: Action.FetchBalances,
 		},
 		metadata,
 		(err, result) => {

src/commands/start-broker.ts

@@ -1,10 +1,20 @@
-import CEXBroker from '../index';
+import CEXBroker from "../index";
 
 /**
  * CLI Command wrapper to start the CEXBroker
  */
-export async function startBrokerCommand(policyPath: string, port: number,whitelistIps: string[],url: string) {
-    const broker = new CEXBroker({}, policyPath, { port,whitelistIps,verityProverUrl: url });
-    broker.loadEnvConfig();
-    await broker.run();
+export async function startBrokerCommand(
+	policyPath: string,
+	port: number,
+	whitelistIps: string[],
+	verityProverUrl: string,
+) {
+	const broker = new CEXBroker({}, policyPath, {
+		port,
+		whitelistIps,
+		verityProverUrl,
+		useVerity: !!verityProverUrl,
+	});
+	broker.loadEnvConfig();
+	await broker.run();
 }

src/helpers/index.ts

@@ -10,9 +10,9 @@ export function authenticateRequest<T, E>(
 	whitelistIps: string[],
 ): boolean {
 	const clientIp = call.getPeer().split(":")[0];
-	if (whitelistIps.includes("*")){
-		return true
-	}else if (!clientIp || !whitelistIps.includes(clientIp)) {
+	if (whitelistIps.includes("*")) {
+		return true;
+	} else if (!clientIp || !whitelistIps.includes(clientIp)) {
 		log.warn(`Blocked access from unauthorized IP: ${clientIp || "unknown"}`);
 		return false;
 	}
@@ -48,10 +48,10 @@ export function createBroker(
 			recvWindow: 60000,
 		},
 	});
-	
-	if (process.env.CEX_BROKER_SANDBOX_MODE === 'true') {
-      exchange.setSandboxMode(true);
-  }
+
+	if (process.env.CEX_BROKER_SANDBOX_MODE === "true") {
+		exchange.setSandboxMode(true);
+	}
 	exchange.options.recvWindow = 60000;
 	return exchange;
 }

src/helpers/logger.ts

@@ -2,7 +2,7 @@ import { Logger } from "tslog";
 
 const log = new Logger({
 	type: process.env.NODE_ENV === "production" ? "json" : "pretty",
-	stylePrettyLogs: false,
+	stylePrettyLogs: process.env.NODE_ENV !== "production",
 	minLevel: process.env.LOG_LEVEL === "debug" ? 0 : 3,
 });
 

src/index.ts

@@ -92,7 +92,7 @@ export default class CEXBroker {
 		}
 
 		if (Object.keys(configMap).length === 0) {
-			log.error(`❌ NO CEX Broker Key Found`);
+			log.warn(`❌ NO CEX Broker Key Found`);
 		}
 
 		// Finalize config and print result per broker
@@ -229,7 +229,7 @@ export default class CEXBroker {
 			for (const index of Object.keys(creds.secondaryKeys)) {
 				const sec = creds.secondaryKeys[+index];
 				if (!!sec?.apiKey && !!sec?.apiSecret) {
-					secondaryBroker[+index] = new ExchangeClass({
+					const exchange = new ExchangeClass({
 						apiKey: sec.apiKey,
 						secret: sec.apiSecret,
 						enableRateLimit: true,
@@ -242,6 +242,7 @@ export default class CEXBroker {
 							recvWindow: 60000,
 						},
 					});
+					secondaryBroker[+index] = exchange;
 				} else {
 					log.warn(
 						`⚠️ Incomplete secondary credentials for broker "${broker}" at index ${index}`,

src/server.ts

@@ -49,11 +49,12 @@ export function getServer(
 		) => {
 			// Log incoming request
 			log.info(
-				`Request - ExecuteAction: ${JSON.stringify({
+				`Request - ExecuteAction:`,
+				{
 					action: call.request.action,
 					cex: call.request.cex,
 					symbol: call.request.symbol,
-				})}`,
+				}
 			);
 
 			// IP Authentication
@@ -70,11 +71,11 @@ export function getServer(
 			const metadata = call.metadata;
 			const { action, cex, symbol } = call.request;
 			// Validate required fields
-			if (!action || !cex || !symbol) {
+			if (!action || !cex) {
 				return callback(
 					{
 						code: grpc.status.INVALID_ARGUMENT,
-						message: "action, cex, symbol, and cex are required",
+						message: "`action` AND `cex` fields are required",
 					},
 					null,
 				);
@@ -94,6 +95,15 @@ export function getServer(
 				);
 			}
 
+			// Check if Verity is set. If so, set options based on metadata.
+			if (useVerity && broker.useVerity) {
+				const redact = metadata.get("verity-t-redacted")?.[0]?.toString() || "";
+				log.info(`Verity Options: Redact`, { redact });
+				broker.addVerityRequestOptions({
+					redact,
+				});
+			}
+
 			switch (action) {
 				case Action.Deposit: {
 					const transactionSchema = Joi.object({
@@ -160,6 +170,15 @@ export function getServer(
 				}
 
 				case Action.FetchDepositAddresses: {
+					if (!symbol) {
+						return callback(
+							{
+								code: grpc.status.INVALID_ARGUMENT,
+								message: `ValidationError: Symbol requied`,
+							},
+							null,
+						);
+					}
 					const fetchDepositAddressesSchema = Joi.object({
 						chain: Joi.string().required(),
 						params: Joi.object()
@@ -224,6 +243,15 @@ export function getServer(
 					break;
 				}
 				case Action.Transfer: {
+					if (!symbol) {
+						return callback(
+							{
+								code: grpc.status.INVALID_ARGUMENT,
+								message: `ValidationError: Symbol requied`,
+							},
+							null,
+						);
+					}
 					const transferSchema = Joi.object({
 						recipientAddress: Joi.string().required(),
 						amount: Joi.number().positive().required(), // Must be a positive number
@@ -482,9 +510,9 @@ export function getServer(
 						// Fetch balance from the specified CEX
 						const balance = (await broker.fetchFreeBalance({
 							...(call.request.payload ?? {}),
-							// biome-ignore lint/suspicious/noExplicitAny: invalid typing
+							// biome-ignore lint/suspicious/noExplicitAny:  https://github.com/ccxt/ccxt/issues/26327
 						})) as any;
-						const currencyBalance = balance[symbol];
+						const currencyBalance = symbol ? balance[symbol] : balance;
 
 						callback(null, {
 							proof: broker.last_proof || "",
@@ -508,10 +536,9 @@ export function getServer(
 				case Action.FetchBalances:
 					try {
 						// Fetch balance from the specified CEX
-						const balance = (await broker.fetchFreeBalance({
+						const balance = await broker.fetchFreeBalance({
 							...(call.request.payload ?? {}),
-							// biome-ignore lint/suspicious/noExplicitAny: invalid typing
-						})) as any;
+						});
 
 						callback(null, {
 							proof: broker.last_proof || "",
@@ -530,6 +557,15 @@ export function getServer(
 					break;
 
 				case Action.FetchTicker:
+					if (!symbol) {
+						return callback(
+							{
+								code: grpc.status.INVALID_ARGUMENT,
+								message: `ValidationError: Symbol requied`,
+							},
+							null,
+						);
+					}
 					try {
 						const ticker = await broker.fetchTicker(symbol);
 						callback(null, {