aftermath-ts-sdk 0.0.145 → 0.0.147

package/dist/packages/external/turbos/turbosApi.d.ts

@@ -9,11 +9,14 @@ export declare class TurbosApi implements RouterApiInterface<TurbosPoolObject> {
     private readonly Provider;
     readonly Helpers: TurbosApiHelpers;
     constructor(Provider: AftermathApi);
-    fetchPoolForCoinTypes: (inputs: {
-        coinType1: CoinType;
-        coinType2: CoinType;
-    }) => Promise<TurbosPoolObject>;
     fetchAllPools: () => Promise<TurbosPoolObject[]>;
+    fetchPoolsForTrade: (inputs: {
+        coinInType: CoinType;
+        coinOutType: CoinType;
+    }) => Promise<{
+        partialMatchPools: TurbosPoolObject[];
+        exactMatchPools: TurbosPoolObject[];
+    }>;
     fetchSupportedCoins: () => Promise<string[]>;
     fetchTradeAmountOut: (inputs: {
         walletAddress: SuiAddress;
@@ -22,6 +25,10 @@ export declare class TurbosApi implements RouterApiInterface<TurbosPoolObject> {
         coinOutType: CoinType;
         coinInAmount: Balance;
     }) => Promise<Balance>;
+    otherCoinInPool: (inputs: {
+        coinType: CoinType;
+        pool: TurbosPoolObject;
+    }) => string;
     fetchTradeTx: (inputs: {
         walletAddress: SuiAddress;
         pool: TurbosPoolObject;

package/dist/packages/external/turbos/turbosApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turbosApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/external/turbos/turbosApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8DAA8D,CAAC;AAElG,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,qBAAa,SAAU,YAAW,kBAAkB,CAAC,gBAAgB,CAAC;IAWzD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IANrC,SAAgB,OAAO,mBAAC;gBAMK,QAAQ,EAAE,YAAY;IAa5C,qBAAqB,WAAkB;QAC7C,SAAS,EAAE,QAAQ,CAAC;QACpB,SAAS,EAAE,QAAQ,CAAC;KACpB,KAAG,QAAQ,gBAAgB,CAAC,CAE3B;IAEK,aAAa,oCAGlB;IAEK,mBAAmB,0BAQxB;IAMK,mBAAmB,WAAkB;QAC3C,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,gBAAgB,CAAC;QACvB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACtB,KAAG,QAAQ,OAAO,CAAC,CAGlB;IAMK,YAAY,WAAY;QAC9B,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,gBAAgB,CAAC;QACvB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACtB,KAAG,QAAQ,qBAAqB,CAAC,CAIhC;CACF"}
+{"version":3,"file":"turbosApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/external/turbos/turbosApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8DAA8D,CAAC;AAElG,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,qBAAa,SAAU,YAAW,kBAAkB,CAAC,gBAAgB,CAAC;IAWzD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IANrC,SAAgB,OAAO,mBAAC;gBAMK,QAAQ,EAAE,YAAY;IAa5C,aAAa,oCAGlB;IAEK,kBAAkB,WAAY;QACpC,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACtB,KAAG,QAAQ;QACX,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;QACtC,eAAe,EAAE,gBAAgB,EAAE,CAAC;KACpC,CAAC,CAEA;IAMK,mBAAmB,0BAQxB;IAEK,mBAAmB,WAAkB;QAC3C,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,gBAAgB,CAAC;QACvB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACtB,KAAG,QAAQ,OAAO,CAAC,CAGlB;IAEK,eAAe,WAAY;QACjC,QAAQ,EAAE,QAAQ,CAAC;QACnB,IAAI,EAAE,gBAAgB,CAAC;KACvB,YAEC;IAMK,YAAY,WAAY;QAC9B,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,gBAAgB,CAAC;QACvB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACtB,KAAG,QAAQ,qBAAqB,CAAC,CAIhC;CACF"}

package/dist/packages/external/turbos/turbosApi.js

@@ -24,25 +24,28 @@ class TurbosApi {
         /////////////////////////////////////////////////////////////////////
         //// Objects
         /////////////////////////////////////////////////////////////////////
-        this.fetchPoolForCoinTypes = (inputs) => __awaiter(this, void 0, void 0, function* () {
-            return this.Helpers.fetchPoolForCoinTypes(inputs);
-        });
         this.fetchAllPools = () => __awaiter(this, void 0, void 0, function* () {
             const pools = yield this.Helpers.fetchAllPools();
             return pools;
         });
+        this.fetchPoolsForTrade = (inputs) => {
+            return this.Helpers.fetchPoolsForTrade(inputs);
+        };
+        /////////////////////////////////////////////////////////////////////
+        //// Inspections
+        /////////////////////////////////////////////////////////////////////
         this.fetchSupportedCoins = () => __awaiter(this, void 0, void 0, function* () {
             const pools = yield this.Helpers.fetchAllPools();
             const allCoins = pools.reduce((acc, pool) => [...acc, pool.coinTypeA, pool.coinTypeB], []);
             return utils_1.Helpers.uniqueArray(allCoins);
         });
-        /////////////////////////////////////////////////////////////////////
-        //// Inspections
-        /////////////////////////////////////////////////////////////////////
         this.fetchTradeAmountOut = (inputs) => __awaiter(this, void 0, void 0, function* () {
             const tradeResult = yield this.Helpers.fetchCalcTradeResult(inputs);
             return tradeResult.amountOut;
         });
+        this.otherCoinInPool = (inputs) => {
+            return turbosApiHelpers_1.TurbosApiHelpers.otherCoinInPool(inputs);
+        };
         /////////////////////////////////////////////////////////////////////
         //// Transactions
         /////////////////////////////////////////////////////////////////////

package/dist/packages/external/turbos/turbosApiHelpers.d.ts

@@ -12,10 +12,13 @@ export declare class TurbosApiHelpers {
     };
     constructor(Provider: AftermathApi);
     fetchAllPools: () => Promise<TurbosPoolObject[]>;
-    fetchPoolForCoinTypes: (inputs: {
-        coinType1: CoinType;
-        coinType2: CoinType;
-    }) => Promise<TurbosPoolObject>;
+    fetchPoolsForTrade: (inputs: {
+        coinInType: CoinType;
+        coinOutType: CoinType;
+    }) => Promise<{
+        partialMatchPools: TurbosPoolObject[];
+        exactMatchPools: TurbosPoolObject[];
+    }>;
     tradeCoinAToCoinBTx: (inputs: {
         tx: TransactionBlock;
         poolObjectId: ObjectId;
@@ -184,8 +187,15 @@ export declare class TurbosApiHelpers {
         coinOutType: CoinType;
         coinInAmount: Balance;
     }) => Promise<TurbosCalcTradeResult>;
+    static otherCoinInPool: (inputs: {
+        coinType: CoinType;
+        pool: TurbosPoolObject;
+    }) => string;
+    private fetchPoolForCoinTypes;
+    private fetchPoolsForCoinType;
     private static partialPoolFromSuiObjectResponse;
     private static isPoolForCoinTypes;
+    private static isPoolForCoinType;
     private static isCoinA;
     private static calcSqrtPriceLimit;
 }

package/dist/packages/external/turbos/turbosApiHelpers.d.ts.map

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

package/dist/packages/external/turbos/turbosApiHelpers.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurbosApiHelpers = void 0;
 const sui_js_1 = require("@mysten/sui.js");
@@ -22,7 +23,7 @@ class TurbosApiHelpers {
     //// Constructor
     /////////////////////////////////////////////////////////////////////
     constructor(Provider) {
-        var _a;
+        var _b;
         this.Provider = Provider;
         /////////////////////////////////////////////////////////////////////
         //// Public Methods
@@ -32,23 +33,39 @@ class TurbosApiHelpers {
         /////////////////////////////////////////////////////////////////////
         this.fetchAllPools = () => __awaiter(this, void 0, void 0, function* () {
             const poolsSimpleInfo = yield this.Provider.DynamicFields().fetchCastAllDynamicFieldsOfType(this.addresses.turbos.objects.poolsTable, (objectIds) => this.Provider.Objects().fetchCastObjectBatch(objectIds, TurbosApiHelpers.partialPoolFromSuiObjectResponse), () => true);
-            const sqrtPrices = yield this.Provider.Objects().fetchCastObjectBatch(poolsSimpleInfo.map((poolInfo) => poolInfo.id), (data) => {
-                var _a;
-                const sqrtPrice = (_a = (0, sui_js_1.getObjectFields)(data)) === null || _a === void 0 ? void 0 : _a.sqrt_price;
-                return BigInt(sqrtPrice);
+            const poolsMoreInfo = yield this.Provider.Objects().fetchCastObjectBatch(poolsSimpleInfo.map((poolInfo) => poolInfo.id), (data) => {
+                const fields = (0, sui_js_1.getObjectFields)(data);
+                if (!fields)
+                    throw new Error("no fields found on turbos pool object");
+                const sqrtPrice = BigInt(fields.sqrt_price);
+                const liquidity = BigInt(fields.liquidity);
+                const isUnlocked = fields.unlocked;
+                return {
+                    liquidity,
+                    isUnlocked,
+                    sqrtPrice,
+                };
             });
-            const pools = poolsSimpleInfo.map((info, index) => {
-                return Object.assign(Object.assign({}, info), { sqrtPrice: sqrtPrices[index] });
+            const completePools = poolsSimpleInfo.map((info, index) => {
+                return Object.assign(Object.assign({}, info), { sqrtPrice: poolsMoreInfo[index].sqrtPrice });
             });
-            return pools;
+            const usablePools = completePools.filter((_, index) => poolsMoreInfo[index].isUnlocked &&
+                poolsMoreInfo[index].liquidity > BigInt(0));
+            return usablePools;
         });
-        this.fetchPoolForCoinTypes = (inputs) => __awaiter(this, void 0, void 0, function* () {
-            const allPools = yield this.fetchAllPools();
-            // NOTE: will there ever be more than 1 valid pool (is this unsafe ?)
-            const foundPool = allPools.find((pool) => TurbosApiHelpers.isPoolForCoinTypes(Object.assign({ pool }, inputs)));
-            if (!foundPool)
-                throw new Error("no turbos pools found for given coin types");
-            return foundPool;
+        this.fetchPoolsForTrade = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const possiblePools = yield this.fetchPoolsForCoinType({
+                coinType: inputs.coinOutType,
+            });
+            const [exactMatchPools, partialMatchPools] = utils_1.Helpers.bifilter(possiblePools, (pool) => TurbosApiHelpers.isPoolForCoinTypes({
+                pool,
+                coinType1: inputs.coinInType,
+                coinType2: inputs.coinOutType,
+            }));
+            return {
+                exactMatchPools,
+                partialMatchPools,
+            };
         });
         /////////////////////////////////////////////////////////////////////
         //// Transaction Commands
@@ -114,7 +131,7 @@ class TurbosApiHelpers {
         this.tradeTx = (inputs) => {
             const { coinInType, pool } = inputs;
             const commandInputs = Object.assign(Object.assign(Object.assign({}, inputs), pool), { poolObjectId: pool.id });
-            if (TurbosApiHelpers.isCoinA(coinInType, pool))
+            if (TurbosApiHelpers.isCoinA({ pool, coinType: coinInType }))
                 return this.tradeCoinAToCoinBTx(commandInputs);
             return this.tradeCoinBToCoinATx(commandInputs);
         };
@@ -198,7 +215,26 @@ class TurbosApiHelpers {
                 throw new Error("e");
             }
         });
-        const turbos = (_a = this.Provider.addresses.externalRouter) === null || _a === void 0 ? void 0 : _a.turbos;
+        /////////////////////////////////////////////////////////////////////
+        //// Private Methods
+        /////////////////////////////////////////////////////////////////////
+        /////////////////////////////////////////////////////////////////////
+        //// Objects
+        /////////////////////////////////////////////////////////////////////
+        this.fetchPoolForCoinTypes = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const allPools = yield this.fetchAllPools();
+            // NOTE: will there ever be more than 1 valid pool (is this unsafe ?)
+            const foundPool = allPools.find((pool) => TurbosApiHelpers.isPoolForCoinTypes(Object.assign({ pool }, inputs)));
+            if (!foundPool)
+                throw new Error("no turbos pools found for given coin types");
+            return foundPool;
+        });
+        this.fetchPoolsForCoinType = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const allPools = yield this.fetchAllPools();
+            const foundPools = allPools.filter((pool) => TurbosApiHelpers.isPoolForCoinType(Object.assign({ pool }, inputs)));
+            return foundPools;
+        });
+        const turbos = (_b = this.Provider.addresses.externalRouter) === null || _b === void 0 ? void 0 : _b.turbos;
         const pools = this.Provider.addresses.pools;
         const referralVault = this.Provider.addresses.referralVault;
         if (!turbos || !pools || !referralVault)
@@ -215,6 +251,7 @@ class TurbosApiHelpers {
     }
 }
 exports.TurbosApiHelpers = TurbosApiHelpers;
+_a = TurbosApiHelpers;
 /////////////////////////////////////////////////////////////////////
 //// Constants
 /////////////////////////////////////////////////////////////////////
@@ -225,14 +262,25 @@ TurbosApiHelpers.constants = {
     },
 };
 /////////////////////////////////////////////////////////////////////
+//// Public Static Methods
+/////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////
+//// Helpers
+/////////////////////////////////////////////////////////////////////
+TurbosApiHelpers.otherCoinInPool = (inputs) => {
+    return _a.isCoinA(inputs)
+        ? inputs.pool.coinTypeB
+        : inputs.pool.coinTypeA;
+};
+/////////////////////////////////////////////////////////////////////
 //// Private Static Methods
 /////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////
 //// Casting
 /////////////////////////////////////////////////////////////////////
 TurbosApiHelpers.partialPoolFromSuiObjectResponse = (data) => {
-    var _a;
-    const content = (_a = data.data) === null || _a === void 0 ? void 0 : _a.content;
+    var _b;
+    const content = (_b = data.data) === null || _b === void 0 ? void 0 : _b.content;
     if ((content === null || content === void 0 ? void 0 : content.dataType) !== "moveObject")
         throw new Error("sui object response is not an object");
     const fields = content.fields.value.fields;
@@ -254,7 +302,15 @@ TurbosApiHelpers.isPoolForCoinTypes = (inputs) => {
         (pool.coinTypeA === utils_1.Helpers.addLeadingZeroesToType(coinType2) &&
             pool.coinTypeB === utils_1.Helpers.addLeadingZeroesToType(coinType1)));
 };
-TurbosApiHelpers.isCoinA = (coin, pool) => utils_1.Helpers.addLeadingZeroesToType(coin) === pool.coinTypeA;
+TurbosApiHelpers.isPoolForCoinType = (inputs) => {
+    const { pool, coinType } = inputs;
+    return (pool.coinTypeA === utils_1.Helpers.addLeadingZeroesToType(coinType) ||
+        pool.coinTypeB === utils_1.Helpers.addLeadingZeroesToType(coinType));
+};
+TurbosApiHelpers.isCoinA = (inputs) => {
+    const { coinType, pool } = inputs;
+    return utils_1.Helpers.addLeadingZeroesToType(coinType) === pool.coinTypeA;
+};
 TurbosApiHelpers.calcSqrtPriceLimit = (inputs) => {
     const { sqrtPrice, isCoinAToCoinB } = inputs;
     const change = sqrtPrice / BigInt(100);

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

@@ -1,18 +1,16 @@
 import { AftermathApi } from "../../../general/providers/aftermathApi";
-import { RouterSynchronousApiHelpers } from "./routerSynchronousApiHelpers";
 import { Balance, CoinType, RouterExternalFee, RouterCompleteTradeRoute, SerializedTransaction, Slippage, SuiNetwork, Url, RouterSerializableCompleteGraph, RouterProtocolName } from "../../../types";
 import { SuiAddress } from "@mysten/sui.js";
 import { NojoAmmApi } from "../../external/nojo/nojoAmmApi";
 import { DeepBookApi } from "../../external/deepBook/deepBookApi";
 import { PoolsApi } from "../../pools/api/poolsApi";
 import { CetusApi } from "../../external/cetus/cetusApi";
-import { RouterAsyncApiHelpers } from "./routerAsyncApiHelpers";
 import { TurbosApi } from "../../external/turbos/turbosApi";
+import { RouterApiHelpers } from "./routerApiHelpers";
 export declare class RouterApi {
     private readonly Provider;
     readonly protocols: RouterProtocolName[];
-    readonly Helpers: RouterSynchronousApiHelpers;
-    readonly AsyncHelpers: RouterAsyncApiHelpers;
+    readonly Helpers: RouterApiHelpers;
     constructor(Provider: AftermathApi, protocols?: RouterProtocolName[]);
     Aftermath: () => PoolsApi;
     Nojo: () => NojoAmmApi;

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

@@ -1 +1 @@
-{"version":3,"file":"routerApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EACN,OAAO,EACP,QAAQ,EACR,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,QAAQ,EACR,UAAU,EACV,GAAG,EACH,+BAA+B,EAC/B,kBAAkB,EAElB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAEzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,qBAAa,SAAS;IAapB,OAAO,CAAC,QAAQ,CAAC,QAAQ;aACT,SAAS,EAAE,kBAAkB,EAAE;IAThD,SAAgB,OAAO,8BAAC;IACxB,SAAgB,YAAY,wBAAC;gBAOX,QAAQ,EAAE,YAAY,EACvB,SAAS,GAAE,kBAAkB,EAAkB;IAWzD,SAAS,iBAAqC;IAC9C,IAAI,mBAAuC;IAC3C,QAAQ,oBAAwC;IAChD,KAAK,iBAAqC;IAC1C,MAAM,kBAAsC;IAU5C,sBAAsB,iDAK3B;IAMK,2BAA2B,WAAkB;QACnD,KAAK,EAAE,+BAA+B,CAAC;KACvC,gEAEC;IAMK,oCAAoC,WAAkB;QAC5D,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;QAC1B,KAAK,EAAE,+BAA+B,CAAC;QACvC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;QACtB,WAAW,CAAC,EAAE,iBAAiB,CAAC;KAGhC,KAAG,QAAQ,wBAAwB,CAAC,CAiCnC;IAwBW,qCAAqC,CAAC,MAAM,EAAE;QAC1D,aAAa,EAAE,UAAU,CAAC;QAC1B,aAAa,EAAE,wBAAwB,CAAC;QACxC,QAAQ,EAAE,QAAQ,CAAC;KACnB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CASlC"}
+{"version":3,"file":"routerApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,EACN,OAAO,EACP,QAAQ,EACR,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,QAAQ,EACR,UAAU,EACV,GAAG,EACH,+BAA+B,EAC/B,kBAAkB,EAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAGzD,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,SAAS;IAYpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;aACT,SAAS,EAAE,kBAAkB,EAAE;IARhD,SAAgB,OAAO,mBAAC;gBAON,QAAQ,EAAE,YAAY,EACvB,SAAS,GAAE,kBAAkB,EAAkB;IAUzD,SAAS,iBAAqC;IAC9C,IAAI,mBAAuC;IAC3C,QAAQ,oBAAwC;IAChD,KAAK,iBAAqC;IAC1C,MAAM,kBAAsC;IAU5C,sBAAsB,iDAI3B;IAMK,2BAA2B,WAAkB;QACnD,KAAK,EAAE,+BAA+B,CAAC;KACvC,gEAEC;IAMK,oCAAoC,WAAkB;QAC5D,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;QAC1B,KAAK,EAAE,+BAA+B,CAAC;QACvC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;QACtB,WAAW,CAAC,EAAE,iBAAiB,CAAC;KAGhC,KAAG,QAAQ,wBAAwB,CAAC,CAKnC;IAwBW,qCAAqC,CAAC,MAAM,EAAE;QAC1D,aAAa,EAAE,UAAU,CAAC;QAC1B,aAAa,EAAE,wBAAwB,CAAC;QACxC,QAAQ,EAAE,QAAQ,CAAC;KACnB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAQlC"}

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

@@ -10,16 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouterApi = void 0;
-const routerSynchronousApiHelpers_1 = require("./routerSynchronousApiHelpers");
 const routerGraph_1 = require("../utils/synchronous/routerGraph");
-const types_1 = require("../../../types");
 const nojoAmmApi_1 = require("../../external/nojo/nojoAmmApi");
 const deepBookApi_1 = require("../../external/deepBook/deepBookApi");
 const poolsApi_1 = require("../../pools/api/poolsApi");
 const cetusApi_1 = require("../../external/cetus/cetusApi");
-const routerAsyncGraph_1 = require("../utils/async/routerAsyncGraph");
-const routerAsyncApiHelpers_1 = require("./routerAsyncApiHelpers");
 const turbosApi_1 = require("../../external/turbos/turbosApi");
+const routerApiHelpers_1 = require("./routerApiHelpers");
 class RouterApi {
     /////////////////////////////////////////////////////////////////////
     //// Constructor
@@ -42,10 +39,9 @@ class RouterApi {
         //// Graph
         /////////////////////////////////////////////////////////////////////
         this.fetchSerializableGraph = () => __awaiter(this, void 0, void 0, function* () {
-            const pools = yield this.Helpers.fetchAllPools({
+            return this.Helpers.fetchSerializableGraph({
                 protocols: this.protocols,
             });
-            return routerGraph_1.RouterGraph.createGraph({ pools });
         });
         /////////////////////////////////////////////////////////////////////
         //// Coin Paths
@@ -57,26 +53,10 @@ class RouterApi {
         //// Routing
         /////////////////////////////////////////////////////////////////////
         this.fetchCompleteTradeRouteGivenAmountIn = (inputs) => __awaiter(this, void 0, void 0, function* () {
-            if (this.protocols.length === 0)
-                throw new Error("no protocols set in constructor");
-            const { network, graph, coinInAmount } = inputs;
-            const coinInAmounts = routerSynchronousApiHelpers_1.RouterSynchronousApiHelpers.amountsInForRouterTrade({
-                coinInAmount,
-            });
-            const tradeResults = yield this.AsyncHelpers.fetchTradeResults(Object.assign(Object.assign({}, inputs), { protocols: this.protocols.filter(types_1.isRouterAsyncProtocolName), coinInAmounts }));
-            const routerGraph = new routerGraph_1.RouterGraph(network, graph);
-            if (tradeResults.results.length <= 0)
-                return routerGraph.getCompleteRouteGivenAmountIn(inputs);
-            const synchronousCompleteRoutes = routerGraph.getCompleteRoutesGivenAmountIns(Object.assign(Object.assign({}, inputs), { coinInAmounts }));
-            return routerAsyncGraph_1.RouterAsyncGraph.createFinalCompleteRoute({
-                tradeResults,
-                synchronousCompleteRoutes,
-                coinInAmounts,
-            });
+            return this.Helpers.fetchCompleteTradeRouteGivenAmountIn(Object.assign(Object.assign({}, inputs), { protocols: this.protocols }));
         });
         this.Provider = Provider;
-        this.Helpers = new routerSynchronousApiHelpers_1.RouterSynchronousApiHelpers(Provider);
-        this.AsyncHelpers = new routerAsyncApiHelpers_1.RouterAsyncApiHelpers(Provider);
+        this.Helpers = new routerApiHelpers_1.RouterApiHelpers(Provider);
     }
     // public fetchCompleteTradeRouteGivenAmountOut = async (
     // 	network: SuiNetwork | Url,
@@ -100,7 +80,7 @@ class RouterApi {
     /////////////////////////////////////////////////////////////////////
     fetchTransactionForCompleteTradeRoute(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            const tx = yield this.Helpers.fetchBuildTransactionForCompleteTradeRoute(inputs);
+            const tx = yield this.Helpers.fetchTransactionForCompleteTradeRoute(inputs);
             return this.Provider.Transactions().fetchSetGasBudgetAndSerializeTransaction(tx);
         });
     }

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

@@ -0,0 +1,41 @@
+import { SuiAddress, TransactionBlock } from "@mysten/sui.js";
+import { AftermathApi } from "../../../general/providers/aftermathApi";
+import { Balance, CoinType, RouterCompleteTradeRoute, RouterExternalFee, RouterProtocolName, RouterSerializableCompleteGraph, Slippage, SuiNetwork, Url } from "../../../types";
+import { RouterAsyncApiHelpers } from "./routerAsyncApiHelpers";
+import { RouterSynchronousApiHelpers } from "./routerSynchronousApiHelpers";
+export declare class RouterApiHelpers {
+    private readonly Provider;
+    static readonly constants: {
+        defaults: {
+            tradePartitionCount: number;
+        };
+    };
+    readonly SynchronousHelpers: RouterSynchronousApiHelpers;
+    readonly AsyncHelpers: RouterAsyncApiHelpers;
+    constructor(Provider: AftermathApi);
+    fetchSerializableGraph: (inputs: {
+        protocols: RouterProtocolName[];
+    }) => Promise<RouterSerializableCompleteGraph>;
+    fetchCompleteTradeRouteGivenAmountIn: (inputs: {
+        protocols: RouterProtocolName[];
+        network: SuiNetwork | Url;
+        graph: RouterSerializableCompleteGraph;
+        coinInType: CoinType;
+        coinInAmount: Balance;
+        coinOutType: CoinType;
+        referrer?: SuiAddress;
+        externalFee?: RouterExternalFee;
+    }) => Promise<RouterCompleteTradeRoute>;
+    private fetchCompleteTradeRoutesForLastRouteAsyncPool;
+    fetchTransactionForCompleteTradeRoute(inputs: {
+        walletAddress: SuiAddress;
+        completeRoute: RouterCompleteTradeRoute;
+        slippage: Slippage;
+    }): Promise<TransactionBlock>;
+    static amountsInForRouterTrade: (inputs: {
+        coinInAmount: Balance;
+        partitions?: number;
+    }) => Balance[];
+    private static addFinalRouterCompleteTradeRouteToRoute;
+}
+//# sourceMappingURL=routerApiHelpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"routerApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApiHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACN,OAAO,EACP,QAAQ,EAER,wBAAwB,EACxB,iBAAiB,EACjB,kBAAkB,EAClB,+BAA+B,EAC/B,QAAQ,EACR,UAAU,EACV,GAAG,EAEH,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAG5E,qBAAa,gBAAgB;IAsBhB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAjBrC,gBAAuB,SAAS;;;;MAI9B;IAMF,SAAgB,kBAAkB,8BAAC;IACnC,SAAgB,YAAY,wBAAC;gBAMA,QAAQ,EAAE,YAAY;IAe5C,sBAAsB,WAAkB;QAC9C,SAAS,EAAE,kBAAkB,EAAE,CAAC;KAChC,8CAGC;IAMK,oCAAoC,WAAkB;QAC5D,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAChC,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;QAC1B,KAAK,EAAE,+BAA+B,CAAC;QACvC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;QACtB,WAAW,CAAC,EAAE,iBAAiB,CAAC;KAGhC,KAAG,QAAQ,wBAAwB,CAAC,CAgEnC;IAEF,OAAO,CAAC,6CAA6C,CAuDnD;IAmDW,qCAAqC,CAAC,MAAM,EAAE;QAC1D,aAAa,EAAE,UAAU,CAAC;QAC1B,aAAa,EAAE,wBAAwB,CAAC;QACxC,QAAQ,EAAE,QAAQ,CAAC;KACnB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAc7B,OAAc,uBAAuB,WAAY;QAChD,YAAY,EAAE,OAAO,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;KACpB,KAAG,OAAO,EAAE,CAqBX;IAUF,OAAO,CAAC,MAAM,CAAC,uCAAuC,CAwCpD;CACF"}