@cetusprotocol/dlmm-sdk 0.0.2 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/dlmm-sdk",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "SDK for cetus dlmm",
   "typings": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -26,10 +26,12 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@cetusprotocol/common-sdk": "workspace:*",
-    "@cetusprotocol/test-utils": "workspace:*"
+    "@cetusprotocol/test-utils": "workspace:*",
+    "blakejs": "^1.2.1"
   },
   "peerDependencies": {
     "@cetusprotocol/common-sdk": "*",
-    "@mysten/sui": "*"
+    "@mysten/sui": "*",
+    "blakejs": "*"
   }
 }

package/src/config/mainnet.ts

@@ -5,21 +5,21 @@ export const dlmmMainnet: SdkOptions = {
   env: 'mainnet',
   full_rpc_url: FullRpcUrlMainnet,
   dlmm_pool: {
-    package_id: '0x8eb878ff59ecd9326697dc80f9df55ccfb050a711bb712981b1dc509f393cbdf',
-    published_at: '0xa0f34a9aa8cd17e92c87bd93957c8daeba7fd45c2dbbba73f45ff47a93526c6b',
+    package_id: '0x5664f9d3fd82c84023870cfbda8ea84e14c8dd56ce557ad2116e0668581a682b',
+    published_at: '0x5664f9d3fd82c84023870cfbda8ea84e14c8dd56ce557ad2116e0668581a682b',
     version: 1,
     config: {
-      registry_id: '0xd436e82a6ef89b0ad4a1b8bd19b0e8e1c662e4a358a8dfe8221b1833abf3685b',
-      pools_id: '0x09bb9bde6875ba06551617aec1ea7a653cda0f526ae7ce42bdc6ef4a713a3f19',
-      global_config_id: '0xbf90603a8a7488a1440ed88e1d4c8d7b1f0c4cfd827dbb1c70655acc90258cc2',
-      versioned_id: '0x8bdb4c81a2d507dbbf4a5762e64a3c39cae1fd201b47aae474eff8b31e1f384a',
-      admin_cap_id: '0xec28f827eb125c80f316a0356b84eb52b98c6157bd443095843b1a3788518655',
-      partners_id: '0x19c6643ead4b13f4066db107a8606694cff3a2d81b7f11c759da460b5ea23491',
+      registry_id: '0xb1d55e7d895823c65f98d99b81a69436cf7d1638629c9ccb921326039cda1f1b',
+      pools_id: '0xc3683b2356cac6423e9ecaea20955c7cc193998b016e5b884730ed1192174991',
+      global_config_id: '0xf31b605d117f959b9730e8c07b08b856cb05143c5e81d5751c90d2979e82f599',
+      versioned_id: '0x05370b2d656612dd5759cbe80463de301e3b94a921dfc72dd9daa2ecdeb2d0a8',
+      admin_cap_id: '0xc4c42bc31cb54beb679dccd547f8bdb970cb6dc989bd1f85a4fed4812ed95d6e',
+      partners_id: '0x5c0affc8d363b6abb1f32790c229165215f4edead89a9bc7cd95dad717b4296a',
     },
   },
   dlmm_router: {
-    package_id: '0xb269f062e8f7fd2bd653a79405dea7c48cb0bf62b11e33c939637d52b1560a65',
-    published_at: '0xb269f062e8f7fd2bd653a79405dea7c48cb0bf62b11e33c939637d52b1560a65',
+    package_id: '0xc65d59c4aa7c9d53836bdbbb2a1418b02be6a351a767c64d6e4b7e96d26356d2',
+    published_at: '0xda28da84b5b1fef0ca053a2373e80ddb3a75f45e891e825fb06c2a53f838067d',
     version: 1,
   },
 }

package/src/config/testnet.ts

@@ -6,7 +6,7 @@ export const dlmmTestnet: SdkOptions = {
   full_rpc_url: FullRpcUrlTestnet,
   dlmm_pool: {
     package_id: '0x17a1f5a8779461ff44e942adf33325cce112c693d6a177ed77f035ca86d1fdb6',
-    published_at: '0x17a1f5a8779461ff44e942adf33325cce112c693d6a177ed77f035ca86d1fdb6',
+    published_at: '0x6d32c1be32eefcea933c03dd5cb7c783d1d83f6b30c4d1131d955933747b1701',
     version: 1,
     config: {
       registry_id: '0x319070e26a6809f439d3c4a45e63bf74939c5fe3165de7b65968ee8547f71bd0',
@@ -18,8 +18,8 @@ export const dlmmTestnet: SdkOptions = {
     },
   },
   dlmm_router: {
-    package_id: '0x70777a78c17b550170924b4bf598fa6d883106521cc02eda798401a315b6751b',
-    published_at: '0x70777a78c17b550170924b4bf598fa6d883106521cc02eda798401a315b6751b',
+    package_id: '0xba3059875c8980ac171fc2bac81b9df172fb77fa0cb5a267636df701225b93ef',
+    published_at: '0x59b7a2da6db8f9245a1db6169018af7124c0714fa77a84224967ead6be125127',
     version: 1,
   },
   faucet: {

package/src/modules/poolModule.ts

@@ -14,9 +14,18 @@ import {
   isSortedSymbols,
   PageQuery,
   PaginationArgs,
+  printTransaction,
 } from '@cetusprotocol/common-sdk'
 import { DlmmErrorCode, handleError } from '../errors/errors'
-import { BinUtils, parseBinInfo, parseBinInfoList, parseDlmmBasePool, parseDlmmPool, parsePoolTransactionInfo } from '../utils'
+import {
+  BinUtils,
+  buildPoolKey,
+  parseBinInfo,
+  parseBinInfoList,
+  parseDlmmBasePool,
+  parseDlmmPool,
+  parsePoolTransactionInfo,
+} from '../utils'
 import { CetusDlmmSDK } from '../sdk'
 import {
   BinAmount,
@@ -50,6 +59,35 @@ export class PoolModule implements IModule<CetusDlmmSDK> {
     return this._sdk
   }
 
+  async getPoolAddress(coin_type_a: string, coin_type_b: string, bin_step: number, base_factor: number): Promise<string | undefined> {
+    try {
+      const poolKey = buildPoolKey(coin_type_a, coin_type_b, bin_step, base_factor)
+      const { dlmm_pool } = this._sdk.sdkOptions
+      const { pools_id } = getPackagerConfigs(dlmm_pool)
+      const res = await this._sdk.FullClient.getDynamicFieldObject({
+        parentId: pools_id,
+        name: {
+          type: '0x2::object::ID',
+          value: poolKey,
+        },
+      })
+      const fields = getObjectFields(res)
+      return fields.value.fields.value.fields.pool_id
+    } catch (error) {
+      return handleError(DlmmErrorCode.FetchError, error as Error, {
+        [DETAILS_KEYS.METHOD_NAME]: 'getPoolAddress',
+        [DETAILS_KEYS.REQUEST_PARAMS]: {
+          coin_type_a,
+          coin_type_b,
+          bin_step,
+          base_factor,
+        },
+      })
+    }
+
+    return undefined
+  }
+
   /**
    * Get the list of DLMM base pools
    * @param pagination_args - The pagination arguments
@@ -205,19 +243,27 @@ export class PoolModule implements IModule<CetusDlmmSDK> {
     const bin_infos: BinAmount[] = []
     let start_bin_id: number | undefined = undefined
     let hasNext = true
-
     while (hasNext) {
       const tx: Transaction = new Transaction()
+      let start_bin
+      if (start_bin_id !== undefined) {
+        start_bin = tx.moveCall({
+          target: `0x1::option::some`,
+          arguments: [tx.pure.u32(Number(asUintN(BigInt(start_bin_id))))],
+          typeArguments: ['u32'],
+        })
+      } else {
+        start_bin = tx.moveCall({
+          target: `0x1::option::none`,
+          typeArguments: ['u32'],
+        })
+      }
+
       tx.moveCall({
         target: `${dlmm_pool.published_at}::pool::fetch_bins`,
-        arguments: [
-          tx.object(pool_id),
-          tx.pure.vector('u32', start_bin_id ? [Number(asUintN(BigInt(start_bin_id)))] : []),
-          tx.pure.u64(limit),
-        ],
+        arguments: [tx.object(pool_id), start_bin, tx.pure.u64(limit)],
         typeArguments: [coin_type_a, coin_type_b],
       })
-
       const res = await this._sdk.FullClient.devInspectTransactionBlock({
         transactionBlock: tx,
         sender: normalizeSuiAddress('0x0'),
@@ -225,7 +271,7 @@ export class PoolModule implements IModule<CetusDlmmSDK> {
 
       const list = parseBinInfoList(res)
       bin_infos.push(...list)
-      start_bin_id = list.length > 0 ? list[list.length - 1].bin_id : undefined
+      start_bin_id = list.length > 0 ? list[list.length - 1].bin_id + 1 : undefined
       hasNext = list.length === limit
     }
 
@@ -381,6 +427,7 @@ export class PoolModule implements IModule<CetusDlmmSDK> {
       strategy_type,
       use_bin_infos,
       base_factor,
+      pool_id,
     } = option
 
     let lower_bin_id
@@ -400,18 +447,18 @@ export class PoolModule implements IModule<CetusDlmmSDK> {
       active_id = BinUtils.getBinIdFromPrice(d(1).div(price).toString(), bin_step, false, decimals_a, decimals_b)
 
       const calculateOption: CalculateAddLiquidityOption = {
+        pool_id,
         amount_a: bin_infos.amount_b,
         amount_b: bin_infos.amount_a,
         active_id,
         bin_step,
         lower_bin_id,
         upper_bin_id,
-        amount_a_in_active_bin: '0',
-        amount_b_in_active_bin: '0',
+        active_bin_of_pool: undefined,
         strategy_type: option.strategy_type,
       }
 
-      new_bin_infos = this.sdk.Position.calculateAddLiquidityInfo(calculateOption)
+      new_bin_infos = await this.sdk.Position.calculateAddLiquidityInfo(calculateOption)
     }
 
     const createPoolAndAddOption: CreatePoolAndAddOption = {

package/src/modules/positionModule.ts

@@ -28,6 +28,7 @@ import {
 } from '../types/dlmm'
 import {
   BinUtils,
+  FeeUtils,
   getRouterModule,
   parsedDlmmPosFeeData,
   parsedDlmmPosRewardData,
@@ -354,36 +355,56 @@ export class PositionModule implements IModule<CetusDlmmSDK> {
    * @param option - The option for calculating the result of adding liquidity
    * @returns The result of adding liquidity
    */
-  calculateAddLiquidityInfo(option: CalculateAddLiquidityOption | CalculateAddLiquidityAutoFillOption): BinLiquidityInfo {
+  async calculateAddLiquidityInfo(option: CalculateAddLiquidityOption | CalculateAddLiquidityAutoFillOption): Promise<BinLiquidityInfo> {
     const isAutoFill = 'fix_amount_a' in option
-    const { active_id, bin_step, lower_bin_id, upper_bin_id, amount_a_in_active_bin, amount_b_in_active_bin, strategy_type } = option
+    const { active_id, bin_step, lower_bin_id, upper_bin_id, active_bin_of_pool, strategy_type, pool_id } = option
 
+    let bin_infos
     if (isAutoFill) {
       const { coin_amount, fix_amount_a } = option
-      return StrategyUtils.autoFillCoinByStrategy(
+      bin_infos = StrategyUtils.autoFillCoinByStrategyV2(
         active_id,
         bin_step,
         coin_amount,
         fix_amount_a,
-        amount_a_in_active_bin,
-        amount_b_in_active_bin,
         lower_bin_id,
         upper_bin_id,
-        strategy_type
+        strategy_type,
+        active_bin_of_pool
       )
     } else {
-      return StrategyUtils.toAmountsBothSideByStrategy(
+      bin_infos = StrategyUtils.toAmountsBothSideByStrategy(
         active_id,
         bin_step,
         lower_bin_id,
         upper_bin_id,
         option.amount_a,
         option.amount_b,
-        amount_a_in_active_bin,
-        amount_b_in_active_bin,
-        strategy_type
+        strategy_type,
+        active_bin_of_pool
       )
     }
+    if (active_bin_of_pool && pool_id) {
+      const active_bin_index = bin_infos.bins.findIndex((bin) => bin.bin_id === active_id)
+      if (active_bin_index !== -1) {
+        const pool = await this._sdk.Pool.getPool(pool_id, false)
+        if (pool) {
+          const { fees_a, fees_b } = FeeUtils.getCompositionFees(
+            active_bin_of_pool,
+            bin_infos.bins[active_bin_index],
+            pool.variable_parameters
+          )
+          const active_bin = bin_infos.bins[active_bin_index]
+          active_bin.amount_a = d(active_bin.amount_a).sub(fees_a).toFixed(0)
+          active_bin.amount_b = d(active_bin.amount_b).sub(fees_b).toFixed(0)
+          bin_infos.bins[active_bin_index] = active_bin
+          console.log('🚀 ~ PositionModule ~ calculateAddLiquidityInfo ~ fees_a:', fees_a)
+          console.log('🚀 ~ PositionModule ~ calculateAddLiquidityInfo ~ fees_b:', fees_b)
+        }
+      }
+    }
+
+    return bin_infos
   }
 
   /**
@@ -480,7 +501,7 @@ export class PositionModule implements IModule<CetusDlmmSDK> {
    * @param option - The option for adding liquidity with price
    * @returns The transaction
    */
-  addLiquidityWithPricePayload(option: OpenAndAddLiquidityWithPriceOption): Transaction {
+  async addLiquidityWithPricePayload(option: OpenAndAddLiquidityWithPriceOption): Promise<Transaction> {
     const {
       pool_id,
       bin_infos,
@@ -492,8 +513,7 @@ export class PositionModule implements IModule<CetusDlmmSDK> {
       upper_price,
       bin_step,
       strategy_type,
-      amount_a_in_active_bin,
-      amount_b_in_active_bin,
+      active_bin_of_pool,
       decimals_a,
       decimals_b,
       use_bin_infos,
@@ -522,12 +542,11 @@ export class PositionModule implements IModule<CetusDlmmSDK> {
         bin_step,
         lower_bin_id,
         upper_bin_id,
-        amount_a_in_active_bin,
-        amount_b_in_active_bin,
+        active_bin_of_pool,
         strategy_type: strategy_type,
       }
 
-      new_bin_infos = this.sdk.Position.calculateAddLiquidityInfo(calculateOption)
+      new_bin_infos = await this.sdk.Position.calculateAddLiquidityInfo(calculateOption)
     }
 
     const openAndAddLiquidityOption: OpenAndAddLiquidityOption = {

package/src/types/dlmm.ts

@@ -1,5 +1,6 @@
 import type { CoinPairType, TableHandle } from '@cetusprotocol/common-sdk'
 import { TransactionObjectArgument } from '@mysten/sui/transactions'
+import Decimal from 'decimal.js'
 export type DlmmConfigs = {
   registry_id: string
   pools_id: string
@@ -152,6 +153,7 @@ export type CreatePoolOption = {
 } & BaseCreatePoolOption
 
 export type CreatePoolAndAddWithPriceOption = {
+  pool_id: string
   price_base_coin: 'coin_a' | 'coin_b'
   price: string
   lower_price: string
@@ -177,12 +179,12 @@ export type BaseAddLiquidityOption = {
 } & CoinPairType
 
 export type BaseCalculateAddLiquidityOption = {
+  pool_id?: string
   active_id: number
   bin_step: number
   lower_bin_id: number
   upper_bin_id: number
-  amount_a_in_active_bin: string
-  amount_b_in_active_bin: string
+  active_bin_of_pool?: BinAmount
   strategy_type: StrategyType
 }
 
@@ -212,8 +214,7 @@ export type OpenAndAddLiquidityWithPriceOption = BaseAddLiquidityOption & {
   price: string
   lower_price: string
   upper_price: string
-  amount_a_in_active_bin: string
-  amount_b_in_active_bin: string
+  active_bin_of_pool?: BinAmount
   strategy_type: StrategyType
   decimals_a: number
   decimals_b: number
@@ -443,3 +444,23 @@ export type FeeRate = {
   var_fee_rate: string
   total_fee_rate: string
 }
+
+export type WeightsOptions = {
+  strategy_type: StrategyType
+  active_id: number
+  bin_step: number
+  lower_bin_id: number
+  upper_bin_id: number
+  total_amount_a: string
+  total_amount_b: string
+  active_bin_of_pool?: BinAmount
+}
+
+export type WeightsInfo = {
+  total_weight_a: Decimal
+  total_weight_b: Decimal
+  weights: Decimal[]
+  weight_per_prices: Decimal[]
+  active_weight_a: Decimal
+  active_weight_b: Decimal
+} & WeightsOptions

package/src/utils/feeUtils.ts

@@ -20,7 +20,7 @@ export class FeeUtils {
   static calculateCompositionFee(amount: string, total_fee_rate: string) {
     const fee_amount = d(amount).mul(total_fee_rate)
     const composition_fee = d(fee_amount).mul(d(FEE_PRECISION).add(total_fee_rate))
-    return composition_fee.div(d(FEE_PRECISION).pow(2)).toFixed(0)
+    return composition_fee.div(1000000000000000000).toFixed(0)
   }
 
   static calculateProtocolFee(fee_amount: string, protocol_fee_rate: string) {
@@ -40,31 +40,33 @@ export class FeeUtils {
   static getCompositionFees(
     active_bin: BinAmount,
     used_bin: BinAmount,
-    binStepConfig: BinStepConfig,
     variableParameters: VariableParameters
   ): { fees_a: string; fees_b: string } {
+    const { bin_step_config } = variableParameters
     if (d(active_bin.liquidity || '0').eq(d(0))) {
       return {
         fees_a: '0',
         fees_b: '0',
       }
     }
-    const { bin_step, base_factor } = binStepConfig
+    const { bin_step, base_factor } = bin_step_config
     const qPrice = BinUtils.getQPriceFromId(active_bin.bin_id, bin_step)
-    const used_liquidity = BinUtils.getLiquidity(used_bin.amount_a, used_bin.amount_b, qPrice)
+    const bin_liquidity = BinUtils.getLiquidity(active_bin.amount_a, active_bin.amount_b, qPrice)
+    const delta_liquidity = BinUtils.getLiquidity(used_bin.amount_a, used_bin.amount_b, qPrice)
+    const delta_liquidity_share = d(active_bin.liquidity).mul(delta_liquidity).div(bin_liquidity).toFixed(0)
 
     const { amount_a: amount_a_out, amount_b: amount_b_out } = BinUtils.calculateOutByShare(
       {
         bin_id: active_bin.bin_id,
-        liquidity: d(active_bin.liquidity).add(used_liquidity).toFixed(0),
+        liquidity: d(active_bin.liquidity).add(delta_liquidity_share).toFixed(0),
         amount_a: d(active_bin.amount_a).add(used_bin.amount_a).toFixed(0),
         amount_b: d(active_bin.amount_b).add(used_bin.amount_b).toFixed(0),
         price_per_lamport: active_bin.price_per_lamport,
       },
-      used_liquidity
+      delta_liquidity_share
     )
 
-    const base_fee = d(bin_step).mul(base_factor)
+    const base_fee = d(bin_step).mul(base_factor).mul(10)
     const variable_fee = FeeUtils.getVariableFee(variableParameters)
 
     let total_fee_rate = d(base_fee).add(variable_fee).toFixed(0)
@@ -76,12 +78,10 @@ export class FeeUtils {
     let fees_a = '0'
     let fees_b = '0'
 
-    if (d(amount_a_out).gt(used_bin.amount_a)) {
-      fees_a = FeeUtils.calculateCompositionFee(amount_a_out, total_fee_rate)
-    }
-
-    if (d(amount_b_out).gt(used_bin.amount_b)) {
-      fees_b = FeeUtils.calculateCompositionFee(amount_b_out, total_fee_rate)
+    if (d(amount_a_out).gt(used_bin.amount_a) && d(used_bin.amount_b).gt(amount_b_out)) {
+      fees_b = FeeUtils.calculateCompositionFee(d(used_bin.amount_b).sub(amount_b_out).toFixed(0), total_fee_rate)
+    } else if (d(amount_b_out).gt(used_bin.amount_b) && d(used_bin.amount_a).gt(amount_a_out)) {
+      fees_a = FeeUtils.calculateCompositionFee(d(used_bin.amount_a).sub(amount_a_out).toFixed(0), total_fee_rate)
     }
 
     return {

package/src/utils/parseData.ts

@@ -37,6 +37,7 @@ import {
 import { BinUtils } from './binUtils'
 import { BASIS_POINT } from '../types/constants'
 import { bcs } from '@mysten/sui/bcs'
+import { blake2b } from 'blakejs'
 
 /**
  * Parse the DLMM base pool data
@@ -278,7 +279,7 @@ export function parseBinInfoList(res: DevInspectResults): BinAmount[] {
       fee_b_growth_global: bcs.u128(),
     })
 
-    const bin_amounts = bcs.vector(bcsCoinAmount).parse(Uint8Array.from(res.results![0].returnValues![0][0]))
+    const bin_amounts = bcs.vector(bcsCoinAmount).parse(Uint8Array.from(res.results![1].returnValues![0][0]))
 
     return bin_amounts.map((bin_amount) => {
       const bin_id = asIntN(BigInt(bin_amount.id.bits))
@@ -303,7 +304,7 @@ export function parseBinInfo(fields: any): BinAmount {
       bin_id,
       amount_a: fields.amount_a,
       amount_b: fields.amount_b,
-      liquidity: fields.liquidity_supply,
+      liquidity: fields.liquidity_share,
       price_per_lamport: BinUtils.getPricePerLamportFromQPrice(fields.price),
     }
 
@@ -507,6 +508,13 @@ export function safeMulAmount(amount: Decimal, rate: Decimal): Decimal {
   return result.floor()
 }
 
+export function safeAmount(amount: Decimal): Decimal {
+  if (amount.gt(0) && amount.lt(1)) {
+    throw new DlmmError(`Multiplication ${amount.toString()} is less than 1`, DlmmErrorCode.AmountTooSmall)
+  }
+  return amount.floor()
+}
+
 export function getRouterModule(strategy_type: StrategyType) {
   switch (strategy_type) {
     case StrategyType.Spot:
@@ -517,3 +525,32 @@ export function getRouterModule(strategy_type: StrategyType) {
       return 'bid_ask'
   }
 }
+
+export function buildPoolKey(coin_type_a: string, coin_type_b: string, bin_step: number, base_factor: number) {
+  // Convert coin types to bytes
+  let coinABytes = Buffer.from(coin_type_a, 'utf8')
+  const coinBBytes = Buffer.from(coin_type_b, 'utf8')
+
+  const lenB = coinBBytes.length
+
+  let i = 0
+
+  // Append coinB bytes to coinA (without validation)
+  while (i < lenB) {
+    const byteB = coinBBytes[i]
+    coinABytes = Buffer.concat([coinABytes, Buffer.from([byteB])])
+    i++
+  }
+
+  // Serialize bin_step and base_factor using BCS
+  const binStepBytes = bcs.u16().serialize(bin_step).toBytes()
+  const baseFactorBytes = bcs.u16().serialize(base_factor).toBytes()
+
+  // Concatenate all bytes
+  const combinedBytes = Buffer.concat([coinABytes, binStepBytes, baseFactorBytes])
+
+  // Hash with blake2b256
+  const hash = blake2b(combinedBytes, undefined, 32)
+
+  return `0x${Buffer.from(hash).toString('hex')}`
+}