@mmt-finance/clmm-sui-sdk 1.0.0 → 1.0.1

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import Decimal$1, { Decimal } from 'decimal.js';
 import * as _mysten_sui_transactions from '@mysten/sui/transactions';
-import { TransactionArgument, Transaction, TransactionObjectArgument, TransactionDataBuilder, BuildTransactionOptions } from '@mysten/sui/transactions';
-import { SuiClient, SuiParsedData } from '@mysten/sui/client';
+import { Transaction, TransactionArgument, TransactionObjectArgument, TransactionDataBuilder, BuildTransactionOptions } from '@mysten/sui/transactions';
+import { SuiJsonRpcClient, SuiParsedData } from '@mysten/sui/jsonRpc';
 import BN from 'bn.js';
 
 interface PoolParams {
@@ -367,14 +367,14 @@ declare class PositionModule implements BaseModule {
     constructor(sdk: MmtSDK);
     get sdk(): MmtSDK;
     openPosition(params: OpenPositionParams): {
-        $kind: "NestedResult";
         NestedResult: [number, number];
+        $kind: "NestedResult";
     } | undefined;
     closePosition(params: ClosePositionParams): void;
     private checkTickRangeValidity;
     borrowMutRewardInfoObject(txb: Transaction, positionId: string | TransactionArgument, reward_index: number, useMvr?: boolean): {
-        $kind: "NestedResult";
         NestedResult: [number, number];
+        $kind: "NestedResult";
     } | undefined;
     fetchPositionRpc(positionId: string): Promise<PositionRpc>;
     getUserPositionsUsdValue(address: string, pools: ExtendedPool[], tokens: TokenSchema[]): Promise<({
@@ -399,7 +399,7 @@ declare class PositionModule implements BaseModule {
         feeAmountX: number;
         feeAmountY: number;
     } | null)[]>;
-    fetchRewards(positions: any, pools: ExtendedPool[], address: string, client: SuiClient): Promise<Record<string, RewardsData>>;
+    fetchRewards(positions: any, pools: ExtendedPool[], address: string, client: SuiJsonRpcClient): Promise<Record<string, RewardsData>>;
     getCoinOwedReward(positionId: string | TransactionArgument, reward_index: number): Promise<string>;
     getOwedCoinX(positionId: string | TransactionArgument): Promise<string>;
     getOwedCoinY(positionId: string | TransactionArgument): Promise<string>;
@@ -441,10 +441,11 @@ interface SdkOptions {
     suiClientUrl?: string;
     customHeaders?: HeadersInit;
     mvrEndpoint?: string;
-    client?: SuiClient;
+    client?: SuiJsonRpcClient;
+    customRpcNetwork?: 'mainnet' | 'testnet';
 }
 declare class MmtSDK {
-    protected readonly rpcModule: SuiClient;
+    protected readonly rpcModule: SuiJsonRpcClient;
     protected readonly poolModule: PoolModule;
     protected readonly positionModule: PositionModule;
     protected readonly routeModule: RouteModule;
@@ -452,7 +453,7 @@ declare class MmtSDK {
     readonly sdkConfig: SdkConfig;
     readonly mvrNamedPackagesPlugin: (transactionData: TransactionDataBuilder, _buildOptions: BuildTransactionOptions, next: () => Promise<void>) => Promise<void>;
     constructor(options?: SdkOptions);
-    get rpcClient(): SuiClient;
+    get rpcClient(): SuiJsonRpcClient;
     get Pool(): PoolModule;
     get Position(): PositionModule;
     get Route(): RouteModule;
@@ -476,12 +477,12 @@ declare class PoolModule {
     } | undefined;
     addLiquidity({ txb, pool, position, coinX, coinY, minAmountX, minAmountY, transferToAddress, useMvr, }: AddLiquidityParams): Promise<{
         coinA: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
         coinB: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
     } | undefined>;
     /**
@@ -502,12 +503,12 @@ declare class PoolModule {
     } | null>;
     removeLiquidity({ txb, pool, positionId, liquidity, minAmountX, minAmountY, transferToAddress, useMvr, }: RemoveLiquidityParams): {
         removeLpCoinA: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
         removeLpCoinB: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
     } | undefined;
     calcLiquidityAmounts({ amountA, amountB, decimalsA, decimalsB, currentSqrtPriceD, lowerSqrtPriceD, upperSqrtPriceD, }: {
@@ -538,19 +539,19 @@ declare class PoolModule {
         rewarderApr: RewarderAPR[];
     };
     collectReward({ txb, pool, positionId, rewardCoinType, transferToAddress, useMvr, }: CollectRewardParams): {
-        $kind: "NestedResult";
         NestedResult: [number, number];
+        $kind: "NestedResult";
     } | undefined;
     private _findRouteAndSwap;
     claimRewardsAs({ txb, pool, positionId, rewarderCoinTypes, targetCoinType, slippage, toAddress, useMvr, pools, }: ClaimRewardsAsParams): Promise<TransactionObjectArgument | undefined>;
     collectFee({ txb, pool, positionId, transferToAddress, useMvr }: CollectFeeParams): {
         feeCoinA: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
         feeCoinB: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
     } | undefined;
     /**
@@ -684,9 +685,9 @@ declare function getCoinXYForLiquidity(liquidity: Decimal$1.Instance, reserveInS
 declare function estimateLiquidityForCoinA(sqrtPriceX: BN, sqrtPriceY: BN, coinAmount: BN): BN;
 declare function estimateLiquidityForCoinB(sqrtPriceX: BN, sqrtPriceY: BN, coinAmount: BN): BN;
 declare function estLiquidityAndcoinAmountFromOneAmounts(lowerTick: number, upperTick: number, coinAmount: BN, iscoinA: boolean, roundUp: boolean, slippage: number, curSqrtPrice: BN): LiquidityInput;
-declare const fetchUserObjectsByPkg: (client: SuiClient, packageId: string, address: string) => Promise<SuiParsedData[]>;
+declare const fetchUserObjectsByPkg: (client: SuiJsonRpcClient, packageId: string, address: string) => Promise<SuiParsedData[]>;
 declare function getLimitSqrtPriceUsingSlippage({ currentSqrtPrice, tokenX, tokenY, slippagePercentage, isTokenX, }: Pick<ExtendedPool, 'poolId' | 'tokenX' | 'tokenY'> & {
-    client: SuiClient;
+    client: SuiJsonRpcClient;
     currentSqrtPrice?: string;
     slippagePercentage: number;
     isTokenX: boolean;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import Decimal$1, { Decimal } from 'decimal.js';
 import * as _mysten_sui_transactions from '@mysten/sui/transactions';
-import { TransactionArgument, Transaction, TransactionObjectArgument, TransactionDataBuilder, BuildTransactionOptions } from '@mysten/sui/transactions';
-import { SuiClient, SuiParsedData } from '@mysten/sui/client';
+import { Transaction, TransactionArgument, TransactionObjectArgument, TransactionDataBuilder, BuildTransactionOptions } from '@mysten/sui/transactions';
+import { SuiJsonRpcClient, SuiParsedData } from '@mysten/sui/jsonRpc';
 import BN from 'bn.js';
 
 interface PoolParams {
@@ -367,14 +367,14 @@ declare class PositionModule implements BaseModule {
     constructor(sdk: MmtSDK);
     get sdk(): MmtSDK;
     openPosition(params: OpenPositionParams): {
-        $kind: "NestedResult";
         NestedResult: [number, number];
+        $kind: "NestedResult";
     } | undefined;
     closePosition(params: ClosePositionParams): void;
     private checkTickRangeValidity;
     borrowMutRewardInfoObject(txb: Transaction, positionId: string | TransactionArgument, reward_index: number, useMvr?: boolean): {
-        $kind: "NestedResult";
         NestedResult: [number, number];
+        $kind: "NestedResult";
     } | undefined;
     fetchPositionRpc(positionId: string): Promise<PositionRpc>;
     getUserPositionsUsdValue(address: string, pools: ExtendedPool[], tokens: TokenSchema[]): Promise<({
@@ -399,7 +399,7 @@ declare class PositionModule implements BaseModule {
         feeAmountX: number;
         feeAmountY: number;
     } | null)[]>;
-    fetchRewards(positions: any, pools: ExtendedPool[], address: string, client: SuiClient): Promise<Record<string, RewardsData>>;
+    fetchRewards(positions: any, pools: ExtendedPool[], address: string, client: SuiJsonRpcClient): Promise<Record<string, RewardsData>>;
     getCoinOwedReward(positionId: string | TransactionArgument, reward_index: number): Promise<string>;
     getOwedCoinX(positionId: string | TransactionArgument): Promise<string>;
     getOwedCoinY(positionId: string | TransactionArgument): Promise<string>;
@@ -441,10 +441,11 @@ interface SdkOptions {
     suiClientUrl?: string;
     customHeaders?: HeadersInit;
     mvrEndpoint?: string;
-    client?: SuiClient;
+    client?: SuiJsonRpcClient;
+    customRpcNetwork?: 'mainnet' | 'testnet';
 }
 declare class MmtSDK {
-    protected readonly rpcModule: SuiClient;
+    protected readonly rpcModule: SuiJsonRpcClient;
     protected readonly poolModule: PoolModule;
     protected readonly positionModule: PositionModule;
     protected readonly routeModule: RouteModule;
@@ -452,7 +453,7 @@ declare class MmtSDK {
     readonly sdkConfig: SdkConfig;
     readonly mvrNamedPackagesPlugin: (transactionData: TransactionDataBuilder, _buildOptions: BuildTransactionOptions, next: () => Promise<void>) => Promise<void>;
     constructor(options?: SdkOptions);
-    get rpcClient(): SuiClient;
+    get rpcClient(): SuiJsonRpcClient;
     get Pool(): PoolModule;
     get Position(): PositionModule;
     get Route(): RouteModule;
@@ -476,12 +477,12 @@ declare class PoolModule {
     } | undefined;
     addLiquidity({ txb, pool, position, coinX, coinY, minAmountX, minAmountY, transferToAddress, useMvr, }: AddLiquidityParams): Promise<{
         coinA: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
         coinB: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
     } | undefined>;
     /**
@@ -502,12 +503,12 @@ declare class PoolModule {
     } | null>;
     removeLiquidity({ txb, pool, positionId, liquidity, minAmountX, minAmountY, transferToAddress, useMvr, }: RemoveLiquidityParams): {
         removeLpCoinA: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
         removeLpCoinB: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
     } | undefined;
     calcLiquidityAmounts({ amountA, amountB, decimalsA, decimalsB, currentSqrtPriceD, lowerSqrtPriceD, upperSqrtPriceD, }: {
@@ -538,19 +539,19 @@ declare class PoolModule {
         rewarderApr: RewarderAPR[];
     };
     collectReward({ txb, pool, positionId, rewardCoinType, transferToAddress, useMvr, }: CollectRewardParams): {
-        $kind: "NestedResult";
         NestedResult: [number, number];
+        $kind: "NestedResult";
     } | undefined;
     private _findRouteAndSwap;
     claimRewardsAs({ txb, pool, positionId, rewarderCoinTypes, targetCoinType, slippage, toAddress, useMvr, pools, }: ClaimRewardsAsParams): Promise<TransactionObjectArgument | undefined>;
     collectFee({ txb, pool, positionId, transferToAddress, useMvr }: CollectFeeParams): {
         feeCoinA: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
         feeCoinB: {
-            $kind: "NestedResult";
             NestedResult: [number, number];
+            $kind: "NestedResult";
         } | undefined;
     } | undefined;
     /**
@@ -684,9 +685,9 @@ declare function getCoinXYForLiquidity(liquidity: Decimal$1.Instance, reserveInS
 declare function estimateLiquidityForCoinA(sqrtPriceX: BN, sqrtPriceY: BN, coinAmount: BN): BN;
 declare function estimateLiquidityForCoinB(sqrtPriceX: BN, sqrtPriceY: BN, coinAmount: BN): BN;
 declare function estLiquidityAndcoinAmountFromOneAmounts(lowerTick: number, upperTick: number, coinAmount: BN, iscoinA: boolean, roundUp: boolean, slippage: number, curSqrtPrice: BN): LiquidityInput;
-declare const fetchUserObjectsByPkg: (client: SuiClient, packageId: string, address: string) => Promise<SuiParsedData[]>;
+declare const fetchUserObjectsByPkg: (client: SuiJsonRpcClient, packageId: string, address: string) => Promise<SuiParsedData[]>;
 declare function getLimitSqrtPriceUsingSlippage({ currentSqrtPrice, tokenX, tokenY, slippagePercentage, isTokenX, }: Pick<ExtendedPool, 'poolId' | 'tokenX' | 'tokenY'> & {
-    client: SuiClient;
+    client: SuiJsonRpcClient;
     currentSqrtPrice?: string;
     slippagePercentage: number;
     isTokenX: boolean;

package/dist/index.js

@@ -5,7 +5,7 @@ var transactions = require('@mysten/sui/transactions');
 var utils = require('@mysten/sui/utils');
 var BN3 = require('bn.js');
 var Decimal4 = require('decimal.js');
-var client = require('@mysten/sui/client');
+var jsonRpc = require('@mysten/sui/jsonRpc');
 var ccGraph = require('@syntsugar/cc-graph');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -969,26 +969,6 @@ var ClmmPoolsError = class _ClmmPoolsError extends Error {
     return e instanceof _ClmmPoolsError && e.errorCode === code;
   }
 };
-function isSUICoin(coinType) {
-  return utils.normalizeStructTag(coinType) === utils.normalizeStructTag(SUI_COIN_TYPE);
-}
-function formatCoinType(coinType) {
-  return isSUICoin(coinType) ? SUI_COIN_TYPE_FORMATTED : coinType;
-}
-function mergeCoins(coinObjects, txb) {
-  if (coinObjects.length === 1) {
-    return typeof coinObjects[0] === "string" ? txb.object(coinObjects[0]) : coinObjects[0];
-  }
-  const firstCoin = typeof coinObjects[0] === "string" ? txb.object(coinObjects[0]) : coinObjects[0];
-  if (!firstCoin) {
-    throw new ClmmPoolsError("First coin is not found", "FirstCoinNotFound" /* FirstCoinNotFound */);
-  }
-  txb.mergeCoins(
-    firstCoin,
-    coinObjects.slice(1).map((coin) => typeof coin === "string" ? txb.object(coin) : coin)
-  );
-  return firstCoin;
-}
 
 // src/utils/common.ts
 function txnArgument(object, tx) {
@@ -1014,6 +994,28 @@ function transformPositionRpcObject(initialObject) {
     }))
   };
 }
+
+// src/utils/coin-utils.ts
+function isSUICoin(coinType) {
+  return utils.normalizeStructTag(coinType) === utils.normalizeStructTag(SUI_COIN_TYPE);
+}
+function formatCoinType(coinType) {
+  return isSUICoin(coinType) ? SUI_COIN_TYPE_FORMATTED : coinType;
+}
+function mergeCoins(coinObjects, txb) {
+  if (coinObjects.length === 1) {
+    return typeof coinObjects[0] === "string" ? txb.object(coinObjects[0]) : coinObjects[0];
+  }
+  const firstCoin = typeof coinObjects[0] === "string" ? txb.object(coinObjects[0]) : coinObjects[0];
+  if (!firstCoin) {
+    throw new ClmmPoolsError("First coin is not found", "FirstCoinNotFound" /* FirstCoinNotFound */);
+  }
+  txb.mergeCoins(
+    txnArgument(firstCoin, txb),
+    coinObjects.slice(1).map((coin) => txnArgument(coin, txb))
+  );
+  return firstCoin;
+}
 var MathUtil = class {
   static toX64_BN(num) {
     return num.mul(new BN3__default.default(2).pow(new BN3__default.default(64)));
@@ -2116,7 +2118,7 @@ var PoolModule = class {
       arguments: [isXtoY ? txnArgument(receiveB, txb) : txnArgument(receiveA, txb)]
     });
     if (transferToAddress && utils.isValidSuiAddress(transferToAddress)) {
-      txb.transferObjects([inputCoin], txb.pure.address(transferToAddress));
+      txb.transferObjects([txnArgument(inputCoin, txb)], txb.pure.address(transferToAddress));
       txb.transferObjects([outputCoin], txb.pure.address(transferToAddress));
     } else {
       return {
@@ -2215,7 +2217,7 @@ var PoolModule = class {
       isXtoY,
       limitSqrtPrice,
       useMvr
-    }) || { outputCoin: void 0, leftoverCoin: void 0 };
+    }) || { outputCoin: void 0};
     const outputCoinAmount = txb.moveCall({
       target: "0x2::coin::value",
       arguments: [txnArgument(outputCoin, txb)],
@@ -2545,7 +2547,7 @@ var PoolModule = class {
         useMvr
       }) || { outputCoin: void 0, leftoverCoin: void 0 };
       if (leftoverCoin) {
-        txb.transferObjects([leftoverCoin], txb.pure.address(toAddress));
+        txb.transferObjects([txnArgument(leftoverCoin, txb)], txb.pure.address(toAddress));
       }
       currentCoin = outputCoin ?? currentCoin;
       currentCoinType = isXtoY ? swapPool.tokenYType : swapPool.tokenXType;
@@ -3530,13 +3532,13 @@ var MainnetConfig = {
 };
 var TestnetConfig = {
   clmm: {
-    packageId: "0xd7c99e1546b1fc87a6489afdc08bcece4ae1340cbd8efd2ab152ad71dea0f0f2",
-    publishedAt: "0xd7c99e1546b1fc87a6489afdc08bcece4ae1340cbd8efd2ab152ad71dea0f0f2",
-    aclId: "0xb3ffc02f50b866b8b29a3b6005f21d16ad386e33c20d384ee21610ba754ba899",
-    adminCapId: "0x6a271f877a36c75e48120af09124fed1ce3464caf3254307f7ded086ff2120c9",
+    packageId: "0xcf548a43151dafca6ed4b7bcbb17698eac0bf5c761d9458c53719a8a004dda02",
+    publishedAt: "0xcf548a43151dafca6ed4b7bcbb17698eac0bf5c761d9458c53719a8a004dda02",
+    aclId: "0x14be48fa41942aa3b40fb23af60a3941ac18ee69ad7ef6816b20d8f44187484c",
+    adminCapId: "0xcd25c030e26ec8dc47e47c1b785572fe33e702f0c029b9bb464081ead5d027fe",
     slippageCheckPackageId: "0xfd6a45c396a90811fd93efaf585cc95c29aecd079c87822893f1e97e3fee8c50",
-    globalConfigId: "0x3c4385bf373c7997a953ee548f45188d9f1ca4284ec835467688d8ee276e1af7",
-    versionId: "0x83ea3e3e7384efd6b524ff973e4b627cd84d190c45d3f4fd9f5f4fc6c95fd26b",
+    globalConfigId: "0x5c7929a413933b3bcec3cb6352274d358d2eeb7973233fa1e2b60ccf3a33691a",
+    versionId: "0xda7375acbf29ebdf0e8a219db2baf363748882d186927c6f4001681d6251d522",
     mvrName: ""
   },
   mmtApiUrl: "https://api-dev.mmt.finance",
@@ -4031,10 +4033,11 @@ var MmtSDK = class {
   sdkConfig;
   mvrNamedPackagesPlugin;
   constructor(options) {
-    if (options?.network === "custom" && !options?.contractConst) {
-      throw new Error("missing contractConst for custom network");
+    if (options?.network === "custom" && (!options?.contractConst || !options?.customRpcNetwork)) {
+      throw new Error("missing contractConst or customRpcNetwork for custom network");
     }
     const network = options?.network || "mainnet";
+    const rpcNetwork = options?.customRpcNetwork || network;
     const defaultConfig = Config.getDefaultConfig(network);
     const suiClientUrl = options?.suiClientUrl || defaultConfig.suiClientUrl;
     const mvrEndpoint = options?.mvrEndpoint || defaultConfig.mvrEndpoint;
@@ -4049,7 +4052,7 @@ var MmtSDK = class {
       mvrEndpoint,
       customHeaders: options?.customHeaders
     };
-    this.rpcModule = options?.client ? options?.client : new client.SuiClient({ url: suiClientUrl });
+    this.rpcModule = options?.client ? options?.client : new jsonRpc.SuiJsonRpcClient({ url: suiClientUrl, network: rpcNetwork });
     this.poolModule = new PoolModule(this);
     this.positionModule = new PositionModule(this);
     this.routeModule = new RouteModule(this);

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { Transaction } from '@mysten/sui/transactions';
 import { parseStructTag, normalizeSuiAddress, normalizeSuiObjectId, isValidSuiAddress, normalizeStructTag, isValidNamedPackage, isValidNamedType } from '@mysten/sui/utils';
 import BN3 from 'bn.js';
 import Decimal4 from 'decimal.js';
-import { SuiClient } from '@mysten/sui/client';
+import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
 import { Graph, GraphVertex, GraphEdge } from '@syntsugar/cc-graph';
 
 var __defProp = Object.defineProperty;
@@ -962,26 +962,6 @@ var ClmmPoolsError = class _ClmmPoolsError extends Error {
     return e instanceof _ClmmPoolsError && e.errorCode === code;
   }
 };
-function isSUICoin(coinType) {
-  return normalizeStructTag(coinType) === normalizeStructTag(SUI_COIN_TYPE);
-}
-function formatCoinType(coinType) {
-  return isSUICoin(coinType) ? SUI_COIN_TYPE_FORMATTED : coinType;
-}
-function mergeCoins(coinObjects, txb) {
-  if (coinObjects.length === 1) {
-    return typeof coinObjects[0] === "string" ? txb.object(coinObjects[0]) : coinObjects[0];
-  }
-  const firstCoin = typeof coinObjects[0] === "string" ? txb.object(coinObjects[0]) : coinObjects[0];
-  if (!firstCoin) {
-    throw new ClmmPoolsError("First coin is not found", "FirstCoinNotFound" /* FirstCoinNotFound */);
-  }
-  txb.mergeCoins(
-    firstCoin,
-    coinObjects.slice(1).map((coin) => typeof coin === "string" ? txb.object(coin) : coin)
-  );
-  return firstCoin;
-}
 
 // src/utils/common.ts
 function txnArgument(object, tx) {
@@ -1007,6 +987,28 @@ function transformPositionRpcObject(initialObject) {
     }))
   };
 }
+
+// src/utils/coin-utils.ts
+function isSUICoin(coinType) {
+  return normalizeStructTag(coinType) === normalizeStructTag(SUI_COIN_TYPE);
+}
+function formatCoinType(coinType) {
+  return isSUICoin(coinType) ? SUI_COIN_TYPE_FORMATTED : coinType;
+}
+function mergeCoins(coinObjects, txb) {
+  if (coinObjects.length === 1) {
+    return typeof coinObjects[0] === "string" ? txb.object(coinObjects[0]) : coinObjects[0];
+  }
+  const firstCoin = typeof coinObjects[0] === "string" ? txb.object(coinObjects[0]) : coinObjects[0];
+  if (!firstCoin) {
+    throw new ClmmPoolsError("First coin is not found", "FirstCoinNotFound" /* FirstCoinNotFound */);
+  }
+  txb.mergeCoins(
+    txnArgument(firstCoin, txb),
+    coinObjects.slice(1).map((coin) => txnArgument(coin, txb))
+  );
+  return firstCoin;
+}
 var MathUtil = class {
   static toX64_BN(num) {
     return num.mul(new BN3(2).pow(new BN3(64)));
@@ -2109,7 +2111,7 @@ var PoolModule = class {
       arguments: [isXtoY ? txnArgument(receiveB, txb) : txnArgument(receiveA, txb)]
     });
     if (transferToAddress && isValidSuiAddress(transferToAddress)) {
-      txb.transferObjects([inputCoin], txb.pure.address(transferToAddress));
+      txb.transferObjects([txnArgument(inputCoin, txb)], txb.pure.address(transferToAddress));
       txb.transferObjects([outputCoin], txb.pure.address(transferToAddress));
     } else {
       return {
@@ -2208,7 +2210,7 @@ var PoolModule = class {
       isXtoY,
       limitSqrtPrice,
       useMvr
-    }) || { outputCoin: void 0, leftoverCoin: void 0 };
+    }) || { outputCoin: void 0};
     const outputCoinAmount = txb.moveCall({
       target: "0x2::coin::value",
       arguments: [txnArgument(outputCoin, txb)],
@@ -2538,7 +2540,7 @@ var PoolModule = class {
         useMvr
       }) || { outputCoin: void 0, leftoverCoin: void 0 };
       if (leftoverCoin) {
-        txb.transferObjects([leftoverCoin], txb.pure.address(toAddress));
+        txb.transferObjects([txnArgument(leftoverCoin, txb)], txb.pure.address(toAddress));
       }
       currentCoin = outputCoin ?? currentCoin;
       currentCoinType = isXtoY ? swapPool.tokenYType : swapPool.tokenXType;
@@ -3523,13 +3525,13 @@ var MainnetConfig = {
 };
 var TestnetConfig = {
   clmm: {
-    packageId: "0xd7c99e1546b1fc87a6489afdc08bcece4ae1340cbd8efd2ab152ad71dea0f0f2",
-    publishedAt: "0xd7c99e1546b1fc87a6489afdc08bcece4ae1340cbd8efd2ab152ad71dea0f0f2",
-    aclId: "0xb3ffc02f50b866b8b29a3b6005f21d16ad386e33c20d384ee21610ba754ba899",
-    adminCapId: "0x6a271f877a36c75e48120af09124fed1ce3464caf3254307f7ded086ff2120c9",
+    packageId: "0xcf548a43151dafca6ed4b7bcbb17698eac0bf5c761d9458c53719a8a004dda02",
+    publishedAt: "0xcf548a43151dafca6ed4b7bcbb17698eac0bf5c761d9458c53719a8a004dda02",
+    aclId: "0x14be48fa41942aa3b40fb23af60a3941ac18ee69ad7ef6816b20d8f44187484c",
+    adminCapId: "0xcd25c030e26ec8dc47e47c1b785572fe33e702f0c029b9bb464081ead5d027fe",
     slippageCheckPackageId: "0xfd6a45c396a90811fd93efaf585cc95c29aecd079c87822893f1e97e3fee8c50",
-    globalConfigId: "0x3c4385bf373c7997a953ee548f45188d9f1ca4284ec835467688d8ee276e1af7",
-    versionId: "0x83ea3e3e7384efd6b524ff973e4b627cd84d190c45d3f4fd9f5f4fc6c95fd26b",
+    globalConfigId: "0x5c7929a413933b3bcec3cb6352274d358d2eeb7973233fa1e2b60ccf3a33691a",
+    versionId: "0xda7375acbf29ebdf0e8a219db2baf363748882d186927c6f4001681d6251d522",
     mvrName: ""
   },
   mmtApiUrl: "https://api-dev.mmt.finance",
@@ -4024,10 +4026,11 @@ var MmtSDK = class {
   sdkConfig;
   mvrNamedPackagesPlugin;
   constructor(options) {
-    if (options?.network === "custom" && !options?.contractConst) {
-      throw new Error("missing contractConst for custom network");
+    if (options?.network === "custom" && (!options?.contractConst || !options?.customRpcNetwork)) {
+      throw new Error("missing contractConst or customRpcNetwork for custom network");
     }
     const network = options?.network || "mainnet";
+    const rpcNetwork = options?.customRpcNetwork || network;
     const defaultConfig = Config.getDefaultConfig(network);
     const suiClientUrl = options?.suiClientUrl || defaultConfig.suiClientUrl;
     const mvrEndpoint = options?.mvrEndpoint || defaultConfig.mvrEndpoint;
@@ -4042,7 +4045,7 @@ var MmtSDK = class {
       mvrEndpoint,
       customHeaders: options?.customHeaders
     };
-    this.rpcModule = options?.client ? options?.client : new SuiClient({ url: suiClientUrl });
+    this.rpcModule = options?.client ? options?.client : new SuiJsonRpcClient({ url: suiClientUrl, network: rpcNetwork });
     this.poolModule = new PoolModule(this);
     this.positionModule = new PositionModule(this);
     this.routeModule = new RouteModule(this);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mmt-finance/clmm-sui-sdk",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Momentum SDK to access the Momentum CLMM",
   "type": "commonjs",
   "author": "Momentum Finance",
@@ -26,13 +26,16 @@
   },
   "devDependencies": {
     "@anatine/esbuild-decorators": "^0.2.19",
+    "@babel/core": "^7.29.0",
+    "@babel/preset-env": "^7.29.2",
     "@commitlint/config-conventional": "^19.7.1",
-    "@mysten/sui": "1.28.2",
+    "@mysten/sui": "2.4.0",
     "@types/bn.js": "^5.1.5",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.14.11",
     "@typescript-eslint/eslint-plugin": "^6.19.1",
     "@typescript-eslint/parser": "^6.19.1",
+    "babel-jest": "^30.3.0",
     "bn.js": "^5.2.1",
     "branch-name-lint": "^2.1.1",
     "commitlint": "^19.7.1",

package/src/config.ts

@@ -16,13 +16,13 @@ export const MainnetConfig = {
 
 export const TestnetConfig = {
   clmm: {
-    packageId: '0xd7c99e1546b1fc87a6489afdc08bcece4ae1340cbd8efd2ab152ad71dea0f0f2',
-    publishedAt: '0xd7c99e1546b1fc87a6489afdc08bcece4ae1340cbd8efd2ab152ad71dea0f0f2',
-    aclId: '0xb3ffc02f50b866b8b29a3b6005f21d16ad386e33c20d384ee21610ba754ba899',
-    adminCapId: '0x6a271f877a36c75e48120af09124fed1ce3464caf3254307f7ded086ff2120c9',
+    packageId: '0xcf548a43151dafca6ed4b7bcbb17698eac0bf5c761d9458c53719a8a004dda02',
+    publishedAt: '0xcf548a43151dafca6ed4b7bcbb17698eac0bf5c761d9458c53719a8a004dda02',
+    aclId: '0x14be48fa41942aa3b40fb23af60a3941ac18ee69ad7ef6816b20d8f44187484c',
+    adminCapId: '0xcd25c030e26ec8dc47e47c1b785572fe33e702f0c029b9bb464081ead5d027fe',
     slippageCheckPackageId: '0xfd6a45c396a90811fd93efaf585cc95c29aecd079c87822893f1e97e3fee8c50',
-    globalConfigId: '0x3c4385bf373c7997a953ee548f45188d9f1ca4284ec835467688d8ee276e1af7',
-    versionId: '0x83ea3e3e7384efd6b524ff973e4b627cd84d190c45d3f4fd9f5f4fc6c95fd26b',
+    globalConfigId: '0x5c7929a413933b3bcec3cb6352274d358d2eeb7973233fa1e2b60ccf3a33691a',
+    versionId: '0xda7375acbf29ebdf0e8a219db2baf363748882d186927c6f4001681d6251d522',
     mvrName: '',
   },
   mmtApiUrl: 'https://api-dev.mmt.finance',

package/src/modules/pool-module.ts

@@ -1,5 +1,5 @@
 import { bcs } from '@mysten/sui/bcs';
-import { SuiObjectResponse } from '@mysten/sui/client';
+import { SuiObjectResponse } from '@mysten/sui/jsonRpc';
 import { TransactionArgument, Transaction, TransactionObjectArgument } from '@mysten/sui/transactions';
 import { isValidSuiAddress, normalizeSuiAddress, normalizeSuiObjectId, parseStructTag } from '@mysten/sui/utils';
 import BN from 'bn.js';
@@ -277,7 +277,7 @@ export class PoolModule {
     });
 
     if (transferToAddress && isValidSuiAddress(transferToAddress)) {
-      txb.transferObjects([inputCoin], txb.pure.address(transferToAddress));
+      txb.transferObjects([txnArgument(inputCoin, txb)], txb.pure.address(transferToAddress));
       txb.transferObjects([outputCoin], txb.pure.address(transferToAddress));
     } else {
       return {
@@ -835,7 +835,7 @@ export class PoolModule {
       }) || { outputCoin: undefined, leftoverCoin: undefined };
 
       if (leftoverCoin) {
-        txb.transferObjects([leftoverCoin], txb.pure.address(toAddress));
+        txb.transferObjects([txnArgument(leftoverCoin, txb)], txb.pure.address(toAddress));
       }
 
       currentCoin = outputCoin ?? currentCoin;

package/src/modules/position-module.ts

@@ -1,5 +1,5 @@
 import { bcs } from '@mysten/sui/bcs';
-import { SuiClient } from '@mysten/sui/client';
+import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
 import { Transaction, TransactionArgument } from '@mysten/sui/transactions';
 import BN from 'bn.js';
 
@@ -289,7 +289,7 @@ export class PositionModule implements BaseModule {
     }
   }
 
-  public async fetchRewards(positions: any, pools: ExtendedPool[], address: string, client: SuiClient) {
+  public async fetchRewards(positions: any, pools: ExtendedPool[], address: string, client: SuiJsonRpcClient) {
     const { contractConst } = this.sdk.sdkConfig;
     const allRewards: Record<string, RewardsData> = {};
     const batchSize = 100;

package/src/sdk.ts

@@ -1,4 +1,4 @@
-import { SuiClient } from '@mysten/sui/client';
+import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
 import { BuildTransactionOptions, TransactionDataBuilder } from '@mysten/sui/transactions';
 
 import { Config } from './config';
@@ -16,11 +16,12 @@ export interface SdkOptions {
   suiClientUrl?: string;
   customHeaders?: HeadersInit;
   mvrEndpoint?: string;
-  client?: SuiClient;
+  client?: SuiJsonRpcClient;
+  customRpcNetwork?: 'mainnet' | 'testnet';
 }
 
 export class MmtSDK {
-  protected readonly rpcModule: SuiClient;
+  protected readonly rpcModule: SuiJsonRpcClient;
 
   protected readonly poolModule: PoolModule;
 
@@ -39,10 +40,11 @@ export class MmtSDK {
   ) => Promise<void>;
 
   constructor(options?: SdkOptions) {
-    if (options?.network === 'custom' && !options?.contractConst) {
-      throw new Error('missing contractConst for custom network');
+    if (options?.network === 'custom' && (!options?.contractConst || !options?.customRpcNetwork)) {
+      throw new Error('missing contractConst or customRpcNetwork for custom network');
     }
     const network = options?.network || 'mainnet';
+    const rpcNetwork = options?.customRpcNetwork || network;
     const defaultConfig = Config.getDefaultConfig(network);
     const suiClientUrl = options?.suiClientUrl || defaultConfig.suiClientUrl;
     const mvrEndpoint = options?.mvrEndpoint || defaultConfig.mvrEndpoint;
@@ -57,7 +59,9 @@ export class MmtSDK {
       mvrEndpoint,
       customHeaders: options?.customHeaders,
     };
-    this.rpcModule = options?.client ? options?.client : new SuiClient({ url: suiClientUrl });
+    this.rpcModule = options?.client
+      ? options?.client
+      : new SuiJsonRpcClient({ url: suiClientUrl, network: rpcNetwork });
     this.poolModule = new PoolModule(this);
     this.positionModule = new PositionModule(this);
     this.routeModule = new RouteModule(this);
@@ -67,7 +71,7 @@ export class MmtSDK {
     });
   }
 
-  get rpcClient(): SuiClient {
+  get rpcClient(): SuiJsonRpcClient {
     return this.rpcModule;
   }
 

package/src/utils/coin-utils.ts

@@ -1,10 +1,12 @@
-import { CoinStruct, SuiClient } from '@mysten/sui/client';
+import { CoinStruct, SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
 import { TransactionArgument, Transaction } from '@mysten/sui/transactions';
 import { normalizeStructTag } from '@mysten/sui/utils';
 
 import { SUI_COIN_TYPE, SUI_COIN_TYPE_FORMATTED } from '@/constants';
 import { ClmmPoolsError, UtilsErrorCode } from '@/errors/errors';
 
+import { txnArgument } from './common';
+
 export function isSUICoin(coinType: string) {
   return normalizeStructTag(coinType) === normalizeStructTag(SUI_COIN_TYPE);
 }
@@ -31,8 +33,8 @@ export function mergeCoins(
     throw new ClmmPoolsError('First coin is not found', UtilsErrorCode.FirstCoinNotFound);
   }
   txb.mergeCoins(
-    firstCoin,
-    coinObjects.slice(1).map((coin) => (typeof coin === 'string' ? txb.object(coin) : coin)),
+    txnArgument(firstCoin, txb),
+    coinObjects.slice(1).map((coin) => txnArgument(coin, txb)),
   );
   return firstCoin;
 }
@@ -90,7 +92,7 @@ export async function getAllUserCoins({
 }: {
   address: string;
   type: string;
-  suiClient: SuiClient;
+  suiClient: SuiJsonRpcClient;
 }) {
   let cursor: string | null = null;
 
@@ -123,7 +125,7 @@ export async function getAllUserCoins({
 export async function mergeAllUserCoins(
   coinType: string,
   signerAddress: string,
-  suiClient: SuiClient,
+  suiClient: SuiJsonRpcClient,
 ): Promise<Transaction | undefined> {
   try {
     const coins = await getAllUserCoins({

package/src/utils/mvr/mvr-named-packages-plugin.ts

@@ -1,7 +1,8 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { BuildTransactionOptions, NamedPackagesPluginCache, TransactionDataBuilder } from '@mysten/sui/transactions';
+import type { NamedPackagesOverrides } from '@mysten/sui/client';
+import { BuildTransactionOptions, TransactionDataBuilder } from '@mysten/sui/transactions';
 import { parseStructTag } from '@mysten/sui/utils';
 
 import { mvrCacheLocal } from './mvr-cache-local';
@@ -40,7 +41,7 @@ export type NamedPackagesPluginOptions = {
    * 	}
    *
    */
-  overrides?: NamedPackagesPluginCache;
+  overrides?: NamedPackagesOverrides;
 };
 
 /**

package/src/utils/pool-utils.ts

@@ -1,4 +1,4 @@
-import { SuiClient, SuiParsedData } from '@mysten/sui/client';
+import { SuiJsonRpcClient, SuiParsedData } from '@mysten/sui/jsonRpc';
 import BN from 'bn.js';
 import Decimal from 'decimal.js';
 
@@ -290,7 +290,7 @@ export function estLiquidityAndcoinAmountFromOneAmounts(
 }
 
 export const fetchUserObjectsByPkg = async (
-  client: SuiClient,
+  client: SuiJsonRpcClient,
   packageId: string,
   address: string,
 ): Promise<SuiParsedData[]> => {
@@ -334,7 +334,7 @@ export async function getLimitSqrtPriceUsingSlippage({
   slippagePercentage,
   isTokenX,
 }: Pick<ExtendedPool, 'poolId' | 'tokenX' | 'tokenY'> & {
-  client: SuiClient;
+  client: SuiJsonRpcClient;
   currentSqrtPrice?: string;
   slippagePercentage: number; // 1 = 1% slippage
   isTokenX: boolean;

package/tsconfig.json

@@ -4,8 +4,8 @@
     "lib": ["es2022", "esnext", "dom"],
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
     "baseUrl": "./",
     "paths": { "@/*": ["./src/*"] },
     "resolveJsonModule": true,
@@ -29,6 +29,12 @@
     "noFallthroughCasesInSwitch": true,
     "noUncheckedIndexedAccess": true
   },
+  "ts-node": {
+    "compilerOptions": {
+      "module": "CommonJS",
+      "moduleResolution": "node"
+    }
+  },
   "exclude": ["node_modules", "dist"],
   "include": ["./src/**/*", "./test/**/*", "./scripts/**/*", "./examples/**/*", "./*.json", "./*.ts", "./*.js"]
 }