merge with main

src/services/Aggregator/schemas/orderSchema.ts

@@ -87,6 +87,7 @@ const subOrderSchema = baseOrderSchema.extend({
     message: `subOrder.parentOrderId must be a hex string, got ${value}`,
   })),
   exchange: z.string(),
+  exchanges: z.string().array().optional(),
   brokerAddress: brokerAddressSchema,
   tradesInfo: z.record(
     z.string().uuid(),

src/services/Aggregator/ws/schemas/addressUpdateSchema.ts

@@ -23,6 +23,7 @@ const subOrderSchema = z.object({
   A: z.number(), // settled amount
   p: z.number(), // avg weighed settlement price
   e: z.string(), // exchange
+  es: z.string().array().optional(), // exchanges
   b: z.string(), // broker address
   S: z.enum(subOrderStatuses), // status
   o: z.boolean(), // internal only
@@ -52,6 +53,7 @@ export const orderUpdateSchema = z.object({
     subOrders: o.c.map((so) => ({
       pair: so.P,
       exchange: so.e,
+      exchanges: so.es,
       id: so.i,
       amount: so.a,
       settledAmount: so.A,
@@ -106,6 +108,7 @@ export const fullOrderSchema = z.object({
   subOrders: o.c.map((so) => ({
     pair: so.P,
     exchange: so.e,
+    exchangs: so.es,
     id: so.i,
     amount: so.a,
     settledAmount: so.A,

src/services/BlockchainService/index.ts

@@ -59,6 +59,13 @@ type AtomicSwapHistoryTargetQuery = AtomicSwapHistoryBaseQuery & {
   expiredRedeem?: 0 | 1
   state?: 'REDEEMED' | 'BEFORE-REDEEM'
 }
+
+type PlatformFees = {
+  assetIn: string
+  assetOut: string
+  walletAddress?: string | undefined
+  fromWidget?: string | undefined
+}
 class BlockchainService {
   private readonly apiUrl: string;
 
@@ -231,23 +238,17 @@ class BlockchainService {
     { headers: this.basicAuthHeaders }
   );
 
-  getPlatformFees = (
-    { assetIn, assetOut, walletAddress, fromWidget }: {
-      assetIn?: string | undefined,
-      assetOut?: string | undefined,
-      walletAddress?: string | undefined,
-      fromWidget?: string | undefined
-    }
+  getPlatformFees = ({
+    assetIn,
+    assetOut,
+    walletAddress,
+    fromWidget
+  }: PlatformFees
   ) => {
     const url = new URL(`${this.apiUrl}/api/platform-fees`);
 
-    if (assetIn !== undefined) {
-      url.searchParams.append('assetIn', assetIn);
-    }
-
-    if (assetOut !== undefined) {
-      url.searchParams.append('assetOut', assetOut);
-    }
+    url.searchParams.append('assetIn', assetIn);
+    url.searchParams.append('assetOut', assetOut);
 
     if (walletAddress !== undefined) {
       url.searchParams.append('walletAddress', walletAddress);