Merge branch 'refs/heads/main' into feat/OP-4308-cross-chain-swap

# Conflicts:
#	package-lock.json
#	package.json

src/services/Aggregator/schemas/swapInfoSchema.ts

@@ -13,6 +13,8 @@ const exchangeContractStep = z.object({
   assetIn: z.string(),
   assetOut: z.string(),
   factory: z.string(),
+  assetAddressIn: z.string(),
+  assetAddressOut: z.string(),
 });
 
 const swapInfoBase = z.object({

src/services/Aggregator/ws/index.ts

@@ -518,6 +518,9 @@ class AggregatorWS {
               assetIn: path.ai,
               assetOut: path.ao,
               factory: path.f,
+              assetAddressIn: path.aai,
+              assetAddressOut: path.aao,
+              fee: path.fee,
             })),
             poolOptimal: json.po,
             ...(json.oi) && {

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

@@ -40,6 +40,9 @@ const swapInfoSchemaBase = baseMessageSchema.extend({
     ai: z.string().toUpperCase(), // asset in
     ao: z.string().toUpperCase(), // asset out
     f: factorySchema, // factory
+    aai: z.string(), // asset address in
+    aao: z.string(), // asset address out
+    fee: z.number().optional(), // fee
   })),
   usd: z.object({ // USD info of this swap, nullable
     aa: z.number().optional(), // available amount in, USD