@cetusprotocol/aggregator-sdk 0.3.16 → 0.3.18

package/src/transaction/deepbook_v3.ts

@@ -3,7 +3,7 @@ import {
   TransactionArgument,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, getAggregatorV2ExtendPublishedAt, Path } from ".."
 import { mintZeroCoin } from "~/utils/coin"
 
 export type CetusFlashSwapResult = {
@@ -27,7 +27,8 @@ export class DeepbookV3 implements Dex {
     txb: Transaction,
     path: Path,
     inputCoin: TransactionObjectArgument,
-    deepbookv3DeepFee?: TransactionObjectArgument
+    packages?: Map<string, string>,
+    deepbookv3DeepFee?: TransactionObjectArgument,
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
     const [func, coinAType, coinBType] = direction
@@ -48,8 +49,9 @@ export class DeepbookV3 implements Dex {
       deepFee,
       txb.object(CLOCK_ADDRESS),
     ]
+    const publishedAt = getAggregatorV2ExtendPublishedAt(client.publishedAtV2Extend(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAtV2()}::deepbookv3::${func}`,
+      target: `${publishedAt}::deepbookv3::${func}`,
       typeArguments: [coinAType, coinBType],
       arguments: args,
     }) as TransactionArgument

package/src/transaction/flowx_v2.ts

@@ -3,7 +3,7 @@ import {
   TransactionArgument,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, Dex, Env, Path } from ".."
+import { AggregatorClient, Dex, Env, getAggregatorV2PublishedAt, Path } from ".."
 
 export class FlowxV2 implements Dex {
   private container: string
@@ -21,7 +21,8 @@ export class FlowxV2 implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
 
@@ -30,9 +31,9 @@ export class FlowxV2 implements Dex {
       : ["swap_b2a", target, from]
 
     const args = [txb.object(this.container), inputCoin]
-
+    const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAt()}::flowx_amm::${func}`,
+      target: `${publishedAt}::flowx_amm::${func}`,
       typeArguments: [coinAType, coinBType],
       arguments: args,
     }) as TransactionObjectArgument

package/src/transaction/flowx_v3.ts

@@ -2,7 +2,7 @@ import {
   Transaction,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, getAggregatorV2PublishedAt, Path } from ".."
 
 export class FlowxV3 implements Dex {
   private versioned: string
@@ -23,7 +23,8 @@ export class FlowxV3 implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
 
@@ -39,8 +40,9 @@ export class FlowxV3 implements Dex {
       txb.object(CLOCK_ADDRESS),
     ]
 
+    const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAt()}::flowx_clmm::${func}`,
+      target: `${publishedAt}::flowx_clmm::${func}`,
       typeArguments: [coinAType, coinBType],
       arguments: args,
     }) as TransactionObjectArgument

package/src/transaction/haedal.ts

@@ -2,7 +2,7 @@ import {
   Transaction,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, Dex, Env, Path } from ".."
+import { AggregatorClient, Dex, Env, getAggregatorV2PublishedAt, Path } from ".."
 
 export class Haedal implements Dex {
   constructor(env: Env) {
@@ -15,7 +15,8 @@ export class Haedal implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction } = path
     if (!direction) {
@@ -23,8 +24,9 @@ export class Haedal implements Dex {
     }
     const func = "swap_a2b"
     const args = [txb.object(path.id), txb.object("0x5"), inputCoin]
+    const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAt()}::haedal::${func}`,
+      target: `${publishedAt}::haedal::${func}`,
       typeArguments: [],
       arguments: args,
     }) as TransactionObjectArgument

package/src/transaction/haedal_pmm.ts

@@ -3,7 +3,7 @@ import {
   TransactionArgument,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, getAggregatorV2ExtendPublishedAt, Path } from ".."
 import { SuiPriceServiceConnection, SuiPythClient } from "@pythnetwork/pyth-sui-js"
 import { SuiClient } from "@mysten/sui/client"
 
@@ -29,7 +29,8 @@ export class HaedalPmm implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
     const [func, coinAType, coinBType] = direction
@@ -59,8 +60,9 @@ export class HaedalPmm implements Dex {
       inputCoin,
       txb.object(CLOCK_ADDRESS),
     ]
+    const publishedAt = getAggregatorV2ExtendPublishedAt(client.publishedAtV2Extend(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAtV2()}::haedalpmm::${func}`,
+      target: `${publishedAt}::haedalpmm::${func}`,
       typeArguments: [coinAType, coinBType],
       arguments: args,
     }) as TransactionArgument

package/src/transaction/index.ts

@@ -7,12 +7,31 @@ import { AggregatorClient, Path } from ".."
 export const CLOCK_ADDRESS =
   "0x0000000000000000000000000000000000000000000000000000000000000006"
 
+export const AGGREGATOR_V2 = "aggregator_v2"
+export const AGGREGATOR_V2_EXTEND = "aggregator_v2_extend"
+
+export function getAggregatorV2PublishedAt(aggregatorV2PublishedAt: string, packages?: Map<string, string> | Record<string, string>) {
+  if (packages instanceof Map) {
+    return packages.get(AGGREGATOR_V2) ?? aggregatorV2PublishedAt
+  }
+  return aggregatorV2PublishedAt
+}
+
+export function getAggregatorV2ExtendPublishedAt(aggregatorV2ExtendPublishedAt: string, packages?: Map<string, string> | Record<string, string>) {
+  if (packages instanceof Map) {
+    return packages.get(AGGREGATOR_V2_EXTEND) ?? aggregatorV2ExtendPublishedAt
+  }
+  return aggregatorV2ExtendPublishedAt
+}
+
 export interface Dex {
   swap(
     client: AggregatorClient,
     ptb: Transaction,
     path: Path,
     inputCoin: TransactionObjectArgument,
-    deepbookv3DeepFee?: TransactionObjectArgument
+    packages?: Map<string, string>,
+    deepbookv3DeepFee?: TransactionObjectArgument,
   ): Promise<TransactionObjectArgument>
 }
+

package/src/transaction/kriya_v2.ts

@@ -2,7 +2,7 @@ import {
   Transaction,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, Dex, Env, Path } from ".."
+import { AggregatorClient, Dex, Env, getAggregatorV2PublishedAt, Path } from ".."
 
 export class KriyaV2 implements Dex {
   constructor(env: Env) {
@@ -15,7 +15,8 @@ export class KriyaV2 implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
 
@@ -24,9 +25,9 @@ export class KriyaV2 implements Dex {
       : ["swap_b2a", target, from]
 
     const args = [txb.object(path.id), inputCoin]
-
+    const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAt()}::kriya_amm::${func}`,
+      target: `${publishedAt}::kriya_amm::${func}`,
       typeArguments: [coinAType, coinBType],
       arguments: args,
     }) as TransactionObjectArgument

package/src/transaction/kriya_v3.ts

@@ -2,7 +2,7 @@ import {
   Transaction,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, getAggregatorV2PublishedAt, Path } from ".."
 
 export class KriyaV3 implements Dex {
   private version: string
@@ -20,7 +20,8 @@ export class KriyaV3 implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
 
@@ -34,9 +35,9 @@ export class KriyaV3 implements Dex {
       txb.object(this.version),
       txb.object(CLOCK_ADDRESS),
     ]
-
+    const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAt()}::kriya_clmm::${func}`,
+      target: `${publishedAt}::kriya_clmm::${func}`,
       typeArguments: [coinAType, coinBType],
       arguments: args,
     }) as TransactionObjectArgument

package/src/transaction/scallop.ts

@@ -2,7 +2,7 @@ import {
   Transaction,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, getAggregatorV2ExtendPublishedAt, Path } from ".."
 
 export class Scallop implements Dex {
   private version: string
@@ -27,7 +27,8 @@ export class Scallop implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
 
@@ -51,9 +52,9 @@ export class Scallop implements Dex {
       inputCoin,
       txb.object(CLOCK_ADDRESS),
     ]
-
+    const publishedAt = getAggregatorV2ExtendPublishedAt(client.publishedAtV2Extend(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAtV2()}::scallop::${func}`,
+      target: `${publishedAt}::scallop::${func}`,
       typeArguments: [coinAType, coinBType],
       arguments: args,
     }) as TransactionObjectArgument

package/src/transaction/suilend.ts

@@ -2,10 +2,9 @@ import {
   Transaction,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+import { AggregatorClient, Dex, Env, getAggregatorV2ExtendPublishedAt, Path } from ".."
 
 export class Suilend implements Dex {
-  private liquid_staking_pool: string
   private sui_system_state: string
 
   constructor(env: Env) {
@@ -13,10 +12,6 @@ export class Suilend implements Dex {
       throw new Error("Suilend only supported on mainnet")
     }
 
-    this.liquid_staking_pool = env === Env.Mainnet
-      ? "0x15eda7330c8f99c30e430b4d82fd7ab2af3ead4ae17046fcb224aa9bad394f6b"
-      : "0x0"
-
     this.sui_system_state =
       env === Env.Mainnet
         ? "0x0000000000000000000000000000000000000000000000000000000000000005"
@@ -27,7 +22,8 @@ export class Suilend implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
 
@@ -36,13 +32,13 @@ export class Suilend implements Dex {
       : ["swap_b2a", from]
 
     const args = [
-      txb.object(this.liquid_staking_pool),
+      txb.object(path.id),
       txb.object(this.sui_system_state),
       inputCoin,
     ]
-
+    const publishedAt = getAggregatorV2ExtendPublishedAt(client.publishedAtV2Extend(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAtV2()}::suilend::${func}`,
+      target: `${publishedAt}::suilend::${func}`,
       typeArguments: [springCoinType],
       arguments: args,
     }) as TransactionObjectArgument

package/src/transaction/swap.ts

@@ -155,6 +155,7 @@ export async function swapInPools(
       },
     ],
     insufficientLiquidity: false,
+    byAmountIn: params.byAmountIn,
   }
 
   const result = {

package/src/transaction/turbos.ts

@@ -3,7 +3,7 @@ import {
   TransactionArgument,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, getAggregatorV2PublishedAt, Path } from ".."
 
 export class Turbos implements Dex {
   private versioned: string
@@ -21,7 +21,8 @@ export class Turbos implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
 
@@ -43,9 +44,9 @@ export class Turbos implements Dex {
       txb.object(CLOCK_ADDRESS),
       txb.object(this.versioned),
     ]
-
+    const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAt()}::turbos::${func}`,
+      target: `${publishedAt}::turbos::${func}`,
       typeArguments: [coinAType, coinBType, path.extendedDetails.turbosFeeType],
       arguments: args,
     }) as TransactionObjectArgument

package/src/transaction/volo.ts

@@ -2,7 +2,7 @@ import {
   Transaction,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
-import { AggregatorClient, Dex, Env, Path } from ".."
+import { AggregatorClient, Dex, Env, getAggregatorV2PublishedAt, Path } from ".."
 
 export class Volo implements Dex {
   private nativePool: string
@@ -23,7 +23,8 @@ export class Volo implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction } = path
 
@@ -40,8 +41,9 @@ export class Volo implements Dex {
       inputCoin,
     ]
 
+    const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages)
     const res = txb.moveCall({
-      target: `${client.publishedAt()}::volo::${func}`,
+      target: `${publishedAt}::volo::${func}`,
       typeArguments: [],
       arguments: args,
     }) as TransactionObjectArgument

package/src/utils/coin.ts

@@ -61,15 +61,23 @@ export function buildInputCoin(
   txb: Transaction,
   allCoins: CoinAsset[],
   amount: bigint,
-  coinType: string
+  coinType: string,
 ): BuildCoinResult {
   const usedCoinAsests = CoinUtils.getCoinAssets(coinType, allCoins)
-  if (amount === BigInt(0) && usedCoinAsests.length === 0) {
-    const zeroCoin = mintZeroCoin(txb, coinType)
-    return {
-      targetCoin: zeroCoin,
-      isMintZeroCoin: true,
-      targetCoinAmount: 0,
+  if (amount === BigInt(0)) {
+    if (CoinUtils.isSuiCoin(coinType) || usedCoinAsests.length === 0 && !CoinUtils.isSuiCoin(coinType)) {
+      const zeroCoin = mintZeroCoin(txb, coinType)
+      return {
+        targetCoin: zeroCoin,
+        isMintZeroCoin: true,
+        targetCoinAmount: 0,
+      }
+    } else {
+      return {
+        targetCoin: txb.object(usedCoinAsests[0].coinObjectId),
+        isMintZeroCoin: false,
+        targetCoinAmount: Number(usedCoinAsests[0].balance.toString()),
+      }
     }
   }
 
@@ -116,8 +124,12 @@ export function buildInputCoin(
     )
   }
 
+  const targetCoin = txb.splitCoins(txb.object(masterCoin), [
+    txb.pure.u64(amount.toString()),
+  ])
+
   return {
-    targetCoin: txb.object(masterCoin),
+    targetCoin,
     isMintZeroCoin: false,
     targetCoinAmount: Number(amount.toString()),
   }

package/tests/router.test.ts

@@ -33,9 +33,9 @@ describe("router module", () => {
       keypair = buildTestAccount()
     }
 
-    // const wallet = keypair.getPublicKey().toSuiAddress()
-    // console.log("wallet: ", wallet)
-    const wallet = "0x0005e9b405ab0424b6494b64d3d5b79b6715d06d284585faffe1ee1a873ba8a3"
+    const wallet = keypair.getPublicKey().toSuiAddress()
+    console.log("wallet: ", wallet)
+    // const wallet = "0x02e39bddb06f617112595378fef741f523fbf22ea188cca99ecb61a9904dda2a"
 
     const endpoint = aggregatorURL
 
@@ -78,7 +78,6 @@ describe("router module", () => {
         byAmountIn,
         txb,
         slippage: 0.01,
-        isMergeTragetCoin: false,
         refreshAllCoins: true,
       })
 
@@ -110,9 +109,9 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "746028139919"
-    const target = "0x375f70cf2ae4c00bf37117d0c85a2c71545e6ee05c4a5c7d282cd66a4504b068::usdt::USDT"
-    const from = "0x2::sui::SUI"
+    const amount = "10000"
+    const from = "0x83556891f4a0f233ce7b05cfe7f957d4020492a34f5405b2cb9377d060bef4bf::spring_sui::SPRING_SUI"
+    const target = "0x2::sui::SUI"
 
     const res = await client.findRouters({
       from,
@@ -120,7 +119,7 @@ describe("router module", () => {
       amount: new BN(amount),
       byAmountIn,
       depth: 3,
-      // providers: ["HAEDAL"],
+      providers: ["SUILEND"],
     })
 
     if (res != null) {
@@ -135,12 +134,9 @@ describe("router module", () => {
     if (res != null) {
       console.log(JSON.stringify(res, null, 2))
       await client.fastRouterSwap({
-        routers: res.routes,
-        byAmountIn,
+        routers: res,
         txb,
         slippage: 0.01,
-        isMergeTragetCoin: false,
-        // partner: "0x1f5fa5c820f40d43fc47815ad06d95e40a1942ff72a732a92e8ef4aa8cde70a5",
         refreshAllCoins: true,
         payDeepFeeAmount: 0,
       })
@@ -153,13 +149,13 @@ describe("router module", () => {
         console.log("event", JSON.stringify(event, null, 2))
       }
 
-      // if (result.effects.status.status === "success") {
-      //   // console.log("Sim exec transaction success")
-      //   const result = await client.signAndExecuteTransaction(txb, keypair)
-      //   console.log("result", result)
-      // } else {
-      //   console.log("result", result)
-      // }
+      if (result.effects.status.status === "success") {
+        // console.log("Sim exec transaction success")
+        const result = await client.signAndExecuteTransaction(txb, keypair)
+        console.log("result", result)
+      } else {
+        console.log("result", result)
+      }
     }
   }, 600000)
 
@@ -190,7 +186,6 @@ describe("router module", () => {
         byAmountIn,
         txb,
         slippage: 0.02,
-        isMergeTragetCoin: false,
         refreshAllCoins: true,
       })
 
@@ -240,7 +235,6 @@ describe("router module", () => {
               byAmountIn,
               slippage: 0.01,
               txb,
-              isMergeTragetCoin: false,
             })
 
             let result = await client.devInspectTransactionBlock(txb)
@@ -322,7 +316,6 @@ describe("router module", () => {
         byAmountIn,
         txb,
         slippage: 0.01,
-        isMergeTragetCoin: false,
         refreshAllCoins: true,
       })