@suilend/sdk 2.0.3 → 3.0.1

package/lib/initialize.js

@@ -16,7 +16,7 @@ import { parseLendingMarket, parseObligation } from "../parsers";
 import * as simulate from "../utils/simulate";
 import { WAD } from "./constants";
 import { getWorkingPythEndpoint } from "./pyth";
-import { STRATEGY_WRAPPER_PACKAGE_ID_V1, } from "./strategyOwnerCap";
+import { STRATEGY_TYPE_INFO_MAP, STRATEGY_WRAPPER_PACKAGE_ID_V1, } from "./strategyOwnerCap";
 export const RESERVES_CUSTOM_ORDER = {
     [LENDING_MARKET_ID]: [
         // MAIN ASSETS
@@ -94,7 +94,7 @@ const TREATS_COINTYPE = "0x0dadb7fa2771c2952f96161fc1f0c105d1f22d53926b9ff2498a8
 export const NORMALIZED_MAYA_COINTYPE = normalizeStructTag(MAYA_COINTYPE);
 export const NORMALIZED_mPOINTS_COINTYPE = normalizeStructTag(mPOINTS_COINTYPE);
 export const NORMALIZED_TREATS_COINTYPE = normalizeStructTag(TREATS_COINTYPE);
-export const initializeSuilend = (suiClient, suilendClient, lendingMarketMetadata, fallbackPythEndpoint) => __awaiter(void 0, void 0, void 0, function* () {
+export const initializeSuilend = (suiGrpcClient, suilendClient, lendingMarketMetadata, fallbackPythEndpoint) => __awaiter(void 0, void 0, void 0, function* () {
     const nowMs = Date.now();
     const nowS = Math.floor(nowMs / 1000);
     const interestCompoundedRawReserves = suilendClient.lendingMarket.reserves.map((r) => simulate.compoundReserveInterest(r, nowS));
@@ -222,7 +222,7 @@ export const initializeSuilendRewards = (reserveMap, activeRewardCoinTypes) => _
     }
     return { rewardPriceMap };
 });
-export const initializeObligations = (suiClient, suilendClient, refreshedRawReserves, reserveMap, address) => __awaiter(void 0, void 0, void 0, function* () {
+export const initializeObligations = (suiGrpcClient, suilendClient, refreshedRawReserves, reserveMap, address) => __awaiter(void 0, void 0, void 0, function* () {
     if (!address)
         return {
             strategyOwnerCaps: [],
@@ -232,14 +232,18 @@ export const initializeObligations = (suiClient, suilendClient, refreshedRawRese
         };
     const [strategyOwnerCaps, obligationOwnerCaps] = yield Promise.all([
         (() => __awaiter(void 0, void 0, void 0, function* () {
-            if (suilendClient.lendingMarket.id !== LENDING_MARKET_ID)
-                return []; // Only main lending market has strategy owner caps
-            const objects = yield getAllOwnedObjects(suiClient, address, {
-                StructType: `${STRATEGY_WRAPPER_PACKAGE_ID_V1}::strategy_wrapper::StrategyOwnerCap<${suilendClient.lendingMarket.$typeArgs[0]}>`,
+            const hasStrategies = Object.values(STRATEGY_TYPE_INFO_MAP).some((info) => info.lendingMarketId === suilendClient.lendingMarket.id);
+            if (!hasStrategies)
+                return [];
+            const objects = yield getAllOwnedObjects(suiGrpcClient, address, `${STRATEGY_WRAPPER_PACKAGE_ID_V1}::strategy_wrapper::StrategyOwnerCap<${suilendClient.lendingMarket.$typeArgs[0]}>`);
+            const objectsWithJson = yield suiGrpcClient.getObjects({
+                objectIds: objects.map((o) => o.objectId),
+                include: { json: true },
             });
-            return objects.map((obj) => {
-                var _a;
-                const fields = ((_a = obj.data) === null || _a === void 0 ? void 0 : _a.content).fields;
+            return objectsWithJson.objects
+                .filter((obj) => !(obj instanceof Error))
+                .map((obj) => {
+                const fields = obj.json.fields;
                 const id = fields.id.id;
                 const strategyType = fields.strategy_type;
                 const obligationOwnerCapId = fields.inner_cap.fields.id.id;
@@ -253,12 +257,12 @@ export const initializeObligations = (suiClient, suilendClient, refreshedRawRese
                 return result;
             });
         }))(),
-        SuilendClient.getObligationOwnerCaps(address, suilendClient.lendingMarket.$typeArgs, suiClient),
+        SuilendClient.getObligationOwnerCaps(address, suilendClient.lendingMarket.$typeArgs, suiGrpcClient),
     ]);
     const obligations = (yield Promise.all([
         ...strategyOwnerCaps.map((soc) => soc.obligationId),
         ...obligationOwnerCaps.map((ownerCap) => ownerCap.obligationId),
-    ].map((obligationId) => SuilendClient.getObligation(obligationId, suilendClient.lendingMarket.$typeArgs, suiClient))))
+    ].map((obligationId) => SuilendClient.getObligation(obligationId, suilendClient.lendingMarket.$typeArgs, suiGrpcClient))))
         .map((rawObligation) => simulate.refreshObligation(rawObligation, refreshedRawReserves))
         .map((refreshedObligation) => parseObligation(refreshedObligation, reserveMap, strategyOwnerCaps.some((soc) => soc.obligationId === refreshedObligation.id)))
         .sort((a, b) => +b.netValueUsd.minus(a.netValueUsd));

package/lib/liquidityMining.d.ts

@@ -1,4 +1,4 @@
-import { CoinMetadata } from "@mysten/sui/jsonRpc";
+import { SuiClientTypes } from "@mysten/sui/client";
 import BigNumber from "bignumber.js";
 import { ParsedObligation, ParsedReserve } from "../parsers";
 import { RewardsMap, Side } from "./types";
@@ -44,7 +44,7 @@ export type PerDayRewardSummary = Omit<RewardSummary, "stats"> & {
 };
 export declare const getDepositShare: (reserve: ParsedReserve, share: BigNumber) => BigNumber;
 export declare const getBorrowShare: (reserve: ParsedReserve, share: BigNumber) => BigNumber;
-export declare const formatRewards: (parsedReserveMap: Record<string, ParsedReserve>, coinMetadataMap: Record<string, CoinMetadata>, priceMap: Record<string, BigNumber | undefined>, obligations?: ParsedObligation[]) => RewardMap;
+export declare const formatRewards: (parsedReserveMap: Record<string, ParsedReserve>, coinMetadataMap: Record<string, SuiClientTypes.CoinMetadata>, priceMap: Record<string, BigNumber | undefined>, obligations?: ParsedObligation[]) => RewardMap;
 export declare const getFilteredRewards: (rewards: RewardSummary[]) => RewardSummary[];
 export declare const getDedupedAprRewards: (filteredRewards: RewardSummary[]) => AprRewardSummary[];
 export declare const getDedupedPerDayRewards: (filteredRewards: RewardSummary[]) => PerDayRewardSummary[];
@@ -56,5 +56,5 @@ export declare const getTotalAprPercent: (side: Side, aprPercent: BigNumber, fil
 export declare const getNetAprPercent: (obligation: ParsedObligation, rewardMap: RewardMap, lstStatsMap: Record<string, {
     aprPercent: BigNumber;
 }>, sdeUsdAprPercent: BigNumber | undefined, eThirdAprPercent: BigNumber | undefined, eEarnAprPercent: BigNumber | undefined, noShares?: boolean) => BigNumber;
-export declare const getRewardsMap: (obligation: ParsedObligation | undefined, rewardMap: RewardMap, coinMetadataMap: Record<string, CoinMetadata>) => RewardsMap;
+export declare const getRewardsMap: (obligation: ParsedObligation | undefined, rewardMap: RewardMap, coinMetadataMap: Record<string, SuiClientTypes.CoinMetadata>) => RewardsMap;
 export {};

package/lib/pythAdapter.d.ts

@@ -0,0 +1,9 @@
+import { SuiGrpcClient } from "@mysten/sui/grpc";
+/**
+ * Adapter that wraps SuiGrpcClient to provide the legacy SuiClient (JSON-RPC)
+ * interface expected by third-party SDKs like @pythnetwork/pyth-sui-js and
+ * @flowx-finance/sdk.
+ *
+ * Maps old JSON-RPC method signatures to the new gRPC equivalents.
+ */
+export declare function createJsonRpcAdapter(suiGrpcClient: SuiGrpcClient): any;

package/lib/pythAdapter.js

@@ -0,0 +1,121 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+/**
+ * Adapter that wraps SuiGrpcClient to provide the legacy SuiClient (JSON-RPC)
+ * interface expected by third-party SDKs like @pythnetwork/pyth-sui-js and
+ * @flowx-finance/sdk.
+ *
+ * Maps old JSON-RPC method signatures to the new gRPC equivalents.
+ */
+export function createJsonRpcAdapter(suiGrpcClient) {
+    return {
+        getObject(_a) {
+            return __awaiter(this, arguments, void 0, function* ({ id }) {
+                var _b, _c;
+                const { object } = yield suiGrpcClient.getObject({
+                    objectId: id,
+                    include: { json: true },
+                });
+                return {
+                    data: {
+                        objectId: object.objectId,
+                        type: object.type,
+                        content: {
+                            dataType: "moveObject",
+                            fields: (_c = (_b = object.json) === null || _b === void 0 ? void 0 : _b.fields) !== null && _c !== void 0 ? _c : object.json,
+                            type: object.type,
+                        },
+                    },
+                };
+            });
+        },
+        getCoins(_a) {
+            return __awaiter(this, arguments, void 0, function* ({ owner, coinType, cursor, }) {
+                const result = yield suiGrpcClient.listCoins({
+                    owner,
+                    coinType,
+                    cursor,
+                });
+                return {
+                    data: result.objects.map((coin) => ({
+                        coinObjectId: coin.objectId,
+                        version: coin.version,
+                        digest: coin.digest,
+                        balance: coin.balance,
+                        coinType: coin.type,
+                    })),
+                    nextCursor: result.cursor,
+                    hasNextPage: result.hasNextPage,
+                };
+            });
+        },
+        getDynamicFieldObject(_a) {
+            return __awaiter(this, arguments, void 0, function* ({ parentId, name, }) {
+                var _b, _c, _d, _e, _f, _g;
+                const { dynamicField } = yield suiGrpcClient.getDynamicField({
+                    parentId,
+                    name: {
+                        type: name.type,
+                        bcs: dynamicField_encodeName(name),
+                    },
+                });
+                const childObject = dynamicField.$kind === "DynamicObject" && dynamicField.childId
+                    ? yield suiGrpcClient
+                        .getObject({
+                        objectId: dynamicField.childId,
+                        include: { json: true },
+                    })
+                        .then((r) => r.object)
+                    : null;
+                const obj = childObject !== null && childObject !== void 0 ? childObject : dynamicField;
+                const type = (_c = (_b = childObject === null || childObject === void 0 ? void 0 : childObject.type) !== null && _b !== void 0 ? _b : dynamicField.valueType) !== null && _c !== void 0 ? _c : dynamicField.type;
+                const json = (_d = childObject === null || childObject === void 0 ? void 0 : childObject.json) !== null && _d !== void 0 ? _d : (_e = dynamicField.value) === null || _e === void 0 ? void 0 : _e.json;
+                return {
+                    data: {
+                        objectId: (_f = childObject === null || childObject === void 0 ? void 0 : childObject.objectId) !== null && _f !== void 0 ? _f : dynamicField.fieldId,
+                        type,
+                        content: {
+                            dataType: "moveObject",
+                            fields: (_g = json === null || json === void 0 ? void 0 : json.fields) !== null && _g !== void 0 ? _g : json,
+                            type,
+                        },
+                    },
+                };
+            });
+        },
+    };
+}
+function dynamicField_encodeName(name) {
+    // The pyth client passes structured names like:
+    //   { type: "vector<u8>", value: "price_info" }
+    //   { type: "..::PriceIdentifier", value: { bytes: number[] } }
+    // The gRPC getDynamicField expects BCS-encoded name bytes.
+    // We use the bcs module to encode them.
+    const { bcs } = require("@mysten/sui/bcs");
+    if (name.type === "vector<u8>") {
+        const bytes = typeof name.value === "string"
+            ? new TextEncoder().encode(name.value)
+            : new Uint8Array(name.value);
+        return bcs.vector(bcs.u8()).serialize(Array.from(bytes)).toBytes();
+    }
+    if (name.value &&
+        typeof name.value === "object" &&
+        "bytes" in name.value &&
+        Array.isArray(name.value.bytes)) {
+        const struct = bcs.struct("PriceIdentifier", {
+            bytes: bcs.vector(bcs.u8()),
+        });
+        return struct.serialize(name.value).toBytes();
+    }
+    if (typeof name.value === "boolean") {
+        return bcs.bool().serialize(name.value).toBytes();
+    }
+    throw new Error(`jsonRpcAdapter: unsupported dynamic field name type "${name.type}"`);
+}

package/lib/strategyOwnerCap.d.ts

@@ -1,22 +1,27 @@
 import { AggregatorClient as CetusSdk } from "@cetusprotocol/aggregator-sdk";
-import { Transaction, TransactionObjectInput, TransactionResult } from "@mysten/sui/transactions";
+import { Transaction, TransactionObjectArgument, TransactionObjectInput, TransactionResult } from "@mysten/sui/transactions";
 import BigNumber from "bignumber.js";
 import { ParsedObligation, ParsedReserve } from "../parsers";
 import { RewardsMap, StrategyOwnerCap } from "./types";
 export declare const STRATEGY_WRAPPER_PACKAGE_ID_V1 = "0xba97dc73a07638d03d77ad2161484eb21db577edc9cadcd7035fef4b4f2f6fa1";
 export declare enum StrategyType {
     sSUI_SUI_LOOPING = "1",
-    stratSUI_SUI_LOOPING = "2",
     USDC_sSUI_SUI_LOOPING = "3",
+    USDsui_USDC_LOOPING = "10",
+    eEARN_USDC_LOOPING = "11",
     AUSD_sSUI_SUI_LOOPING = "4",
     xBTC_sSUI_SUI_LOOPING = "100",// Used to be for Slush Strategies #0
     xBTC_suiWBTC_LOOPING = "101",// Used to be for Slush Strategies #1
     suiUSDT_sSUI_SUI_LOOPING = "5",
     AUSD_USDC_LOOPING = "6",
     AUSD_suiUSDT_LOOPING = "7",
-    USDC_suiUSDT_LOOPING = "8"
+    USDC_suiUSDT_LOOPING = "8",
+    USDsui_sSUI_SUI_LOOPING = "9",
+    stratSUI_SUI_LOOPING = "2"
 }
 export declare const STRATEGY_TYPE_INFO_MAP: Record<StrategyType, {
+    lendingMarketId: string;
+    lendingMarketType: string;
     queryParam: string;
     header: {
         coinTypes: string[];
@@ -30,10 +35,10 @@ export declare const STRATEGY_TYPE_INFO_MAP: Record<StrategyType, {
     currencyCoinTypes: string[];
     defaultCurrencyCoinType: string;
 }>;
-export declare const strategyDeposit: (coin: TransactionObjectInput, coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, transaction: Transaction) => TransactionResult;
-export declare const strategyBorrow: (coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, value: bigint, transaction: Transaction) => TransactionResult;
-export declare const strategyWithdraw: (coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, value: bigint, transaction: Transaction) => TransactionResult;
-export declare const strategyClaimRewardsAndSwapForCoinType: (address: string, cetusSdk: CetusSdk, cetusPartnerId: string, rewardsMap: RewardsMap, rewardPriceMap: Record<string, BigNumber | undefined>, depositReserve: ParsedReserve, strategyOwnerCap: TransactionObjectInput, isDepositing: boolean, transaction: Transaction) => Promise<void>;
+export declare const strategyDeposit: (strategyType: StrategyType, coin: TransactionObjectInput, coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, transaction: Transaction) => TransactionResult;
+export declare const strategyBorrow: (strategyType: StrategyType, coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, value: bigint, transaction: Transaction) => TransactionResult;
+export declare const strategyWithdraw: (strategyType: StrategyType, coinType: string, strategyOwnerCap: TransactionObjectInput, reserveArrayIndex: bigint, value: bigint, transaction: Transaction) => TransactionResult;
+export declare const strategyClaimRewardsAndMergeCoins: (strategyType: StrategyType, rewardsMap: RewardsMap, strategyOwnerCap: TransactionObjectInput, transaction: Transaction) => Record<string, TransactionObjectArgument>;
 export declare const strategySwapSomeDepositsForCoinType: (strategyType: StrategyType, cetusSdk: CetusSdk, cetusPartnerId: string, obligation: ParsedObligation, noSwapCoinTypes: string[], // coinTypes to not swap for depositReserve.coinType
 swapPercent: BigNumber, // percent of deposit to swap for depositReserve.coinType (0-100)
 depositReserve: ParsedReserve, strategyOwnerCap: TransactionObjectInput, transaction: Transaction) => Promise<void>;