@magmaprotocol/magma-clmm-sdk 0.5.64 → 0.5.66

package/dist/index.d.ts

@@ -1752,6 +1752,8 @@ type DlmmPoolInfo = {
     base_factor: number;
     base_fee: number;
     active_index: number;
+    coinAmountA: string;
+    coinAmountB: string;
 };
 type DlmmAddLiquidityParams = {
     pool_id: string;
@@ -1849,6 +1851,21 @@ type DlmmPositionInfo = {
     fees: DlmmEventEarnedFees;
     contractPool: DlmmPoolInfo | undefined;
 };
+type MintByStrategyParams = {
+    pair: string;
+    bin_step: number;
+    coinTypeA: string;
+    coinTypeB: string;
+    amountATotal: number;
+    amountBTotal: number;
+    fixCoinA: boolean;
+    fixCoinB: boolean;
+    strategy: number;
+    min_bin: number;
+    max_bin: number;
+    active_bin: number;
+    slippage: number;
+};
 
 type BigNumber = Decimal.Value | number | string;
 
@@ -3722,8 +3739,8 @@ declare class DlmmModule implements IModule {
     get sdk(): MagmaClmmSDK;
     getPoolInfo(pools: string[]): Promise<DlmmPoolInfo[]>;
     fetchPairParams(params: FetchPairParams): Promise<EventPairParams>;
-    price_to_storage_id(price: string, bin_step: number, tokenADecimal: number, tokenBDecimal: number): number;
     createPairPayload(params: CreatePairParams): Promise<Transaction>;
+    mintByStrategy(params: MintByStrategyParams): Promise<Transaction>;
     mintPercent(params: MintPercentParams): Promise<Transaction>;
     createPositionByAmount(params: MintAmountParams): Promise<Transaction>;
     addLiquidity(params: DlmmAddLiquidityParams): Promise<Transaction>;
@@ -3731,17 +3748,18 @@ declare class DlmmModule implements IModule {
     private _raisePositionByAmountsReward;
     burnPosition(params: DlmmBurnPositionParams): Promise<Transaction>;
     shrinkPosition(params: DlmmShrinkPosition): Promise<Transaction>;
-    collectReward(params: DlmmCollectRewardParams): Promise<Transaction>;
-    collectFees(params: DlmmCollectFeeParams): Promise<Transaction>;
+    collectFeeAndReward(params: DlmmCollectRewardParams & DlmmCollectFeeParams): Promise<Transaction>;
+    collectReward(params: DlmmCollectRewardParams, transaction?: Transaction): Promise<Transaction>;
+    collectFees(params: DlmmCollectFeeParams, transaction?: Transaction): Promise<Transaction>;
     createPairAddLiquidity(params: DlmmCreatePairAddLiquidityParams): Promise<Transaction>;
     swap(params: DLMMSwapParams): Promise<Transaction>;
     fetchBins(params: FetchBinsParams): Promise<EventBin[]>;
     /**
-   * Gets a list of positions for the given account address.
-   * @param accountAddress The account address to get positions for.
-   * @param assignPoolIds An array of pool IDs to filter the positions by.
-   * @returns array of Position objects.
-   */
+     * Gets a list of positions for the given account address.
+     * @param accountAddress The account address to get positions for.
+     * @param assignPoolIds An array of pool IDs to filter the positions by.
+     * @returns array of Position objects.
+     */
     getUserPositionById(positionId: string, showDisplay?: boolean): Promise<DlmmPositionInfo>;
     /**
      * Gets a list of positions for the given account address.
@@ -4508,4 +4526,4 @@ interface InitMagmaSDKOptions {
  */
 declare function initMagmaSDK(options: InitMagmaSDKOptions): MagmaClmmSDK;
 
-export { AMM_SWAP_MODULE, AddBribeReward, AddLiquidityCommonParams, AddLiquidityFixTokenParams, AddLiquidityParams, AddLiquidityWithProtectionParams, AddressAndDirection, AdjustResult, AggregatorResult, AmountSpecified, BasePath, BigNumber, BinDisplay, BinLiquidity, BinMath, Bits, BuildCoinResult, CLOCK_ADDRESS, CachedContent, CalculateRatesParams, CalculateRatesResult, ClaimAndLockParams, ClaimFeesParams, ClaimFeesPoolsParams, ClmmConfig, ClmmExpectSwapModule, ClmmFetcherModule, ClmmIntegratePoolModule, ClmmIntegratePoolV2Module, ClmmIntegratePoolV3Module, ClmmIntegrateRouterModule, ClmmIntegrateRouterWithPartnerModule, ClmmIntegrateUtilsModule, ClmmPartnerModule, ClmmPoolConfig, ClmmPoolUtil, ClmmPositionStatus, ClmmpoolData, ClosePositionParams, CoinAmounts, CoinAsset, CoinAssist, CoinConfig, CoinInfoAddress, CoinNode, CoinPairType, CoinProvider, CoinStoreAddress, CollectFeeParams, CollectFeesQuote, CollectFeesQuoteParam, CollectRewarderParams, ConfigModule, CreateLockParams, CreatePairParams, CreatePartnerEvent, CreatePoolAddLiquidityParams, CreatePoolParams, DEFAULT_GAS_BUDGET_FOR_MERGE, DEFAULT_GAS_BUDGET_FOR_SPLIT, DEFAULT_GAS_BUDGET_FOR_STAKE, DEFAULT_GAS_BUDGET_FOR_TRANSFER, DEFAULT_GAS_BUDGET_FOR_TRANSFER_SUI, DEFAULT_NFT_TRANSFER_GAS_FEE, DLMMSwapParams, DataPage, DeepbookClobV2Moudle, DeepbookCustodianV2Moudle, DeepbookEndpointsV2Moudle, DeepbookPool, DeepbookUtils, DepositPosition, DlmmAddLiquidityParams, DlmmBurnPositionParams, DlmmCollectFeeParams, DlmmCollectRewardParams, DlmmConfig, DlmmCreatePairAddLiquidityParams, DlmmEventEarnedFees, DlmmEventEarnedRewards, DlmmEventPairRewardTypes, DlmmPoolInfo, DlmmPosition, DlmmPositionInfo, DlmmRewardsParams, DlmmScript, DlmmShrinkPosition, EpochEmission, EventBin, EventPairLiquidity, EventPairParams, EventPositionLiquidity, FEE_RATE_DENOMINATOR, FaucetCoin, FetchBinsParams, FetchPairParams, FetchParams, GAS_SYMBOL, GAS_TYPE_ARG, GAS_TYPE_ARG_LONG, Gauge, GetPairLiquidityParams, GetPairRewarderParams, GetPositionLiquidityParams, GetRewardByPosition, IncreaseLockAmountParams, IncreaseUnlockTimeParams, LaunchpadPoolConfig, LiquidityAndCoinYResult, LiquidityInput, LockModule, LockPermanentParams, LockVoteEvent, MAX_SQRT_PRICE, MAX_TICK_INDEX, MIN_SQRT_PRICE, MIN_TICK_INDEX, MagmaClmmSDK, MagmaConfigs, MathUtil, MergeLockParams, MintAmountParams, MintPercentParams, Minter, NFT, ONE, OnePath, OpenPositionAddLiquidityWithProtectionParams, OpenPositionParams, Order, POOL_NO_LIQUIDITY, POOL_STRUCT, Package, PageQuery, PaginationArgs, PathLink, PathProvider, Percentage, PokeParams, Pool, PoolImmutables, PoolInfo, PoolModule, Position, PositionModule, PositionReward, PositionStatus, PositionUtil, PreRouterSwapParams, PreSwapLpChangeParams, PreSwapParams, PreSwapResult, PreSwapWithMultiPoolParams, PriceResult, RemoveLiquidityParams, RewardDistributor, Rewarder, RewarderAmountOwed, RouterModule, RouterModuleV2, RpcModule, SUI_SYSTEM_STATE_OBJECT_ID, SdkOptions, SplitPath, SplitSwap, SplitSwapResult, SplitUnit, StakedPositionOfPool, StrategyType, SuiAddressType, SuiBasicTypes, SuiInputTypes, SuiObjectDataWithContent, SuiObjectIdType, SuiResource, SuiStructTag, SuiTxArg, SwapDirection, SwapModule, SwapParams, SwapResult, SwapStepResult, SwapUtils, SwapWithRouterParams, TICK_ARRAY_SIZE, TWO, Tick, TickData, TickMath, TickUtil, TokenConfig, TokenConfigEvent, TokenInfo, TokenModule, TransPreSwapWithMultiPoolParams, TransactionUtil, TransferLockParams, TxBlock, U128, U128_MAX, U64_MAX, VoteParams, Voter, VotingEscrow, WithdrawPosition, ZERO, addHexPrefix, adjustForCoinSlippage, adjustForSlippage, asIntN, asUintN, autoFillXByStrategy, autoFillXByWeight, autoFillYByStrategy, autoFillYByWeight, bufferToHex, buildClmmPositionName, buildNFT, buildPool, buildPosition, buildPositionReward, buildTickData, buildTickDataByEvent, cacheTime24h, cacheTime5min, checkAddress, checkInvalidSuiAddress, clmmMainnet, clmmTestnet, collectFeesQuote, composeType, computeSwap, computeSwapStep, createSplitAmountArray, createSplitArray, createTestTransferTxPayloadParams, d, decimalsMultiplier, MagmaClmmSDK as default, estPoolAPR, estPosAPRResult, estPositionAPRWithDeltaMethod, estPositionAPRWithMultiMethod, estimateLiquidityForCoinA, estimateLiquidityForCoinB, extractAddressFromType, extractStructTagFromType, findAdjustCoin, fixCoinType, fixSuiObjectId, fromDecimalsAmount, getAmountFixedDelta, getAmountUnfixedDelta, getCoinAFromLiquidity, getCoinBFromLiquidity, getCoinXYForLiquidity, getDefaultSuiInputType, getDeltaA, getDeltaB, getDeltaDownFromOutput, getDeltaUpFromInput, getFutureTime, getLiquidityAndCoinYByCoinX, getLiquidityFromCoinA, getLiquidityFromCoinB, getLowerSqrtPriceFromCoinA, getLowerSqrtPriceFromCoinB, getMoveObject, getMoveObjectType, getMovePackageContent, getNearestTickByTick, getNextSqrtPriceAUp, getNextSqrtPriceBDown, getNextSqrtPriceFromInput, getNextSqrtPriceFromOutput, getObjectDeletedResponse, getObjectDisplay, getObjectFields, getObjectId, getObjectNotExistsResponse, getObjectOwner, getObjectPreviousTransactionDigest, getObjectReference, getObjectType, getObjectVersion, getPackagerConfigs, getPriceOfBinByBinId, getRewardInTickRange, getSuiObjectData, getTickDataFromUrlData, getUpperSqrtPriceFromCoinA, getUpperSqrtPriceFromCoinB, hasPublicTransfer, hexToNumber, hexToString, initMagmaSDK, initMainnetSDK, initTestnetSDK, isSortedSymbols, isSuiObjectResponse, newBits, normalizeCoinType, patchFixSuiObjectId, printTransaction, removeHexPrefix, secretKeyToEd25519Keypair, secretKeyToSecp256k1Keypair, shortAddress, shortString, tickScore, toAmountAskSide, toAmountBidSide, toAmountBothSide, toAmountsBothSideByStrategy, toBuffer, toCoinAmount, toDecimalsAmount, transClmmpoolDataWithoutTicks, utf8to16, withLiquiditySlippage };
+export { AMM_SWAP_MODULE, AddBribeReward, AddLiquidityCommonParams, AddLiquidityFixTokenParams, AddLiquidityParams, AddLiquidityWithProtectionParams, AddressAndDirection, AdjustResult, AggregatorResult, AmountSpecified, BasePath, BigNumber, BinDisplay, BinLiquidity, BinMath, Bits, BuildCoinResult, CLOCK_ADDRESS, CachedContent, CalculateRatesParams, CalculateRatesResult, ClaimAndLockParams, ClaimFeesParams, ClaimFeesPoolsParams, ClmmConfig, ClmmExpectSwapModule, ClmmFetcherModule, ClmmIntegratePoolModule, ClmmIntegratePoolV2Module, ClmmIntegratePoolV3Module, ClmmIntegrateRouterModule, ClmmIntegrateRouterWithPartnerModule, ClmmIntegrateUtilsModule, ClmmPartnerModule, ClmmPoolConfig, ClmmPoolUtil, ClmmPositionStatus, ClmmpoolData, ClosePositionParams, CoinAmounts, CoinAsset, CoinAssist, CoinConfig, CoinInfoAddress, CoinNode, CoinPairType, CoinProvider, CoinStoreAddress, CollectFeeParams, CollectFeesQuote, CollectFeesQuoteParam, CollectRewarderParams, ConfigModule, CreateLockParams, CreatePairParams, CreatePartnerEvent, CreatePoolAddLiquidityParams, CreatePoolParams, DEFAULT_GAS_BUDGET_FOR_MERGE, DEFAULT_GAS_BUDGET_FOR_SPLIT, DEFAULT_GAS_BUDGET_FOR_STAKE, DEFAULT_GAS_BUDGET_FOR_TRANSFER, DEFAULT_GAS_BUDGET_FOR_TRANSFER_SUI, DEFAULT_NFT_TRANSFER_GAS_FEE, DLMMSwapParams, DataPage, DeepbookClobV2Moudle, DeepbookCustodianV2Moudle, DeepbookEndpointsV2Moudle, DeepbookPool, DeepbookUtils, DepositPosition, DlmmAddLiquidityParams, DlmmBurnPositionParams, DlmmCollectFeeParams, DlmmCollectRewardParams, DlmmConfig, DlmmCreatePairAddLiquidityParams, DlmmEventEarnedFees, DlmmEventEarnedRewards, DlmmEventPairRewardTypes, DlmmPoolInfo, DlmmPosition, DlmmPositionInfo, DlmmRewardsParams, DlmmScript, DlmmShrinkPosition, EpochEmission, EventBin, EventPairLiquidity, EventPairParams, EventPositionLiquidity, FEE_RATE_DENOMINATOR, FaucetCoin, FetchBinsParams, FetchPairParams, FetchParams, GAS_SYMBOL, GAS_TYPE_ARG, GAS_TYPE_ARG_LONG, Gauge, GetPairLiquidityParams, GetPairRewarderParams, GetPositionLiquidityParams, GetRewardByPosition, IncreaseLockAmountParams, IncreaseUnlockTimeParams, LaunchpadPoolConfig, LiquidityAndCoinYResult, LiquidityInput, LockModule, LockPermanentParams, LockVoteEvent, MAX_SQRT_PRICE, MAX_TICK_INDEX, MIN_SQRT_PRICE, MIN_TICK_INDEX, MagmaClmmSDK, MagmaConfigs, MathUtil, MergeLockParams, MintAmountParams, MintByStrategyParams, MintPercentParams, Minter, NFT, ONE, OnePath, OpenPositionAddLiquidityWithProtectionParams, OpenPositionParams, Order, POOL_NO_LIQUIDITY, POOL_STRUCT, Package, PageQuery, PaginationArgs, PathLink, PathProvider, Percentage, PokeParams, Pool, PoolImmutables, PoolInfo, PoolModule, Position, PositionModule, PositionReward, PositionStatus, PositionUtil, PreRouterSwapParams, PreSwapLpChangeParams, PreSwapParams, PreSwapResult, PreSwapWithMultiPoolParams, PriceResult, RemoveLiquidityParams, RewardDistributor, Rewarder, RewarderAmountOwed, RouterModule, RouterModuleV2, RpcModule, SUI_SYSTEM_STATE_OBJECT_ID, SdkOptions, SplitPath, SplitSwap, SplitSwapResult, SplitUnit, StakedPositionOfPool, StrategyType, SuiAddressType, SuiBasicTypes, SuiInputTypes, SuiObjectDataWithContent, SuiObjectIdType, SuiResource, SuiStructTag, SuiTxArg, SwapDirection, SwapModule, SwapParams, SwapResult, SwapStepResult, SwapUtils, SwapWithRouterParams, TICK_ARRAY_SIZE, TWO, Tick, TickData, TickMath, TickUtil, TokenConfig, TokenConfigEvent, TokenInfo, TokenModule, TransPreSwapWithMultiPoolParams, TransactionUtil, TransferLockParams, TxBlock, U128, U128_MAX, U64_MAX, VoteParams, Voter, VotingEscrow, WithdrawPosition, ZERO, addHexPrefix, adjustForCoinSlippage, adjustForSlippage, asIntN, asUintN, autoFillXByStrategy, autoFillXByWeight, autoFillYByStrategy, autoFillYByWeight, bufferToHex, buildClmmPositionName, buildNFT, buildPool, buildPosition, buildPositionReward, buildTickData, buildTickDataByEvent, cacheTime24h, cacheTime5min, checkAddress, checkInvalidSuiAddress, clmmMainnet, clmmTestnet, collectFeesQuote, composeType, computeSwap, computeSwapStep, createSplitAmountArray, createSplitArray, createTestTransferTxPayloadParams, d, decimalsMultiplier, MagmaClmmSDK as default, estPoolAPR, estPosAPRResult, estPositionAPRWithDeltaMethod, estPositionAPRWithMultiMethod, estimateLiquidityForCoinA, estimateLiquidityForCoinB, extractAddressFromType, extractStructTagFromType, findAdjustCoin, fixCoinType, fixSuiObjectId, fromDecimalsAmount, getAmountFixedDelta, getAmountUnfixedDelta, getCoinAFromLiquidity, getCoinBFromLiquidity, getCoinXYForLiquidity, getDefaultSuiInputType, getDeltaA, getDeltaB, getDeltaDownFromOutput, getDeltaUpFromInput, getFutureTime, getLiquidityAndCoinYByCoinX, getLiquidityFromCoinA, getLiquidityFromCoinB, getLowerSqrtPriceFromCoinA, getLowerSqrtPriceFromCoinB, getMoveObject, getMoveObjectType, getMovePackageContent, getNearestTickByTick, getNextSqrtPriceAUp, getNextSqrtPriceBDown, getNextSqrtPriceFromInput, getNextSqrtPriceFromOutput, getObjectDeletedResponse, getObjectDisplay, getObjectFields, getObjectId, getObjectNotExistsResponse, getObjectOwner, getObjectPreviousTransactionDigest, getObjectReference, getObjectType, getObjectVersion, getPackagerConfigs, getPriceOfBinByBinId, getRewardInTickRange, getSuiObjectData, getTickDataFromUrlData, getUpperSqrtPriceFromCoinA, getUpperSqrtPriceFromCoinB, hasPublicTransfer, hexToNumber, hexToString, initMagmaSDK, initMainnetSDK, initTestnetSDK, isSortedSymbols, isSuiObjectResponse, newBits, normalizeCoinType, patchFixSuiObjectId, printTransaction, removeHexPrefix, secretKeyToEd25519Keypair, secretKeyToSecp256k1Keypair, shortAddress, shortString, tickScore, toAmountAskSide, toAmountBidSide, toAmountBothSide, toAmountsBothSideByStrategy, toBuffer, toCoinAmount, toDecimalsAmount, transClmmpoolDataWithoutTicks, utf8to16, withLiquiditySlippage };

package/dist/index.js

@@ -10750,7 +10750,9 @@ var DlmmModule = class {
         coin_b: fields.y.fields.name,
         base_factor: fields.params.fields.base_factor,
         base_fee: fields.params.fields.base_factor / 1e4 * (fields.bin_step / 1e4),
-        active_index: fields.params.fields.active_index
+        active_index: fields.params.fields.active_index,
+        coinAmountA: fields.reserve_x,
+        coinAmountB: fields.reserve_y
       });
     });
     return poolList;
@@ -10796,18 +10798,11 @@ var DlmmModule = class {
     });
     return res;
   }
-  // params price: input (b/(10^b_decimal))/(a/(10^a_decimal))
-  price_to_storage_id(price, bin_step, tokenADecimal, tokenBDecimal) {
-    const priceDec = new import_decimal13.default(price);
-    const tenDec = new import_decimal13.default(10);
-    const twoDec = new import_decimal13.default(2);
-    const price_x128 = priceDec.mul(tenDec.pow(tokenBDecimal)).div(tenDec.pow(tokenADecimal)).mul(twoDec.pow(128));
-    const active_id = (0, import_calc_dlmm3.get_real_id_from_price_x128)(price_x128.toFixed(0).toString(), bin_step);
-    return (0, import_calc_dlmm3.get_storage_id_from_real_id)(active_id);
-  }
   // NOTE: x, y should be sorted
   async createPairPayload(params) {
-    const storage_id = this.price_to_storage_id(params.priceTokenBPerTokenA, params.bin_step, params.coinADecimal, params.coinBDecimal);
+    const storage_id = (0, import_calc_dlmm3.get_storage_id_from_real_id)(
+      BinMath.getBinIdFromPrice(params.priceTokenBPerTokenA, params.bin_step, params.coinADecimal, params.coinBDecimal)
+    );
     const tx = new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
     const { clmm_pool, dlmm_pool, integrate } = this.sdk.sdkOptions;
@@ -10828,6 +10823,64 @@ var DlmmModule = class {
     });
     return tx;
   }
+  async mintByStrategy(params) {
+    const tx = new import_transactions12.Transaction();
+    const slippage = new import_decimal13.default(params.slippage);
+    const lower_slippage = new import_decimal13.default(1).plus(slippage.div(new import_decimal13.default(1e4)));
+    const upper_slippage = new import_decimal13.default(1).plus(slippage.div(new import_decimal13.default(1e4)));
+    tx.setSender(this.sdk.senderAddress);
+    const { dlmm_pool, integrate } = this.sdk.sdkOptions;
+    const dlmmConfig = getPackagerConfigs(dlmm_pool);
+    const typeArguments = [params.coinTypeA, params.coinTypeB];
+    const price = (0, import_calc_dlmm3.get_price_x128_from_real_id)(params.active_bin, params.bin_step);
+    const min_price = new import_decimal13.default(price).mul(lower_slippage);
+    const max_price = new import_decimal13.default(price).mul(upper_slippage);
+    const active_min = (0, import_calc_dlmm3.get_storage_id_from_real_id)((0, import_calc_dlmm3.get_real_id_from_price_x128)(min_price.toDecimalPlaces(0).toString(), params.bin_step));
+    const active_max = (0, import_calc_dlmm3.get_storage_id_from_real_id)((0, import_calc_dlmm3.get_real_id_from_price_x128)(max_price.toDecimalPlaces(0).toString(), params.bin_step));
+    const allCoins = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress);
+    let primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(params.amountATotal), params.coinTypeA, false, true);
+    let primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(params.amountBTotal), params.coinTypeB, false, true);
+    let amount_min = 0;
+    let amount_max = 0;
+    if (params.fixCoinA) {
+      amount_min = new import_decimal13.default(params.amountATotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
+      amount_max = new import_decimal13.default(params.amountATotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
+      primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amount_max), params.coinTypeB, false, true);
+    }
+    if (params.fixCoinB) {
+      amount_min = new import_decimal13.default(params.amountBTotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
+      amount_max = new import_decimal13.default(params.amountBTotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
+      primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amount_max), params.coinTypeB, false, true);
+    }
+    if (params.fixCoinA && params.fixCoinB) {
+    } else if (params.fixCoinA) {
+      params.amountBTotal = 0;
+    } else if (params.fixCoinB) {
+      params.amountATotal = 0;
+    }
+    const args = [
+      tx.object(params.pair),
+      tx.object(dlmmConfig.factory),
+      primaryCoinAInputs.targetCoin,
+      primaryCoinBInputs.targetCoin,
+      tx.pure.u64(params.amountATotal),
+      tx.pure.u64(params.amountBTotal),
+      tx.pure.u8(params.strategy),
+      tx.pure.u32(params.min_bin),
+      tx.pure.u32(params.max_bin),
+      tx.pure.u32(active_min),
+      tx.pure.u32(active_max),
+      tx.pure.u64(amount_min),
+      tx.pure.u64(amount_max),
+      tx.object(CLOCK_ADDRESS)
+    ];
+    tx.moveCall({
+      target: `${integrate.published_at}::${DlmmScript}::mint_percent`,
+      typeArguments,
+      arguments: args
+    });
+    return tx;
+  }
   // Create a position by percent
   async mintPercent(params) {
     const tx = new import_transactions12.Transaction();
@@ -10996,8 +11049,16 @@ var DlmmModule = class {
     });
     return tx;
   }
-  async collectReward(params) {
-    const tx = new import_transactions12.Transaction();
+  async collectFeeAndReward(params) {
+    let tx = new import_transactions12.Transaction();
+    tx = await this.collectFees(params);
+    if (params.rewards_token.length > 0) {
+      tx = await this.collectReward(params);
+    }
+    return tx;
+  }
+  async collectReward(params, transaction) {
+    const tx = transaction || new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
     const { integrate, clmm_pool } = this.sdk.sdkOptions;
     const clmmConfigs = getPackagerConfigs(clmm_pool);
@@ -11019,8 +11080,8 @@ var DlmmModule = class {
     });
     return tx;
   }
-  async collectFees(params) {
-    const tx = new import_transactions12.Transaction();
+  async collectFees(params, transaction) {
+    const tx = transaction || new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
     const { integrate } = this.sdk.sdkOptions;
     const typeArguments = [params.coin_a, params.coin_b];
@@ -11071,11 +11132,28 @@ var DlmmModule = class {
     const { clmm_pool, integrate } = this.sdk.sdkOptions;
     const { global_config_id } = getPackagerConfigs(clmm_pool);
     const typeArguments = [params.coinTypeA, params.coinTypeB];
+    const allCoinAsset = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress);
+    const primaryCoinInputA = TransactionUtil.buildCoinForAmount(
+      tx,
+      allCoinAsset,
+      params.swapForY ? BigInt(params.amountIn) : BigInt(0),
+      params.coinTypeA,
+      false,
+      true
+    );
+    const primaryCoinInputB = TransactionUtil.buildCoinForAmount(
+      tx,
+      allCoinAsset,
+      params.swapForY ? BigInt(0) : BigInt(params.amountIn),
+      params.coinTypeB,
+      false,
+      true
+    );
     const args = [
       tx.object(params.pair),
       tx.object(global_config_id),
-      tx.object(params.coinTypeA),
-      tx.object(params.coinTypeB),
+      primaryCoinInputA.targetCoin,
+      primaryCoinInputB.targetCoin,
       tx.pure.u64(params.amountIn),
       tx.pure.u64(params.minAmountOut),
       tx.pure.bool(params.swapForY),
@@ -11116,11 +11194,11 @@ var DlmmModule = class {
     return res;
   }
   /**
-  * Gets a list of positions for the given account address.
-  * @param accountAddress The account address to get positions for.
-  * @param assignPoolIds An array of pool IDs to filter the positions by.
-  * @returns array of Position objects.
-  */
+   * Gets a list of positions for the given account address.
+   * @param accountAddress The account address to get positions for.
+   * @param assignPoolIds An array of pool IDs to filter the positions by.
+   * @returns array of Position objects.
+   */
   async getUserPositionById(positionId, showDisplay = true) {
     let position;
     const ownerRes = await this._sdk.fullClient.getObject({
@@ -11386,7 +11464,7 @@ var DlmmModule = class {
       fee_y: 0
     };
     if (simulateRes.error != null) {
-      throw new Error(`fetchBins error code: ${simulateRes.error ?? "unknown error"}`);
+      throw new Error(`fetchPairRewards error code: ${simulateRes.error ?? "unknown error"}`);
     }
     simulateRes.events?.forEach((item) => {
       if (extractStructTagFromType(item.type).name === `EventPositionLiquidity`) {