@cetusprotocol/dlmm-sdk 0.0.3 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/dlmm-sdk",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "SDK for cetus dlmm",
   "typings": "dist/index.d.ts",
   "main": "dist/index.js",

package/src/config/mainnet.ts

@@ -19,7 +19,7 @@ export const dlmmMainnet: SdkOptions = {
   },
   dlmm_router: {
     package_id: '0xc65d59c4aa7c9d53836bdbbb2a1418b02be6a351a767c64d6e4b7e96d26356d2',
-    published_at: '0xda28da84b5b1fef0ca053a2373e80ddb3a75f45e891e825fb06c2a53f838067d',
+    published_at: '0x8d389fa25cb08ebc5e520bc520ed394eed9e62b56b7868acb398bf298b8a76f3',
     version: 1,
   },
 }

package/src/utils/strategyUtils.ts

@@ -192,8 +192,8 @@ export class StrategyUtils {
       bin_step,
       lower_bin_id: min_bin_id,
       upper_bin_id: max_bin_id,
-      total_amount_a: fix_amount_a ? amount : info.amount_a,
-      total_amount_b: fix_amount_a ? info.amount_b : amount,
+      total_amount_a: info.amount_a,
+      total_amount_b: info.amount_b,
       active_bin_of_pool,
     })
 

package/src/utils/weightUtils.ts

@@ -61,9 +61,22 @@ export class WeightUtils {
 
     const diff_weight = d(DEFAULT_MAX_WEIGHT).sub(d(DEFAULT_MIN_WEIGHT)).floor()
 
-    const diff_min_weight = active_id > lower_bin_id ? diff_weight.div(d(active_id - lower_bin_id)).floor() : d(0)
-
-    const diff_max_weight = upper_bin_id > active_id ? diff_weight.div(d(upper_bin_id - active_id)).floor() : d(0)
+    const left_end_bin_id = active_id > upper_bin_id ? upper_bin_id : active_id
+    const right_start_bin_id = active_id < lower_bin_id ? lower_bin_id : active_id
+
+    const diff_min_weight =
+      active_id > lower_bin_id
+        ? left_end_bin_id === lower_bin_id
+          ? d(0)
+          : diff_weight.div(d(left_end_bin_id - lower_bin_id)).floor()
+        : d(0)
+
+    const diff_max_weight =
+      upper_bin_id > active_id
+        ? right_start_bin_id === upper_bin_id
+          ? d(0)
+          : diff_weight.div(d(upper_bin_id - right_start_bin_id)).floor()
+        : d(0)
 
     let bin_id = lower_bin_id
     let weights: Decimal[] = []
@@ -72,7 +85,7 @@ export class WeightUtils {
     while (bin_id <= upper_bin_id) {
       let weight: Decimal = d(0)
       if (bin_id < active_id) {
-        const delta_bin = active_id - bin_id
+        const delta_bin = left_end_bin_id - bin_id
         if (strategy_type === StrategyType.Spot) {
           weight = d(1)
         } else if (strategy_type === StrategyType.BidAsk) {
@@ -81,7 +94,7 @@ export class WeightUtils {
           weight = d(base_weight).sub(diff_min_weight.mul(delta_bin)).floor()
         }
       } else if (bin_id > active_id) {
-        const delta_bin = bin_id - active_id
+        const delta_bin = bin_id - right_start_bin_id
         if (strategy_type === StrategyType.Spot) {
           weight = d(1)
         } else if (strategy_type === StrategyType.BidAsk) {

package/tests/bin.test.ts

@@ -57,21 +57,36 @@ describe('dlmm bin', () => {
   })
 
   test('calculateAddLiquidityInfo', async () => {
-    const calculateOption: CalculateAddLiquidityOption = {
-      amount_a: '100000000',
-      amount_b: '100000000',
-      active_id: 0,
-      bin_step: 2,
-      lower_bin_id: 0,
-      upper_bin_id: 70,
-      amount_a_in_active_bin: '0',
-      amount_b_in_active_bin: '0',
-      strategy_type: StrategyType.Spot,
+    // const calculateOption: CalculateAddLiquidityOption = {
+    //   amount_a: '100000000',
+    //   amount_b: '100000000',
+    //   active_id: 0,
+    //   bin_step: 2,
+    //   lower_bin_id: 0,
+    //   upper_bin_id: 70,
+    //   amount_a_in_active_bin: '0',
+    //   amount_b_in_active_bin: '0',
+    //   strategy_type: StrategyType.Spot,
+    // }
+    // const bin_infos = sdk.Position.calculateAddLiquidityInfo(calculateOption)
+    // console.log('🚀 ~ test ~ split_bin_infos:', bin_infos.bins.length)
+    // const split_bin_infos = BinUtils.splitBinLiquidityInfo(bin_infos, 0, 70)
+    // console.log('🚀 ~ test ~ split_bin_infos:', split_bin_infos.length)
+
+    const calculateOption = {
+      active_bin_of_pool: undefined,
+      active_id: 2290,
+      pool_id: '0x556d4a393ce033ba4ee77980b70b63ca7b824752583e51103c15e4038cc96e44',
+      amount_a: '0',
+      amount_b: '1000000000',
+      bin_step: 25,
+      lower_bin_id: 2273,
+      strategy_type: 0,
+      upper_bin_id: 2273
     }
-    const bin_infos = sdk.Position.calculateAddLiquidityInfo(calculateOption)
-    console.log('🚀 ~ test ~ split_bin_infos:', bin_infos.bins.length)
-    const split_bin_infos = BinUtils.splitBinLiquidityInfo(bin_infos, 0, 70)
-    console.log('🚀 ~ test ~ split_bin_infos:', split_bin_infos.length)
+
+    const bin_infos = await sdk.Position.calculateAddLiquidityInfo(calculateOption)
+    console.log("🚀 ~ bin_infos:", JSON.stringify(bin_infos, null, 2))
   })
 
   test('findMinMaxBinId', async () => {