@cetusprotocol/dlmm-sdk 0.0.2 → 0.0.3

package/tests/add_liquidity_spot.test.ts

@@ -14,11 +14,11 @@ import {
 import { printTransaction, toDecimalsAmount } from '@cetusprotocol/common-sdk'
 import { BinUtils } from '../src/utils/binUtils'
 
-const pool_id = '0x833a468857db452508351dbbe5f9859ed557014bf0a23e4c8eba5dfa0c0741f0'
+const pool_id = '0x2ebd6828bc7a952f6e3a884800f70c3ad658964fa9a103bea953835d73873e68'
 const position_id = '0xf5139870fbc926d1ca1afdc536b4ab457a9c2a696440d10955572f04b95d9e29'
 
 describe('dlmm add liquidity spot', () => {
-  const sdk = CetusDlmmSDK.createSDK({ env: 'testnet', full_rpc_url: 'https://rpc-testnet.suiscan.xyz:443' })
+  const sdk = CetusDlmmSDK.createSDK({ env: 'mainnet' })
   let send_key_pair: Ed25519Keypair
   let account: string
   let pool: DlmmPool
@@ -55,17 +55,17 @@ describe('dlmm add liquidity spot', () => {
     )
 
     const calculateOption: CalculateAddLiquidityOption = {
+      pool_id,
       amount_a,
       amount_b,
       active_id,
       bin_step,
       lower_bin_id,
       upper_bin_id,
-      amount_a_in_active_bin: amounts_in_active_bin?.amount_a || '0',
-      amount_b_in_active_bin: amounts_in_active_bin?.amount_b || '0',
+      active_bin_of_pool: amounts_in_active_bin,
       strategy_type: StrategyType.Spot,
     }
-    const bin_infos = sdk.Position.calculateAddLiquidityInfo(calculateOption)
+    const bin_infos = await sdk.Position.calculateAddLiquidityInfo(calculateOption)
     //  console.log('🚀 ~ test ~ bin_infos:', bin_infos)
 
     const addOption: OpenAndAddLiquidityWithPriceOption = {
@@ -78,19 +78,18 @@ describe('dlmm add liquidity spot', () => {
       lower_price,
       upper_price,
       bin_step,
-      amount_a_in_active_bin: amounts_in_active_bin?.amount_a || '0',
-      amount_b_in_active_bin: amounts_in_active_bin?.amount_b || '0',
+      active_bin_of_pool: amounts_in_active_bin,
       strategy_type: StrategyType.Spot,
       decimals_a: 6,
       decimals_b: 6,
       max_price_slippage: 0.01,
       active_id,
     }
-    const tx = sdk.Position.addLiquidityWithPricePayload(addOption)
+    const tx = await sdk.Position.addLiquidityWithPricePayload(addOption)
 
     printTransaction(tx)
 
-    const res = await sdk.FullClient.executeTx(send_key_pair, tx, false)
+    const res = await sdk.FullClient.executeTx(send_key_pair, tx, true)
     console.log('🚀 ~ test ~ res:', res)
   })
 
@@ -99,8 +98,8 @@ describe('dlmm add liquidity spot', () => {
     console.log('🚀 ~ beforeEach ~ pool:', pool)
     const { active_id, bin_step } = pool
     const amount_a = '10000000'
-    const amount_b = '0'
-    const lower_bin_id = active_id
+    const amount_b = '20000000'
+    const lower_bin_id = active_id - 10
     const upper_bin_id = active_id + 10
 
     const amounts_in_active_bin = await sdk.Position.getActiveBinIfInRange(
@@ -112,17 +111,17 @@ describe('dlmm add liquidity spot', () => {
     )
 
     const calculateOption: CalculateAddLiquidityOption = {
+      pool_id,
       amount_a,
       amount_b,
       active_id,
       bin_step,
       lower_bin_id,
       upper_bin_id,
-      amount_a_in_active_bin: amounts_in_active_bin?.amount_a || '0',
-      amount_b_in_active_bin: amounts_in_active_bin?.amount_b || '0',
+      active_bin_of_pool: amounts_in_active_bin,
       strategy_type: StrategyType.Spot,
     }
-    const bin_infos = sdk.Position.calculateAddLiquidityInfo(calculateOption)
+    const bin_infos = await sdk.Position.calculateAddLiquidityInfo(calculateOption)
     console.log('🚀 ~ test ~ bin_infos:', bin_infos)
 
     const addOption: OpenAndAddLiquidityOption = {
@@ -140,7 +139,7 @@ describe('dlmm add liquidity spot', () => {
     }
     const tx = sdk.Position.addLiquidityPayload(addOption)
     tx.setGasBudget(10000000000)
-    printTransaction(tx)
+    // printTransaction(tx)
 
     const res = await sdk.FullClient.executeTx(send_key_pair, tx, false)
     console.log('🚀 ~ test ~ res:', res)
@@ -167,17 +166,17 @@ describe('dlmm add liquidity spot', () => {
     const amount_b = '0'
 
     const calculateOption: CalculateAddLiquidityOption = {
+      pool_id,
       amount_a,
       amount_b,
       active_id,
       bin_step,
       lower_bin_id,
       upper_bin_id,
-      amount_a_in_active_bin: amounts_in_active_bin?.amount_a || '0',
-      amount_b_in_active_bin: amounts_in_active_bin?.amount_b || '0',
+      active_bin_of_pool: amounts_in_active_bin,
       strategy_type: StrategyType.Spot,
     }
-    const bin_infos = sdk.Position.calculateAddLiquidityInfo(calculateOption)
+    const bin_infos = await sdk.Position.calculateAddLiquidityInfo(calculateOption)
     console.log('🚀 ~ test ~ bin_infos:', bin_infos)
 
     const addOption: AddLiquidityOption = {
@@ -225,17 +224,17 @@ describe('dlmm add liquidity spot', () => {
     const coin_amount = toDecimalsAmount(1, 9)
 
     const calculateOption: CalculateAddLiquidityAutoFillOption = {
+      pool_id,
       coin_amount,
-      fix_amount_a: false,
+      fix_amount_a: true,
       active_id,
       bin_step,
       lower_bin_id,
       upper_bin_id,
-      amount_a_in_active_bin: amounts_in_active_bin?.amount_a || '0',
-      amount_b_in_active_bin: amounts_in_active_bin?.amount_b || '0',
+      active_bin_of_pool: amounts_in_active_bin,
       strategy_type: StrategyType.Spot,
     }
-    const bin_infos = sdk.Position.calculateAddLiquidityInfo(calculateOption)
+    const bin_infos = await sdk.Position.calculateAddLiquidityInfo(calculateOption)
     console.log('🚀 ~ test ~ bin_infos:', bin_infos)
 
     const addOption: AddLiquidityOption = {
@@ -256,6 +255,59 @@ describe('dlmm add liquidity spot', () => {
     tx.setGasBudget(10000000000)
     printTransaction(tx)
 
+    const res = await sdk.FullClient.executeTx(send_key_pair, tx, false)
+    console.log('🚀 ~ test ~ res:', res)
+  })
+
+  test('4 spot strategy  fix coin a open add liquidity', async () => {
+    pool = await sdk.Pool.getPool(pool_id)
+    const { active_id, bin_step, bin_manager, coin_type_a, coin_type_b } = pool
+    console.log('🚀 ~ pool:', pool)
+
+    const lower_bin_id = active_id
+    const upper_bin_id = active_id
+
+    const amounts_in_active_bin = await sdk.Position.getActiveBinIfInRange(
+      bin_manager.bin_manager_handle,
+      lower_bin_id,
+      upper_bin_id,
+      active_id,
+      bin_step
+    )
+
+    const coin_amount = toDecimalsAmount(1, 6)
+
+    const calculateOption: CalculateAddLiquidityAutoFillOption = {
+      pool_id,
+      coin_amount,
+      fix_amount_a: true,
+      active_id,
+      bin_step,
+      lower_bin_id,
+      upper_bin_id,
+      active_bin_of_pool: amounts_in_active_bin,
+      strategy_type: StrategyType.Spot,
+    }
+    const bin_infos = await sdk.Position.calculateAddLiquidityInfo(calculateOption)
+    console.log('🚀 ~ test ~ bin_infos:', bin_infos)
+
+    const addOption: OpenAndAddLiquidityOption = {
+      pool_id,
+      bin_infos: bin_infos,
+      coin_type_a,
+      coin_type_b,
+      active_id,
+      use_bin_infos: false,
+      strategy_type: StrategyType.Spot,
+      max_price_slippage: 0.01,
+      bin_step,
+      lower_bin_id,
+      upper_bin_id,
+    }
+    const tx = sdk.Position.addLiquidityPayload(addOption)
+    tx.setGasBudget(10000000000)
+    printTransaction(tx)
+
     const res = await sdk.FullClient.executeTx(send_key_pair, tx, true)
     console.log('🚀 ~ test ~ res:', res)
   })

package/tests/config.test.ts

@@ -3,9 +3,13 @@ import type { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519'
 import { buildTestAccount } from '@cetusprotocol/test-utils'
 import { CetusDlmmSDK } from '../src/sdk'
 import { parseCurrentRewardPeriodEmission, parseRewardPeriodEmission } from '../src/utils/parseData'
+import { Transaction } from '@mysten/sui/transactions'
+import { CoinAssist, printTransaction } from '@cetusprotocol/common-sdk'
+import { toB64, toBase64 } from '@mysten/sui/utils'
+import BN from 'bn.js'
 
 describe('config', () => {
-  const sdk = CetusDlmmSDK.createSDK({ env: 'testnet' })
+  const sdk = CetusDlmmSDK.createSDK({ env: 'mainnet' })
   let send_key_pair: Ed25519Keypair
   let account: string
 
@@ -20,6 +24,24 @@ describe('config', () => {
     console.log('🚀 ~ test ~ res:', res)
   })
 
+  test('build rawBytes', async () => {
+    const tx = new Transaction()
+
+    const zeroCoin = CoinAssist.buildCoinWithBalance(
+      BigInt(100),
+      '0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC',
+      tx
+    )
+    tx.transferObjects([zeroCoin], tx.pure.address(account))
+    tx.setSender(account)
+
+    printTransaction(tx)
+    // build rawBytes
+    const data = await tx.build({ client: sdk.FullClient })
+    const rawBytes = toBase64(data)
+    console.log('rawBytes: ', rawBytes)
+  })
+
   test('getBinStepConfigList', async () => {
     const res = await sdk.Config.getBinStepConfigList('0xc00e4dbc372948b2b72ae5554c7296b39e107a92821baff08aa640aba0b07aed')
     console.log('🚀 ~ test ~ res:', res)

package/tests/pool.test.ts

@@ -6,7 +6,7 @@ import { BinUtils } from '../src/utils/binUtils'
 import { StrategyType } from '../src/types/dlmm'
 import { asIntN, asUintN, d, printTransaction } from '@cetusprotocol/common-sdk'
 import { Transaction } from '@mysten/sui/transactions'
-import { FeeUtils } from '../src/utils'
+import { buildPoolKey, FeeUtils } from '../src/utils'
 import { FEE_PRECISION, MAX_FEE_RATE } from '../src/types/constants'
 
 describe('pool', () => {
@@ -70,6 +70,16 @@ describe('pool', () => {
     console.log('🚀 ~ test ~ bin_info:', bin_info)
   })
 
+  test('getPoolAddress', async () => {
+    const address = await sdk.Pool.getPoolAddress(
+      '14a71d857b34677a7d57e0feb303df1adb515a37780645ab763d42ce8d1a5e48::usdt::USDT',
+      '0000000000000000000000000000000000000000000000000000000000000002::sui::SUI',
+      25,
+      10000
+    )
+    console.log('🚀 ~ test ~ address:', address)
+  })
+
   test('getVariableFee', async () => {
     const pool = await sdk.Pool.getPool('0xe7e85914ab054a8d0d6d8f5f3e52445d17153da1efba857fed986f2d79e43412')
     console.log('🚀 ~ test ~ pool:', JSON.stringify(pool, null, 2))
@@ -83,7 +93,7 @@ describe('pool', () => {
 
   test('1 getPoolBinInfo', async () => {
     const bin_info = await sdk.Pool.getPoolBinInfo({
-      pool_id: '0xffd4260d625f99349542badf632037c824ad919425ee227de1745b19edc05133',
+      pool_id: '0x2805cdfa9a58d112d1a8ce238cd77dbb40b1fe89d9e64f1625dee8ce378450bf',
       coin_type_a: '0x14a71d857b34677a7d57e0feb303df1adb515a37780645ab763d42ce8d1a5e48::usdt::USDT',
       coin_type_b: '0x14a71d857b34677a7d57e0feb303df1adb515a37780645ab763d42ce8d1a5e48::usdc::USDC',
     })

package/tests/position.test.ts

@@ -30,8 +30,8 @@ describe('dlmm position', () => {
   })
 
   test('get position', async () => {
-    const pool = await sdk.Pool.getPool('0x6055e7eb872d7db12a6267fe43310326189aaf2cc1ba5ad4228f1c2c3b3998c2')
-    const res = await sdk.Position.getPosition('0xf3385e599ca649880233194e34b1910991c997f5f72f4888c831df79c6c65d17')
+    const pool = await sdk.Pool.getPool('0x9ec24e51ba5083a800538622ef42343de80f62e9b3f2a507ed409ca0155cff35')
+    const res = await sdk.Position.getPosition('0xe7b049747668f198137adbbba21c5e03ab56266bf5273413a1713e097f7482ae')
     console.log('🚀 ~ test ~ res:', res)
 
     const active_bin = await sdk.Pool.getBinInfo(pool.bin_manager.bin_manager_handle, pool.active_id, pool.bin_step)