aftermath-ts-sdk 0.0.162 → 0.0.164

package/dist/packages/router/utils/synchronous/interfaces/routerPoolInterface.d.ts

@@ -24,15 +24,18 @@ export interface RouterPoolInterface {
         coinOutType: CoinType;
         referrer?: SuiAddress;
     }) => Balance;
-    addTradeCommandToTransaction: (inputs: {
+    tradeTx: (inputs: {
         provider: AftermathApi;
         tx: TransactionBlock;
         coinIn: ObjectId | TransactionArgument;
         coinInAmount: Balance;
+        expectedCoinOutAmount: Balance;
         coinInType: CoinType;
         coinOutType: CoinType;
-        expectedAmountOut: Balance;
         slippage: Slippage;
+        tradePotato: TransactionArgument;
+        isFirstSwapForPath: boolean;
+        isLastSwapForPath: boolean;
         referrer?: SuiAddress;
         externalFee?: RouterExternalFee;
     }) => TransactionArgument;

package/dist/packages/router/utils/synchronous/interfaces/routerPoolInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routerPoolInterface.d.ts","sourceRoot":"","sources":["../../../../../../src/packages/router/utils/synchronous/interfaces/routerPoolInterface.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,kBAAkB,EAClB,sBAAsB,EACtB,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,GAAG,EACH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAahE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACxC,IAAI,EAAE,sBAAsB,CAAC;IAE7B,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;CAC1B,GAAG,mBAAmB,CActB;AAmBD,MAAM,WAAW,mBAAmB;IASnC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;IACnC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAOhC,YAAY,EAAE,CAAC,MAAM,EAAE;QACtB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACtB,KAAK,MAAM,CAAC;IAEb,iBAAiB,EAAE,CAAC,MAAM,EAAE;QAC3B,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAK,OAAO,CAAC;IAEd,4BAA4B,EAAE,CAAC,MAAM,EAAE;QACtC,QAAQ,EAAE,YAAY,CAAC;QACvB,EAAE,EAAE,gBAAgB,CAAC;QACrB,MAAM,EAAE,QAAQ,GAAG,mBAAmB,CAAC;QACvC,YAAY,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,QAAQ,EAAE,QAAQ,CAAC;QACnB,QAAQ,CAAC,EAAE,UAAU,CAAC;QACtB,WAAW,CAAC,EAAE,iBAAiB,CAAC;KAChC,KAAK,mBAAmB,CAAC;IAY1B,gBAAgB,EAAE,CAAC,MAAM,EAAE;QAC1B,UAAU,EAAE,QAAQ,CAAC;QACrB,aAAa,EAAE,OAAO,CAAC;QACvB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAK,OAAO,CAAC;IAEd,yBAAyB,EAAE,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,CAAC;KACvB,KAAK,mBAAmB,CAAC;IAE1B,wBAAwB,EAAE,CAAC,MAAM,EAAE;QAClC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,CAAC;KACvB,KAAK,mBAAmB,CAAC;CAC1B"}
+{"version":3,"file":"routerPoolInterface.d.ts","sourceRoot":"","sources":["../../../../../../src/packages/router/utils/synchronous/interfaces/routerPoolInterface.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,kBAAkB,EAClB,sBAAsB,EACtB,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,GAAG,EACH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAsBhE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACxC,IAAI,EAAE,sBAAsB,CAAC;IAE7B,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;CAC1B,GAAG,mBAAmB,CAsBtB;AAmBD,MAAM,WAAW,mBAAmB;IASnC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;IACnC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAOhC,YAAY,EAAE,CAAC,MAAM,EAAE;QACtB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACtB,KAAK,MAAM,CAAC;IAEb,iBAAiB,EAAE,CAAC,MAAM,EAAE;QAC3B,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAK,OAAO,CAAC;IAEd,OAAO,EAAE,CAAC,MAAM,EAAE;QACjB,QAAQ,EAAE,YAAY,CAAC;QACvB,EAAE,EAAE,gBAAgB,CAAC;QACrB,MAAM,EAAE,QAAQ,GAAG,mBAAmB,CAAC;QACvC,YAAY,EAAE,OAAO,CAAC;QACtB,qBAAqB,EAAE,OAAO,CAAC;QAC/B,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,EAAE,QAAQ,CAAC;QACnB,WAAW,EAAE,mBAAmB,CAAC;QACjC,kBAAkB,EAAE,OAAO,CAAC;QAC5B,iBAAiB,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,EAAE,UAAU,CAAC;QACtB,WAAW,CAAC,EAAE,iBAAiB,CAAC;KAChC,KAAK,mBAAmB,CAAC;IAY1B,gBAAgB,EAAE,CAAC,MAAM,EAAE;QAC1B,UAAU,EAAE,QAAQ,CAAC;QACrB,aAAa,EAAE,OAAO,CAAC;QACvB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAK,OAAO,CAAC;IAEd,yBAAyB,EAAE,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,CAAC;KACvB,KAAK,mBAAmB,CAAC;IAE1B,wBAAwB,EAAE,CAAC,MAAM,EAAE;QAClC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,CAAC;KACvB,KAAK,mBAAmB,CAAC;CAC1B"}

package/dist/packages/router/utils/synchronous/interfaces/routerPoolInterface.js

@@ -5,28 +5,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRouterPool = void 0;
 const aftermathRouterPool_1 = __importDefault(require("../routerPools/aftermathRouterPool"));
-const nojoRouterPool_1 = __importDefault(require("../routerPools/nojoRouterPool"));
-const nojoAmmTypes_1 = require("../../../../external/nojo/nojoAmmTypes");
 const deepBookTypes_1 = require("../../../../external/deepBook/deepBookTypes");
 const deepBookRouterPool_1 = __importDefault(require("../routerPools/deepBookRouterPool"));
 const cetusTypes_1 = require("../../../../external/cetus/cetusTypes");
 const cetusRouterPool_1 = __importDefault(require("../routerPools/cetusRouterPool"));
 const turbosTypes_1 = require("../../../../external/turbos/turbosTypes");
 const turbosRouterPool_1 = __importDefault(require("../routerPools/turbosRouterPool"));
-/////////////////////////////////////////////////////////////////////
-//// Creation
-/////////////////////////////////////////////////////////////////////
+const interestRouterPool_1 = __importDefault(require("../routerPools/interestRouterPool"));
+const interestTypes_1 = require("../../../../external/interest/interestTypes");
+const kriyaTypes_1 = require("../../../../external/kriya/kriyaTypes");
+const kriyaRouterPool_1 = __importDefault(require("../routerPools/kriyaRouterPool"));
+const baySwapTypes_1 = require("../../../../external/baySwap/baySwapTypes");
+const baySwapRouterPool_1 = __importDefault(require("../routerPools/baySwapRouterPool"));
+const suiswapTypes_1 = require("../../../../external/suiswap/suiswapTypes");
+const suiswapRouterPool_1 = __importDefault(require("../routerPools/suiswapRouterPool"));
+const blueMoveTypes_1 = require("../../../../external/blueMove/blueMoveTypes");
+const blueMoveRouterPool_1 = __importDefault(require("../routerPools/blueMoveRouterPool"));
+// =========================================================================
+//  Creation
+// =========================================================================
 function createRouterPool(inputs) {
     const { pool, network } = inputs;
-    const constructedPool = (0, nojoAmmTypes_1.isNojoPoolObject)(pool)
-        ? new nojoRouterPool_1.default(pool, network)
-        : (0, deepBookTypes_1.isDeepBookPoolObject)(pool)
-            ? new deepBookRouterPool_1.default(pool, network)
-            : (0, turbosTypes_1.isTurbosPoolObject)(pool)
-                ? new turbosRouterPool_1.default(pool, network)
-                : (0, cetusTypes_1.isCetusRouterPoolObject)(pool)
-                    ? new cetusRouterPool_1.default(pool, network)
-                    : new aftermathRouterPool_1.default(pool, network);
+    const constructedPool = (0, deepBookTypes_1.isDeepBookPoolObject)(pool)
+        ? new deepBookRouterPool_1.default(pool, network)
+        : (0, turbosTypes_1.isTurbosPoolObject)(pool)
+            ? new turbosRouterPool_1.default(pool, network)
+            : (0, cetusTypes_1.isCetusRouterPoolObject)(pool)
+                ? new cetusRouterPool_1.default(pool, network)
+                : (0, interestTypes_1.isInterestPoolObject)(pool)
+                    ? new interestRouterPool_1.default(pool, network)
+                    : (0, kriyaTypes_1.isKriyaPoolObject)(pool)
+                        ? new kriyaRouterPool_1.default(pool, network)
+                        : (0, baySwapTypes_1.isBaySwapPoolObject)(pool)
+                            ? new baySwapRouterPool_1.default(pool, network)
+                            : (0, suiswapTypes_1.isSuiswapPoolObject)(pool)
+                                ? new suiswapRouterPool_1.default(pool, network)
+                                : (0, blueMoveTypes_1.isBlueMovePoolObject)(pool)
+                                    ? new blueMoveRouterPool_1.default(pool, network)
+                                    : new aftermathRouterPool_1.default(pool, network);
     return constructedPool;
 }
 exports.createRouterPool = createRouterPool;

package/dist/packages/router/utils/synchronous/routerGraph.js

@@ -14,13 +14,13 @@ exports.RouterGraph = void 0;
 const helpers_1 = require("../../../../general/utils/helpers");
 const routerPoolInterface_1 = require("./interfaces/routerPoolInterface");
 const router_1 = require("../../router");
-/////////////////////////////////////////////////////////////////////
-//// Class
-/////////////////////////////////////////////////////////////////////
+// =========================================================================
+//  Class
+// =========================================================================
 class RouterGraph {
-    /////////////////////////////////////////////////////////////////////
-    //// Constructor
-    /////////////////////////////////////////////////////////////////////
+    // =========================================================================
+    //  Constructor
+    // =========================================================================
     constructor(network, graph, options) {
         this.splitTradeBetweenRoutes = (graph, routes, coinInAmount, isGivenAmountOut, referrer) => {
             const coinInPartitionAmount = coinInAmount /
@@ -186,9 +186,9 @@ class RouterGraph {
         this.graph = RouterGraph.graphFromSerializable({ graph, network });
         this.constants = Object.assign(Object.assign({}, RouterGraph.defaultOptions), options);
     }
-    /////////////////////////////////////////////////////////////////////
-    //// Public Methods
-    /////////////////////////////////////////////////////////////////////
+    // =========================================================================
+    //  Public Methods
+    // =========================================================================
     updateOptions(partialOptions) {
         this.constants = Object.assign(Object.assign({}, this.constants), partialOptions);
     }
@@ -239,12 +239,12 @@ class RouterGraph {
             : completeRoutes;
         return result;
     }
-    /////////////////////////////////////////////////////////////////////
-    //// Public Static Methods
-    /////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////
-    //// Graph Creation
-    /////////////////////////////////////////////////////////////////////
+    // =========================================================================
+    //  Public Static Methods
+    // =========================================================================
+    // =========================================================================
+    //  Graph Creation
+    // =========================================================================
     static createGraph(inputs) {
         const poolClasses = inputs.pools.map((pool) => (0, routerPoolInterface_1.createRouterPool)({
             pool,
@@ -299,9 +299,9 @@ class RouterGraph {
         };
         return graph;
     }
-    /////////////////////////////////////////////////////////////////////
-    //// Private Methods
-    /////////////////////////////////////////////////////////////////////
+    // =========================================================================
+    //  Private Methods
+    // =========================================================================
     getCompleteRoute(inputs) {
         if (Object.keys(this.graph).length <= 0)
             throw new Error("empty graphs");
@@ -322,18 +322,18 @@ class RouterGraph {
 }
 exports.RouterGraph = RouterGraph;
 _a = RouterGraph;
-/////////////////////////////////////////////////////////////////////
-//// Public Static Constants
-/////////////////////////////////////////////////////////////////////
+// =========================================================================
+//  Public Static Constants
+// =========================================================================
 RouterGraph.defaultOptions = {
     maxRouteLength: 3,
     tradePartitionCount: 5,
     minRoutesToCheck: 10,
     maxGasCost: BigInt(500000000), // 0.5 SUI
 };
-/////////////////////////////////////////////////////////////////////
-//// Supported Coins
-/////////////////////////////////////////////////////////////////////
+// =========================================================================
+//  Supported Coins
+// =========================================================================
 // TODO: do this more efficiently
 RouterGraph.supportedCoinPathsFromGraph = (inputs) => __awaiter(void 0, void 0, void 0, function* () {
     var _b;
@@ -379,12 +379,12 @@ RouterGraph.supportedCoinPathsFromGraph = (inputs) => __awaiter(void 0, void 0,
     });
     return mergedCoinPaths;
 });
-/////////////////////////////////////////////////////////////////////
-//// Private Static Methods
-/////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////
-//// Graph Creation
-/////////////////////////////////////////////////////////////////////
+// =========================================================================
+//  Private Static Methods
+// =========================================================================
+// =========================================================================
+//  Graph Creation
+// =========================================================================
 RouterGraph.updateCoinNodesFromPool = (coinNodes, pool) => {
     const coinTypes = pool.coinTypes.map(helpers_1.Helpers.addLeadingZeroesToType);
     const uid = pool.uid;
@@ -414,9 +414,9 @@ RouterGraph.updateCoinNodesFromPool = (coinNodes, pool) => {
     }
     return newCoinNodes;
 };
-/////////////////////////////////////////////////////////////////////
-//// Route Finding
-/////////////////////////////////////////////////////////////////////
+// =========================================================================
+//  Route Finding
+// =========================================================================
 RouterGraph.findRoutes = (syncGraph, coinIn, coinOut, maxRouteLength, isGivenAmountOut) => {
     const syncCoinInEdges = syncGraph.coinNodes[coinIn].coinOutThroughPoolEdges;
     const startingRoutes = _a.createStartingRoutes(syncGraph.pools, syncCoinInEdges, coinIn, coinOut, false);
@@ -611,9 +611,9 @@ RouterGraph.routerCompleteTradeRouteFromCompleteTradeRoute = (completeRoute, poo
         referrer,
     };
 };
-/////////////////////////////////////////////////////////////////////
-//// Supported Coins
-/////////////////////////////////////////////////////////////////////
+// =========================================================================
+//  Supported Coins
+// =========================================================================
 RouterGraph.extendCoinPathsForHops = (inputs) => {
     const { startingCoinPaths, maxHops } = inputs;
     let extendedCoinPaths = helpers_1.Helpers.deepCopy(startingCoinPaths);

package/dist/packages/router/utils/synchronous/routerPools/aftermathRouterPool.d.ts

@@ -24,15 +24,18 @@ declare class AftermathRouterPool implements RouterPoolInterface {
         coinOutType: CoinType;
         referrer?: SuiAddress;
     }) => Balance;
-    addTradeCommandToTransaction: (inputs: {
+    tradeTx: (inputs: {
         provider: AftermathApi;
         tx: TransactionBlock;
         coinIn: ObjectId | TransactionArgument;
         coinInAmount: Balance;
         coinInType: CoinType;
         coinOutType: CoinType;
-        expectedAmountOut: Balance;
+        expectedCoinOutAmount: Balance;
         slippage: Slippage;
+        tradePotato: TransactionArgument;
+        isFirstSwapForPath: boolean;
+        isLastSwapForPath: boolean;
         referrer?: SuiAddress;
     }) => {
         kind: "Input";

package/dist/packages/router/utils/synchronous/routerPools/aftermathRouterPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aftermathRouterPool.d.ts","sourceRoot":"","sources":["../../../../../../src/packages/router/utils/synchronous/routerPools/aftermathRouterPool.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,OAAO,EACP,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,GAAG,EACH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,cAAM,mBAAoB,YAAW,mBAAmB;gBAK3C,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG;IAevD,QAAQ,CAAC,YAAY,eAAe;IACpC,QAAQ,CAAC,qBAAqB,SAAuB;IACrD,QAAQ,CAAC,aAAa,SAAS;IAE/B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;IACnC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAO;IAMjC,YAAY,WAAY;QACvB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACtB,YA2BC;IAEF,iBAAiB,WAAY;QAC5B,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAG,OAAO,CA8CT;IAEF,4BAA4B,WAAY;QACvC,QAAQ,EAAE,YAAY,CAAC;QACvB,EAAE,EAAE,gBAAgB,CAAC;QACrB,MAAM,EAAE,QAAQ,GAAG,mBAAmB,CAAC;QACvC,YAAY,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,QAAQ,EAAE,QAAQ,CAAC;QACnB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB;;;;;;;;;;;;;;MA2CC;IAEF,gBAAgB,WAAY;QAC3B,UAAU,EAAE,QAAQ,CAAC;QACrB,aAAa,EAAE,OAAO,CAAC;QACvB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAG,OAAO,CAiCT;IAEF,yBAAyB,WAAY;QACpC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,CAAC;KACvB,KAAG,mBAAmB,CAMrB;IAEF,wBAAwB,WAAY;QACnC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,CAAC;KACvB,KAAG,mBAAmB,CA8BrB;CACF;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"aftermathRouterPool.d.ts","sourceRoot":"","sources":["../../../../../../src/packages/router/utils/synchronous/routerPools/aftermathRouterPool.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,OAAO,EACP,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,GAAG,EACH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,cAAM,mBAAoB,YAAW,mBAAmB;gBAK3C,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG;IAevD,QAAQ,CAAC,YAAY,eAAe;IACpC,QAAQ,CAAC,qBAAqB,SAAuB;IACrD,QAAQ,CAAC,aAAa,SAAS;IAE/B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,GAAG,CAAC;IACnC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAO;IAMjC,YAAY,WAAY;QACvB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACtB,YA8BC;IAEF,iBAAiB,WAAY;QAC5B,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAG,OAAO,CA8CT;IAEF,OAAO,WAAY;QAClB,QAAQ,EAAE,YAAY,CAAC;QACvB,EAAE,EAAE,gBAAgB,CAAC;QACrB,MAAM,EAAE,QAAQ,GAAG,mBAAmB,CAAC;QACvC,YAAY,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;QACtB,qBAAqB,EAAE,OAAO,CAAC;QAC/B,QAAQ,EAAE,QAAQ,CAAC;QACnB,WAAW,EAAE,mBAAmB,CAAC;QACjC,kBAAkB,EAAE,OAAO,CAAC;QAC5B,iBAAiB,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB;;;;;;;;;;;;;;MA2CC;IAEF,gBAAgB,WAAY;QAC3B,UAAU,EAAE,QAAQ,CAAC;QACrB,aAAa,EAAE,OAAO,CAAC;QACvB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAG,OAAO,CAiCT;IAEF,yBAAyB,WAAY;QACpC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,CAAC;KACvB,KAAG,mBAAmB,CAMrB;IAEF,wBAAwB,WAAY;QACnC,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,aAAa,EAAE,OAAO,CAAC;KACvB,KAAG,mBAAmB,CA8BrB;CACF;AAED,eAAe,mBAAmB,CAAC"}

package/dist/packages/router/utils/synchronous/routerPools/aftermathRouterPool.js

@@ -3,28 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const pools_1 = require("../../../../pools");
 const utils_1 = require("../../../../../general/utils");
 class AftermathRouterPool {
-    /////////////////////////////////////////////////////////////////////
-    //// Constructor
-    /////////////////////////////////////////////////////////////////////
+    // =========================================================================
+    //  Constructor
+    // =========================================================================
     constructor(pool, network) {
-        /////////////////////////////////////////////////////////////////////
-        //// Constants
-        /////////////////////////////////////////////////////////////////////
+        // =========================================================================
+        //  Constants
+        // =========================================================================
         this.protocolName = "Aftermath";
         this.expectedGasCostPerHop = BigInt(100000000); // 0.1 SUI
         this.noHopsAllowed = false;
-        /////////////////////////////////////////////////////////////////////
-        //// Functions
-        /////////////////////////////////////////////////////////////////////
+        // =========================================================================
+        //  Functions
+        // =========================================================================
         this.getSpotPrice = (inputs) => {
             // withdraw/deposit
             if (inputs.coinInType === this.pool.lpCoinType ||
                 inputs.coinOutType === this.pool.lpCoinType) {
                 // TODO: do this calc more efficiently
-                let smallAmountIn = BigInt(10);
+                let smallAmountIn = BigInt(100000);
                 while (smallAmountIn < utils_1.Casting.u64MaxBigInt) {
                     try {
                         const smallAmountOut = this.getTradeAmountOut(Object.assign(Object.assign({}, inputs), { coinInAmount: smallAmountIn }));
+                        if (smallAmountOut <= BigInt(0))
+                            throw new Error("0 amount out");
                         return Number(smallAmountIn) / Number(smallAmountOut);
                     }
                     catch (e) { }
@@ -73,26 +75,26 @@ class AftermathRouterPool {
             // trade
             return this.poolClass.getTradeAmountOut(inputs);
         };
-        this.addTradeCommandToTransaction = (inputs) => {
+        this.tradeTx = (inputs) => {
             // withdraw
             if (inputs.coinInType === this.pool.lpCoinType) {
-                return inputs.provider.Pools().Helpers.multiCoinWithdrawTx(Object.assign(Object.assign({}, inputs), { poolId: this.pool.objectId, 
+                return inputs.provider.Pools().multiCoinWithdrawTx(Object.assign(Object.assign({}, inputs), { poolId: this.pool.objectId, 
                     // this is beacuse typescript complains for some reason otherwise
-                    lpCoinId: inputs.coinIn, coinTypes: [inputs.coinOutType], expectedAmountsOut: [inputs.expectedAmountOut], lpCoinType: this.pool.lpCoinType }));
+                    lpCoinId: inputs.coinIn, coinTypes: [inputs.coinOutType], expectedAmountsOut: [inputs.expectedCoinOutAmount], lpCoinType: this.pool.lpCoinType }));
             }
             // deposit
             if (inputs.coinOutType === this.pool.lpCoinType) {
                 const expectedLpRatio = this.poolClass.getMultiCoinWithdrawLpRatio({
-                    lpCoinAmountOut: inputs.expectedAmountOut,
+                    lpCoinAmountOut: inputs.expectedCoinOutAmount,
                 });
-                return inputs.provider.Pools().Helpers.multiCoinDepositTx(Object.assign(Object.assign({}, inputs), { poolId: this.pool.objectId, 
+                return inputs.provider.Pools().multiCoinDepositTx(Object.assign(Object.assign({}, inputs), { poolId: this.pool.objectId, 
                     // this is beacuse typescript complains for some reason otherwise
                     coinIds: typeof inputs.coinIn === "string"
                         ? [inputs.coinIn]
                         : [inputs.coinIn], coinTypes: [inputs.coinInType], expectedLpRatio: utils_1.Casting.numberToFixedBigInt(expectedLpRatio), lpCoinType: this.pool.lpCoinType }));
             }
             // trade
-            const coinOut = inputs.provider.Pools().Helpers.tradeTx(Object.assign(Object.assign({}, inputs), { poolId: this.pool.objectId, lpCoinType: this.pool.lpCoinType, coinInId: inputs.coinIn }));
+            const coinOut = inputs.provider.Pools().routerWrapperTradeTx(Object.assign(Object.assign({}, inputs), { poolId: this.pool.objectId, lpCoinType: this.pool.lpCoinType, coinInId: inputs.coinIn }));
             return coinOut;
         };
         this.getTradeAmountIn = (inputs) => {

package/dist/packages/router/utils/synchronous/routerPools/baySwapRouterPool.d.ts

@@ -0,0 +1,102 @@
+import { ObjectId, SuiAddress, TransactionArgument, TransactionBlock } from "@mysten/sui.js";
+import { Balance, Slippage, SuiNetwork, UniqueId, Url } from "../../../../../types";
+import { CoinType } from "../../../../coin/coinTypes";
+import { RouterPoolInterface } from "../interfaces/routerPoolInterface";
+import { AftermathApi } from "../../../../../general/providers";
+import { BaySwapPoolObject } from "../../../../external/baySwap/baySwapTypes";
+declare class BaySwapRouterPool implements RouterPoolInterface {
+    constructor(pool: BaySwapPoolObject, network: SuiNetwork | Url);
+    readonly protocolName = "BaySwap";
+    readonly expectedGasCostPerHop: bigint;
+    readonly noHopsAllowed = false;
+    readonly pool: BaySwapPoolObject;
+    readonly network: SuiNetwork | Url;
+    readonly uid: UniqueId;
+    readonly coinTypes: CoinType[];
+    private static readonly FEE_SCALING;
+    private static readonly ONE_E_8;
+    getSpotPrice: (inputs: {
+        coinInType: CoinType;
+        coinOutType: CoinType;
+    }) => number;
+    getTradeAmountOut: (inputs: {
+        coinInType: CoinType;
+        coinInAmount: Balance;
+        coinOutType: CoinType;
+        referrer?: SuiAddress;
+    }) => Balance;
+    tradeTx: (inputs: {
+        provider: AftermathApi;
+        tx: TransactionBlock;
+        coinIn: ObjectId | TransactionArgument;
+        coinInAmount: Balance;
+        coinInType: CoinType;
+        coinOutType: CoinType;
+        expectedCoinOutAmount: Balance;
+        slippage: Slippage;
+        tradePotato: TransactionArgument;
+        isFirstSwapForPath: boolean;
+        isLastSwapForPath: boolean;
+        referrer?: SuiAddress;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
+    getTradeAmountIn: (inputs: {
+        coinInType: CoinType;
+        coinOutAmount: Balance;
+        coinOutType: CoinType;
+        referrer?: SuiAddress;
+    }) => Balance;
+    getUpdatedPoolBeforeTrade: (inputs: {
+        coinInType: CoinType;
+        coinInAmount: Balance;
+        coinOutType: CoinType;
+        coinOutAmount: Balance;
+    }) => RouterPoolInterface;
+    getUpdatedPoolAfterTrade: (inputs: {
+        coinInType: CoinType;
+        coinInAmount: Balance;
+        coinOutType: CoinType;
+        coinOutAmount: Balance;
+    }) => RouterPoolInterface;
+    private getPoolBalance;
+    private getSwapAmountStable;
+    getSwapAmountUncorrelated: (reserveA: number, reserveB: number, amount: number, totalFeeRate?: number) => {
+        amountToSwap: number;
+        recievedAmount: number;
+    };
+    private get_input_price_uncorrelated;
+    private get_input_price_stable;
+    private lp_value;
+    private get_y;
+    private calcF;
+    private calcD;
+}
+export default BaySwapRouterPool;
+//# sourceMappingURL=baySwapRouterPool.d.ts.map

package/dist/packages/router/utils/synchronous/routerPools/baySwapRouterPool.d.ts.map

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