aftermath-ts-sdk 0.0.145 → 0.0.147

package/dist/packages/router/api/routerApiHelpers.js

@@ -0,0 +1,191 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouterApiHelpers = void 0;
+const types_1 = require("../../../types");
+const routerGraph_1 = require("../utils/synchronous/routerGraph");
+const routerAsyncApiHelpers_1 = require("./routerAsyncApiHelpers");
+const routerSynchronousApiHelpers_1 = require("./routerSynchronousApiHelpers");
+const routerAsyncGraph_1 = require("../utils/async/routerAsyncGraph");
+class RouterApiHelpers {
+    /////////////////////////////////////////////////////////////////////
+    //// Constructor
+    /////////////////////////////////////////////////////////////////////
+    constructor(Provider) {
+        this.Provider = Provider;
+        /////////////////////////////////////////////////////////////////////
+        //// Public Methods
+        /////////////////////////////////////////////////////////////////////
+        /////////////////////////////////////////////////////////////////////
+        //// Graph
+        /////////////////////////////////////////////////////////////////////
+        this.fetchSerializableGraph = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const pools = yield this.SynchronousHelpers.fetchAllPools(inputs);
+            return routerGraph_1.RouterGraph.createGraph({ pools });
+        });
+        /////////////////////////////////////////////////////////////////////
+        //// Routing
+        /////////////////////////////////////////////////////////////////////
+        this.fetchCompleteTradeRouteGivenAmountIn = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            if (inputs.protocols.length === 0)
+                throw new Error("no protocols set in constructor");
+            const { network, graph, coinInAmount } = inputs;
+            const coinInAmounts = RouterApiHelpers.amountsInForRouterTrade({
+                coinInAmount,
+            });
+            const asyncProtocols = inputs.protocols.filter(types_1.isRouterAsyncProtocolName);
+            const { exactMatchPools, partialMatchPools } = yield this.AsyncHelpers.fetchPossiblePools(Object.assign(Object.assign({}, inputs), { protocols: asyncProtocols }));
+            const routerGraph = new routerGraph_1.RouterGraph(network, graph);
+            if (exactMatchPools.length <= 0 && partialMatchPools.length <= 0)
+                return routerGraph.getCompleteRouteGivenAmountIn(inputs);
+            const [exactTradeResults, completeRoutesForLastPoolAsync] = yield Promise.all([
+                this.AsyncHelpers.fetchTradeResults(Object.assign(Object.assign({}, inputs), { pools: exactMatchPools, coinInAmounts })),
+                Promise.all(partialMatchPools.map((lastPool) => this.fetchCompleteTradeRoutesForLastRouteAsyncPool(Object.assign(Object.assign({}, inputs), { routerGraph,
+                    coinInAmounts,
+                    lastPool })))),
+            ]);
+            const synchronousCompleteRoutes = routerGraph.getCompleteRoutesGivenAmountIns(Object.assign(Object.assign({}, inputs), { coinInAmounts }));
+            const allCompleteRoutes = [
+                ...completeRoutesForLastPoolAsync,
+                synchronousCompleteRoutes,
+            ];
+            const completeRoutes = allCompleteRoutes.filter((routes) => routes.length > 0);
+            return routerAsyncGraph_1.RouterAsyncGraph.createFinalCompleteRoute({
+                tradeResults: exactTradeResults,
+                completeRoutes: completeRoutes.length <= 0 ? undefined : completeRoutes,
+                coinInAmounts,
+            });
+        });
+        this.fetchCompleteTradeRoutesForLastRouteAsyncPool = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const { routerGraph } = inputs;
+            const asyncApi = this.AsyncHelpers.protocolNamesToApi[this.AsyncHelpers.protocolNameFromPool({
+                pool: inputs.lastPool,
+            })]();
+            const lastPoolCoinInType = asyncApi.otherCoinInPool({
+                coinType: inputs.coinOutType,
+                pool: inputs.lastPool,
+            });
+            const synchronousCompleteRoutes = routerGraph.getCompleteRoutesGivenAmountIns(Object.assign(Object.assign({}, inputs), { coinOutType: lastPoolCoinInType }));
+            const lastPoolCoinInAmounts = synchronousCompleteRoutes.map((route) => route.coinOut.amount);
+            const tradeResults = yield this.AsyncHelpers.fetchTradeResults(Object.assign(Object.assign({}, inputs), { coinInType: lastPoolCoinInType, pools: [inputs.lastPool], coinInAmounts: lastPoolCoinInAmounts }));
+            const asyncCompleteRoutes = routerAsyncGraph_1.RouterAsyncGraph.completeRoutesFromTradeResults({
+                tradeResults,
+            })[0];
+            const finalCompleteRoutes = synchronousCompleteRoutes.map((syncRoute, index) => RouterApiHelpers.addFinalRouterCompleteTradeRouteToRoute({
+                startCompleteRoute: syncRoute,
+                endCompleteRoute: asyncCompleteRoutes[index],
+            }));
+            return finalCompleteRoutes.every((route) => route.routes.length === 0)
+                ? []
+                : finalCompleteRoutes;
+        });
+        this.Provider = Provider;
+        this.SynchronousHelpers = new routerSynchronousApiHelpers_1.RouterSynchronousApiHelpers(Provider);
+        this.AsyncHelpers = new routerAsyncApiHelpers_1.RouterAsyncApiHelpers(Provider);
+    }
+    // public fetchCompleteTradeRouteGivenAmountIn = async (inputs: {
+    // 	protocols: RouterProtocolName[];
+    // 	network: SuiNetwork | Url;
+    // 	graph: RouterSerializableCompleteGraph;
+    // 	coinInType: CoinType;
+    // 	coinInAmount: Balance;
+    // 	coinOutType: CoinType;
+    // 	referrer?: SuiAddress;
+    // 	externalFee?: RouterExternalFee;
+    // 	// TODO: add options to set all these params ?
+    // 	// maxRouteLength?: number,
+    // }): Promise<RouterCompleteTradeRoute> => {
+    // 	if (inputs.protocols.length === 0)
+    // 		throw new Error("no protocols set in constructor");
+    // 	const { network, graph, coinInAmount } = inputs;
+    // 	const coinInAmounts = RouterApiHelpers.amountsInForRouterTrade({
+    // 		coinInAmount,
+    // 	});
+    // 	const tradeResults = await this.AsyncHelpers.fetchTradeResults({
+    // 		...inputs,
+    // 		protocols: inputs.protocols.filter(isRouterAsyncProtocolName),
+    // 		coinInAmounts,
+    // 	});
+    // 	const routerGraph = new RouterGraph(network, graph);
+    // 	if (tradeResults.results.length <= 0)
+    // 		return routerGraph.getCompleteRouteGivenAmountIn(inputs);
+    // 	const synchronousCompleteRoutes =
+    // 		routerGraph.getCompleteRoutesGivenAmountIns({
+    // 			...inputs,
+    // 			coinInAmounts,
+    // 		});
+    // 	return RouterAsyncGraph.createFinalCompleteRoute({
+    // 		tradeResults,
+    // 		synchronousCompleteRoutes,
+    // 		coinInAmounts,
+    // 	});
+    // };
+    /////////////////////////////////////////////////////////////////////
+    //// Transactions
+    /////////////////////////////////////////////////////////////////////
+    fetchTransactionForCompleteTradeRoute(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.SynchronousHelpers.fetchBuildTransactionForCompleteTradeRoute(inputs);
+        });
+    }
+}
+exports.RouterApiHelpers = RouterApiHelpers;
+/////////////////////////////////////////////////////////////////////
+//// Constants
+/////////////////////////////////////////////////////////////////////
+RouterApiHelpers.constants = {
+    defaults: {
+        tradePartitionCount: 3,
+    },
+};
+/////////////////////////////////////////////////////////////////////
+//// Public Static Methods
+/////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////
+//// Helpers
+/////////////////////////////////////////////////////////////////////
+RouterApiHelpers.amountsInForRouterTrade = (inputs) => {
+    const { coinInAmount } = inputs;
+    const partitions = inputs.partitions ||
+        RouterApiHelpers.constants.defaults.tradePartitionCount;
+    const coinInPartitionAmount = coinInAmount / BigInt(Math.floor(partitions));
+    const coinInRemainderAmount = coinInAmount % BigInt(Math.floor(partitions));
+    const amountsIn = Array(partitions)
+        .fill(0)
+        .map((_, index) => index === 0
+        ? coinInRemainderAmount + coinInPartitionAmount
+        : BigInt(1 + index) * coinInPartitionAmount);
+    return amountsIn;
+};
+/////////////////////////////////////////////////////////////////////
+//// Private Methods
+/////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////
+//// Helpers
+/////////////////////////////////////////////////////////////////////
+RouterApiHelpers.addFinalRouterCompleteTradeRouteToRoute = (inputs) => {
+    const { startCompleteRoute, endCompleteRoute } = inputs;
+    const totalEndRouteAmountIn = endCompleteRoute.coinIn.amount;
+    return Object.assign(Object.assign({}, startCompleteRoute), { routes: startCompleteRoute.routes.map((route) => {
+            const finalRoute = endCompleteRoute.routes[0];
+            const finalPath = finalRoute.paths[0];
+            // TODO: handle remainder amount
+            const finalCoinOutAmountForRoute = route.coinOut.amount / totalEndRouteAmountIn;
+            const spotPrice = Number(route.coinIn.amount) /
+                Number(finalCoinOutAmountForRoute);
+            return {
+                spotPrice,
+                coinIn: Object.assign({}, route.coinIn),
+                coinOut: Object.assign(Object.assign({}, finalRoute.coinOut), { amount: finalCoinOutAmountForRoute }),
+                paths: [...route.paths, finalPath],
+            };
+        }), coinOut: Object.assign({}, endCompleteRoute.coinOut), spotPrice: startCompleteRoute.spotPrice * endCompleteRoute.spotPrice });
+};

package/dist/packages/router/api/routerAsyncApiHelpers.d.ts

@@ -1,16 +1,27 @@
 import { AftermathApi } from "../../../general/providers/aftermathApi";
-import { RouterAsyncProtocolName, RouterAsyncTradeResults } from "../routerTypes";
+import { RouterAsyncProtocolName, RouterAsyncSerializablePool, RouterAsyncTradeResults } from "../routerTypes";
 import { Balance, CoinType } from "../../../types";
+import { RouterAsyncApiInterface } from "../utils/async/routerAsyncApiInterface";
 export declare class RouterAsyncApiHelpers {
     private readonly Provider;
-    private readonly protocolNamesToApi;
+    readonly protocolNamesToApi: Record<RouterAsyncProtocolName, () => RouterAsyncApiInterface<any>>;
     constructor(Provider: AftermathApi);
-    fetchTradeResults: (inputs: {
+    fetchPossiblePools: (inputs: {
         protocols: RouterAsyncProtocolName[];
         coinInType: CoinType;
         coinOutType: CoinType;
+    }) => Promise<{
+        exactMatchPools: RouterAsyncSerializablePool[];
+        partialMatchPools: RouterAsyncSerializablePool[];
+    }>;
+    fetchTradeResults: (inputs: {
+        pools: RouterAsyncSerializablePool[];
+        coinInType: CoinType;
+        coinOutType: CoinType;
         coinInAmounts: Balance[];
     }) => Promise<RouterAsyncTradeResults>;
-    private protocolApisFromNames;
+    protocolNameFromPool: (inputs: {
+        pool: RouterAsyncSerializablePool;
+    }) => RouterAsyncProtocolName;
 }
 //# sourceMappingURL=routerAsyncApiHelpers.d.ts.map

package/dist/packages/router/api/routerAsyncApiHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routerAsyncApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerAsyncApiHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACN,uBAAuB,EAEvB,uBAAuB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAMnD,qBAAa,qBAAqB;IAiBrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAZrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAMjC;gBAM2B,QAAQ,EAAE,YAAY;IAQ5C,iBAAiB,WAAkB;QACzC,SAAS,EAAE,uBAAuB,EAAE,CAAC;QACrC,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,EAAE,CAAC;KACzB,KAAG,QAAQ,uBAAuB,CAAC,CAgDlC;IA4CF,OAAO,CAAC,qBAAqB,CAK3B;CACF"}
+{"version":3,"file":"routerAsyncApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerAsyncApiHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACN,uBAAuB,EACvB,2BAA2B,EAE3B,uBAAuB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAOjF,qBAAa,qBAAqB;IAiBrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAZrC,SAAgB,kBAAkB,EAAE,MAAM,CACzC,uBAAuB,EACvB,MAAM,uBAAuB,CAAC,GAAG,CAAC,CAClC,CAGC;gBAM2B,QAAQ,EAAE,YAAY;IAQ5C,kBAAkB,WAAkB;QAC1C,SAAS,EAAE,uBAAuB,EAAE,CAAC;QACrC,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACtB,KAAG,QAAQ;QACX,eAAe,EAAE,2BAA2B,EAAE,CAAC;QAC/C,iBAAiB,EAAE,2BAA2B,EAAE,CAAC;KACjD,CAAC,CA8BA;IAEK,iBAAiB,WAAkB;QACzC,KAAK,EAAE,2BAA2B,EAAE,CAAC;QACrC,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,EAAE,CAAC;KACzB,KAAG,QAAQ,uBAAuB,CAAC,CAwDlC;IA4CK,oBAAoB,WAAY;QACtC,IAAI,EAAE,2BAA2B,CAAC;KAClC,KAAG,uBAAuB,CAQzB;CACF"}

package/dist/packages/router/api/routerAsyncApiHelpers.js

@@ -13,6 +13,7 @@ exports.RouterAsyncApiHelpers = void 0;
 const cetusApi_1 = require("../../external/cetus/cetusApi");
 const rpcApiHelpers_1 = require("../../../general/api/rpcApiHelpers");
 const turbosApi_1 = require("../../external/turbos/turbosApi");
+const turbosTypes_1 = require("../../external/turbos/turbosTypes");
 class RouterAsyncApiHelpers {
     /////////////////////////////////////////////////////////////////////
     //// Constructor
@@ -29,18 +30,47 @@ class RouterAsyncApiHelpers {
         /////////////////////////////////////////////////////////////////////
         //// Objects
         /////////////////////////////////////////////////////////////////////
+        this.fetchPossiblePools = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const apis = inputs.protocols.map((protocol) => this.protocolNamesToApi[protocol]());
+            const allPools = (yield Promise.all(apis.map((api) => api.fetchPoolsForTrade(inputs)))).reduce((acc, pools) => {
+                return {
+                    exactMatchPools: [
+                        ...acc.exactMatchPools,
+                        ...pools.exactMatchPools,
+                    ],
+                    partialMatchPools: [
+                        ...acc.partialMatchPools,
+                        ...pools.partialMatchPools,
+                    ],
+                };
+            }, {
+                partialMatchPools: [],
+                exactMatchPools: [],
+            });
+            return allPools;
+        });
         this.fetchTradeResults = (inputs) => __awaiter(this, void 0, void 0, function* () {
-            const { coinInAmounts, coinInType, coinOutType } = inputs;
-            const apis = this.protocolApisFromNames(inputs);
+            const { coinInAmounts } = inputs;
+            const protocols = inputs.pools.map((pool) => this.protocolNameFromPool({ pool }));
+            const apis = protocols.map((protocol) => this.protocolNamesToApi[protocol]());
             const resultsOrUndefined = yield Promise.all(apis.map((api, index) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const pool = yield api.fetchPoolForCoinTypes(Object.assign(Object.assign({}, inputs), { coinType1: coinInType, coinType2: coinOutType }));
-                    const amountsOut = yield Promise.all(coinInAmounts.map((amountIn) => api.fetchTradeAmountOut(Object.assign(Object.assign({}, inputs), { pool, walletAddress: rpcApiHelpers_1.RpcApiHelpers.constants
-                            .devInspectSigner, coinInAmount: amountIn }))));
+                    const pool = inputs.pools[index];
+                    const amountsOut = yield Promise.all(coinInAmounts.map((amountIn) => __awaiter(this, void 0, void 0, function* () {
+                        try {
+                            return yield api.fetchTradeAmountOut(Object.assign(Object.assign({}, inputs), { pool, walletAddress: rpcApiHelpers_1.RpcApiHelpers.constants
+                                    .devInspectSigner, coinInAmount: amountIn }));
+                        }
+                        catch (e) {
+                            console.error(e);
+                            return BigInt(0);
+                        }
+                    })));
+                    const protocol = protocols[index];
                     return {
                         pool,
                         amountsOut,
-                        protocol: inputs.protocols[index],
+                        protocol,
                     };
                 }
                 catch (e) {
@@ -84,9 +114,12 @@ class RouterAsyncApiHelpers {
         /////////////////////////////////////////////////////////////////////
         //// Helpers
         /////////////////////////////////////////////////////////////////////
-        this.protocolApisFromNames = (inputs) => {
-            const { protocols } = inputs;
-            return protocols.map((name) => this.protocolNamesToApi[name]());
+        this.protocolNameFromPool = (inputs) => {
+            const { pool } = inputs;
+            const protocolName = (0, turbosTypes_1.isTurbosPoolObject)(pool)
+                ? "Turbos"
+                : "Cetus";
+            return protocolName;
         };
         this.Provider = Provider;
     }

package/dist/packages/router/api/routerSynchronousApiHelpers.d.ts

@@ -1,15 +1,10 @@
 import { SuiAddress, TransactionBlock } from "@mysten/sui.js";
 import { AftermathApi } from "../../../general/providers/aftermathApi";
 import { RouterCompleteTradeRoute, RouterProtocolName, RouterSerializablePool } from "../routerTypes";
-import { Balance, CoinType, Slippage } from "../../../types";
+import { CoinType, Slippage } from "../../../types";
 export declare class RouterSynchronousApiHelpers {
     private readonly Provider;
     private readonly protocolNamesToApi;
-    static readonly constants: {
-        defaults: {
-            tradePartitionCount: number;
-        };
-    };
     constructor(Provider: AftermathApi);
     fetchAllPools: (inputs: {
         protocols: RouterProtocolName[];
@@ -22,10 +17,6 @@ export declare class RouterSynchronousApiHelpers {
         completeRoute: RouterCompleteTradeRoute;
         slippage: Slippage;
     }): Promise<TransactionBlock>;
-    static amountsInForRouterTrade: (inputs: {
-        coinInAmount: Balance;
-        partitions?: number;
-    }) => Balance[];
     private protocolApisFromNames;
 }
 //# sourceMappingURL=routerSynchronousApiHelpers.d.ts.map

package/dist/packages/router/api/routerSynchronousApiHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routerSynchronousApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerSynchronousApiHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EAEV,gBAAgB,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACN,wBAAwB,EACxB,kBAAkB,EAClB,sBAAsB,EACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,gBAAgB,CAAC;AAW9E,qBAAa,2BAA2B;IA0B3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IArBrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CASjC;IAEF,gBAAuB,SAAS;;;;MAI9B;gBAM2B,QAAQ,EAAE,YAAY;IAQ5C,aAAa,WAAkB;QACrC,SAAS,EAAE,kBAAkB,EAAE,CAAC;KAChC,KAAG,QAAQ,sBAAsB,EAAE,CAAC,CAanC;IAMK,mBAAmB,WAAkB;QAC3C,SAAS,EAAE,kBAAkB,EAAE,CAAC;KAChC,KAAG,QAAQ,QAAQ,EAAE,CAAC,CAgBrB;IAMW,0CAA0C,CAAC,MAAM,EAAE;QAC/D,aAAa,EAAE,UAAU,CAAC;QAC1B,aAAa,EAAE,wBAAwB,CAAC;QACxC,QAAQ,EAAE,QAAQ,CAAC;KACnB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkH7B,OAAc,uBAAuB,WAAY;QAChD,YAAY,EAAE,OAAO,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;KACpB,KAAG,OAAO,EAAE,CAqBX;IAUF,OAAO,CAAC,qBAAqB,CAK3B;CACF"}
+{"version":3,"file":"routerSynchronousApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerSynchronousApiHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EAEV,gBAAgB,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACN,wBAAwB,EACxB,kBAAkB,EAClB,sBAAsB,EACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAW,QAAQ,EAAE,QAAQ,EAAmB,MAAM,gBAAgB,CAAC;AAW9E,qBAAa,2BAA2B;IAoB3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAfrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CASjC;gBAM2B,QAAQ,EAAE,YAAY;IAQ5C,aAAa,WAAkB;QACrC,SAAS,EAAE,kBAAkB,EAAE,CAAC;KAChC,KAAG,QAAQ,sBAAsB,EAAE,CAAC,CAanC;IAMK,mBAAmB,WAAkB;QAC3C,SAAS,EAAE,kBAAkB,EAAE,CAAC;KAChC,KAAG,QAAQ,QAAQ,EAAE,CAAC,CAgBrB;IAMW,0CAA0C,CAAC,MAAM,EAAE;QAC/D,aAAa,EAAE,UAAU,CAAC;QAC1B,aAAa,EAAE,wBAAwB,CAAC;QACxC,QAAQ,EAAE,QAAQ,CAAC;KACnB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAsH7B,OAAO,CAAC,qBAAqB,CAK3B;CACF"}

package/dist/packages/router/api/routerSynchronousApiHelpers.js

@@ -125,7 +125,11 @@ class RouterSynchronousApiHelpers {
                         slippage,
                         referrer,
                     });
-                    coinIn = poolForPath.noHopsAllowed ? undefined : newCoinIn;
+                    coinIn =
+                        poolForPath.noHopsAllowed &&
+                            poolForPath.protocolName !== "Cetus"
+                            ? undefined
+                            : newCoinIn;
                 }
                 if (coinIn)
                     coinsOut.push(coinIn);
@@ -152,27 +156,3 @@ class RouterSynchronousApiHelpers {
     }
 }
 exports.RouterSynchronousApiHelpers = RouterSynchronousApiHelpers;
-RouterSynchronousApiHelpers.constants = {
-    defaults: {
-        tradePartitionCount: 3,
-    },
-};
-/////////////////////////////////////////////////////////////////////
-//// Public Static Methods
-/////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////
-//// Helpers
-/////////////////////////////////////////////////////////////////////
-RouterSynchronousApiHelpers.amountsInForRouterTrade = (inputs) => {
-    const { coinInAmount } = inputs;
-    const partitions = inputs.partitions ||
-        RouterSynchronousApiHelpers.constants.defaults.tradePartitionCount;
-    const coinInPartitionAmount = coinInAmount / BigInt(Math.floor(partitions));
-    const coinInRemainderAmount = coinInAmount % BigInt(Math.floor(partitions));
-    const amountsIn = Array(partitions)
-        .fill(0)
-        .map((_, index) => index === 0
-        ? coinInRemainderAmount + coinInPartitionAmount
-        : BigInt(1 + index) * coinInPartitionAmount);
-    return amountsIn;
-};

package/dist/packages/router/routerTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routerTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/router/routerTypes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"routerTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/router/routerTypes.ts"],"names":[],"mappings":"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"}

package/dist/packages/router/utils/async/routerAsyncApiInterface.d.ts

@@ -1,11 +1,14 @@
 import { SuiAddress } from "@mysten/sui.js";
 import { CoinType } from "../../../coin/coinTypes";
-import { Balance, SerializedTransaction } from "../../../../types";
-export interface RouterAsyncApiInterface<PoolType> {
-    fetchPoolForCoinTypes: (inputs: {
-        coinType1: CoinType;
-        coinType2: CoinType;
-    }) => Promise<PoolType>;
+import { Balance, RouterAsyncSerializablePool, SerializedTransaction } from "../../../../types";
+export interface RouterAsyncApiInterface<PoolType extends RouterAsyncSerializablePool> {
+    fetchPoolsForTrade: (inputs: {
+        coinInType: CoinType;
+        coinOutType: CoinType;
+    }) => Promise<{
+        partialMatchPools: PoolType[];
+        exactMatchPools: PoolType[];
+    }>;
     fetchTradeAmountOut: (inputs: {
         walletAddress: SuiAddress;
         pool: PoolType;
@@ -13,6 +16,10 @@ export interface RouterAsyncApiInterface<PoolType> {
         coinOutType: CoinType;
         coinInAmount: Balance;
     }) => Promise<Balance>;
+    otherCoinInPool: (inputs: {
+        coinType: CoinType;
+        pool: PoolType;
+    }) => CoinType;
     fetchTradeTx: (inputs: {
         walletAddress: SuiAddress;
         pool: PoolType;

package/dist/packages/router/utils/async/routerAsyncApiInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routerAsyncApiInterface.d.ts","sourceRoot":"","sources":["../../../../../src/packages/router/utils/async/routerAsyncApiInterface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAMnE,MAAM,WAAW,uBAAuB,CAAC,QAAQ;IAahD,qBAAqB,EAAE,CAAC,MAAM,EAAE;QAC/B,SAAS,EAAE,QAAQ,CAAC;QACpB,SAAS,EAAE,QAAQ,CAAC;KACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAMxB,mBAAmB,EAAE,CAAC,MAAM,EAAE;QAC7B,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACtB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAcvB,YAAY,EAAE,CAAC,MAAM,EAAE;QACtB,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACtB,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACrC"}
+{"version":3,"file":"routerAsyncApiInterface.d.ts","sourceRoot":"","sources":["../../../../../src/packages/router/utils/async/routerAsyncApiInterface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EACN,OAAO,EACP,2BAA2B,EAC3B,qBAAqB,EACrB,MAAM,mBAAmB,CAAC;AAM3B,MAAM,WAAW,uBAAuB,CACvC,QAAQ,SAAS,2BAA2B;IAc5C,kBAAkB,EAAE,CAAC,MAAM,EAAE;QAC5B,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACtB,KAAK,OAAO,CAAC;QACb,iBAAiB,EAAE,QAAQ,EAAE,CAAC;QAC9B,eAAe,EAAE,QAAQ,EAAE,CAAC;KAC5B,CAAC,CAAC;IAMH,mBAAmB,EAAE,CAAC,MAAM,EAAE;QAC7B,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACtB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAUvB,eAAe,EAAE,CAAC,MAAM,EAAE;QACzB,QAAQ,EAAE,QAAQ,CAAC;QACnB,IAAI,EAAE,QAAQ,CAAC;KACf,KAAK,QAAQ,CAAC;IAMf,YAAY,EAAE,CAAC,MAAM,EAAE;QACtB,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACtB,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACrC"}

package/dist/packages/router/utils/async/routerAsyncGraph.d.ts

@@ -3,10 +3,12 @@ export declare class RouterAsyncGraph {
     static createFinalCompleteRoute(inputs: {
         tradeResults: RouterAsyncTradeResults;
         coinInAmounts: Balance[];
-        synchronousCompleteRoutes?: RouterCompleteTradeRoute[];
+        completeRoutes?: RouterCompleteTradeRoute[][];
     }): RouterCompleteTradeRoute;
+    static completeRoutesFromTradeResults: (inputs: {
+        tradeResults: RouterAsyncTradeResults;
+    }) => RouterCompleteTradeRoute[][];
     private static splitTradeBetweenRoutes;
     private static singleCompleteRouteFromMany;
-    private static completeRoutesFromTradeResults;
 }
 //# sourceMappingURL=routerAsyncGraph.d.ts.map

package/dist/packages/router/utils/async/routerAsyncGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routerAsyncGraph.d.ts","sourceRoot":"","sources":["../../../../../src/packages/router/utils/async/routerAsyncGraph.ts"],"names":[],"mappings":"AACA,OAAO,EACN,OAAO,EACP,uBAAuB,EACvB,wBAAwB,EAExB,MAAM,mBAAmB,CAAC;AAM3B,qBAAa,gBAAgB;WASd,wBAAwB,CAAC,MAAM,EAAE;QAC9C,YAAY,EAAE,uBAAuB,CAAC;QACtC,aAAa,EAAE,OAAO,EAAE,CAAC;QACzB,yBAAyB,CAAC,EAAE,wBAAwB,EAAE,CAAC;KACvD,GAAG,wBAAwB;IA6B5B,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAyCpC;IAEF,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAqCxC;IAEF,OAAO,CAAC,MAAM,CAAC,8BAA8B,CAiD3C;CACF"}
+{"version":3,"file":"routerAsyncGraph.d.ts","sourceRoot":"","sources":["../../../../../src/packages/router/utils/async/routerAsyncGraph.ts"],"names":[],"mappings":"AACA,OAAO,EACN,OAAO,EACP,uBAAuB,EACvB,wBAAwB,EAExB,MAAM,mBAAmB,CAAC;AAM3B,qBAAa,gBAAgB;WASd,wBAAwB,CAAC,MAAM,EAAE;QAC9C,YAAY,EAAE,uBAAuB,CAAC;QACtC,aAAa,EAAE,OAAO,EAAE,CAAC;QACzB,cAAc,CAAC,EAAE,wBAAwB,EAAE,EAAE,CAAC;KAC9C,GAAG,wBAAwB;IAqB5B,OAAc,8BAA8B,WAAY;QACvD,YAAY,EAAE,uBAAuB,CAAC;KACtC,KAAG,wBAAwB,EAAE,EAAE,CA+C9B;IAUF,OAAO,CAAC,MAAM,CAAC,uBAAuB,CA2CpC;IAEF,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAqCxC;CACF"}

package/dist/packages/router/utils/async/routerAsyncGraph.js

@@ -14,19 +14,48 @@ class RouterAsyncGraph {
     /////////////////////////////////////////////////////////////////////
     static createFinalCompleteRoute(inputs) {
         const asyncCompleteRoutes = this.completeRoutesFromTradeResults(inputs);
-        const completeRoutes = inputs.synchronousCompleteRoutes
-            ? [...asyncCompleteRoutes, inputs.synchronousCompleteRoutes]
-            : [...asyncCompleteRoutes];
+        const completeRoutes = inputs.completeRoutes
+            ? [...asyncCompleteRoutes, ...inputs.completeRoutes]
+            : asyncCompleteRoutes;
         const chosenCompleteRoutes = this.splitTradeBetweenRoutes(Object.assign(Object.assign({}, inputs), { completeRoutes }));
         const finalCompleteRoute = this.singleCompleteRouteFromMany({
             completeRoutes: chosenCompleteRoutes,
         });
         if (finalCompleteRoute.coinOut.amount <= BigInt(0))
-            throw new Error("unable to find route ");
+            throw new Error("unable to find route");
         return finalCompleteRoute;
     }
 }
 exports.RouterAsyncGraph = RouterAsyncGraph;
+RouterAsyncGraph.completeRoutesFromTradeResults = (inputs) => {
+    const { tradeResults } = inputs;
+    const completeRoutes = tradeResults.results.map((result) => {
+        const routes = result.amountsOut.map((amountOut, amountOutIndex) => {
+            const path = {
+                pool: result.pool,
+                protocolName: result.protocol,
+                coinIn: {
+                    type: tradeResults.coinInType,
+                    amount: tradeResults.coinInAmounts[amountOutIndex],
+                    tradeFee: BigInt(0),
+                },
+                coinOut: {
+                    type: tradeResults.coinOutType,
+                    amount: amountOut,
+                    tradeFee: BigInt(0),
+                },
+                spotPrice: Number(tradeResults.coinInAmounts[0]) /
+                    Number(result.amountsOut[0]),
+            };
+            return Object.assign(Object.assign({}, path), { paths: [path] });
+        });
+        const completeRoutes = routes.map((route) => {
+            return Object.assign({ routes: [route] }, route);
+        });
+        return completeRoutes;
+    });
+    return completeRoutes;
+};
 /////////////////////////////////////////////////////////////////////
 //// Private Static Methods
 /////////////////////////////////////////////////////////////////////
@@ -35,7 +64,7 @@ exports.RouterAsyncGraph = RouterAsyncGraph;
 /////////////////////////////////////////////////////////////////////
 RouterAsyncGraph.splitTradeBetweenRoutes = (inputs) => {
     const { completeRoutes, coinInAmounts } = inputs;
-    let chosenRouteIndexes = Array(coinInAmounts.length).fill(-1);
+    let chosenRouteIndexes = Array(completeRoutes.length).fill(-1);
     for (const _ of coinInAmounts) {
         const incrementalAmountsOut = completeRoutes.map((route, index) => {
             const prevChosenIndex = chosenRouteIndexes[index];
@@ -84,32 +113,3 @@ RouterAsyncGraph.singleCompleteRouteFromMany = (inputs) => {
         },
     };
 };
-RouterAsyncGraph.completeRoutesFromTradeResults = (inputs) => {
-    const { tradeResults } = inputs;
-    const completeRoutes = tradeResults.results.map((result) => {
-        const routes = result.amountsOut.map((amountOut, amountOutIndex) => {
-            const path = {
-                pool: result.pool,
-                protocolName: result.protocol,
-                coinIn: {
-                    type: tradeResults.coinInType,
-                    amount: tradeResults.coinInAmounts[amountOutIndex],
-                    tradeFee: BigInt(0),
-                },
-                coinOut: {
-                    type: tradeResults.coinOutType,
-                    amount: amountOut,
-                    tradeFee: BigInt(0),
-                },
-                spotPrice: Number(tradeResults.coinInAmounts[0]) /
-                    Number(result.amountsOut[0]),
-            };
-            return Object.assign(Object.assign({}, path), { paths: [path] });
-        });
-        const completeRoutes = routes.map((route) => {
-            return Object.assign({ routes: [route] }, route);
-        });
-        return completeRoutes;
-    });
-    return completeRoutes;
-};

package/dist/packages/router/utils/synchronous/routerGraph.d.ts

@@ -18,17 +18,6 @@ export declare class RouterGraph {
     readonly graph: RouterCompleteGraph;
     readonly constants: RouterOptions;
     constructor(network: SuiNetwork | Url, graph: RouterSerializableCompleteGraph, options?: RouterOptions);
-    static createGraph(inputs: {
-        pools: RouterSerializablePool[];
-    }): RouterSerializableCompleteGraph;
-    static graphFromSerializable(inputs: {
-        graph: RouterSerializableCompleteGraph;
-        network: SuiNetwork | Url;
-    }): RouterCompleteGraph;
-    static supportedCoinPathsFromGraph: (inputs: {
-        graph: RouterSerializableCompleteGraph;
-        maxRouteLength?: number;
-    }) => Promise<RouterSupportedCoinPaths>;
     getCompleteRouteGivenAmountIn(inputs: {
         coinInType: CoinType;
         coinInAmount: Balance;
@@ -43,6 +32,17 @@ export declare class RouterGraph {
         referrer?: SuiAddress;
         externalFee?: RouterExternalFee;
     }): RouterCompleteTradeRoute[];
+    static createGraph(inputs: {
+        pools: RouterSerializablePool[];
+    }): RouterSerializableCompleteGraph;
+    static graphFromSerializable(inputs: {
+        graph: RouterSerializableCompleteGraph;
+        network: SuiNetwork | Url;
+    }): RouterCompleteGraph;
+    static supportedCoinPathsFromGraph: (inputs: {
+        graph: RouterSerializableCompleteGraph;
+        maxRouteLength?: number;
+    }) => Promise<RouterSupportedCoinPaths>;
     private getCompleteRoute;
     private static updateCoinNodesFromPool;
     private static findRoutes;
@@ -58,6 +58,8 @@ export declare class RouterGraph {
     private static gasCostForRoutes;
     private static gasCostForRoute;
     private static routerCompleteTradeRouteFromCompleteTradeRoute;
+    private static extendCoinPathsForHops;
+    private static mergeCoinPaths;
 }
 export {};
 //# sourceMappingURL=routerGraph.d.ts.map