Merge pull request #20 from usherlabs/FIET-440

Fiet-440

Author: victorshevtsov

bun.lock

@@ -1,6 +1,6 @@
 {
 	"name": "@usherlabs/cex-broker",
-	"version": "0.1.18",
+	"version": "0.1.19",
 	"description": "Unified gRPC API to CEXs by Usher Labs.",
 	"repository": "git@gitlab.com:usherlabs/cex-broker.git",
 	"homepage": "https://usher.so/",
@@ -50,7 +50,7 @@
 	"dependencies": {
 		"@grpc/grpc-js": "^1.13.4",
 		"@grpc/proto-loader": "^0.7.15",
-		"@usherlabs/ccxt": "^0.0.12",
+		"@usherlabs/ccxt": "^0.0.13",
 		"@usherlabs/verity-client": "^0.1.1",
 		"commander": "^14.0.0",
 		"joi": "^17.13.3",

package.json

@@ -68,21 +68,37 @@ function onClientReady() {
 		},
 	);
 
-	// Test ExecuteAction for balance
+	// Test ExecuteAction for Account ID
 	client.executeAction(
 		{
-			cex: "binance",
-			symbol: "USDT,BTC,ETH",
-			payload: { type: "spot" },
-			action: Action.FetchBalances,
+			cex: "mexc",
+			action: Action.FetchAccountId,
 		},
 		metadata,
 		(err, result) => {
 			if (err) {
 				log.error({ err });
 				return;
 			}
-			log.info("ExecuteAction Balance Result:", { result });
+			log.info("ExecuteAction  Result:", { result: result?.result });
 		},
 	);
+
+	// // Test ExecuteAction for balance
+	// client.executeAction(
+	// 	{
+	// 		cex: "binance",
+	// 		symbol: "USDT,BTC,ETH",
+	// 		payload: { type: "spot" },
+	// 		action: Action.FetchBalances,
+	// 	},
+	// 	metadata,
+	// 	(err, result) => {
+	// 		if (err) {
+	// 			log.error({ err });
+	// 			return;
+	// 		}
+	// 		log.info("ExecuteAction Balance Result:", { result });
+	// 	},
+	// );
 }

src/client.dev.ts

@@ -9,4 +9,5 @@ export const CCXT_METHODS_WITH_VERITY = [
 	"fetchFundingHistory",
 	"fetchWithdrawals",
 	"fetchWithdrawal",
+	"fetchAccountId",
 ];

src/helpers/constants.ts

@@ -55,4 +55,5 @@ enum Action {
   FetchTicker=8;
   FetchCurrency=9;
   Call=10;
+  FetchAccountId=11;
 }

src/proto/node.proto

@@ -212,6 +212,62 @@ export function getServer(
 					}
 					break;
 				}
+				case Action.FetchAccountId: {
+					try {
+						let accountId: string | undefined;
+						let uid: string | undefined;
+
+						const temp_broker = broker as any;
+
+						// 1. Bybit-style method?
+						if (typeof temp_broker.privateGetV5UserQueryApi === "function") {
+							const query = await temp_broker.privateGetV5UserQueryApi();
+							if (!query?.id || !query?.userID) {
+								throw new Error("Invalid response structure from privateGetV5UserQueryApi");
+							}
+							accountId = query.id;
+							uid = query.userID;
+							// 2. MEXC-style method?
+						} else if (typeof temp_broker.spotPrivateGetUid === "function") {
+							const query = await temp_broker.spotPrivateGetUid();
+							accountId = query.uid;
+							uid = query.uid;
+
+							// 3. Binance-style method?
+						} else if (typeof temp_broker.privateGetAccount === "function") {
+							const query = await temp_broker.privateGetAccount();
+							accountId = query.uid;
+							uid = query.uid;
+
+							// 4. None matched → unsupported exchange
+						} else {
+							return callback(
+								{
+									code: grpc.status.INTERNAL,
+									message:
+										"Error: fetching account ID not supported for this broker",
+								},
+								null,
+							);
+						}
+
+						// Return normalized response
+						return callback(null, {
+							proof: verityProof,
+							result: JSON.stringify({ accountId, uid }),
+						});
+					} catch (error) {
+						log.error(`Error fetching account ID ${cex}:`, error);
+						callback(
+							{
+								code: grpc.status.INTERNAL,
+								message: `Error fetching account ID from ${cex}`,
+							},
+							null,
+						);
+					}
+					break;
+				}
 
 				case Action.Call: {
 					const callSchema = Joi.object({
@@ -374,15 +430,15 @@ export function getServer(
 						const depositAddresses =
 							broker.has.fetchDepositAddress === true
 								? [
-										await broker.fetchDepositAddress(symbol, {
-											network: fetchDepositAddresses.chain,
-											...(fetchDepositAddresses.params ?? {}),
-										}),
-									]
-								: await broker.fetchDepositAddressesByNetwork(symbol, {
+									await broker.fetchDepositAddress(symbol, {
 										network: fetchDepositAddresses.chain,
 										...(fetchDepositAddresses.params ?? {}),
-									});
+									}),
+								]
+								: await broker.fetchDepositAddressesByNetwork(symbol, {
+									network: fetchDepositAddresses.chain,
+									...(fetchDepositAddresses.params ?? {}),
+								});
 
 						if (depositAddresses.length > 0) {
 							return callback(null, {