@cetusprotocol/aggregator-sdk 1.5.4 → 1.5.5

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import * as _mysten_sui_jsonRpc from '@mysten/sui/jsonRpc';
-import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
+import * as _mysten_sui_client from '@mysten/sui/client';
 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 {
@@ -309,7 +309,7 @@ declare class PythAdapter {
     private priceTableInfo;
     private priceFeedObjectIdCache;
     private baseUpdateFee;
-    constructor(client: SuiJsonRpcClient, pythStateId: ObjectId, wormholeStateId: ObjectId, hermesUrls: string[]);
+    constructor(client: SuiGrpcClient, pythStateId: ObjectId, wormholeStateId: ObjectId, hermesUrls: string[]);
     getPriceFeedsUpdateData(priceIDs: string[]): Promise<Buffer[]>;
     getBaseUpdateFee(): Promise<number>;
     getPackageId(objectId: ObjectId): Promise<string>;
@@ -407,7 +407,7 @@ declare function getProvidersIncluding(includeProviders: string[]): string[];
 type AggregatorClientParams = {
     endpoint?: string;
     signer?: string;
-    client?: SuiJsonRpcClient;
+    client?: SuiGrpcClient;
     env?: Env;
     pythUrls?: string[];
     apiKey?: string;
@@ -419,7 +419,7 @@ type AggregatorClientParams = {
 declare class AggregatorClient {
     endpoint: string;
     signer: string;
-    client: SuiJsonRpcClient;
+    client: SuiGrpcClient;
     env: Env;
     apiKey: string;
     protected pythAdapter: PythAdapter;
@@ -461,8 +461,15 @@ 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_jsonRpc.DevInspectResults>;
-    sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_jsonRpc.SuiTransactionBlockResponse>;
+    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;
+    }>>;
 }
 
 /**
@@ -495,7 +502,7 @@ type GetOrCreateAccountCapResult = {
     accountCap: TransactionObjectArgument;
     isCreate: boolean;
 };
-declare function getOrCreateAccountCap(txb: Transaction, client: SuiJsonRpcClient, owner: string): Promise<GetOrCreateAccountCapResult>;
+declare function getOrCreateAccountCap(txb: Transaction, client: SuiGrpcClient, owner: string): Promise<GetOrCreateAccountCapResult>;
 
 /**
  * Represents a SUI address, which is a string.
@@ -645,23 +652,67 @@ interface Dex {
 }
 
 /**
- * Matches the shape of DevInspectResults from JSON-RPC.
+ * Matches the shape of SuiClientTypes.SimulateTransactionResult with effects included.
  * Using a local type so gas.ts can be used without importing the full SDK.
  */
 type SimulateTransactionResult = {
-    effects: {
+    $kind: 'Transaction' | 'FailedTransaction';
+    Transaction?: {
         status: {
-            status: 'success' | 'failure';
-            error?: string;
+            success: true;
+            error: null;
+        } | {
+            success: false;
+            error: {
+                message: string;
+            };
         };
-        gasUsed: {
-            computationCost: string;
-            storageCost: string;
-            storageRebate: string;
-            nonRefundableStorageFee: string;
+        effects?: {
+            status: {
+                success: true;
+                error: null;
+            } | {
+                success: false;
+                error: {
+                    message: string;
+                };
+            };
+            gasUsed: {
+                computationCost: string;
+                storageCost: string;
+                storageRebate: string;
+                nonRefundableStorageFee: string;
+            };
+        };
+    };
+    FailedTransaction?: {
+        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;
+            };
         };
     };
-    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 { SuiJsonRpcClient } from '@mysten/sui/jsonRpc';
+import { SuiGrpcClient } from '@mysten/sui/grpc';
 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/.pnpm/bn.js@5.2.3/node_modules/bn.js/lib/bn.js
+// node_modules/bn.js/lib/bn.js
 var require_bn = __commonJS({
-  "node_modules/.pnpm/bn.js@5.2.3/node_modules/bn.js/lib/bn.js"(exports$1, module) {
+  "node_modules/bn.js/lib/bn.js"(exports, 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[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = inspect;
+          BN7.prototype[Symbol.for("nodejs.util.inspect.custom")] = inspect;
         } catch (e) {
           BN7.prototype.inspect = inspect;
         }
@@ -1762,10 +1762,6 @@ 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) {
@@ -2781,7 +2777,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$1);
+    })(typeof module === "undefined" || module, exports);
   }
 });
 
@@ -3414,7 +3410,7 @@ var AGGREGATOR_V3_CONFIG = {
 };
 
 // src/api.ts
-var SDK_VERSION = 1010504;
+var SDK_VERSION = 1010505;
 function parseRouterResponse(data, byAmountIn) {
   let packages = /* @__PURE__ */ new Map();
   if (data.packages) {
@@ -3850,7 +3846,7 @@ var AggregatorConfig = class {
 // src/math.ts
 var import_bn3 = __toESM(require_bn());
 
-// node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.mjs
+// node_modules/decimal.js/decimal.mjs
 var EXP_LIMIT = 9e15;
 var MAX_DIGITS = 1e9;
 var NUMERALS = "0123456789abcdef";
@@ -6019,7 +6015,7 @@ function tanh(x) {
 function trunc(x) {
   return finalise(x = new this(x), x.e + 1, 1);
 }
-P[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = P.toString;
+P[Symbol.for("nodejs.util.inspect.custom")] = P.toString;
 P[Symbol.toStringTag] = "Decimal";
 var Decimal = P.constructor = clone(DEFAULTS);
 LN10 = new Decimal(LN10);
@@ -7855,12 +7851,11 @@ var PythAdapter = class {
     if (this.baseUpdateFee !== void 0) {
       return this.baseUpdateFee;
     }
-    const res = await this.client.getObject({
-      id: this.pythStateId,
-      options: { showContent: true }
+    const { object } = await this.client.getObject({
+      objectId: this.pythStateId,
+      include: { json: true }
     });
-    const content = res.data?.content;
-    const json = content && "fields" in content ? content.fields : null;
+    const json = object.json;
     if (!json) {
       throw new Error("Unable to fetch pyth state object");
     }
@@ -7868,21 +7863,16 @@ var PythAdapter = class {
     return this.baseUpdateFee;
   }
   async getPackageId(objectId) {
-    const res = await this.client.getObject({
-      id: objectId,
-      options: { showContent: true }
+    const { object } = await this.client.getObject({
+      objectId,
+      include: { json: true }
     });
-    const content = res.data?.content;
-    const json = content && "fields" in content ? content.fields : null;
+    const json = object.json;
     if (!json) {
       throw new Error(`Cannot fetch package id for object ${objectId}`);
     }
     if ("upgrade_cap" in json) {
-      const upgradeCap = json.upgrade_cap;
-      const packageId = upgradeCap?.fields?.package;
-      if (typeof packageId === "string") {
-        return packageId;
-      }
+      return json.upgrade_cap.package;
     }
     throw new Error("upgrade_cap not found");
   }
@@ -7906,19 +7896,20 @@ var PythAdapter = class {
     const { id: tableId, fieldType } = await this.getPriceTableInfo();
     const feedIdBytes = Buffer.from(normalizedFeedId, "hex");
     try {
-      const result = await this.client.getDynamicFieldObject({
+      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({
         parentId: tableId,
         name: {
-          type: `${fieldType}::price_identifier::PriceIdentifier`,
-          value: { bytes: Array.from(feedIdBytes) }
+          type: fieldType,
+          bcs: bcsBytes
         }
       });
-      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;
-      }
+      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("");
       this.priceFeedObjectIdCache.set(normalizedFeedId, objectId);
       return objectId;
     } catch {
@@ -7929,27 +7920,40 @@ var PythAdapter = class {
     if (this.priceTableInfo !== void 0) {
       return this.priceTableInfo;
     }
-    const result = await this.client.getDynamicFieldObject({
-      parentId: this.pythStateId,
-      name: {
-        type: "vector<u8>",
-        value: "price_info"
+    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;
+          }
+        }
       }
-    });
-    if (!result.data?.type) {
-      throw new Error(
-        "Price Table not found, contract may not be initialized"
-      );
+      hasNextPage = dynamicFields.hasNextPage;
+      cursor = dynamicFields.cursor;
     }
-    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;
+    throw new Error(
+      "Price Table not found, contract may not be initialized"
+    );
   }
   extractVaaBytesFromAccumulatorMessage(accumulatorMessage) {
-    const trailingPayloadSize = accumulatorMessage.readUint8(6);
+    const trailingPayloadSize = accumulatorMessage.readUInt8(6);
     const vaaSizeOffset = 7 + trailingPayloadSize + 1;
-    const vaaSize = accumulatorMessage.readUint16BE(vaaSizeOffset);
+    const vaaSize = accumulatorMessage.readUInt16BE(vaaSizeOffset);
     const vaaOffset = vaaSizeOffset + 2;
     return accumulatorMessage.subarray(vaaOffset, vaaOffset + vaaSize);
   }
@@ -8128,21 +8132,21 @@ async function getOrCreateAccountCap(txb, client, owner) {
 }
 async function getAccountCap(client, owner) {
   const limit = 50;
-  let cursor = void 0;
+  let cursor = null;
   while (true) {
-    const ownedObjects = await client.getOwnedObjects({
+    const ownedObjects = await client.listOwnedObjects({
       owner,
       cursor,
       limit,
-      filter: { StructType: `${DEEPBOOK_PACKAGE_ID}::${DEEPBOOK_CUSTODIAN_V2_MODULE}::AccountCap` }
+      type: `${DEEPBOOK_PACKAGE_ID}::${DEEPBOOK_CUSTODIAN_V2_MODULE}::AccountCap`
     });
-    if (ownedObjects.data.length !== 0) {
-      return ownedObjects.data[0].data?.objectId ?? null;
+    if (ownedObjects.objects.length !== 0) {
+      return ownedObjects.objects[0].objectId;
     }
     if (!ownedObjects.hasNextPage) {
       break;
     }
-    cursor = ownedObjects.nextCursor ?? void 0;
+    cursor = ownedObjects.cursor;
   }
   return null;
 }
@@ -8170,10 +8174,10 @@ function getAggregatorV2Extend2PublishedAt(publishedAt, packages) {
 // src/utils/gas.ts
 var import_bn4 = __toESM(require_bn());
 function extractGasMetrics(result) {
-  const effects = result.effects;
-  const isSuccess = !result.error && effects.status.status === "success";
-  if (!isSuccess) {
-    const errorMsg = result.error ?? effects.status.error ?? "Unknown error";
+  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";
     return {
       computationCost: "0",
       storageCost: "0",
@@ -8891,8 +8895,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 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 });
+    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 });
     this.signer = params.signer || "";
     this.env = params.env || 0 /* Mainnet */;
     const config2 = _AggregatorClient.CONFIG[this.env];
@@ -8933,13 +8937,13 @@ var _AggregatorClient = class _AggregatorClient {
   }
   async getOneCoinUsedToMerge(coinType) {
     try {
-      const gotCoin = await this.client.getCoins({
+      const gotCoin = await this.client.listCoins({
         owner: this.signer,
         coinType,
         limit: 1
       });
-      if (gotCoin.data.length === 1) {
-        return gotCoin.data[0].coinObjectId;
+      if (gotCoin.objects.length === 1) {
+        return gotCoin.objects[0].objectId;
       }
       return null;
     } catch (error) {
@@ -9413,15 +9417,7 @@ var _AggregatorClient = class _AggregatorClient {
    * @throws Error if input coin amount exceeds maxAmountIn
    */
   async routerSwapWithMaxAmountIn(params) {
-    const {
-      router,
-      inputCoin,
-      slippage,
-      txb,
-      partner,
-      cetusDlmmPartner,
-      maxAmountIn
-    } = params;
+    const { router, inputCoin, slippage, txb, partner, maxAmountIn } = params;
     if (slippage > 1 || slippage < 0) {
       throw new Error(CLIENT_CONFIG.ERRORS.INVALID_SLIPPAGE);
     }
@@ -9456,8 +9452,7 @@ var _AggregatorClient = class _AggregatorClient {
         amountOut.toString(),
         amountLimit.toString(),
         priceInfoObjectIds,
-        partner ?? this.partner,
-        cetusDlmmPartner ?? this.cetusDlmmPartner
+        partner ?? this.partner
       );
     } else {
       return this.expectOutputSwapV3WithMaxAmountIn(
@@ -9474,14 +9469,7 @@ var _AggregatorClient = class _AggregatorClient {
   // auto build input coin
   // auto merge, transfer or destory target coin.
   async fastRouterSwap(params) {
-    const {
-      router,
-      slippage,
-      txb,
-      partner,
-      cetusDlmmPartner,
-      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;
@@ -9638,7 +9626,7 @@ var _AggregatorClient = class _AggregatorClient {
     }
   }
   async fixableRouterSwapV3(params) {
-    const { router, inputCoin, slippage, txb, partner, cetusDlmmPartner } = params;
+    const { router, inputCoin, slippage, txb, partner } = params;
     checkOverlayFeeConfig(this.overlayFeeRate, this.overlayFeeReceiver);
     let overlayFee = 0;
     if (router.byAmountIn) {
@@ -9667,8 +9655,7 @@ var _AggregatorClient = class _AggregatorClient {
         expectedAmountOut.toString(),
         amountLimit.toString(),
         priceInfoObjectIds,
-        partner ?? this.partner,
-        cetusDlmmPartner ?? this.cetusDlmmPartner
+        partner ?? this.partner
       );
     } else {
       return this.expectOutputSwapV3(
@@ -9705,16 +9692,18 @@ var _AggregatorClient = class _AggregatorClient {
       });
     }
     tx.setSenderIfNotSet(this.signer || "0x0");
-    const simulateRes = await this.client.devInspectTransactionBlock({
-      sender: this.signer || "0x0",
-      transactionBlock: tx
+    const simulateRes = await this.client.simulateTransaction({
+      transaction: tx,
+      include: { events: true, effects: true }
     });
-    if (simulateRes.error) {
-      throw new Error("Simulation error: " + simulateRes.error);
+    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);
     }
-    const events = simulateRes.events ?? [];
+    const events = txResult.events ?? [];
     const valueData = events.filter((item) => {
-      return item.type.includes("CalculatedSwapResultEvent");
+      return item.eventType.includes("CalculatedSwapResultEvent");
     });
     if (valueData.length === 0 || valueData.length !== pools.length) {
       throw new Error("Simulate event result error");
@@ -9722,7 +9711,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].parsedJson;
+      const eventJson2 = valueData[i].json;
       if (eventJson2?.data?.is_exceed) {
         continue;
       }
@@ -9740,11 +9729,11 @@ var _AggregatorClient = class _AggregatorClient {
         }
       }
     }
-    const eventJson = valueData[tempIndex].parsedJson;
+    const eventJson = valueData[tempIndex].json;
     const eventData = eventJson?.data;
     const [decimalA, decimalB] = await Promise.all([
-      this.client.getCoinMetadata({ coinType: coinA }).then((res) => res?.decimals ?? null),
-      this.client.getCoinMetadata({ coinType: coinB }).then((res) => res?.decimals ?? null)
+      this.client.getCoinMetadata({ coinType: coinA }).then((res) => res.coinMetadata?.decimals ?? null),
+      this.client.getCoinMetadata({ coinType: coinB }).then((res) => res.coinMetadata?.decimals ?? null)
     ]);
     if (decimalA == null || decimalB == null) {
       throw new Error("Cannot get coin decimals");
@@ -9813,9 +9802,9 @@ var _AggregatorClient = class _AggregatorClient {
   }
   async devInspectTransactionBlock(txb) {
     txb.setSenderIfNotSet(this.signer || "0x0");
-    const res = await this.client.devInspectTransactionBlock({
-      sender: this.signer || "0x0",
-      transactionBlock: txb
+    const res = await this.client.simulateTransaction({
+      transaction: txb,
+      include: { events: true, effects: true }
     });
     return res;
   }
@@ -9823,7 +9812,7 @@ var _AggregatorClient = class _AggregatorClient {
     const res = await this.client.signAndExecuteTransaction({
       transaction: txb,
       signer,
-      options: { showEffects: true, showEvents: true, showBalanceChanges: true }
+      include: { effects: true, events: true, balanceChanges: true }
     });
     return res;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "type": "module",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@mysten/sui": "^2.6.0",
+    "@mysten/sui": "^2.16.3",
     "@pythnetwork/hermes-client": "^3.1.0",
     "bip39": "^3.1.0",
     "dotenv": "^16.4.5",