@suilend/sdk 2.0.4 → 3.0.2

package/_generated/suilend/reserve-config/structs.js

@@ -13,7 +13,6 @@ import { decodeFromFields, decodeFromFieldsWithTypes, decodeFromJSONField, field
 import { composeSuiType, compressSuiType, } from "../../_framework/util";
 import { PKG_V1 } from "../index";
 import { bcs } from "@mysten/sui/bcs";
-import { fromBase64 } from "@mysten/sui/utils";
 /* ============================== ReserveConfig =============================== */
 export function isReserveConfig(type) {
     type = compressSuiType(type);
@@ -59,8 +58,6 @@ export class ReserveConfig {
             bcs: ReserveConfig.bcs,
             fromJSONField: (field) => ReserveConfig.fromJSONField(field),
             fromJSON: (json) => ReserveConfig.fromJSON(json),
-            fromSuiParsedData: (content) => ReserveConfig.fromSuiParsedData(content),
-            fromSuiObjectData: (content) => ReserveConfig.fromSuiObjectData(content),
             fetch: (client, id) => __awaiter(this, void 0, void 0, function* () { return ReserveConfig.fetch(client, id); }),
             new: (fields) => {
                 return new ReserveConfig([], fields);
@@ -207,40 +204,13 @@ export class ReserveConfig {
         }
         return ReserveConfig.fromJSONField(json);
     }
-    static fromSuiParsedData(content) {
-        if (content.dataType !== "moveObject") {
-            throw new Error("not an object");
-        }
-        if (!isReserveConfig(content.type)) {
-            throw new Error(`object at ${content.fields.id} is not a ReserveConfig object`);
-        }
-        return ReserveConfig.fromFieldsWithTypes(content);
-    }
-    static fromSuiObjectData(data) {
-        if (data.bcs) {
-            if (data.bcs.dataType !== "moveObject" ||
-                !isReserveConfig(data.bcs.type)) {
-                throw new Error(`object at is not a ReserveConfig object`);
-            }
-            return ReserveConfig.fromBcs(fromBase64(data.bcs.bcsBytes));
-        }
-        if (data.content) {
-            return ReserveConfig.fromSuiParsedData(data.content);
-        }
-        throw new Error("Both `bcs` and `content` fields are missing from the data. Include `showBcs` or `showContent` in the request.");
-    }
     static fetch(client, id) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const res = yield client.getObject({ id, options: { showBcs: true } });
-            if (res.error) {
-                throw new Error(`error fetching ReserveConfig object at id ${id}: ${res.error.code}`);
-            }
-            if (((_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.bcs) === null || _b === void 0 ? void 0 : _b.dataType) !== "moveObject" ||
-                !isReserveConfig(res.data.bcs.type)) {
+            const { object } = yield client.getObject({ objectId: id, include: { content: true } });
+            if (!isReserveConfig(object.type)) {
                 throw new Error(`object at id ${id} is not a ReserveConfig object`);
             }
-            return ReserveConfig.fromSuiObjectData(res.data);
+            return ReserveConfig.fromBcs(object.content);
         });
     }
 }
@@ -274,8 +244,6 @@ export class ReserveConfigBuilder {
             bcs: ReserveConfigBuilder.bcs,
             fromJSONField: (field) => ReserveConfigBuilder.fromJSONField(field),
             fromJSON: (json) => ReserveConfigBuilder.fromJSON(json),
-            fromSuiParsedData: (content) => ReserveConfigBuilder.fromSuiParsedData(content),
-            fromSuiObjectData: (content) => ReserveConfigBuilder.fromSuiObjectData(content),
             fetch: (client, id) => __awaiter(this, void 0, void 0, function* () { return ReserveConfigBuilder.fetch(client, id); }),
             new: (fields) => {
                 return new ReserveConfigBuilder([], fields);
@@ -332,40 +300,13 @@ export class ReserveConfigBuilder {
         }
         return ReserveConfigBuilder.fromJSONField(json);
     }
-    static fromSuiParsedData(content) {
-        if (content.dataType !== "moveObject") {
-            throw new Error("not an object");
-        }
-        if (!isReserveConfigBuilder(content.type)) {
-            throw new Error(`object at ${content.fields.id} is not a ReserveConfigBuilder object`);
-        }
-        return ReserveConfigBuilder.fromFieldsWithTypes(content);
-    }
-    static fromSuiObjectData(data) {
-        if (data.bcs) {
-            if (data.bcs.dataType !== "moveObject" ||
-                !isReserveConfigBuilder(data.bcs.type)) {
-                throw new Error(`object at is not a ReserveConfigBuilder object`);
-            }
-            return ReserveConfigBuilder.fromBcs(fromBase64(data.bcs.bcsBytes));
-        }
-        if (data.content) {
-            return ReserveConfigBuilder.fromSuiParsedData(data.content);
-        }
-        throw new Error("Both `bcs` and `content` fields are missing from the data. Include `showBcs` or `showContent` in the request.");
-    }
     static fetch(client, id) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const res = yield client.getObject({ id, options: { showBcs: true } });
-            if (res.error) {
-                throw new Error(`error fetching ReserveConfigBuilder object at id ${id}: ${res.error.code}`);
-            }
-            if (((_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.bcs) === null || _b === void 0 ? void 0 : _b.dataType) !== "moveObject" ||
-                !isReserveConfigBuilder(res.data.bcs.type)) {
+            const { object } = yield client.getObject({ objectId: id, include: { content: true } });
+            if (!isReserveConfigBuilder(object.type)) {
                 throw new Error(`object at id ${id} is not a ReserveConfigBuilder object`);
             }
-            return ReserveConfigBuilder.fromSuiObjectData(res.data);
+            return ReserveConfigBuilder.fromBcs(object.content);
         });
     }
 }

package/client.d.ts

@@ -1,4 +1,4 @@
-import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 import { Transaction, TransactionObjectArgument, TransactionObjectInput } from "@mysten/sui/transactions";
 import { SuiPriceServiceConnection, SuiPythClient } from "@pythnetwork/pyth-sui-js";
 import { LendingMarket, ObligationOwnerCap } from "./_generated/suilend/lending-market/structs";
@@ -29,12 +29,12 @@ export type ClaimRewardsReward = {
 };
 export declare class SuilendClient {
     lendingMarket: LendingMarket<string>;
-    client: SuiJsonRpcClient;
+    suiGrpcClient: SuiGrpcClient;
     pythClient: SuiPythClient;
     pythConnection: SuiPriceServiceConnection;
-    constructor(lendingMarket: LendingMarket<string>, client: SuiJsonRpcClient);
-    static initialize(lendingMarketId: string, lendingMarketType: string, client: SuiJsonRpcClient, logPackageId?: boolean): Promise<SuilendClient>;
-    static getFeeReceivers(client: SuiJsonRpcClient, lendingMarketId: string): Promise<{
+    constructor(lendingMarket: LendingMarket<string>, suiGrpcClient: SuiGrpcClient);
+    static initialize(lendingMarketId: string, lendingMarketType: string, suiGrpcClient: SuiGrpcClient, logPackageId?: boolean): Promise<SuilendClient>;
+    static getFeeReceivers(suiGrpcClient: SuiGrpcClient, lendingMarketId: string): Promise<{
         receivers: string[];
         weights: string[];
     }>;
@@ -42,10 +42,10 @@ export declare class SuilendClient {
         NestedResult: [number, number];
         $kind: "NestedResult";
     };
-    static getObligationOwnerCaps(ownerId: string, lendingMarketTypeArgs: string[], client: SuiJsonRpcClient): Promise<ObligationOwnerCap<string>[]>;
-    static getObligation(obligationId: string, lendingMarketTypeArgs: string[], client: SuiJsonRpcClient): Promise<Obligation<string>>;
+    static getObligationOwnerCaps(ownerId: string, lendingMarketTypeArgs: string[], suiGrpcClient: SuiGrpcClient): Promise<ObligationOwnerCap<string>[]>;
+    static getObligation(obligationId: string, lendingMarketTypeArgs: string[], suiGrpcClient: SuiGrpcClient): Promise<Obligation<string>>;
     getObligation(obligationId: string): Promise<Obligation<string>>;
-    static getLendingMarketOwnerCapId(ownerId: string, lendingMarketTypeArgs: string[], client: SuiJsonRpcClient): Promise<string | undefined>;
+    static getLendingMarketOwnerCapId(ownerId: string, lendingMarketTypeArgs: string[], suiGrpcClient: SuiGrpcClient): Promise<string | undefined>;
     getLendingMarketOwnerCapId(ownerId: string): Promise<string | undefined>;
     createReserve(lendingMarketOwnerCapId: string, transaction: Transaction, pythPriceId: string, coinType: string, createReserveConfigArgs: CreateReserveConfigArgs, useV2?: boolean): Promise<import("@mysten/sui/transactions").TransactionResult>;
     addReward(ownerId: string, lendingMarketOwnerCapId: string, reserveArrayIndex: bigint, isDepositReward: boolean, rewardCoinType: string, rewardValue: string, startTimeMs: bigint, endTimeMs: bigint, transaction: Transaction, mergeCoins?: boolean): Promise<import("@mysten/sui/transactions").TransactionResult>;

package/client.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { SUI_CLOCK_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_ID, fromBase64, normalizeStructTag, toHex, } from "@mysten/sui/utils";
+import { SUI_CLOCK_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_ID, normalizeStructTag, toHex, } from "@mysten/sui/utils";
 import { SuiPriceServiceConnection, SuiPythClient, } from "@pythnetwork/pyth-sui-js";
 import { extractCTokenCoinType, getAllCoins, mergeAllCoins, } from "@suilend/sui-fe";
 import { PriceInfoObject } from "./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs";
@@ -21,6 +21,7 @@ import { Obligation } from "./_generated/suilend/obligation/structs";
 import { newConfig as createRateLimiterConfig, } from "./_generated/suilend/rate-limiter/functions";
 import { createReserveConfig, } from "./_generated/suilend/reserve-config/functions";
 import { PRIMARY_PYTH_ENDPOINT } from "./lib/pyth";
+import { createJsonRpcAdapter } from "./lib/pythAdapter";
 import { Side } from "./lib/types";
 const SUI_COINTYPE = "0x2::sui::SUI";
 const NORMALIZED_SUI_COINTYPE = normalizeStructTag(SUI_COINTYPE);
@@ -54,54 +55,48 @@ export const [STEAMM_LM_LENDING_MARKET_ID, STEAMM_LM_LENDING_MARKET_TYPE] = proc
         "0xc1888ec1b81a414e427a44829310508352aec38252ee0daa9f8b181b6947de9f",
         "0x0a071f4976abae1a7f722199cf0bfcbe695ef9408a878e7d12a7ca87b7e582a6::lp_rewards::LP_REWARDS",
     ];
-function getLatestPackageId(client, upgradeCapId) {
+function getLatestPackageId(suiGrpcClient, upgradeCapId) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const object = yield client.getObject({
-            id: upgradeCapId,
-            options: {
-                showContent: true,
-            },
-        });
-        return ((_a = object.data) === null || _a === void 0 ? void 0 : _a.content).fields.package;
+        const { object } = yield suiGrpcClient.getObject({
+            objectId: upgradeCapId,
+            include: { json: true },
+        });
+        return object.json.package;
     });
 }
 export class SuilendClient {
-    constructor(lendingMarket, client) {
+    constructor(lendingMarket, suiGrpcClient) {
         this.lendingMarket = lendingMarket;
-        this.client = client;
-        this.pythClient = new SuiPythClient(client, PYTH_STATE_ID, WORMHOLE_STATE_ID);
+        this.suiGrpcClient = suiGrpcClient;
+        this.pythClient = new SuiPythClient(createJsonRpcAdapter(suiGrpcClient), PYTH_STATE_ID, WORMHOLE_STATE_ID);
         const pythEndpoint = PRIMARY_PYTH_ENDPOINT; // TODO: Use getWorkingPythEndpoint
         this.pythConnection = new SuiPriceServiceConnection(pythEndpoint, {
             timeout: 30 * 1000,
         });
     }
-    static initialize(lendingMarketId, lendingMarketType, client, logPackageId) {
+    static initialize(lendingMarketId, lendingMarketType, suiGrpcClient, logPackageId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const lendingMarket = yield LendingMarket.fetch(client, phantom(lendingMarketType), lendingMarketId);
-            const publishedAt = yield getLatestPackageId(client, SUILEND_UPGRADE_CAP_ID);
+            const lendingMarket = yield LendingMarket.fetch(suiGrpcClient, phantom(lendingMarketType), lendingMarketId);
+            const publishedAt = yield getLatestPackageId(suiGrpcClient, SUILEND_UPGRADE_CAP_ID);
             if (logPackageId)
                 console.log("@suilend/sdk | publishedAt:", publishedAt);
             setPublishedAt(publishedAt);
-            return new SuilendClient(lendingMarket, client);
+            return new SuilendClient(lendingMarket, suiGrpcClient);
         });
     }
-    static getFeeReceivers(client, lendingMarketId) {
+    static getFeeReceivers(suiGrpcClient, lendingMarketId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const feeReceiver = yield client.getDynamicFieldObject({
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const { dynamicField } = yield suiGrpcClient.getDynamicField({
                 parentId: lendingMarketId,
                 name: {
                     type: `${PKG_V10}::lending_market::FeeReceiversKey`,
-                    value: {
-                        dummy_field: false,
-                    },
+                    bcs: new Uint8Array([0]),
                 },
             });
-            const receivers = ((_a = feeReceiver.data) === null || _a === void 0 ? void 0 : _a.content).fields.value.fields
-                .receivers;
-            const weights = ((_b = feeReceiver.data) === null || _b === void 0 ? void 0 : _b.content).fields.value.fields
-                .weights;
+            const value = dynamicField.value;
+            const receivers = (_d = (_c = (_b = (_a = value.json) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.fields) === null || _d === void 0 ? void 0 : _d.receivers;
+            const weights = (_h = (_g = (_f = (_e = value.json) === null || _e === void 0 ? void 0 : _e.fields) === null || _f === void 0 ? void 0 : _f.value) === null || _g === void 0 ? void 0 : _g.fields) === null || _h === void 0 ? void 0 : _h.weights;
             return { receivers, weights };
         });
     }
@@ -114,82 +109,54 @@ export class SuilendClient {
         });
         return ownerCap;
     }
-    static getObligationOwnerCaps(ownerId, lendingMarketTypeArgs, client) {
+    static getObligationOwnerCaps(ownerId, lendingMarketTypeArgs, suiGrpcClient) {
         return __awaiter(this, void 0, void 0, function* () {
             const allObjs = [];
             let cursor = null;
             let hasNextPage = true;
             while (hasNextPage) {
-                const objs = yield client.getOwnedObjects({
+                const objs = yield suiGrpcClient.listOwnedObjects({
                     owner: ownerId,
                     cursor,
-                    filter: {
-                        StructType: `${PACKAGE_ID}::lending_market::ObligationOwnerCap<${lendingMarketTypeArgs[0]}>`,
-                    },
+                    type: `${PACKAGE_ID}::lending_market::ObligationOwnerCap<${lendingMarketTypeArgs[0]}>`,
+                    include: { content: true },
                 });
-                allObjs.push(...objs.data);
-                cursor = objs.nextCursor;
+                allObjs.push(...objs.objects);
+                cursor = objs.cursor;
                 hasNextPage = objs.hasNextPage;
             }
-            if (allObjs.length > 0) {
-                const obligationOwnerCapObjs = yield Promise.all(allObjs.map((objData) => {
-                    var _a;
-                    return client.getObject({
-                        id: (_a = objData.data) === null || _a === void 0 ? void 0 : _a.objectId,
-                        options: { showBcs: true },
-                    });
-                }));
-                const obligationOwnerCaps = [];
-                obligationOwnerCapObjs.forEach((obj) => {
-                    var _a, _b, _c, _d;
-                    if (((_b = (_a = obj.data) === null || _a === void 0 ? void 0 : _a.bcs) === null || _b === void 0 ? void 0 : _b.dataType) !== "moveObject")
-                        throw new Error("Error: invalid data type");
-                    obligationOwnerCaps.push(ObligationOwnerCap.fromBcs(phantom(lendingMarketTypeArgs[0]), fromBase64((_d = (_c = obj.data) === null || _c === void 0 ? void 0 : _c.bcs) === null || _d === void 0 ? void 0 : _d.bcsBytes)));
-                });
-                return obligationOwnerCaps;
-            }
-            else {
-                return [];
-            }
+            return allObjs.map((obj) => ObligationOwnerCap.fromBcs(phantom(lendingMarketTypeArgs[0]), obj.content));
         });
     }
-    static getObligation(obligationId, lendingMarketTypeArgs, client) {
+    static getObligation(obligationId, lendingMarketTypeArgs, suiGrpcClient) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const obligationData = yield client.getObject({
-                id: obligationId,
-                options: { showBcs: true },
+            const { object } = yield suiGrpcClient.getObject({
+                objectId: obligationId,
+                include: { content: true },
             });
-            if (((_b = (_a = obligationData.data) === null || _a === void 0 ? void 0 : _a.bcs) === null || _b === void 0 ? void 0 : _b.dataType) !== "moveObject") {
-                throw new Error("Error: invalid data type");
-            }
-            const obligation = Obligation.fromBcs(phantom(lendingMarketTypeArgs[0]), fromBase64(obligationData.data.bcs.bcsBytes));
-            return obligation;
+            return Obligation.fromBcs(phantom(lendingMarketTypeArgs[0]), object.content);
         });
     }
     getObligation(obligationId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return SuilendClient.getObligation(obligationId, this.lendingMarket.$typeArgs, this.client);
+            return SuilendClient.getObligation(obligationId, this.lendingMarket.$typeArgs, this.suiGrpcClient);
         });
     }
-    static getLendingMarketOwnerCapId(ownerId, lendingMarketTypeArgs, client) {
+    static getLendingMarketOwnerCapId(ownerId, lendingMarketTypeArgs, suiGrpcClient) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const objs = yield client.getOwnedObjects({
+            const objs = yield suiGrpcClient.listOwnedObjects({
                 owner: ownerId,
-                filter: {
-                    StructType: `${PACKAGE_ID}::lending_market::LendingMarketOwnerCap<${lendingMarketTypeArgs[0]}>`,
-                },
+                type: `${PACKAGE_ID}::lending_market::LendingMarketOwnerCap<${lendingMarketTypeArgs[0]}>`,
             });
-            if (objs.data.length > 0)
-                return (_a = objs.data[0].data) === null || _a === void 0 ? void 0 : _a.objectId;
+            if (objs.objects.length > 0)
+                return objs.objects[0].objectId;
             else
                 return undefined;
         });
     }
     getLendingMarketOwnerCapId(ownerId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return SuilendClient.getLendingMarketOwnerCapId(ownerId, this.lendingMarket.$typeArgs, this.client);
+            return SuilendClient.getLendingMarketOwnerCapId(ownerId, this.lendingMarket.$typeArgs, this.suiGrpcClient);
         });
     }
     createReserve(lendingMarketOwnerCapId, transaction, pythPriceId, coinType, createReserveConfigArgs, useV2) {
@@ -200,7 +167,7 @@ export class SuilendClient {
                 pythPriceId,
             ]);
             const priceInfoObjectIds = yield this.pythClient.updatePriceFeeds(transaction, priceUpdateData, [pythPriceId]);
-            const coinMetadata = yield this.client.getCoinMetadata({
+            const { coinMetadata } = yield this.suiGrpcClient.getCoinMetadata({
                 coinType: coinType,
             });
             console.log("[createReserve] coinMetadata", coinMetadata);
@@ -221,16 +188,16 @@ export class SuilendClient {
     }
     addReward(ownerId_1, lendingMarketOwnerCapId_1, reserveArrayIndex_1, isDepositReward_1, rewardCoinType_1, rewardValue_1, startTimeMs_1, endTimeMs_1, transaction_1) {
         return __awaiter(this, arguments, void 0, function* (ownerId, lendingMarketOwnerCapId, reserveArrayIndex, isDepositReward, rewardCoinType, rewardValue, startTimeMs, endTimeMs, transaction, mergeCoins = true) {
-            const coins = (yield this.client.getCoins({
+            const coins = (yield this.suiGrpcClient.listCoins({
                 owner: ownerId,
                 coinType: rewardCoinType,
-            })).data;
+            })).objects;
             if (coins.length > 1 && !isSui(rewardCoinType) && mergeCoins) {
-                transaction.mergeCoins(transaction.object(coins[0].coinObjectId), coins.map((c) => transaction.object(c.coinObjectId)).slice(1));
+                transaction.mergeCoins(transaction.object(coins[0].objectId), coins.map((c) => transaction.object(c.objectId)).slice(1));
             }
             const [rewardCoin] = transaction.splitCoins(isSui(rewardCoinType)
                 ? transaction.gas
-                : transaction.object(coins[0].coinObjectId), [rewardValue]);
+                : transaction.object(coins[0].objectId), [rewardValue]);
             return addPoolReward(transaction, [this.lendingMarket.$typeArgs[0], rewardCoinType], {
                 lendingMarketOwnerCap: transaction.object(lendingMarketOwnerCapId),
                 lendingMarket: transaction.object(this.lendingMarket.id),
@@ -400,7 +367,7 @@ export class SuilendClient {
             }))()));
             const stalePriceIdentifiers = [];
             yield Promise.all(Object.entries(priceInfoObjectIds).map(([i, priceInfoObjectId]) => (() => __awaiter(this, void 0, void 0, function* () {
-                const priceInfoObject = yield PriceInfoObject.fetch(this.client, priceInfoObjectId);
+                const priceInfoObject = yield PriceInfoObject.fetch(this.suiGrpcClient, priceInfoObjectId);
                 const publishTime = priceInfoObject.priceInfo.priceFeed.price.timestamp;
                 const stalenessSeconds = Date.now() / 1000 - Number(publishTime);
                 if (stalenessSeconds > 20) {
@@ -454,21 +421,21 @@ export class SuilendClient {
     }
     depositIntoObligation(ownerId, coinType, value, transaction, obligationOwnerCap) {
         return __awaiter(this, void 0, void 0, function* () {
-            const coins = yield getAllCoins(this.client, ownerId, coinType);
+            const coins = yield getAllCoins(this.suiGrpcClient, ownerId, coinType);
             const mergeCoin = mergeAllCoins(coinType, transaction, coins);
             const [sendCoin] = transaction.splitCoins(isSui(coinType)
                 ? transaction.gas
-                : transaction.object(mergeCoin.coinObjectId), [value]);
+                : transaction.object(mergeCoin.objectId), [value]);
             this.deposit(sendCoin, coinType, obligationOwnerCap, transaction);
         });
     }
     depositLiquidityAndGetCTokens(ownerId, coinType, value, transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const coins = yield getAllCoins(this.client, ownerId, coinType);
+            const coins = yield getAllCoins(this.suiGrpcClient, ownerId, coinType);
             const mergeCoin = mergeAllCoins(coinType, transaction, coins);
             const [sendCoin] = transaction.splitCoins(isSui(coinType)
                 ? transaction.gas
-                : transaction.object(mergeCoin.coinObjectId), [value]);
+                : transaction.object(mergeCoin.objectId), [value]);
             const [ctokens] = depositLiquidityAndMintCtokens(transaction, [this.lendingMarket.$typeArgs[0], coinType], {
                 lendingMarket: transaction.object(this.lendingMarket.id),
                 reserveArrayIndex: transaction.pure.u64(this.findReserveArrayIndex(coinType)),
@@ -578,11 +545,11 @@ export class SuilendClient {
     }
     repayIntoObligation(ownerId, obligationId, coinType, value, transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const coins = yield getAllCoins(this.client, ownerId, coinType);
+            const coins = yield getAllCoins(this.suiGrpcClient, ownerId, coinType);
             const mergeCoin = mergeAllCoins(coinType, transaction, coins);
             const [sendCoin] = transaction.splitCoins(isSui(coinType)
                 ? transaction.gas
-                : transaction.object(mergeCoin.coinObjectId), [value]);
+                : transaction.object(mergeCoin.objectId), [value]);
             const result = this.repay(obligationId, coinType, sendCoin, transaction);
             transaction.transferObjects([sendCoin], transaction.pure.address(ownerId));
             return result;
@@ -639,7 +606,7 @@ export class SuilendClient {
         return __awaiter(this, void 0, void 0, function* () {
             const mergeCoinMap = {};
             for (const ctokenCoinType of ctokenCoinTypes) {
-                const coins = yield getAllCoins(this.client, ownerId, ctokenCoinType);
+                const coins = yield getAllCoins(this.suiGrpcClient, ownerId, ctokenCoinType);
                 const mergeCoin = mergeAllCoins(ctokenCoinType, transaction, coins);
                 mergeCoinMap[ctokenCoinType] = mergeCoin;
             }
@@ -652,7 +619,7 @@ export class SuilendClient {
                     ],
                     arguments: [],
                 });
-                const [redeemCoin] = this.redeem(transaction.object(mergeCoin.coinObjectId), coinType, exemption, transaction);
+                const [redeemCoin] = this.redeem(transaction.object(mergeCoin.objectId), coinType, exemption, transaction);
                 transaction.transferObjects([redeemCoin], transaction.pure.address(ownerId));
             }
         });

package/lib/initialize.d.ts

@@ -1,4 +1,5 @@
-import { CoinMetadata, SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
+import { SuiClientTypes } from "@mysten/sui/client";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 import BigNumber from "bignumber.js";
 import { Reserve } from "../_generated/suilend/reserve/structs";
 import { SuilendClient } from "../client";
@@ -8,7 +9,7 @@ export declare const RESERVES_CUSTOM_ORDER: Record<string, string[]>;
 export declare const NORMALIZED_MAYA_COINTYPE: string;
 export declare const NORMALIZED_mPOINTS_COINTYPE: string;
 export declare const NORMALIZED_TREATS_COINTYPE: string;
-export declare const initializeSuilend: (suiClient: SuiJsonRpcClient, suilendClient: SuilendClient, lendingMarketMetadata?: LendingMarketMetadata, fallbackPythEndpoint?: string) => Promise<{
+export declare const initializeSuilend: (suiGrpcClient: SuiGrpcClient, suilendClient: SuilendClient, lendingMarketMetadata?: LendingMarketMetadata, fallbackPythEndpoint?: string) => Promise<{
     lendingMarket: {
         version: bigint;
         reserves: {
@@ -105,17 +106,17 @@ export declare const initializeSuilend: (suiClient: SuiJsonRpcClient, suilendCli
             depositAprPercent: BigNumber;
             utilizationPercent: BigNumber;
             token: {
+                id: string | null;
                 decimals: number;
-                description: string;
-                iconUrl?: string | null;
-                id?: string | null;
                 name: string;
                 symbol: string;
+                description: string;
+                iconUrl: string | null;
                 coinType: string;
             };
             symbol: string;
             name: string;
-            iconUrl: string | null | undefined;
+            iconUrl: string | null;
             description: string;
             totalDeposits: BigNumber;
         }[];
@@ -145,7 +146,7 @@ export declare const initializeSuilend: (suiClient: SuiJsonRpcClient, suilendCli
         totalSupplyUsd: BigNumber;
         totalBorrowUsd: BigNumber;
     };
-    coinMetadataMap: Record<string, CoinMetadata>;
+    coinMetadataMap: Record<string, SuiClientTypes.CoinMetadata>;
     refreshedRawReserves: Reserve<string>[];
     reserveMap: Record<string, {
         config: {
@@ -241,17 +242,17 @@ export declare const initializeSuilend: (suiClient: SuiJsonRpcClient, suilendCli
         depositAprPercent: BigNumber;
         utilizationPercent: BigNumber;
         token: {
+            id: string | null;
             decimals: number;
-            description: string;
-            iconUrl?: string | null;
-            id?: string | null;
             name: string;
             symbol: string;
+            description: string;
+            iconUrl: string | null;
             coinType: string;
         };
         symbol: string;
         name: string;
-        iconUrl: string | null | undefined;
+        iconUrl: string | null;
         description: string;
         totalDeposits: BigNumber;
     }>;
@@ -264,7 +265,7 @@ export declare const initializeSuilend: (suiClient: SuiJsonRpcClient, suilendCli
 export declare const initializeSuilendRewards: (reserveMap: Record<string, ParsedReserve>, activeRewardCoinTypes: string[]) => Promise<{
     rewardPriceMap: Record<string, BigNumber | undefined>;
 }>;
-export declare const initializeObligations: (suiClient: SuiJsonRpcClient, suilendClient: SuilendClient, refreshedRawReserves: Reserve<string>[], reserveMap: Record<string, ParsedReserve>, address?: string) => Promise<{
+export declare const initializeObligations: (suiGrpcClient: SuiGrpcClient, suilendClient: SuilendClient, refreshedRawReserves: Reserve<string>[], reserveMap: Record<string, ParsedReserve>, address?: string) => Promise<{
     strategyOwnerCaps: StrategyOwnerCap[];
     strategyObligations: {
         id: string;
@@ -381,17 +382,17 @@ export declare const initializeObligations: (suiClient: SuiJsonRpcClient, suilen
                 depositAprPercent: BigNumber;
                 utilizationPercent: BigNumber;
                 token: {
+                    id: string | null;
                     decimals: number;
-                    description: string;
-                    iconUrl?: string | null;
-                    id?: string | null;
                     name: string;
                     symbol: string;
+                    description: string;
+                    iconUrl: string | null;
                     coinType: string;
                 };
                 symbol: string;
                 name: string;
-                iconUrl: string | null | undefined;
+                iconUrl: string | null;
                 description: string;
                 totalDeposits: BigNumber;
             };
@@ -498,17 +499,17 @@ export declare const initializeObligations: (suiClient: SuiJsonRpcClient, suilen
                 depositAprPercent: BigNumber;
                 utilizationPercent: BigNumber;
                 token: {
+                    id: string | null;
                     decimals: number;
-                    description: string;
-                    iconUrl?: string | null;
-                    id?: string | null;
                     name: string;
                     symbol: string;
+                    description: string;
+                    iconUrl: string | null;
                     coinType: string;
                 };
                 symbol: string;
                 name: string;
-                iconUrl: string | null | undefined;
+                iconUrl: string | null;
                 description: string;
                 totalDeposits: BigNumber;
             };
@@ -639,17 +640,17 @@ export declare const initializeObligations: (suiClient: SuiJsonRpcClient, suilen
                 depositAprPercent: BigNumber;
                 utilizationPercent: BigNumber;
                 token: {
+                    id: string | null;
                     decimals: number;
-                    description: string;
-                    iconUrl?: string | null;
-                    id?: string | null;
                     name: string;
                     symbol: string;
+                    description: string;
+                    iconUrl: string | null;
                     coinType: string;
                 };
                 symbol: string;
                 name: string;
-                iconUrl: string | null | undefined;
+                iconUrl: string | null;
                 description: string;
                 totalDeposits: BigNumber;
             };
@@ -756,17 +757,17 @@ export declare const initializeObligations: (suiClient: SuiJsonRpcClient, suilen
                 depositAprPercent: BigNumber;
                 utilizationPercent: BigNumber;
                 token: {
+                    id: string | null;
                     decimals: number;
-                    description: string;
-                    iconUrl?: string | null;
-                    id?: string | null;
                     name: string;
                     symbol: string;
+                    description: string;
+                    iconUrl: string | null;
                     coinType: string;
                 };
                 symbol: string;
                 name: string;
-                iconUrl: string | null | undefined;
+                iconUrl: string | null;
                 description: string;
                 totalDeposits: BigNumber;
             };