@cetusprotocol/aggregator-sdk 0.0.0-experimental-20250724183511 → 0.0.0-experimental-20250729170433

package/dist/index.d.mts

@@ -129,7 +129,6 @@ type RouterData = {
 type FlattenedPath = {
     path: Path;
     isLastUseOfIntermediateToken: boolean;
-    executionOrder: number;
 };
 type ProcessedRouterData = {
     quoteID: string;

package/dist/index.d.ts

@@ -129,7 +129,6 @@ type RouterData = {
 type FlattenedPath = {
     path: Path;
     isLastUseOfIntermediateToken: boolean;
-    executionOrder: number;
 };
 type ProcessedRouterData = {
     quoteID: string;

package/dist/index.js

@@ -6093,11 +6093,12 @@ var restituteMsafeFastRouterSwapParams = (data) => {
 function printTransaction(tx, isPrint = true) {
   return __async(this, null, function* () {
     console.log(`inputs`, tx.getData().inputs);
-    let i = 0;
     tx.getData().commands.forEach((item, index) => {
-      if (isPrint && i < 15) {
-        console.log(`transaction ${index}: `, JSON.stringify(item, bigIntReplacer, 2));
-        i++;
+      if (isPrint) {
+        console.log(
+          `transaction ${index}: `,
+          JSON.stringify(item, bigIntReplacer, 2)
+        );
       }
     });
   });
@@ -6130,7 +6131,7 @@ function parseRouterResponse(data, byAmountIn) {
     }
   }
   return {
-    quoteID: data.quote_id || "",
+    quoteID: data.request_id || "",
     amountIn: new import_bn4.default(data.amount_in.toString()),
     amountOut: new import_bn4.default(data.amount_out.toString()),
     byAmountIn,
@@ -6390,68 +6391,27 @@ function sortAndFlattenRoutes(routerData) {
       }
     }
   }
-  for (const route of routerData.routes) {
-    for (let i = 0; i < route.path.length - 1; i++) {
-      const currentPath = route.path[i];
-      const nextPath = route.path[i + 1];
-      const currentPoolDirectionKey = createPoolDirectionKey(
-        currentPath.id,
-        currentPath.direction
-      );
-      const nextPoolDirectionKey = createPoolDirectionKey(
-        nextPath.id,
-        nextPath.direction
-      );
-      pathDependencies.get(nextPoolDirectionKey).add(currentPoolDirectionKey);
-    }
-  }
-  if (process.env.NODE_ENV === "development") {
-    console.log("Route merging dependency graph:");
-    for (const [poolDirectionKey, deps] of pathDependencies) {
-      if (deps.size > 0) {
-        console.log(
-          `  ${poolDirectionKey} depends on: [${Array.from(deps).join(", ")}]`
-        );
-      } else {
-        console.log(`  ${poolDirectionKey} has no dependencies`);
-      }
-    }
-  }
-  const mergedPaths = /* @__PURE__ */ new Map();
-  for (const [poolDirectionKey, paths] of pathUsageMap) {
-    const firstPath = paths[0];
-    const totalAmountIn = paths.reduce((sum2, path) => {
-      return new import_bn4.default(sum2).add(new import_bn4.default(path.amountIn)).toString();
-    }, "0");
-    mergedPaths.set(poolDirectionKey, __spreadProps(__spreadValues({}, firstPath), {
-      amountIn: totalAmountIn
-    }));
-  }
-  const sortedPoolDirectionKeys = topologicalSortKahn(pathDependencies);
-  if (process.env.NODE_ENV === "development") {
-    console.log("Topological sort execution order:", sortedPoolDirectionKeys);
-  }
   const flattenedPaths = [];
-  let executionOrder = 0;
-  for (const poolDirectionKey of sortedPoolDirectionKeys) {
-    const path = mergedPaths.get(poolDirectionKey);
+  if (routerData.routes.length !== 1) {
+    console.warn(
+      "Multiple routes detected, merging paths may lead to unexpected results"
+    );
+  }
+  const paths = routerData.routes[0].path;
+  for (const path of paths) {
     flattenedPaths.push({
       path,
-      isLastUseOfIntermediateToken: false,
-      // Will be set in second pass
-      executionOrder: executionOrder++
+      isLastUseOfIntermediateToken: false
     });
   }
-  const lastOccurrenceIndex = /* @__PURE__ */ new Map();
-  for (let i = 0; i < flattenedPaths.length; i++) {
+  const seenTokens = /* @__PURE__ */ new Map();
+  for (let i = flattenedPaths.length - 1; i >= 0; i--) {
     const { from } = flattenedPaths[i].path;
-    if (from !== fromCoinType) {
-      lastOccurrenceIndex.set(from, i);
+    if (from !== fromCoinType && !seenTokens.has(from)) {
+      seenTokens.set(from, true);
+      flattenedPaths[i].isLastUseOfIntermediateToken = true;
     }
   }
-  for (const [_tokenType, lastIndex] of lastOccurrenceIndex) {
-    flattenedPaths[lastIndex].isLastUseOfIntermediateToken = true;
-  }
   return {
     quoteID: routerData.quoteID || "",
     amountIn: routerData.amountIn,
@@ -6466,54 +6426,6 @@ function sortAndFlattenRoutes(routerData) {
     overlayFee: routerData.overlayFee
   };
 }
-function topologicalSortKahn(dependencies) {
-  const inDegree = /* @__PURE__ */ new Map();
-  const graph = /* @__PURE__ */ new Map();
-  for (const [nodeId] of dependencies) {
-    inDegree.set(nodeId, 0);
-    graph.set(nodeId, /* @__PURE__ */ new Set());
-  }
-  for (const [nodeId, deps] of dependencies) {
-    for (const depId of deps) {
-      if (!graph.has(depId)) {
-        graph.set(depId, /* @__PURE__ */ new Set());
-        inDegree.set(depId, 0);
-      }
-      graph.get(depId).add(nodeId);
-      inDegree.set(nodeId, (inDegree.get(nodeId) || 0) + 1);
-    }
-  }
-  const queue = [];
-  for (const [nodeId, degree] of inDegree) {
-    if (degree === 0) {
-      queue.push(nodeId);
-    }
-  }
-  const result = [];
-  while (queue.length > 0) {
-    const nodeId = queue.shift();
-    result.push(nodeId);
-    const neighbors = graph.get(nodeId) || /* @__PURE__ */ new Set();
-    for (const neighbor of neighbors) {
-      const newDegree = inDegree.get(neighbor) - 1;
-      inDegree.set(neighbor, newDegree);
-      if (newDegree === 0) {
-        queue.push(neighbor);
-      }
-    }
-  }
-  if (result.length !== dependencies.size) {
-    const remainingNodes = Array.from(dependencies.keys()).filter(
-      (nodeId) => !result.includes(nodeId)
-    );
-    throw new Error(
-      `Circular dependency detected in route merging. Remaining nodes: ${remainingNodes.join(
-        ", "
-      )}`
-    );
-  }
-  return result;
-}
 
 // src/utils/aggregator-config.ts
 var AggregatorConfig2 = class {
@@ -10685,8 +10597,10 @@ var AggregatorClientV3 = class extends AggregatorClient {
       throw new Error(CLIENT_CONFIG.ERRORS.QUOTE_ID_REQUIRED);
     }
     const processedData = sortAndFlattenRoutes(routerData);
-    console.log("expectAmountOut", expectAmountOut);
-    console.log("amountOutLimit", amountOutLimit);
+    console.log(
+      "processedData.flattenedPaths",
+      JSON.stringify(processedData.flattenedPaths, null, 2)
+    );
     const swapCtx = newSwapContext(
       {
         quoteID: processedData.quoteID,
@@ -10823,9 +10737,6 @@ var AggregatorClientV3 = class extends AggregatorClient {
         byAmountIn,
         slippage
       );
-      console.log("expectedAmountOut", expectedAmountOut.toString());
-      console.log("expectedAmountIn", expectedAmountIn.toString());
-      console.log("amountLimit", amountLimit.toString());
       if (!params.routers.packages || !params.routers.packages.get(PACKAGE_NAMES.AGGREGATOR_V3)) {
         throw new Error(CLIENT_CONFIG.ERRORS.PACKAGES_REQUIRED);
       }

package/dist/index.mjs

@@ -6087,11 +6087,12 @@ var restituteMsafeFastRouterSwapParams = (data) => {
 function printTransaction(tx, isPrint = true) {
   return __async(this, null, function* () {
     console.log(`inputs`, tx.getData().inputs);
-    let i = 0;
     tx.getData().commands.forEach((item, index) => {
-      if (isPrint && i < 15) {
-        console.log(`transaction ${index}: `, JSON.stringify(item, bigIntReplacer, 2));
-        i++;
+      if (isPrint) {
+        console.log(
+          `transaction ${index}: `,
+          JSON.stringify(item, bigIntReplacer, 2)
+        );
       }
     });
   });
@@ -6124,7 +6125,7 @@ function parseRouterResponse(data, byAmountIn) {
     }
   }
   return {
-    quoteID: data.quote_id || "",
+    quoteID: data.request_id || "",
     amountIn: new import_bn4.default(data.amount_in.toString()),
     amountOut: new import_bn4.default(data.amount_out.toString()),
     byAmountIn,
@@ -6384,68 +6385,27 @@ function sortAndFlattenRoutes(routerData) {
       }
     }
   }
-  for (const route of routerData.routes) {
-    for (let i = 0; i < route.path.length - 1; i++) {
-      const currentPath = route.path[i];
-      const nextPath = route.path[i + 1];
-      const currentPoolDirectionKey = createPoolDirectionKey(
-        currentPath.id,
-        currentPath.direction
-      );
-      const nextPoolDirectionKey = createPoolDirectionKey(
-        nextPath.id,
-        nextPath.direction
-      );
-      pathDependencies.get(nextPoolDirectionKey).add(currentPoolDirectionKey);
-    }
-  }
-  if (process.env.NODE_ENV === "development") {
-    console.log("Route merging dependency graph:");
-    for (const [poolDirectionKey, deps] of pathDependencies) {
-      if (deps.size > 0) {
-        console.log(
-          `  ${poolDirectionKey} depends on: [${Array.from(deps).join(", ")}]`
-        );
-      } else {
-        console.log(`  ${poolDirectionKey} has no dependencies`);
-      }
-    }
-  }
-  const mergedPaths = /* @__PURE__ */ new Map();
-  for (const [poolDirectionKey, paths] of pathUsageMap) {
-    const firstPath = paths[0];
-    const totalAmountIn = paths.reduce((sum2, path) => {
-      return new import_bn4.default(sum2).add(new import_bn4.default(path.amountIn)).toString();
-    }, "0");
-    mergedPaths.set(poolDirectionKey, __spreadProps(__spreadValues({}, firstPath), {
-      amountIn: totalAmountIn
-    }));
-  }
-  const sortedPoolDirectionKeys = topologicalSortKahn(pathDependencies);
-  if (process.env.NODE_ENV === "development") {
-    console.log("Topological sort execution order:", sortedPoolDirectionKeys);
-  }
   const flattenedPaths = [];
-  let executionOrder = 0;
-  for (const poolDirectionKey of sortedPoolDirectionKeys) {
-    const path = mergedPaths.get(poolDirectionKey);
+  if (routerData.routes.length !== 1) {
+    console.warn(
+      "Multiple routes detected, merging paths may lead to unexpected results"
+    );
+  }
+  const paths = routerData.routes[0].path;
+  for (const path of paths) {
     flattenedPaths.push({
       path,
-      isLastUseOfIntermediateToken: false,
-      // Will be set in second pass
-      executionOrder: executionOrder++
+      isLastUseOfIntermediateToken: false
     });
   }
-  const lastOccurrenceIndex = /* @__PURE__ */ new Map();
-  for (let i = 0; i < flattenedPaths.length; i++) {
+  const seenTokens = /* @__PURE__ */ new Map();
+  for (let i = flattenedPaths.length - 1; i >= 0; i--) {
     const { from } = flattenedPaths[i].path;
-    if (from !== fromCoinType) {
-      lastOccurrenceIndex.set(from, i);
+    if (from !== fromCoinType && !seenTokens.has(from)) {
+      seenTokens.set(from, true);
+      flattenedPaths[i].isLastUseOfIntermediateToken = true;
     }
   }
-  for (const [_tokenType, lastIndex] of lastOccurrenceIndex) {
-    flattenedPaths[lastIndex].isLastUseOfIntermediateToken = true;
-  }
   return {
     quoteID: routerData.quoteID || "",
     amountIn: routerData.amountIn,
@@ -6460,54 +6420,6 @@ function sortAndFlattenRoutes(routerData) {
     overlayFee: routerData.overlayFee
   };
 }
-function topologicalSortKahn(dependencies) {
-  const inDegree = /* @__PURE__ */ new Map();
-  const graph = /* @__PURE__ */ new Map();
-  for (const [nodeId] of dependencies) {
-    inDegree.set(nodeId, 0);
-    graph.set(nodeId, /* @__PURE__ */ new Set());
-  }
-  for (const [nodeId, deps] of dependencies) {
-    for (const depId of deps) {
-      if (!graph.has(depId)) {
-        graph.set(depId, /* @__PURE__ */ new Set());
-        inDegree.set(depId, 0);
-      }
-      graph.get(depId).add(nodeId);
-      inDegree.set(nodeId, (inDegree.get(nodeId) || 0) + 1);
-    }
-  }
-  const queue = [];
-  for (const [nodeId, degree] of inDegree) {
-    if (degree === 0) {
-      queue.push(nodeId);
-    }
-  }
-  const result = [];
-  while (queue.length > 0) {
-    const nodeId = queue.shift();
-    result.push(nodeId);
-    const neighbors = graph.get(nodeId) || /* @__PURE__ */ new Set();
-    for (const neighbor of neighbors) {
-      const newDegree = inDegree.get(neighbor) - 1;
-      inDegree.set(neighbor, newDegree);
-      if (newDegree === 0) {
-        queue.push(neighbor);
-      }
-    }
-  }
-  if (result.length !== dependencies.size) {
-    const remainingNodes = Array.from(dependencies.keys()).filter(
-      (nodeId) => !result.includes(nodeId)
-    );
-    throw new Error(
-      `Circular dependency detected in route merging. Remaining nodes: ${remainingNodes.join(
-        ", "
-      )}`
-    );
-  }
-  return result;
-}
 
 // src/utils/aggregator-config.ts
 var AggregatorConfig2 = class {
@@ -10679,8 +10591,10 @@ var AggregatorClientV3 = class extends AggregatorClient {
       throw new Error(CLIENT_CONFIG.ERRORS.QUOTE_ID_REQUIRED);
     }
     const processedData = sortAndFlattenRoutes(routerData);
-    console.log("expectAmountOut", expectAmountOut);
-    console.log("amountOutLimit", amountOutLimit);
+    console.log(
+      "processedData.flattenedPaths",
+      JSON.stringify(processedData.flattenedPaths, null, 2)
+    );
     const swapCtx = newSwapContext(
       {
         quoteID: processedData.quoteID,
@@ -10817,9 +10731,6 @@ var AggregatorClientV3 = class extends AggregatorClient {
         byAmountIn,
         slippage
       );
-      console.log("expectedAmountOut", expectedAmountOut.toString());
-      console.log("expectedAmountIn", expectedAmountIn.toString());
-      console.log("amountLimit", amountLimit.toString());
       if (!params.routers.packages || !params.routers.packages.get(PACKAGE_NAMES.AGGREGATOR_V3)) {
         throw new Error(CLIENT_CONFIG.ERRORS.PACKAGES_REQUIRED);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "0.0.0-experimental-20250724183511",
+  "version": "0.0.0-experimental-20250729170433",
   "sideEffects": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",