@cetusprotocol/aggregator-sdk 1.5.0 → 1.5.2

package/dist/index.cjs

@@ -3,7 +3,7 @@
 var transactions = require('@mysten/sui/transactions');
 var JSONbig = require('json-bigint');
 var utils = require('@mysten/sui/utils');
-var grpc = require('@mysten/sui/grpc');
+var jsonRpc = require('@mysten/sui/jsonRpc');
 var hermesClient = require('@pythnetwork/hermes-client');
 var bcs = require('@mysten/sui/bcs');
 
@@ -43,9 +43,9 @@ var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__
   mod2
 ));
 
-// node_modules/bn.js/lib/bn.js
+// node_modules/.pnpm/bn.js@5.2.3/node_modules/bn.js/lib/bn.js
 var require_bn = __commonJS({
-  "node_modules/bn.js/lib/bn.js"(exports, module) {
+  "node_modules/.pnpm/bn.js@5.2.3/node_modules/bn.js/lib/bn.js"(exports$1, module) {
     (function(module2, exports2) {
       function assert(val, msg) {
         if (!val) throw new Error(msg || "Assertion failed");
@@ -351,7 +351,7 @@ var require_bn = __commonJS({
       };
       if (typeof Symbol !== "undefined" && typeof Symbol.for === "function") {
         try {
-          BN7.prototype[Symbol.for("nodejs.util.inspect.custom")] = inspect;
+          BN7.prototype[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = inspect;
         } catch (e) {
           BN7.prototype.inspect = inspect;
         }
@@ -1768,6 +1768,10 @@ var require_bn = __commonJS({
           var mask = 67108863 ^ 67108863 >>> r << r;
           this.words[this.length - 1] &= mask;
         }
+        if (this.length === 0) {
+          this.words[0] = 0;
+          this.length = 1;
+        }
         return this._strip();
       };
       BN7.prototype.maskn = function maskn(bits) {
@@ -2783,7 +2787,7 @@ var require_bn = __commonJS({
         var res = this.imod(a._invmp(this.m).mul(this.r2));
         return res._forceRed(this);
       };
-    })(typeof module === "undefined" || module, exports);
+    })(typeof module === "undefined" || module, exports$1);
   }
 });
 
@@ -3416,7 +3420,7 @@ var AGGREGATOR_V3_CONFIG = {
 };
 
 // src/api.ts
-var SDK_VERSION = 1010500;
+var SDK_VERSION = 1010502;
 function parseRouterResponse(data, byAmountIn) {
   let packages = /* @__PURE__ */ new Map();
   if (data.packages) {
@@ -3852,7 +3856,7 @@ var AggregatorConfig = class {
 // src/math.ts
 var import_bn3 = __toESM(require_bn());
 
-// node_modules/decimal.js/decimal.mjs
+// node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.mjs
 var EXP_LIMIT = 9e15;
 var MAX_DIGITS = 1e9;
 var NUMERALS = "0123456789abcdef";
@@ -6021,7 +6025,7 @@ function tanh(x) {
 function trunc(x) {
   return finalise(x = new this(x), x.e + 1, 1);
 }
-P[Symbol.for("nodejs.util.inspect.custom")] = P.toString;
+P[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = P.toString;
 P[Symbol.toStringTag] = "Decimal";
 var Decimal = P.constructor = clone(DEFAULTS);
 LN10 = new Decimal(LN10);
@@ -7857,11 +7861,12 @@ var PythAdapter = class {
     if (this.baseUpdateFee !== void 0) {
       return this.baseUpdateFee;
     }
-    const { object } = await this.client.getObject({
-      objectId: this.pythStateId,
-      include: { json: true }
+    const res = await this.client.getObject({
+      id: this.pythStateId,
+      options: { showContent: true }
     });
-    const json = object.json;
+    const content = res.data?.content;
+    const json = content && "fields" in content ? content.fields : null;
     if (!json) {
       throw new Error("Unable to fetch pyth state object");
     }
@@ -7869,16 +7874,21 @@ var PythAdapter = class {
     return this.baseUpdateFee;
   }
   async getPackageId(objectId) {
-    const { object } = await this.client.getObject({
-      objectId,
-      include: { json: true }
+    const res = await this.client.getObject({
+      id: objectId,
+      options: { showContent: true }
     });
-    const json = object.json;
+    const content = res.data?.content;
+    const json = content && "fields" in content ? content.fields : null;
     if (!json) {
       throw new Error(`Cannot fetch package id for object ${objectId}`);
     }
     if ("upgrade_cap" in json) {
-      return json.upgrade_cap.package;
+      const upgradeCap = json.upgrade_cap;
+      const packageId = upgradeCap?.fields?.package;
+      if (typeof packageId === "string") {
+        return packageId;
+      }
     }
     throw new Error("upgrade_cap not found");
   }
@@ -7902,20 +7912,19 @@ var PythAdapter = class {
     const { id: tableId, fieldType } = await this.getPriceTableInfo();
     const feedIdBytes = Buffer.from(normalizedFeedId, "hex");
     try {
-      const PriceIdentifier = bcs.bcs.struct("PriceIdentifier", {
-        bytes: bcs.bcs.vector(bcs.bcs.u8())
-      });
-      const bcsBytes = PriceIdentifier.serialize({ bytes: Array.from(feedIdBytes) }).toBytes();
-      const result = await this.client.getDynamicField({
+      const result = await this.client.getDynamicFieldObject({
         parentId: tableId,
         name: {
-          type: fieldType,
-          bcs: bcsBytes
+          type: `${fieldType}::price_identifier::PriceIdentifier`,
+          value: { bytes: Array.from(feedIdBytes) }
         }
       });
-      const valueBcs = result.dynamicField.value.bcs;
-      const valueBytes = valueBcs instanceof Uint8Array ? valueBcs : new Uint8Array(Object.values(valueBcs));
-      const objectId = "0x" + Array.from(valueBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
+      const content = result.data?.content;
+      const json = content && "fields" in content ? content.fields : null;
+      const objectId = typeof json?.value === "string" ? json.value : void 0;
+      if (!objectId) {
+        return void 0;
+      }
       this.priceFeedObjectIdCache.set(normalizedFeedId, objectId);
       return objectId;
     } catch {
@@ -7926,35 +7935,22 @@ var PythAdapter = class {
     if (this.priceTableInfo !== void 0) {
       return this.priceTableInfo;
     }
-    let cursor = null;
-    let hasNextPage = true;
-    while (hasNextPage) {
-      const dynamicFields = await this.client.listDynamicFields({
-        parentId: this.pythStateId,
-        cursor
-      });
-      for (const field of dynamicFields.dynamicFields) {
-        if (field.name.type === "vector<u8>") {
-          const objectId = field.$kind === "DynamicObject" && field.childId ? field.childId : field.fieldId;
-          const fieldObj = await this.client.getObject({
-            objectId,
-            include: { json: true }
-          });
-          const type = fieldObj.object.type;
-          if (type.includes("table::Table")) {
-            const innerTypes = type.replace(/.*table::Table</, "").replace(/>$/, "");
-            const fieldType = innerTypes.split(",")[0].trim();
-            this.priceTableInfo = { id: fieldObj.object.objectId, fieldType };
-            return this.priceTableInfo;
-          }
-        }
+    const result = await this.client.getDynamicFieldObject({
+      parentId: this.pythStateId,
+      name: {
+        type: "vector<u8>",
+        value: "price_info"
       }
-      hasNextPage = dynamicFields.hasNextPage;
-      cursor = dynamicFields.cursor;
+    });
+    if (!result.data?.type) {
+      throw new Error(
+        "Price Table not found, contract may not be initialized"
+      );
     }
-    throw new Error(
-      "Price Table not found, contract may not be initialized"
-    );
+    let type = result.data.type.replace("0x2::table::Table<", "");
+    type = type.replace("::price_identifier::PriceIdentifier, 0x2::object::ID>", "");
+    this.priceTableInfo = { id: result.data.objectId, fieldType: type };
+    return this.priceTableInfo;
   }
   extractVaaBytesFromAccumulatorMessage(accumulatorMessage) {
     const trailingPayloadSize = accumulatorMessage.readUint8(6);
@@ -8138,21 +8134,21 @@ async function getOrCreateAccountCap(txb, client, owner) {
 }
 async function getAccountCap(client, owner) {
   const limit = 50;
-  let cursor = null;
+  let cursor = void 0;
   while (true) {
-    const ownedObjects = await client.listOwnedObjects({
+    const ownedObjects = await client.getOwnedObjects({
       owner,
       cursor,
       limit,
-      type: `${DEEPBOOK_PACKAGE_ID}::${DEEPBOOK_CUSTODIAN_V2_MODULE}::AccountCap`
+      filter: { StructType: `${DEEPBOOK_PACKAGE_ID}::${DEEPBOOK_CUSTODIAN_V2_MODULE}::AccountCap` }
     });
-    if (ownedObjects.objects.length !== 0) {
-      return ownedObjects.objects[0].objectId;
+    if (ownedObjects.data.length !== 0) {
+      return ownedObjects.data[0].data?.objectId ?? null;
     }
     if (!ownedObjects.hasNextPage) {
       break;
     }
-    cursor = ownedObjects.cursor;
+    cursor = ownedObjects.nextCursor ?? void 0;
   }
   return null;
 }
@@ -8180,10 +8176,10 @@ function getAggregatorV2Extend2PublishedAt(publishedAt, packages) {
 // src/utils/gas.ts
 var import_bn4 = __toESM(require_bn());
 function extractGasMetrics(result) {
-  const txResult = result.Transaction ?? result.FailedTransaction;
-  const effects = txResult?.effects;
-  if (!effects || !effects.status.success) {
-    const errorMsg = effects?.status.success === false ? effects.status.error.message : "Unknown error";
+  const effects = result.effects;
+  const isSuccess = !result.error && effects.status.status === "success";
+  if (!isSuccess) {
+    const errorMsg = result.error ?? effects.status.error ?? "Unknown error";
     return {
       computationCost: "0",
       storageCost: "0",
@@ -8846,8 +8842,8 @@ var _AggregatorClient = class _AggregatorClient {
   constructor(params) {
     this.endpoint = params.endpoint ? processEndpoint(params.endpoint) : DEFAULT_ENDPOINT;
     const network = params.env === 1 /* Testnet */ ? "testnet" : "mainnet";
-    const grpcUrl = params.env === 1 /* Testnet */ ? "https://fullnode.testnet.sui.io:443" : "https://fullnode.mainnet.sui.io:443";
-    this.client = params.client ?? new grpc.SuiGrpcClient({ network, baseUrl: grpcUrl });
+    const rpcUrl = params.env === 1 /* Testnet */ ? "https://fullnode.testnet.sui.io:443" : "https://fullnode.mainnet.sui.io:443";
+    this.client = params.client ?? new jsonRpc.SuiJsonRpcClient({ network, url: rpcUrl });
     this.signer = params.signer || "";
     this.env = params.env || 0 /* Mainnet */;
     const config2 = _AggregatorClient.CONFIG[this.env];
@@ -8888,13 +8884,13 @@ var _AggregatorClient = class _AggregatorClient {
   }
   async getOneCoinUsedToMerge(coinType) {
     try {
-      const gotCoin = await this.client.listCoins({
+      const gotCoin = await this.client.getCoins({
         owner: this.signer,
         coinType,
         limit: 1
       });
-      if (gotCoin.objects.length === 1) {
-        return gotCoin.objects[0].objectId;
+      if (gotCoin.data.length === 1) {
+        return gotCoin.data[0].coinObjectId;
       }
       return null;
     } catch (error) {
@@ -9308,7 +9304,7 @@ var _AggregatorClient = class _AggregatorClient {
     return outputCoin;
   }
   async routerSwap(params) {
-    const { router, inputCoin, slippage, txb, partner } = params;
+    const { router, inputCoin, slippage, txb, partner, cetusDlmmPartner } = params;
     if (slippage > 1 || slippage < 0) {
       throw new Error(CLIENT_CONFIG.ERRORS.INVALID_SLIPPAGE);
     }
@@ -9342,7 +9338,8 @@ var _AggregatorClient = class _AggregatorClient {
         amountOut.toString(),
         amountLimit.toString(),
         priceInfoObjectIds,
-        partner ?? this.partner
+        partner ?? this.partner,
+        cetusDlmmPartner ?? this.cetusDlmmPartner
       );
     } else {
       return this.expectOutputSwapV3(
@@ -9365,7 +9362,15 @@ var _AggregatorClient = class _AggregatorClient {
    * @throws Error if input coin amount exceeds maxAmountIn
    */
   async routerSwapWithMaxAmountIn(params) {
-    const { router, inputCoin, slippage, txb, partner, maxAmountIn } = params;
+    const {
+      router,
+      inputCoin,
+      slippage,
+      txb,
+      partner,
+      cetusDlmmPartner,
+      maxAmountIn
+    } = params;
     if (slippage > 1 || slippage < 0) {
       throw new Error(CLIENT_CONFIG.ERRORS.INVALID_SLIPPAGE);
     }
@@ -9400,7 +9405,8 @@ var _AggregatorClient = class _AggregatorClient {
         amountOut.toString(),
         amountLimit.toString(),
         priceInfoObjectIds,
-        partner ?? this.partner
+        partner ?? this.partner,
+        cetusDlmmPartner ?? this.cetusDlmmPartner
       );
     } else {
       return this.expectOutputSwapV3WithMaxAmountIn(
@@ -9417,7 +9423,14 @@ var _AggregatorClient = class _AggregatorClient {
   // auto build input coin
   // auto merge, transfer or destory target coin.
   async fastRouterSwap(params) {
-    const { router, slippage, txb, partner, payDeepFeeAmount } = params;
+    const {
+      router,
+      slippage,
+      txb,
+      partner,
+      cetusDlmmPartner,
+      payDeepFeeAmount
+    } = params;
     const fromCoinType = router.paths[0].from;
     const targetCoinType = router.paths[router.paths.length - 1].target;
     const byAmountIn = router.byAmountIn;
@@ -9458,6 +9471,7 @@ var _AggregatorClient = class _AggregatorClient {
       slippage,
       txb,
       partner: partner ?? this.partner,
+      cetusDlmmPartner: cetusDlmmPartner ?? this.cetusDlmmPartner,
       deepbookv3DeepFee: deepCoin
     };
     const targetCoin = await this.routerSwap(routerSwapParams);
@@ -9573,7 +9587,7 @@ var _AggregatorClient = class _AggregatorClient {
     }
   }
   async fixableRouterSwapV3(params) {
-    const { router, inputCoin, slippage, txb, partner } = params;
+    const { router, inputCoin, slippage, txb, partner, cetusDlmmPartner } = params;
     checkOverlayFeeConfig(this.overlayFeeRate, this.overlayFeeReceiver);
     let overlayFee = 0;
     if (router.byAmountIn) {
@@ -9602,7 +9616,8 @@ var _AggregatorClient = class _AggregatorClient {
         expectedAmountOut.toString(),
         amountLimit.toString(),
         priceInfoObjectIds,
-        partner ?? this.partner
+        partner ?? this.partner,
+        cetusDlmmPartner ?? this.cetusDlmmPartner
       );
     } else {
       return this.expectOutputSwapV3(
@@ -9639,18 +9654,16 @@ var _AggregatorClient = class _AggregatorClient {
       });
     }
     tx.setSenderIfNotSet(this.signer || "0x0");
-    const simulateRes = await this.client.simulateTransaction({
-      transaction: tx,
-      include: { events: true, effects: true }
+    const simulateRes = await this.client.devInspectTransactionBlock({
+      sender: this.signer || "0x0",
+      transactionBlock: tx
     });
-    const txResult = simulateRes.Transaction ?? simulateRes.FailedTransaction;
-    if (!txResult || simulateRes.$kind === "FailedTransaction") {
-      const errorMsg = txResult?.status.success === false ? txResult.status.error.message : "Unknown error";
-      throw new Error("Simulation error: " + errorMsg);
+    if (simulateRes.error) {
+      throw new Error("Simulation error: " + simulateRes.error);
     }
-    const events = txResult.events ?? [];
+    const events = simulateRes.events ?? [];
     const valueData = events.filter((item) => {
-      return item.eventType.includes("CalculatedSwapResultEvent");
+      return item.type.includes("CalculatedSwapResultEvent");
     });
     if (valueData.length === 0 || valueData.length !== pools.length) {
       throw new Error("Simulate event result error");
@@ -9658,7 +9671,7 @@ var _AggregatorClient = class _AggregatorClient {
     let tempMaxAmount = byAmountIn ? new import_bn6.default(0) : new import_bn6.default(U64_MAX);
     let tempIndex = 0;
     for (let i = 0; i < valueData.length; i += 1) {
-      const eventJson2 = valueData[i].json;
+      const eventJson2 = valueData[i].parsedJson;
       if (eventJson2?.data?.is_exceed) {
         continue;
       }
@@ -9676,11 +9689,11 @@ var _AggregatorClient = class _AggregatorClient {
         }
       }
     }
-    const eventJson = valueData[tempIndex].json;
+    const eventJson = valueData[tempIndex].parsedJson;
     const eventData = eventJson?.data;
     const [decimalA, decimalB] = await Promise.all([
-      this.client.getCoinMetadata({ coinType: coinA }).then((res) => res.coinMetadata?.decimals ?? null),
-      this.client.getCoinMetadata({ coinType: coinB }).then((res) => res.coinMetadata?.decimals ?? null)
+      this.client.getCoinMetadata({ coinType: coinA }).then((res) => res?.decimals ?? null),
+      this.client.getCoinMetadata({ coinType: coinB }).then((res) => res?.decimals ?? null)
     ]);
     if (decimalA == null || decimalB == null) {
       throw new Error("Cannot get coin decimals");
@@ -9749,9 +9762,9 @@ var _AggregatorClient = class _AggregatorClient {
   }
   async devInspectTransactionBlock(txb) {
     txb.setSenderIfNotSet(this.signer || "0x0");
-    const res = await this.client.simulateTransaction({
-      transaction: txb,
-      include: { events: true, effects: true }
+    const res = await this.client.devInspectTransactionBlock({
+      sender: this.signer || "0x0",
+      transactionBlock: txb
     });
     return res;
   }
@@ -9759,7 +9772,7 @@ var _AggregatorClient = class _AggregatorClient {
     const res = await this.client.signAndExecuteTransaction({
       transaction: txb,
       signer,
-      include: { effects: true, events: true, balanceChanges: true }
+      options: { showEffects: true, showEvents: true, showBalanceChanges: true }
     });
     return res;
   }

package/dist/index.d.cts

@@ -1,8 +1,8 @@
-import * as _mysten_sui_client from '@mysten/sui/client';
+import * as _mysten_sui_jsonRpc from '@mysten/sui/jsonRpc';
+import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
 import { TransactionObjectArgument, Transaction, TransactionArgument } from '@mysten/sui/transactions';
 import BN from 'bn.js';
 import Decimal from 'decimal.js';
-import { SuiGrpcClient } from '@mysten/sui/grpc';
 import { Signer } from '@mysten/sui/cryptography';
 
 interface FindRouterParams {
@@ -308,7 +308,7 @@ declare class PythAdapter {
     private priceTableInfo;
     private priceFeedObjectIdCache;
     private baseUpdateFee;
-    constructor(client: SuiGrpcClient, pythStateId: ObjectId, wormholeStateId: ObjectId, hermesUrls: string[]);
+    constructor(client: SuiJsonRpcClient, pythStateId: ObjectId, wormholeStateId: ObjectId, hermesUrls: string[]);
     getPriceFeedsUpdateData(priceIDs: string[]): Promise<Buffer[]>;
     getBaseUpdateFee(): Promise<number>;
     getPackageId(objectId: ObjectId): Promise<string>;
@@ -365,6 +365,7 @@ type BuildRouterSwapParamsV3 = {
     slippage: number;
     txb: Transaction;
     partner?: string;
+    cetusDlmmPartner?: string;
     deepbookv3DeepFee?: TransactionObjectArgument;
     fixable?: boolean;
 };
@@ -373,6 +374,7 @@ type BuildFastRouterSwapParamsV3 = {
     slippage: number;
     txb: Transaction;
     partner?: string;
+    cetusDlmmPartner?: string;
     refreshAllCoins?: boolean;
     payDeepFeeAmount?: number;
 };
@@ -403,7 +405,7 @@ declare function getProvidersIncluding(includeProviders: string[]): string[];
 type AggregatorClientParams = {
     endpoint?: string;
     signer?: string;
-    client?: SuiGrpcClient;
+    client?: SuiJsonRpcClient;
     env?: Env;
     pythUrls?: string[];
     apiKey?: string;
@@ -415,7 +417,7 @@ type AggregatorClientParams = {
 declare class AggregatorClient {
     endpoint: string;
     signer: string;
-    client: SuiGrpcClient;
+    client: SuiJsonRpcClient;
     env: Env;
     apiKey: string;
     protected pythAdapter: PythAdapter;
@@ -457,15 +459,8 @@ declare class AggregatorClient {
     fixableRouterSwapV3(params: BuildRouterSwapParamsV3): Promise<TransactionObjectArgument>;
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResultV3>;
     updatePythPriceIDs(priceIDs: string[], txb: Transaction): Promise<Map<string, string>>;
-    devInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_client.SuiClientTypes.SimulateTransactionResult<{
-        events: true;
-        effects: true;
-    }>>;
-    sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiClientTypes.TransactionResult<{
-        effects: true;
-        events: true;
-        balanceChanges: true;
-    }>>;
+    devInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_jsonRpc.DevInspectResults>;
+    sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_jsonRpc.SuiTransactionBlockResponse>;
 }
 
 /**
@@ -498,7 +493,7 @@ type GetOrCreateAccountCapResult = {
     accountCap: TransactionObjectArgument;
     isCreate: boolean;
 };
-declare function getOrCreateAccountCap(txb: Transaction, client: SuiGrpcClient, owner: string): Promise<GetOrCreateAccountCapResult>;
+declare function getOrCreateAccountCap(txb: Transaction, client: SuiJsonRpcClient, owner: string): Promise<GetOrCreateAccountCapResult>;
 
 /**
  * Represents a SUI address, which is a string.
@@ -648,67 +643,23 @@ interface Dex {
 }
 
 /**
- * Matches the shape of SuiClientTypes.SimulateTransactionResult with effects included.
+ * Matches the shape of DevInspectResults from JSON-RPC.
  * Using a local type so gas.ts can be used without importing the full SDK.
  */
 type SimulateTransactionResult = {
-    $kind: 'Transaction' | 'FailedTransaction';
-    Transaction?: {
-        status: {
-            success: true;
-            error: null;
-        } | {
-            success: false;
-            error: {
-                message: string;
-            };
-        };
-        effects?: {
-            status: {
-                success: true;
-                error: null;
-            } | {
-                success: false;
-                error: {
-                    message: string;
-                };
-            };
-            gasUsed: {
-                computationCost: string;
-                storageCost: string;
-                storageRebate: string;
-                nonRefundableStorageFee: string;
-            };
-        };
-    };
-    FailedTransaction?: {
+    effects: {
         status: {
-            success: true;
-            error: null;
-        } | {
-            success: false;
-            error: {
-                message: string;
-            };
+            status: 'success' | 'failure';
+            error?: string;
         };
-        effects?: {
-            status: {
-                success: true;
-                error: null;
-            } | {
-                success: false;
-                error: {
-                    message: string;
-                };
-            };
-            gasUsed: {
-                computationCost: string;
-                storageCost: string;
-                storageRebate: string;
-                nonRefundableStorageFee: string;
-            };
+        gasUsed: {
+            computationCost: string;
+            storageCost: string;
+            storageRebate: string;
+            nonRefundableStorageFee: string;
         };
     };
+    error?: string | null;
 };
 interface GasMetrics {
     computationCost: string;

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import * as _mysten_sui_client from '@mysten/sui/client';
+import * as _mysten_sui_jsonRpc from '@mysten/sui/jsonRpc';
+import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
 import { TransactionObjectArgument, Transaction, TransactionArgument } from '@mysten/sui/transactions';
 import BN from 'bn.js';
 import Decimal from 'decimal.js';
-import { SuiGrpcClient } from '@mysten/sui/grpc';
 import { Signer } from '@mysten/sui/cryptography';
 
 interface FindRouterParams {
@@ -308,7 +308,7 @@ declare class PythAdapter {
     private priceTableInfo;
     private priceFeedObjectIdCache;
     private baseUpdateFee;
-    constructor(client: SuiGrpcClient, pythStateId: ObjectId, wormholeStateId: ObjectId, hermesUrls: string[]);
+    constructor(client: SuiJsonRpcClient, pythStateId: ObjectId, wormholeStateId: ObjectId, hermesUrls: string[]);
     getPriceFeedsUpdateData(priceIDs: string[]): Promise<Buffer[]>;
     getBaseUpdateFee(): Promise<number>;
     getPackageId(objectId: ObjectId): Promise<string>;
@@ -365,6 +365,7 @@ type BuildRouterSwapParamsV3 = {
     slippage: number;
     txb: Transaction;
     partner?: string;
+    cetusDlmmPartner?: string;
     deepbookv3DeepFee?: TransactionObjectArgument;
     fixable?: boolean;
 };
@@ -373,6 +374,7 @@ type BuildFastRouterSwapParamsV3 = {
     slippage: number;
     txb: Transaction;
     partner?: string;
+    cetusDlmmPartner?: string;
     refreshAllCoins?: boolean;
     payDeepFeeAmount?: number;
 };
@@ -403,7 +405,7 @@ declare function getProvidersIncluding(includeProviders: string[]): string[];
 type AggregatorClientParams = {
     endpoint?: string;
     signer?: string;
-    client?: SuiGrpcClient;
+    client?: SuiJsonRpcClient;
     env?: Env;
     pythUrls?: string[];
     apiKey?: string;
@@ -415,7 +417,7 @@ type AggregatorClientParams = {
 declare class AggregatorClient {
     endpoint: string;
     signer: string;
-    client: SuiGrpcClient;
+    client: SuiJsonRpcClient;
     env: Env;
     apiKey: string;
     protected pythAdapter: PythAdapter;
@@ -457,15 +459,8 @@ declare class AggregatorClient {
     fixableRouterSwapV3(params: BuildRouterSwapParamsV3): Promise<TransactionObjectArgument>;
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResultV3>;
     updatePythPriceIDs(priceIDs: string[], txb: Transaction): Promise<Map<string, string>>;
-    devInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_client.SuiClientTypes.SimulateTransactionResult<{
-        events: true;
-        effects: true;
-    }>>;
-    sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiClientTypes.TransactionResult<{
-        effects: true;
-        events: true;
-        balanceChanges: true;
-    }>>;
+    devInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_jsonRpc.DevInspectResults>;
+    sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_jsonRpc.SuiTransactionBlockResponse>;
 }
 
 /**
@@ -498,7 +493,7 @@ type GetOrCreateAccountCapResult = {
     accountCap: TransactionObjectArgument;
     isCreate: boolean;
 };
-declare function getOrCreateAccountCap(txb: Transaction, client: SuiGrpcClient, owner: string): Promise<GetOrCreateAccountCapResult>;
+declare function getOrCreateAccountCap(txb: Transaction, client: SuiJsonRpcClient, owner: string): Promise<GetOrCreateAccountCapResult>;
 
 /**
  * Represents a SUI address, which is a string.
@@ -648,67 +643,23 @@ interface Dex {
 }
 
 /**
- * Matches the shape of SuiClientTypes.SimulateTransactionResult with effects included.
+ * Matches the shape of DevInspectResults from JSON-RPC.
  * Using a local type so gas.ts can be used without importing the full SDK.
  */
 type SimulateTransactionResult = {
-    $kind: 'Transaction' | 'FailedTransaction';
-    Transaction?: {
-        status: {
-            success: true;
-            error: null;
-        } | {
-            success: false;
-            error: {
-                message: string;
-            };
-        };
-        effects?: {
-            status: {
-                success: true;
-                error: null;
-            } | {
-                success: false;
-                error: {
-                    message: string;
-                };
-            };
-            gasUsed: {
-                computationCost: string;
-                storageCost: string;
-                storageRebate: string;
-                nonRefundableStorageFee: string;
-            };
-        };
-    };
-    FailedTransaction?: {
+    effects: {
         status: {
-            success: true;
-            error: null;
-        } | {
-            success: false;
-            error: {
-                message: string;
-            };
+            status: 'success' | 'failure';
+            error?: string;
         };
-        effects?: {
-            status: {
-                success: true;
-                error: null;
-            } | {
-                success: false;
-                error: {
-                    message: string;
-                };
-            };
-            gasUsed: {
-                computationCost: string;
-                storageCost: string;
-                storageRebate: string;
-                nonRefundableStorageFee: string;
-            };
+        gasUsed: {
+            computationCost: string;
+            storageCost: string;
+            storageRebate: string;
+            nonRefundableStorageFee: string;
         };
     };
+    error?: string | null;
 };
 interface GasMetrics {
     computationCost: string;

package/dist/index.js

@@ -1,7 +1,7 @@
 import { coinWithBalance, Transaction } from '@mysten/sui/transactions';
 import JSONbig from 'json-bigint';
 import { normalizeSuiObjectId, SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils';
-import { SuiGrpcClient } from '@mysten/sui/grpc';
+import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
 import { HermesClient } from '@pythnetwork/hermes-client';
 import { bcs } from '@mysten/sui/bcs';
 
@@ -37,9 +37,9 @@ var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__
   mod2
 ));
 
-// node_modules/bn.js/lib/bn.js
+// node_modules/.pnpm/bn.js@5.2.3/node_modules/bn.js/lib/bn.js
 var require_bn = __commonJS({
-  "node_modules/bn.js/lib/bn.js"(exports, module) {
+  "node_modules/.pnpm/bn.js@5.2.3/node_modules/bn.js/lib/bn.js"(exports$1, module) {
     (function(module2, exports2) {
       function assert(val, msg) {
         if (!val) throw new Error(msg || "Assertion failed");
@@ -345,7 +345,7 @@ var require_bn = __commonJS({
       };
       if (typeof Symbol !== "undefined" && typeof Symbol.for === "function") {
         try {
-          BN7.prototype[Symbol.for("nodejs.util.inspect.custom")] = inspect;
+          BN7.prototype[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = inspect;
         } catch (e) {
           BN7.prototype.inspect = inspect;
         }
@@ -1762,6 +1762,10 @@ var require_bn = __commonJS({
           var mask = 67108863 ^ 67108863 >>> r << r;
           this.words[this.length - 1] &= mask;
         }
+        if (this.length === 0) {
+          this.words[0] = 0;
+          this.length = 1;
+        }
         return this._strip();
       };
       BN7.prototype.maskn = function maskn(bits) {
@@ -2777,7 +2781,7 @@ var require_bn = __commonJS({
         var res = this.imod(a._invmp(this.m).mul(this.r2));
         return res._forceRed(this);
       };
-    })(typeof module === "undefined" || module, exports);
+    })(typeof module === "undefined" || module, exports$1);
   }
 });
 
@@ -3410,7 +3414,7 @@ var AGGREGATOR_V3_CONFIG = {
 };
 
 // src/api.ts
-var SDK_VERSION = 1010500;
+var SDK_VERSION = 1010502;
 function parseRouterResponse(data, byAmountIn) {
   let packages = /* @__PURE__ */ new Map();
   if (data.packages) {
@@ -3846,7 +3850,7 @@ var AggregatorConfig = class {
 // src/math.ts
 var import_bn3 = __toESM(require_bn());
 
-// node_modules/decimal.js/decimal.mjs
+// node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.mjs
 var EXP_LIMIT = 9e15;
 var MAX_DIGITS = 1e9;
 var NUMERALS = "0123456789abcdef";
@@ -6015,7 +6019,7 @@ function tanh(x) {
 function trunc(x) {
   return finalise(x = new this(x), x.e + 1, 1);
 }
-P[Symbol.for("nodejs.util.inspect.custom")] = P.toString;
+P[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = P.toString;
 P[Symbol.toStringTag] = "Decimal";
 var Decimal = P.constructor = clone(DEFAULTS);
 LN10 = new Decimal(LN10);
@@ -7851,11 +7855,12 @@ var PythAdapter = class {
     if (this.baseUpdateFee !== void 0) {
       return this.baseUpdateFee;
     }
-    const { object } = await this.client.getObject({
-      objectId: this.pythStateId,
-      include: { json: true }
+    const res = await this.client.getObject({
+      id: this.pythStateId,
+      options: { showContent: true }
     });
-    const json = object.json;
+    const content = res.data?.content;
+    const json = content && "fields" in content ? content.fields : null;
     if (!json) {
       throw new Error("Unable to fetch pyth state object");
     }
@@ -7863,16 +7868,21 @@ var PythAdapter = class {
     return this.baseUpdateFee;
   }
   async getPackageId(objectId) {
-    const { object } = await this.client.getObject({
-      objectId,
-      include: { json: true }
+    const res = await this.client.getObject({
+      id: objectId,
+      options: { showContent: true }
     });
-    const json = object.json;
+    const content = res.data?.content;
+    const json = content && "fields" in content ? content.fields : null;
     if (!json) {
       throw new Error(`Cannot fetch package id for object ${objectId}`);
     }
     if ("upgrade_cap" in json) {
-      return json.upgrade_cap.package;
+      const upgradeCap = json.upgrade_cap;
+      const packageId = upgradeCap?.fields?.package;
+      if (typeof packageId === "string") {
+        return packageId;
+      }
     }
     throw new Error("upgrade_cap not found");
   }
@@ -7896,20 +7906,19 @@ var PythAdapter = class {
     const { id: tableId, fieldType } = await this.getPriceTableInfo();
     const feedIdBytes = Buffer.from(normalizedFeedId, "hex");
     try {
-      const PriceIdentifier = bcs.struct("PriceIdentifier", {
-        bytes: bcs.vector(bcs.u8())
-      });
-      const bcsBytes = PriceIdentifier.serialize({ bytes: Array.from(feedIdBytes) }).toBytes();
-      const result = await this.client.getDynamicField({
+      const result = await this.client.getDynamicFieldObject({
         parentId: tableId,
         name: {
-          type: fieldType,
-          bcs: bcsBytes
+          type: `${fieldType}::price_identifier::PriceIdentifier`,
+          value: { bytes: Array.from(feedIdBytes) }
         }
       });
-      const valueBcs = result.dynamicField.value.bcs;
-      const valueBytes = valueBcs instanceof Uint8Array ? valueBcs : new Uint8Array(Object.values(valueBcs));
-      const objectId = "0x" + Array.from(valueBytes).map((b) => b.toString(16).padStart(2, "0")).join("");
+      const content = result.data?.content;
+      const json = content && "fields" in content ? content.fields : null;
+      const objectId = typeof json?.value === "string" ? json.value : void 0;
+      if (!objectId) {
+        return void 0;
+      }
       this.priceFeedObjectIdCache.set(normalizedFeedId, objectId);
       return objectId;
     } catch {
@@ -7920,35 +7929,22 @@ var PythAdapter = class {
     if (this.priceTableInfo !== void 0) {
       return this.priceTableInfo;
     }
-    let cursor = null;
-    let hasNextPage = true;
-    while (hasNextPage) {
-      const dynamicFields = await this.client.listDynamicFields({
-        parentId: this.pythStateId,
-        cursor
-      });
-      for (const field of dynamicFields.dynamicFields) {
-        if (field.name.type === "vector<u8>") {
-          const objectId = field.$kind === "DynamicObject" && field.childId ? field.childId : field.fieldId;
-          const fieldObj = await this.client.getObject({
-            objectId,
-            include: { json: true }
-          });
-          const type = fieldObj.object.type;
-          if (type.includes("table::Table")) {
-            const innerTypes = type.replace(/.*table::Table</, "").replace(/>$/, "");
-            const fieldType = innerTypes.split(",")[0].trim();
-            this.priceTableInfo = { id: fieldObj.object.objectId, fieldType };
-            return this.priceTableInfo;
-          }
-        }
+    const result = await this.client.getDynamicFieldObject({
+      parentId: this.pythStateId,
+      name: {
+        type: "vector<u8>",
+        value: "price_info"
       }
-      hasNextPage = dynamicFields.hasNextPage;
-      cursor = dynamicFields.cursor;
+    });
+    if (!result.data?.type) {
+      throw new Error(
+        "Price Table not found, contract may not be initialized"
+      );
     }
-    throw new Error(
-      "Price Table not found, contract may not be initialized"
-    );
+    let type = result.data.type.replace("0x2::table::Table<", "");
+    type = type.replace("::price_identifier::PriceIdentifier, 0x2::object::ID>", "");
+    this.priceTableInfo = { id: result.data.objectId, fieldType: type };
+    return this.priceTableInfo;
   }
   extractVaaBytesFromAccumulatorMessage(accumulatorMessage) {
     const trailingPayloadSize = accumulatorMessage.readUint8(6);
@@ -8132,21 +8128,21 @@ async function getOrCreateAccountCap(txb, client, owner) {
 }
 async function getAccountCap(client, owner) {
   const limit = 50;
-  let cursor = null;
+  let cursor = void 0;
   while (true) {
-    const ownedObjects = await client.listOwnedObjects({
+    const ownedObjects = await client.getOwnedObjects({
       owner,
       cursor,
       limit,
-      type: `${DEEPBOOK_PACKAGE_ID}::${DEEPBOOK_CUSTODIAN_V2_MODULE}::AccountCap`
+      filter: { StructType: `${DEEPBOOK_PACKAGE_ID}::${DEEPBOOK_CUSTODIAN_V2_MODULE}::AccountCap` }
     });
-    if (ownedObjects.objects.length !== 0) {
-      return ownedObjects.objects[0].objectId;
+    if (ownedObjects.data.length !== 0) {
+      return ownedObjects.data[0].data?.objectId ?? null;
     }
     if (!ownedObjects.hasNextPage) {
       break;
     }
-    cursor = ownedObjects.cursor;
+    cursor = ownedObjects.nextCursor ?? void 0;
   }
   return null;
 }
@@ -8174,10 +8170,10 @@ function getAggregatorV2Extend2PublishedAt(publishedAt, packages) {
 // src/utils/gas.ts
 var import_bn4 = __toESM(require_bn());
 function extractGasMetrics(result) {
-  const txResult = result.Transaction ?? result.FailedTransaction;
-  const effects = txResult?.effects;
-  if (!effects || !effects.status.success) {
-    const errorMsg = effects?.status.success === false ? effects.status.error.message : "Unknown error";
+  const effects = result.effects;
+  const isSuccess = !result.error && effects.status.status === "success";
+  if (!isSuccess) {
+    const errorMsg = result.error ?? effects.status.error ?? "Unknown error";
     return {
       computationCost: "0",
       storageCost: "0",
@@ -8840,8 +8836,8 @@ var _AggregatorClient = class _AggregatorClient {
   constructor(params) {
     this.endpoint = params.endpoint ? processEndpoint(params.endpoint) : DEFAULT_ENDPOINT;
     const network = params.env === 1 /* Testnet */ ? "testnet" : "mainnet";
-    const grpcUrl = params.env === 1 /* Testnet */ ? "https://fullnode.testnet.sui.io:443" : "https://fullnode.mainnet.sui.io:443";
-    this.client = params.client ?? new SuiGrpcClient({ network, baseUrl: grpcUrl });
+    const rpcUrl = params.env === 1 /* Testnet */ ? "https://fullnode.testnet.sui.io:443" : "https://fullnode.mainnet.sui.io:443";
+    this.client = params.client ?? new SuiJsonRpcClient({ network, url: rpcUrl });
     this.signer = params.signer || "";
     this.env = params.env || 0 /* Mainnet */;
     const config2 = _AggregatorClient.CONFIG[this.env];
@@ -8882,13 +8878,13 @@ var _AggregatorClient = class _AggregatorClient {
   }
   async getOneCoinUsedToMerge(coinType) {
     try {
-      const gotCoin = await this.client.listCoins({
+      const gotCoin = await this.client.getCoins({
         owner: this.signer,
         coinType,
         limit: 1
       });
-      if (gotCoin.objects.length === 1) {
-        return gotCoin.objects[0].objectId;
+      if (gotCoin.data.length === 1) {
+        return gotCoin.data[0].coinObjectId;
       }
       return null;
     } catch (error) {
@@ -9302,7 +9298,7 @@ var _AggregatorClient = class _AggregatorClient {
     return outputCoin;
   }
   async routerSwap(params) {
-    const { router, inputCoin, slippage, txb, partner } = params;
+    const { router, inputCoin, slippage, txb, partner, cetusDlmmPartner } = params;
     if (slippage > 1 || slippage < 0) {
       throw new Error(CLIENT_CONFIG.ERRORS.INVALID_SLIPPAGE);
     }
@@ -9336,7 +9332,8 @@ var _AggregatorClient = class _AggregatorClient {
         amountOut.toString(),
         amountLimit.toString(),
         priceInfoObjectIds,
-        partner ?? this.partner
+        partner ?? this.partner,
+        cetusDlmmPartner ?? this.cetusDlmmPartner
       );
     } else {
       return this.expectOutputSwapV3(
@@ -9359,7 +9356,15 @@ var _AggregatorClient = class _AggregatorClient {
    * @throws Error if input coin amount exceeds maxAmountIn
    */
   async routerSwapWithMaxAmountIn(params) {
-    const { router, inputCoin, slippage, txb, partner, maxAmountIn } = params;
+    const {
+      router,
+      inputCoin,
+      slippage,
+      txb,
+      partner,
+      cetusDlmmPartner,
+      maxAmountIn
+    } = params;
     if (slippage > 1 || slippage < 0) {
       throw new Error(CLIENT_CONFIG.ERRORS.INVALID_SLIPPAGE);
     }
@@ -9394,7 +9399,8 @@ var _AggregatorClient = class _AggregatorClient {
         amountOut.toString(),
         amountLimit.toString(),
         priceInfoObjectIds,
-        partner ?? this.partner
+        partner ?? this.partner,
+        cetusDlmmPartner ?? this.cetusDlmmPartner
       );
     } else {
       return this.expectOutputSwapV3WithMaxAmountIn(
@@ -9411,7 +9417,14 @@ var _AggregatorClient = class _AggregatorClient {
   // auto build input coin
   // auto merge, transfer or destory target coin.
   async fastRouterSwap(params) {
-    const { router, slippage, txb, partner, payDeepFeeAmount } = params;
+    const {
+      router,
+      slippage,
+      txb,
+      partner,
+      cetusDlmmPartner,
+      payDeepFeeAmount
+    } = params;
     const fromCoinType = router.paths[0].from;
     const targetCoinType = router.paths[router.paths.length - 1].target;
     const byAmountIn = router.byAmountIn;
@@ -9452,6 +9465,7 @@ var _AggregatorClient = class _AggregatorClient {
       slippage,
       txb,
       partner: partner ?? this.partner,
+      cetusDlmmPartner: cetusDlmmPartner ?? this.cetusDlmmPartner,
       deepbookv3DeepFee: deepCoin
     };
     const targetCoin = await this.routerSwap(routerSwapParams);
@@ -9567,7 +9581,7 @@ var _AggregatorClient = class _AggregatorClient {
     }
   }
   async fixableRouterSwapV3(params) {
-    const { router, inputCoin, slippage, txb, partner } = params;
+    const { router, inputCoin, slippage, txb, partner, cetusDlmmPartner } = params;
     checkOverlayFeeConfig(this.overlayFeeRate, this.overlayFeeReceiver);
     let overlayFee = 0;
     if (router.byAmountIn) {
@@ -9596,7 +9610,8 @@ var _AggregatorClient = class _AggregatorClient {
         expectedAmountOut.toString(),
         amountLimit.toString(),
         priceInfoObjectIds,
-        partner ?? this.partner
+        partner ?? this.partner,
+        cetusDlmmPartner ?? this.cetusDlmmPartner
       );
     } else {
       return this.expectOutputSwapV3(
@@ -9633,18 +9648,16 @@ var _AggregatorClient = class _AggregatorClient {
       });
     }
     tx.setSenderIfNotSet(this.signer || "0x0");
-    const simulateRes = await this.client.simulateTransaction({
-      transaction: tx,
-      include: { events: true, effects: true }
+    const simulateRes = await this.client.devInspectTransactionBlock({
+      sender: this.signer || "0x0",
+      transactionBlock: tx
     });
-    const txResult = simulateRes.Transaction ?? simulateRes.FailedTransaction;
-    if (!txResult || simulateRes.$kind === "FailedTransaction") {
-      const errorMsg = txResult?.status.success === false ? txResult.status.error.message : "Unknown error";
-      throw new Error("Simulation error: " + errorMsg);
+    if (simulateRes.error) {
+      throw new Error("Simulation error: " + simulateRes.error);
     }
-    const events = txResult.events ?? [];
+    const events = simulateRes.events ?? [];
     const valueData = events.filter((item) => {
-      return item.eventType.includes("CalculatedSwapResultEvent");
+      return item.type.includes("CalculatedSwapResultEvent");
     });
     if (valueData.length === 0 || valueData.length !== pools.length) {
       throw new Error("Simulate event result error");
@@ -9652,7 +9665,7 @@ var _AggregatorClient = class _AggregatorClient {
     let tempMaxAmount = byAmountIn ? new import_bn6.default(0) : new import_bn6.default(U64_MAX);
     let tempIndex = 0;
     for (let i = 0; i < valueData.length; i += 1) {
-      const eventJson2 = valueData[i].json;
+      const eventJson2 = valueData[i].parsedJson;
       if (eventJson2?.data?.is_exceed) {
         continue;
       }
@@ -9670,11 +9683,11 @@ var _AggregatorClient = class _AggregatorClient {
         }
       }
     }
-    const eventJson = valueData[tempIndex].json;
+    const eventJson = valueData[tempIndex].parsedJson;
     const eventData = eventJson?.data;
     const [decimalA, decimalB] = await Promise.all([
-      this.client.getCoinMetadata({ coinType: coinA }).then((res) => res.coinMetadata?.decimals ?? null),
-      this.client.getCoinMetadata({ coinType: coinB }).then((res) => res.coinMetadata?.decimals ?? null)
+      this.client.getCoinMetadata({ coinType: coinA }).then((res) => res?.decimals ?? null),
+      this.client.getCoinMetadata({ coinType: coinB }).then((res) => res?.decimals ?? null)
     ]);
     if (decimalA == null || decimalB == null) {
       throw new Error("Cannot get coin decimals");
@@ -9743,9 +9756,9 @@ var _AggregatorClient = class _AggregatorClient {
   }
   async devInspectTransactionBlock(txb) {
     txb.setSenderIfNotSet(this.signer || "0x0");
-    const res = await this.client.simulateTransaction({
-      transaction: txb,
-      include: { events: true, effects: true }
+    const res = await this.client.devInspectTransactionBlock({
+      sender: this.signer || "0x0",
+      transactionBlock: txb
     });
     return res;
   }
@@ -9753,7 +9766,7 @@ var _AggregatorClient = class _AggregatorClient {
     const res = await this.client.signAndExecuteTransaction({
       transaction: txb,
       signer,
-      include: { effects: true, events: true, balanceChanges: true }
+      options: { showEffects: true, showEvents: true, showBalanceChanges: true }
     });
     return res;
   }

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "type": "module",
   "sideEffects": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.js",
-  "author": "Cetus",
   "scripts": {
     "build": "tsup --format cjs,esm --dts",
     "dev": "tsup --watch",