@7kprotocol/sdk-ts 3.4.1 → 3.4.2-beta.0

package/lib/cjs/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EACL,OAAO,EACP,cAAc,EACd,SAAS,EACT,QAAQ,EACR,cAAc,EACd,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACb,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAG7B,QAAA,MAAM,YAAY,uDAAsB,CAAC;AACzC,QAAA,MAAM,YAAY,mEAAsB,CAAC;AAEzC,OAAO,EAEL,MAAM,EAGN,YAAY,EACZ,YAAY,EAGZ,aAAa,EACb,cAAc,EACd,WAAW,EAGX,QAAQ,EACR,cAAc,EACd,OAAO,EACP,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,eAAe,EAGf,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,oBAAoB,EAGpB,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,qBAAqB,GACtB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,wBAmCE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EACL,OAAO,EACP,SAAS,EACT,eAAe,EACf,cAAc,EACd,SAAS,EACT,QAAQ,EACR,cAAc,EACd,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACb,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAG7B,QAAA,MAAM,YAAY,uDAAsB,CAAC;AACzC,QAAA,MAAM,YAAY,mEAAsB,CAAC;AAEzC,OAAO,EACL,OAAO,EACP,SAAS,EACT,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EAEtB,MAAM,EACN,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAElB,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,cAAc,EAEd,aAAa,EACb,cAAc,EACd,SAAS,EAET,aAAa,EAEb,eAAe,EACf,YAAY,GACb,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,wBAqCE"}

package/lib/cjs/types/libs/protocols/base.d.ts

@@ -1,9 +1,8 @@
-import { Transaction } from "@mysten/sui/transactions";
+import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions";
 import { Config, ExtraOracle, TxSorSwap } from "../../types/aggregator";
-import { TransactionResultItem } from "../../types/sui";
 export interface BaseContractParams {
     swapInfo: TxSorSwap;
-    inputCoinObject: TransactionResultItem;
+    inputCoinObject: TransactionObjectArgument;
     currentAccount: string;
     config: Config;
     /** map price feed id to onchain priceInfoObject id */
@@ -11,12 +10,12 @@ export interface BaseContractParams {
 }
 export declare abstract class BaseContract<T = any> {
     protected swapInfo: TxSorSwap;
-    protected inputCoinObject: TransactionResultItem;
+    protected inputCoinObject: TransactionObjectArgument;
     protected currentAccount: string;
     protected config: Config;
     protected pythMap: Record<string, string>;
     constructor({ swapInfo, inputCoinObject, currentAccount, config, pythMap, }: BaseContractParams);
-    abstract swap(tx: Transaction): Promise<TransactionResultItem>;
+    abstract swap(tx: Transaction): Promise<TransactionObjectArgument>;
     protected getInputCoinValue(tx: Transaction): import("@mysten/sui/transactions").TransactionArgument;
     protected getTypeParams(): string[];
     protected get extra(): NonNullable<T>;

package/lib/cjs/types/libs/protocols/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../src/libs/protocols/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,SAAS,CAAC;IACpB,eAAe,EAAE,qBAAqB,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,8BAAsB,YAAY,CAAC,CAAC,GAAG,GAAG;IACxC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC9B,SAAS,CAAC,eAAe,EAAE,qBAAqB,CAAC;IACjD,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAE9B,EACV,QAAQ,EACR,eAAe,EACf,cAAc,EACd,MAAM,EACN,OAAO,GACR,EAAE,kBAAkB;IAQrB,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAE9D,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,WAAW;IAQ3C,SAAS,CAAC,aAAa;IAMvB,SAAS,KAAK,KAAK,mBAMlB;IAED,SAAS,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,WAAW;CAclD"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../src/libs/protocols/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGxE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,SAAS,CAAC;IACpB,eAAe,EAAE,yBAAyB,CAAC;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,8BAAsB,YAAY,CAAC,CAAC,GAAG,GAAG;IACxC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC9B,SAAS,CAAC,eAAe,EAAE,yBAAyB,CAAC;IACrD,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAE9B,EACV,QAAQ,EACR,eAAe,EACf,cAAc,EACd,MAAM,EACN,OAAO,GACR,EAAE,kBAAkB;IAQrB,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAElE,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,WAAW;IAQ3C,SAAS,CAAC,aAAa;IAMvB,SAAS,KAAK,KAAK,mBAMlB;IAED,SAAS,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,WAAW;CAclD"}

package/lib/cjs/types/libs/protocols/steamm/index.d.ts

@@ -14,18 +14,9 @@ export type SteamExtra = {
     oracleIndexes?: number[];
 };
 export declare class SteammContract extends BaseContract<SteamExtra> {
-    swap(tx: Transaction): Promise<{
-        $kind: "NestedResult";
-        NestedResult: [number, number];
-    }>;
-    cpmmSwap(tx: Transaction): {
-        $kind: "NestedResult";
-        NestedResult: [number, number];
-    };
-    ommSwap(tx: Transaction, version: "v1" | "v2"): {
-        $kind: "NestedResult";
-        NestedResult: [number, number];
-    };
+    swap(tx: Transaction): Promise<import("@mysten/sui/transactions").TransactionObjectArgument>;
+    cpmmSwap(tx: Transaction): import("@mysten/sui/transactions").TransactionObjectArgument;
+    ommSwap(tx: Transaction, version: "v1" | "v2"): import("@mysten/sui/transactions").TransactionObjectArgument;
     getOraclePriceUpdate(tx: Transaction): readonly [{
         $kind: "NestedResult";
         NestedResult: [number, number];

package/lib/cjs/types/libs/protocols/steamm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/protocols/steamm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AACF,qBAAa,cAAe,SAAQ,YAAY,CAAC,UAAU,CAAC;IACpD,IAAI,CAAC,EAAE,EAAE,WAAW;;;;IAW1B,QAAQ,CAAC,EAAE,EAAE,WAAW;;;;IAmExB,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,GAAG,IAAI;;;;IAuE7C,oBAAoB,CAAC,EAAE,EAAE,WAAW;;;;;;;CA8BrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/protocols/steamm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AACF,qBAAa,cAAe,SAAQ,YAAY,CAAC,UAAU,CAAC;IACpD,IAAI,CAAC,EAAE,EAAE,WAAW;IAW1B,QAAQ,CAAC,EAAE,EAAE,WAAW;IAmExB,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,GAAG,IAAI;IAuE7C,oBAAoB,CAAC,EAAE,EAAE,WAAW;;;;;;;CA8BrC"}

package/lib/cjs/types/libs/swapWithRoute.d.ts

@@ -1,13 +1,12 @@
-import { Transaction } from "@mysten/sui/transactions";
+import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions";
 import { Config, TxSorSwap } from "../types/aggregator";
-import { TransactionResultItem } from "../types/sui";
 export declare function swapWithRoute({ route, inputCoinObject, currentAccount, config, pythMap, tx, }: {
     route: TxSorSwap[];
-    inputCoinObject: TransactionResultItem;
+    inputCoinObject: TransactionObjectArgument;
     currentAccount: string;
     config: Config;
     /** map price feed id to onchain priceInfoObject id */
     pythMap: Record<string, string>;
     tx: Transaction;
-}): Promise<TransactionResultItem | undefined>;
+}): Promise<TransactionObjectArgument | undefined>;
 //# sourceMappingURL=swapWithRoute.d.ts.map

package/lib/cjs/types/libs/swapWithRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swapWithRoute.d.ts","sourceRoot":"","sources":["../../../../src/libs/swapWithRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAsB,aAAa,CAAC,EAClC,KAAK,EACL,eAAe,EACf,cAAc,EACd,MAAM,EACN,OAAO,EACP,EAAE,GACH,EAAE;IACD,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,eAAe,EAAE,qBAAqB,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,EAAE,EAAE,WAAW,CAAC;CACjB,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAmB7C"}
+{"version":3,"file":"swapWithRoute.d.ts","sourceRoot":"","sources":["../../../../src/libs/swapWithRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGxD,wBAAsB,aAAa,CAAC,EAClC,KAAK,EACL,eAAe,EACf,cAAc,EACd,MAAM,EACN,OAAO,EACP,EAAE,GACH,EAAE;IACD,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,eAAe,EAAE,yBAAyB,CAAC;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,EAAE,EAAE,WAAW,CAAC;CACjB,GAAG,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAmBjD"}

package/lib/cjs/types/types/tx.d.ts

@@ -51,4 +51,17 @@ export interface EstimateGasFeeParams extends CommonParams {
     /** Sui price in usd for gas estimation */
     suiPrice?: number;
 }
+export interface SwapInfo {
+    quote: QuoteResponse;
+    /** @warning this `coinIn` will be consumed completely, no `coinIn` left, user must pass the coinIn object with the balance required for the swap - ie in quote */
+    coinIn: TransactionObjectArgument;
+}
+export interface MultiSwapParams {
+    swaps: SwapInfo[];
+    sender: string;
+    slippageBps: number;
+    tx: Transaction;
+    /** Commission for partner */
+    commission: Commission;
+}
 //# sourceMappingURL=tx.d.ts.map

package/lib/cjs/types/types/tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../../../src/types/tx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,iCAAiC;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,mBAAmB;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,6BAA6B;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,QAAQ,CAAC,EAAE;QACT,EAAE,EAAE,WAAW,CAAC;QAChB,MAAM,CAAC,EAAE,yBAAyB,CAAC;KACpC,CAAC;IACF;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,gCAAgC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../../../src/types/tx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,iCAAiC;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,mBAAmB;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,6BAA6B;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,QAAQ,CAAC,EAAE;QACT,EAAE,EAAE,WAAW,CAAC;QAChB,MAAM,CAAC,EAAE,yBAAyB,CAAC;KACpC,CAAC;IACF;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,gCAAgC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,aAAa,CAAC;IACrB,kKAAkK;IAClK,MAAM,EAAE,yBAAyB,CAAC;CACnC;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,WAAW,CAAC;IAChB,6BAA6B;IAC7B,UAAU,EAAE,UAAU,CAAC;CACxB"}

package/lib/esm/features/limitDca/placeLimitOrder.js

@@ -1,8 +1,12 @@
-import { getSplitCoinForTx } from "../../libs/getSplitCoinForTx";
-import { denormalizeTokenType } from "../../utils/token";
+import { coinWithBalance, Transaction } from "@mysten/sui/transactions";
 import { GLOBAL_CONFIG_ID, LIMIT_ORDER_MODULE_ID } from "./constants";
 export async function placeLimitOrder({ accountAddress, payCoinType, targetCoinType, payCoinAmount, rate, slippage, expireTs, devInspect, }) {
-    const { tx, coinData: payCoin } = await getSplitCoinForTx(accountAddress, payCoinAmount.toString(), [payCoinAmount.toString()], denormalizeTokenType(payCoinType), undefined, devInspect);
+    const tx = new Transaction();
+    const payCoin = tx.add(coinWithBalance({
+        type: payCoinType,
+        balance: payCoinAmount,
+        useGasCoin: !devInspect,
+    }));
     tx.moveCall({
         target: `${LIMIT_ORDER_MODULE_ID}::place_limit_order`,
         arguments: [
@@ -15,5 +19,6 @@ export async function placeLimitOrder({ accountAddress, payCoinType, targetCoinT
         ],
         typeArguments: [payCoinType, targetCoinType],
     });
+    tx.setSenderIfNotSet(accountAddress);
     return tx;
 }

package/lib/esm/features/swap/buildTx.js

@@ -1,15 +1,13 @@
-import { Transaction, } from "@mysten/sui/transactions";
+import { coinWithBalance, Transaction, } from "@mysten/sui/transactions";
 import { isValidSuiAddress, toBase64, toHex } from "@mysten/sui/utils";
 import { Config } from "../../config";
 import { _7K_CONFIG, _7K_PACKAGE_ID, _7K_VAULT } from "../../constants/_7k";
-import { getSplitCoinForTx } from "../../libs/getSplitCoinForTx";
 import { groupSwapRoutes } from "../../libs/groupSwapRoutes";
 import { sponsorBluefinX } from "../../libs/protocols/bluefinx/client";
 import { BluefinXTx } from "../../libs/protocols/bluefinx/types";
 import { swapWithRoute } from "../../libs/swapWithRoute";
 import { isBluefinXRouting, } from "../../types/aggregator";
 import { SuiUtils } from "../../utils/sui";
-import { denormalizeTokenType } from "../../utils/token";
 import { getConfig } from "./config";
 import { ORACLE_BASED_SOURCES } from "./getQuote";
 export const buildTx = async ({ quoteResponse, accountAddress, slippage, commission: __commission, devInspect, extendTx, isSponsored, }) => {
@@ -19,7 +17,7 @@ export const buildTx = async ({ quoteResponse, accountAddress, slippage, commiss
         // commission is ignored for bluefinx
         commissionBps: isBluefinX ? 0 : __commission.commissionBps,
     };
-    const { tx: _tx, coinIn } = extendTx || {};
+    const { tx: _tx, coinIn: _coinIn } = extendTx || {};
     let coinOut;
     if (isBluefinX && devInspect) {
         throw new Error("BluefinX tx is sponsored, skip devInspect");
@@ -37,16 +35,15 @@ export const buildTx = async ({ quoteResponse, accountAddress, slippage, commiss
     const routes = groupSwapRoutes(quoteResponse);
     validateRoutes(routes, isSponsored);
     const splits = routes.map((group) => group[0]?.amount ?? "0");
-    let coinData;
-    if (coinIn) {
-        coinData = tx.splitCoins(coinIn, splits);
-        SuiUtils.transferOrDestroyZeroCoin(tx, quoteResponse.tokenIn, coinIn, accountAddress);
-    }
-    else {
-        const { coinData: _data } = await getSplitCoinForTx(accountAddress, quoteResponse.swapAmountWithDecimal, splits, denormalizeTokenType(quoteResponse.tokenIn), tx, devInspect, isSponsored || isBluefinX);
-        coinData = _data;
-    }
-    const pythMap = await updatePythPriceFeedsIfAny(tx, quoteResponse);
+    const coinIn = _coinIn ||
+        tx.add(coinWithBalance({
+            type: quoteResponse.tokenIn,
+            balance: BigInt(quoteResponse.swapAmountWithDecimal),
+            useGasCoin: !isSponsored && !isBluefinX,
+        }));
+    const coinData = tx.splitCoins(coinIn, splits);
+    SuiUtils.transferOrDestroyZeroCoin(tx, quoteResponse.tokenIn, coinIn, accountAddress);
+    const pythMap = await updatePythPriceFeedsIfAny(tx, [quoteResponse]);
     const coinObjects = [];
     const config = await getConfig();
     await Promise.all(routes.map(async (route, index) => {
@@ -64,75 +61,38 @@ export const buildTx = async ({ quoteResponse, accountAddress, slippage, commiss
         }
     }));
     if (coinObjects.length > 0) {
-        const mergeCoin = coinObjects.length > 1
-            ? SuiUtils.mergeCoins(coinObjects, tx)
-            : coinObjects[0];
-        const returnAmountAfterCommission = (BigInt(10000 - _commission.commissionBps) *
-            BigInt(quoteResponse.returnAmountWithDecimal)) /
-            BigInt(10000);
-        const minReceived = (BigInt(1e9 - +slippage * 1e9) * BigInt(returnAmountAfterCommission)) /
-            BigInt(1e9);
-        tx.moveCall({
-            target: `${_7K_PACKAGE_ID}::settle::settle`,
-            typeArguments: [quoteResponse.tokenIn, quoteResponse.tokenOut],
-            arguments: [
-                tx.object(_7K_CONFIG),
-                tx.object(_7K_VAULT),
-                tx.pure.u64(quoteResponse.swapAmountWithDecimal),
-                mergeCoin,
-                tx.pure.u64(minReceived), // minimum received
-                tx.pure.u64(returnAmountAfterCommission), // expected amount out
-                tx.pure.option("address", isValidSuiAddress(_commission.partner) ? _commission.partner : null),
-                tx.pure.u64(_commission.commissionBps),
-                tx.pure.u64(0),
-            ],
-        });
+        const mergedCoin = tx.add(settle(coinObjects, quoteResponse, Math.floor(+slippage * 10000), _commission));
         if (!extendTx) {
-            tx.transferObjects([mergeCoin], tx.pure.address(accountAddress));
+            tx.transferObjects([mergedCoin], tx.pure.address(accountAddress));
         }
         else {
-            coinOut = mergeCoin;
+            coinOut = mergedCoin;
         }
     }
     if (isBluefinX) {
-        const extra = quoteResponse.swaps[0].extra;
-        if (extra.quoteExpiresAtUtcMillis < Date.now()) {
-            throw new Error("Quote expired");
-        }
-        tx.setSenderIfNotSet(accountAddress);
-        const bytes = await tx.build({
-            client: Config.getSuiClient(),
-            onlyTransactionKind: true,
-        });
-        const res = await sponsorBluefinX({
-            quoteId: extra.quoteId,
-            txBytes: toBase64(bytes),
-            sender: accountAddress,
-        });
-        if (!res.success) {
-            throw new Error("Sponsor failed");
-        }
         return {
-            tx: new BluefinXTx(res.quoteId, res.data.txBytes),
+            tx: await buildBluefinXTx(tx, accountAddress, quoteResponse),
             coinOut,
         };
     }
+    tx.setSenderIfNotSet(accountAddress);
     return { tx, coinOut };
 };
-const getPythPriceFeeds = (res) => {
+export const getPythPriceFeeds = (responses) => {
     const ids = new Set();
-    for (const s of res.swaps) {
-        for (const o of (s.extra?.oracles || [])) {
-            // FIXME: deprecation price_identifier in the next version
-            const bytes = o.Pyth?.bytes || o.Pyth?.price_identifier?.bytes;
-            if (bytes) {
-                ids.add("0x" + toHex(Uint8Array.from(bytes)));
+    for (const res of responses) {
+        for (const s of res.swaps) {
+            for (const o of s.extra?.oracles || []) {
+                const bytes = o.Pyth?.price_identifier?.bytes || o.Pyth?.bytes;
+                if (bytes) {
+                    ids.add("0x" + toHex(Uint8Array.from(bytes)));
+                }
             }
         }
     }
     return Array.from(ids);
 };
-const updatePythPriceFeedsIfAny = async (tx, quoteResponse) => {
+export const updatePythPriceFeedsIfAny = async (tx, quoteResponse) => {
     // update oracles price if any
     const pythMap = {};
     const pythIds = getPythPriceFeeds(quoteResponse);
@@ -145,7 +105,7 @@ const updatePythPriceFeedsIfAny = async (tx, quoteResponse) => {
     }
     return pythMap;
 };
-const validateRoutes = (routes, isSponsored) => {
+export const validateRoutes = (routes, isSponsored) => {
     if (!isSponsored) {
         return;
     }
@@ -154,3 +114,72 @@ const validateRoutes = (routes, isSponsored) => {
         throw new Error("Oracle based sources are not supported for sponsored tx");
     }
 };
+export const getExpectedReturn = (returnAmount, slippageBps, commissionBps, tipBps = 0) => {
+    if (slippageBps > 10000) {
+        throw new Error("Slippage must be less than 100%");
+    }
+    if (commissionBps > 10000) {
+        throw new Error("Commission must be less than 100%");
+    }
+    if (tipBps > 10000) {
+        throw new Error("Tip must be less than 100%");
+    }
+    const returnAmountWithDecimal = BigInt(returnAmount);
+    const tipAmountWithDecimal = (returnAmountWithDecimal * BigInt(tipBps || 0)) / 10000n;
+    const commissionAmountWithDecimal = ((returnAmountWithDecimal - tipAmountWithDecimal) * BigInt(commissionBps)) /
+        10000n;
+    const expectedReturnWithDecimal = returnAmountWithDecimal -
+        tipAmountWithDecimal -
+        commissionAmountWithDecimal;
+    const minAmountWithDecimal = (expectedReturnWithDecimal * BigInt(1e4 - slippageBps)) / 10000n;
+    return {
+        tipAmount: tipAmountWithDecimal,
+        minAmount: minAmountWithDecimal,
+        commissionAmount: commissionAmountWithDecimal,
+        expectedAmount: expectedReturnWithDecimal.toString(10),
+    };
+};
+export const settle = (coinObjects, quoteResponse, slippageBps, _commission) => {
+    return (tx) => {
+        const mergeCoin = coinObjects.length > 1
+            ? (tx.mergeCoins(coinObjects[0], coinObjects.slice(1)), coinObjects[0])
+            : coinObjects[0];
+        const { minAmount, expectedAmount } = getExpectedReturn(quoteResponse.returnAmountWithDecimal, slippageBps, _commission.commissionBps);
+        tx.moveCall({
+            target: `${_7K_PACKAGE_ID}::settle::settle`,
+            typeArguments: [quoteResponse.tokenIn, quoteResponse.tokenOut],
+            arguments: [
+                tx.object(_7K_CONFIG),
+                tx.object(_7K_VAULT),
+                tx.pure.u64(quoteResponse.swapAmountWithDecimal),
+                mergeCoin,
+                tx.pure.u64(minAmount), // minimum received
+                tx.pure.u64(expectedAmount), // expected amount out
+                tx.pure.option("address", isValidSuiAddress(_commission.partner) ? _commission.partner : null),
+                tx.pure.u64(_commission.commissionBps),
+                tx.pure.u64(0),
+            ],
+        });
+        return mergeCoin;
+    };
+};
+export const buildBluefinXTx = async (tx, accountAddress, quoteResponse) => {
+    const extra = quoteResponse.swaps[0].extra;
+    if (extra.quoteExpiresAtUtcMillis < Date.now()) {
+        throw new Error("Quote expired");
+    }
+    tx.setSenderIfNotSet(accountAddress);
+    const bytes = await tx.build({
+        client: Config.getSuiClient(),
+        onlyTransactionKind: true,
+    });
+    const res = await sponsorBluefinX({
+        quoteId: extra.quoteId,
+        txBytes: toBase64(bytes),
+        sender: accountAddress,
+    });
+    if (!res.success) {
+        throw new Error("Sponsor failed");
+    }
+    return new BluefinXTx(res.quoteId, res.data.txBytes);
+};

package/lib/esm/features/swap/buildTxV2.js

@@ -0,0 +1,221 @@
+import { coinWithBalance, Transaction, } from "@mysten/sui/transactions";
+import { isValidSuiAddress, normalizeStructTag } from "@mysten/sui/utils";
+import { groupSwapRoutes } from "../../libs/groupSwapRoutes";
+import { swapWithRoute } from "../../libs/swapWithRoute";
+import { isBluefinXRouting, } from "../../types/aggregator";
+import { SuiUtils } from "../../utils/sui";
+import { buildBluefinXTx, settle, updatePythPriceFeedsIfAny, validateRoutes, } from "./buildTx";
+import { getConfig } from "./config";
+/**
+ * Wave-based transaction builder that optimizes swap execution by:
+ * 1. Grouping swaps into execution waves based on readiness
+ * 2. Merging redundant swaps to the same pool within each wave
+ * 3. Processing waves sequentially, passing intermediate tokens between waves
+ */
+export const buildTxV2 = async ({ quoteResponse, accountAddress, slippage, commission: __commission, devInspect, extendTx, isSponsored, }) => {
+    const isBluefinX = isBluefinXRouting(quoteResponse);
+    const _commission = {
+        ...__commission,
+        commissionBps: isBluefinX ? 0 : __commission.commissionBps,
+    };
+    const { tx: _tx, coinIn: _coinIn } = extendTx || {};
+    let coinOut;
+    if (isBluefinX && devInspect) {
+        throw new Error("BluefinX tx is sponsored, skip devInspect");
+    }
+    if (!accountAddress) {
+        throw new Error("Sender address is required");
+    }
+    if (!quoteResponse.routes) {
+        throw new Error("Invalid quote response: 'routes' are required");
+    }
+    if (!isValidSuiAddress(_commission.partner)) {
+        throw new Error("Invalid commission partner address");
+    }
+    const tx = _tx || new Transaction();
+    const routes = groupSwapRoutes(quoteResponse);
+    validateRoutes(routes, isSponsored);
+    const splits = routes.map((group) => group[0]?.amount ?? "0");
+    const coinIn = _coinIn ||
+        tx.add(coinWithBalance({
+            type: quoteResponse.tokenIn,
+            balance: BigInt(quoteResponse.swapAmountWithDecimal),
+            useGasCoin: !isSponsored && !isBluefinX,
+        }));
+    const coinData = tx.splitCoins(coinIn, splits);
+    SuiUtils.transferOrDestroyZeroCoin(tx, quoteResponse.tokenIn, coinIn, accountAddress);
+    const pythMap = await updatePythPriceFeedsIfAny(tx, [quoteResponse]);
+    const config = await getConfig();
+    const finalCoins = await optimize(pythMap, config, routes, coinData, tx, accountAddress);
+    // Merge all final coins
+    if (finalCoins.length > 0) {
+        let mergeCoin = tx.add(settle(finalCoins, quoteResponse, Math.floor(+slippage * 10000), _commission));
+        if (!extendTx) {
+            tx.transferObjects([mergeCoin], tx.pure.address(accountAddress));
+        }
+        else {
+            coinOut = mergeCoin;
+        }
+    }
+    if (isBluefinX) {
+        return {
+            tx: await buildBluefinXTx(tx, accountAddress, quoteResponse),
+            coinOut,
+        };
+    }
+    tx.setSenderIfNotSet(accountAddress);
+    return { tx, coinOut };
+};
+export const optimize = async (pythMap, config, routes, coinData, tx, accountAddress) => {
+    // Initialize route states with split coins
+    const routeStates = routes.map((route, index) => ({
+        routeIndex: index,
+        currentHopIndex: 0,
+        currentCoin: coinData[index],
+        swaps: route,
+        completed: false,
+    }));
+    const finalCoins = [];
+    const coinTypeOut = routes[0][routes[0].length - 1].assetOut;
+    // Execute swaps in waves
+    let waveNumber = 0;
+    while (true) {
+        const readyHops = [];
+        routeStates.forEach((state) => {
+            if (state.completed)
+                return;
+            if (state.currentHopIndex >= state.swaps.length) {
+                state.completed = true;
+                finalCoins.push(state.currentCoin);
+                return;
+            }
+            const swap = state.swaps[state.currentHopIndex];
+            readyHops.push({
+                routeIndex: state.routeIndex,
+                hopIndex: state.currentHopIndex,
+                swap,
+                inputCoin: state.currentCoin,
+            });
+        });
+        if (readyHops.length === 0)
+            break;
+        // Group hops by pool for merging opportunities
+        const poolGroups = new Map();
+        readyHops.forEach((hop) => {
+            const poolKey = `${hop.swap.poolId}|${hop.swap.assetIn}|${hop.swap.assetOut}`;
+            if (!poolGroups.has(poolKey)) {
+                poolGroups.set(poolKey, {
+                    swap: hop.swap,
+                    hops: [],
+                });
+            }
+            poolGroups.get(poolKey).hops.push(hop);
+        });
+        // Execute each pool group in this wave
+        const wavePromises = [];
+        for (const group of poolGroups.values()) {
+            const { swap, hops } = group;
+            // For merged swaps, we need to combine input coins first
+            const wavePromise = (async () => {
+                let combinedCoin;
+                if (hops.length > 1) {
+                    // Merge all input coins for this pool
+                    const inputCoins = hops.map((h) => h.inputCoin);
+                    tx.mergeCoins(inputCoins[0], inputCoins.slice(1));
+                    combinedCoin = inputCoins[0];
+                }
+                else {
+                    combinedCoin = hops[0].inputCoin;
+                }
+                // Execute the swap with the combined coin
+                const resultCoin = await swapWithRoute({
+                    route: [swap],
+                    inputCoinObject: combinedCoin,
+                    currentAccount: accountAddress,
+                    tx,
+                    config,
+                    pythMap,
+                });
+                if (!resultCoin) {
+                    throw new Error(`Swap failed for pool ${swap.poolId}`);
+                }
+                if (hops[0].swap.assetOut === coinTypeOut) {
+                    finalCoins.push(resultCoin);
+                    hops.forEach((hop) => {
+                        const state = routeStates[hop.routeIndex];
+                        state.completed = true;
+                        state.currentHopIndex++;
+                    });
+                    return;
+                }
+                // For merged swaps, we need to split the output proportionally
+                if (hops.length > 1) {
+                    // Split output proportionally (except the last one which gets the remainder)
+                    const splitAmounts = hops
+                        .slice(1)
+                        .map((hop) => hop.swap.returnAmount);
+                    const splitCoins = splitAmounts.length > 0
+                        ? [resultCoin, ...tx.splitCoins(resultCoin, splitAmounts)]
+                        : [resultCoin];
+                    // Assign split coins back to routes
+                    hops.forEach((hop, index) => {
+                        const state = routeStates[hop.routeIndex];
+                        state.currentCoin = splitCoins[index];
+                        state.currentHopIndex++;
+                    });
+                }
+                else {
+                    // Single swap - simply update the route state
+                    const state = routeStates[hops[0].routeIndex];
+                    state.currentCoin = resultCoin;
+                    state.currentHopIndex++;
+                }
+            })();
+            wavePromises.push(wavePromise);
+        }
+        // Wait for all swaps in this wave to complete
+        await Promise.all(wavePromises);
+        waveNumber++;
+    }
+    return finalCoins;
+};
+/**
+ * execute multiple swap in single transaction
+ *
+ * User must handle the coins from return
+ * @param param - MultiSwapParams
+ * @returns a map of coinType to coinObject
+ */
+export const multiSwap = async ({ sender, slippageBps, swaps, tx, commission, }) => {
+    if (swaps.some((s) => isBluefinXRouting(s.quote))) {
+        throw Error("BluefinX routing not supported yet");
+    }
+    // update oracles price if any
+    const pythMap = await updatePythPriceFeedsIfAny(tx, swaps.map((s) => s.quote));
+    const map = {};
+    const config = await getConfig();
+    for (const { quote: sorResponse, coinIn } of swaps) {
+        const routes = groupSwapRoutes(sorResponse);
+        const splits = routes.map((group) => group[0]?.amount ?? "0");
+        const coinData = splits.length === 1
+            ? [coinIn]
+            : [coinIn, ...tx.splitCoins(coinIn, splits.slice(1))];
+        const coinObjects = await optimize(pythMap, config, routes, coinData, tx, sender);
+        if (coinObjects.length > 0) {
+            const mergeCoin = tx.add(settle(coinObjects, sorResponse, slippageBps, commission));
+            if (!map[normalizeStructTag(sorResponse.tokenOut)]) {
+                map[normalizeStructTag(sorResponse.tokenOut)] = [];
+            }
+            map[normalizeStructTag(sorResponse.tokenOut)].push(mergeCoin);
+        }
+    }
+    const result = {};
+    for (const [tokenOut, coins] of Object.entries(map)) {
+        if (coins.length > 1) {
+            tx.mergeCoins(coins[0], coins.slice(1));
+        }
+        result[tokenOut] = coins[0];
+    }
+    tx.setSenderIfNotSet(sender);
+    return result;
+};

package/lib/esm/features/swap/index.js

@@ -1,4 +1,5 @@
 export * from "./buildTx";
+export * from "./buildTxV2";
 export * from "./estimateGasFee";
 export * from "./executeTx";
 export * from "./getQuote";

package/lib/esm/index.mjs

@@ -2,24 +2,24 @@ export * from "./types/aggregator";
 import { Config } from "./config";
 import { getSuiPrice, getTokenPrice, getTokenPrices } from "./features/prices";
 import { executeBluefinTx } from "./libs/protocols/bluefinx/client";
-import { buildTx, estimateGasFee, executeTx, getQuote, getSwapHistory, DEFAULT_SOURCES, } from "./features/swap";
+import { buildTx, buildTxV2, DEFAULT_SOURCES, estimateGasFee, executeTx, getQuote, getSwapHistory, multiSwap, } from "./features/swap";
 import { cancelDcaOrder, cancelLimitOrder, claimExpiredLimitOrder, getClosedDcaOrders, getClosedLimitOrders, getDcaOrderExecutions, getOpenDcaOrders, getOpenLimitOrders, placeDcaOrder, placeLimitOrder, } from "./features/limitDca";
 // avoid breaking changes
 const getSuiClient = Config.getSuiClient;
 const setSuiClient = Config.setSuiClient;
-export { 
+export { buildTx, buildTxV2, cancelDcaOrder, cancelLimitOrder, claimExpiredLimitOrder, 
 // config
-Config, 
+Config, DEFAULT_SOURCES, estimateGasFee, executeBluefinTx, executeTx, getClosedDcaOrders, getClosedLimitOrders, getDcaOrderExecutions, getOpenDcaOrders, getOpenLimitOrders, 
+// swap
+getQuote, 
 // sui client
-getSuiClient, setSuiClient, 
+getSuiClient, getSuiPrice, getSwapHistory, 
 // prices
-getTokenPrice, getTokenPrices, getSuiPrice, 
-// swap
-getQuote, estimateGasFee, buildTx, getSwapHistory, executeTx, executeBluefinTx, DEFAULT_SOURCES, 
-// limit order
-placeLimitOrder, getOpenLimitOrders, cancelLimitOrder, claimExpiredLimitOrder, getClosedLimitOrders, 
+getTokenPrice, getTokenPrices, multiSwap, 
 // dca
-placeDcaOrder, getOpenDcaOrders, cancelDcaOrder, getClosedDcaOrders, getDcaOrderExecutions, };
+placeDcaOrder, 
+// limit order
+placeLimitOrder, setSuiClient, };
 export default {
     // config
     Config,
@@ -34,6 +34,8 @@ export default {
     getQuote,
     estimateGasFee,
     buildTx,
+    buildTxV2,
+    multiSwap,
     getSwapHistory,
     executeTx,
     executeBluefinTx,

package/lib/esm/types/features/limitDca/placeLimitOrder.d.ts

@@ -1,3 +1,4 @@
+import { Transaction } from "@mysten/sui/transactions";
 export interface PlaceLimitOrderParams {
     accountAddress: string;
     payCoinType: string;
@@ -8,5 +9,5 @@ export interface PlaceLimitOrderParams {
     expireTs: bigint;
     devInspect?: boolean;
 }
-export declare function placeLimitOrder({ accountAddress, payCoinType, targetCoinType, payCoinAmount, rate, slippage, expireTs, devInspect, }: PlaceLimitOrderParams): Promise<import("@mysten/sui/dist/cjs/transactions").Transaction>;
+export declare function placeLimitOrder({ accountAddress, payCoinType, targetCoinType, payCoinAmount, rate, slippage, expireTs, devInspect, }: PlaceLimitOrderParams): Promise<Transaction>;
 //# sourceMappingURL=placeLimitOrder.d.ts.map