Merge remote-tracking branch 'origin/main' into feat/platform-fees

# Conflicts:
#	package.json

src/services/Aggregator/ws/index.ts

@@ -503,6 +503,12 @@ class AggregatorWS {
             minAmountIn: json.ma,
             path: json.ps,
             exchanges: json.e,
+            exchangeContractPath: json.eps.map((path) => ({
+              pool: path.p,
+              assetIn: path.ai,
+              assetOut: path.ao,
+              factory: path.f,
+            })),
             poolOptimal: json.po,
             ...(json.oi) && {
               orderInfo: {

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

@@ -33,6 +33,12 @@ const swapInfoSchemaBase = baseMessageSchema.extend({
   }).optional(),
   as: alternativeSchema.array(),
   anm: z.record(z.string()).optional(), // address to ERC20 names
+  eps: z.array(z.object({
+    p: z.string(), // pool address
+    ai: z.string().toUpperCase(), // asset in
+    ao: z.string().toUpperCase(), // asset out
+    f: z.string().toUpperCase(), // factory
+  }))
 });
 
 const swapInfoSchemaByAmountIn = swapInfoSchemaBase.extend({

src/services/BlockchainService/schemas/atomicHistorySchema.ts

@@ -34,7 +34,7 @@ const sourceAtomicHistorySchemaItem = baseAtomicHistoryItem.extend({
   expiration: z.object({
     lock: z.number().optional(),
   }).optional(),
-  state: z.enum(['BEFORE-LOCK', 'LOCKED', 'REFUNDED', 'CLAIMED']),
+  state: z.enum(['BEFORE-LOCK', 'LOCKED', 'REFUNDED', 'CLAIMED']).optional(),
   targetChainId: z.number(),
   transactions: z.object({
     lock: z.string().optional(),
@@ -51,7 +51,7 @@ const targetAtomicHistorySchemaItem = baseAtomicHistoryItem.extend({
   expiration: z.object({
     redeem: z.number().optional(),
   }).optional(),
-  state: z.enum(['BEFORE-REDEEM', 'REDEEMED']),
+  state: z.enum(['BEFORE-REDEEM', 'REDEEMED']).optional(),
   transactions: z.object({
     redeem: z.string().optional(),
   }).optional(),

src/services/BlockchainService/schemas/infoSchema.ts

@@ -11,6 +11,7 @@ const infoSchema = z.object({
   chainId: z.number(),
   chainName: z.string(),
   exchangeContractAddress: z.string(),
+  swapExecutorContractAddress: z.string(),
   oracleContractAddress: z.string(),
   matcherAddress: z.string(),
   orderFeePercent: z.number(),