@suilend/sdk 2.0.4 → 3.0.2

package/swap/quote.d.ts

@@ -1,17 +1,14 @@
-import { QuoteResponse as Bluefin7kQuote } from "@bluefin-exchange/bluefin7k-aggregator-sdk/cjs";
+import { QuoteResponse as Bluefin7kQuote } from "@bluefin-exchange/bluefin7k-aggregator-sdk";
 import { RouterDataV3 as CetusQuote, AggregatorClient as CetusSdk } from "@cetusprotocol/aggregator-sdk";
 import { AggregatorQuoter as FlowXAggregatorQuoter, GetRoutesResult as FlowXGetRoutesResult } from "@flowx-finance/sdk";
-import { RouterCompleteTradeRoute as AftermathQuote, Aftermath as AftermathSdk } from "aftermath-ts-sdk";
 import BigNumber from "bignumber.js";
 import { Token } from "@suilend/sui-fe";
 export declare enum QuoteProvider {
-    AFTERMATH = "aftermath",
     CETUS = "cetus",
     BLUEFIN7K = "bluefin7k",
     FLOWX = "flowx"
 }
 export declare const QUOTE_PROVIDER_NAME_MAP: {
-    aftermath: string;
     cetus: string;
     bluefin7k: string;
     flowx: string;
@@ -53,9 +50,6 @@ export type StandardizedQuote = {
         path: StandardizedRoutePath[];
     }[];
 } & ({
-    provider: QuoteProvider.AFTERMATH;
-    quote: AftermathQuote;
-} | {
     provider: QuoteProvider.CETUS;
     quote: CetusQuote;
 } | {
@@ -66,12 +60,10 @@ export type StandardizedQuote = {
     quote: FlowXGetRoutesResult<any, any>;
 });
 export declare const getAggQuotes: (sdkMap: {
-    [QuoteProvider.AFTERMATH]: AftermathSdk;
     [QuoteProvider.CETUS]: CetusSdk;
     [QuoteProvider.FLOWX]: FlowXAggregatorQuoter;
 }, activeProviders: QuoteProvider[], onGetAggQuote: (quote: StandardizedQuote | null) => void, tokenIn: Token, tokenOut: Token, amountIn: string) => Promise<void>;
 export declare const getAggSortedQuotesAll: (sdkMap: {
-    [QuoteProvider.AFTERMATH]: AftermathSdk;
     [QuoteProvider.CETUS]: CetusSdk;
     [QuoteProvider.FLOWX]: FlowXAggregatorQuoter;
 }, activeProviders: QuoteProvider[], tokenIn: Token, tokenOut: Token, amountIn: string) => Promise<StandardizedQuote[]>;

package/swap/quote.js

@@ -7,21 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getQuote as getBluefin7kQuoteOriginal, } from "@bluefin-exchange/bluefin7k-aggregator-sdk/cjs";
+import { getQuote as getBluefin7kQuoteOriginal, } from "@bluefin-exchange/bluefin7k-aggregator-sdk";
 import { normalizeStructTag } from "@mysten/sui/utils";
 import BigNumber from "bignumber.js";
 import BN from "bn.js";
 import { v4 as uuidv4 } from "uuid";
-import { WAD } from "../lib";
 export var QuoteProvider;
 (function (QuoteProvider) {
-    QuoteProvider["AFTERMATH"] = "aftermath";
     QuoteProvider["CETUS"] = "cetus";
     QuoteProvider["BLUEFIN7K"] = "bluefin7k";
     QuoteProvider["FLOWX"] = "flowx";
 })(QuoteProvider || (QuoteProvider = {}));
 export const QUOTE_PROVIDER_NAME_MAP = {
-    [QuoteProvider.AFTERMATH]: "Aftermath",
     [QuoteProvider.CETUS]: "Cetus",
     [QuoteProvider.BLUEFIN7K]: "Bluefin7k",
     [QuoteProvider.FLOWX]: "FlowX",
@@ -52,44 +49,6 @@ const getAggQuoteWrapper = (provider, getAggQuote, timeoutMs) => __awaiter(void
         return null;
     }
 });
-const getAftermathQuote = (sdk, tokenIn, tokenOut, amountIn) => __awaiter(void 0, void 0, void 0, function* () {
-    const quote = yield sdk.Router().getCompleteTradeRouteGivenAmountIn({
-        coinInType: tokenIn.coinType,
-        coinOutType: tokenOut.coinType,
-        coinInAmount: BigInt(amountIn),
-    });
-    const standardizedQuote = {
-        id: uuidv4(),
-        provider: QuoteProvider.AFTERMATH,
-        in: {
-            coinType: tokenIn.coinType,
-            amount: new BigNumber(quote.coinIn.amount.toString()).div(10 ** tokenIn.decimals),
-        },
-        out: {
-            coinType: tokenOut.coinType,
-            amount: new BigNumber(quote.coinOut.amount.toString()).div(10 ** tokenOut.decimals),
-        },
-        routes: quote.routes.map((route, routeIndex) => ({
-            percent: new BigNumber(route.portion.toString()).div(WAD).times(100),
-            path: route.paths.map((path) => ({
-                id: uuidv4(),
-                poolId: path.poolId,
-                routeIndex,
-                provider: path.protocolName,
-                in: {
-                    coinType: normalizeStructTag(path.coinIn.type),
-                    amount: new BigNumber(path.coinIn.amount.toString()),
-                },
-                out: {
-                    coinType: normalizeStructTag(path.coinOut.type),
-                    amount: new BigNumber(path.coinOut.amount.toString()),
-                },
-            })),
-        })),
-        quote,
-    };
-    return standardizedQuote;
-});
 const getCetusQuote = (sdk, tokenIn, tokenOut, amountIn) => __awaiter(void 0, void 0, void 0, function* () {
     const quote = yield sdk.findRouters({
         from: tokenIn.coinType,
@@ -248,13 +207,6 @@ const getFlowXQuote = (sdk, tokenIn, tokenOut, amountIn) => __awaiter(void 0, vo
 export const getAggQuotes = (sdkMap, activeProviders, onGetAggQuote, tokenIn, tokenOut, amountIn) => __awaiter(void 0, void 0, void 0, function* () {
     const timeoutMs = 15000;
     // Get quotes in parallel
-    // Aftermath
-    if (activeProviders.includes(QuoteProvider.AFTERMATH)) {
-        (() => __awaiter(void 0, void 0, void 0, function* () {
-            const standardizedQuote = yield getAggQuoteWrapper(QuoteProvider.AFTERMATH, () => getAftermathQuote(sdkMap[QuoteProvider.AFTERMATH], tokenIn, tokenOut, amountIn), timeoutMs);
-            onGetAggQuote(standardizedQuote);
-        }))();
-    }
     // Cetus
     if (activeProviders.includes(QuoteProvider.CETUS)) {
         (() => __awaiter(void 0, void 0, void 0, function* () {
@@ -281,9 +233,6 @@ export const getAggSortedQuotesAll = (sdkMap, activeProviders, tokenIn, tokenOut
     const timeoutMs = 1500;
     // Get quotes in parallel
     const quotes = yield Promise.all([
-        activeProviders.includes(QuoteProvider.AFTERMATH)
-            ? getAggQuoteWrapper(QuoteProvider.AFTERMATH, () => getAftermathQuote(sdkMap[QuoteProvider.AFTERMATH], tokenIn, tokenOut, amountIn), timeoutMs)
-            : null,
         activeProviders.includes(QuoteProvider.CETUS)
             ? getAggQuoteWrapper(QuoteProvider.CETUS, () => getCetusQuote(sdkMap[QuoteProvider.CETUS], tokenIn, tokenOut, amountIn), timeoutMs)
             : null,

package/swap/transaction.d.ts

@@ -1,11 +1,9 @@
 import { AggregatorClient as CetusSdk } from "@cetusprotocol/aggregator-sdk";
 import { AggregatorQuoter as FlowXAggregatorQuoter } from "@flowx-finance/sdk";
-import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions";
-import { Aftermath as AftermathSdk } from "aftermath-ts-sdk";
 import { QuoteProvider, StandardizedQuote } from "./quote";
-export declare const getSwapTransaction: (suiClient: SuiJsonRpcClient, address: string, quote: StandardizedQuote, slippagePercent: number, sdkMap: {
-    [QuoteProvider.AFTERMATH]: AftermathSdk;
+export declare const getSwapTransaction: (suiGrpcClient: SuiGrpcClient, address: string, quote: StandardizedQuote, slippagePercent: number, sdkMap: {
     [QuoteProvider.CETUS]: CetusSdk;
     [QuoteProvider.FLOWX]: FlowXAggregatorQuoter;
 }, partnerIdMap: {

package/swap/transaction.js

@@ -7,9 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { BluefinXTx, buildTx as buildBluefin7kTransaction, } from "@bluefin-exchange/bluefin7k-aggregator-sdk/cjs";
+import { BluefinXTx, buildTx as buildBluefin7kTransaction, } from "@bluefin-exchange/bluefin7k-aggregator-sdk";
 import { Coin as FlowXCoin, Commission as FlowXCommission, CommissionType as FlowXCommissionType, TradeBuilder as FlowXTradeBuilder, } from "@flowx-finance/sdk";
 import { getAllCoins, isSui, mergeAllCoins } from "@suilend/sui-fe";
+import { createJsonRpcAdapter } from "../lib/pythAdapter";
 import { QuoteProvider } from "./quote";
 const getSwapTransactionWrapper = (provider, getSwapTransaction) => __awaiter(void 0, void 0, void 0, function* () {
     console.log(`[getSwapTransactionWrapper] fetching transaction for ${provider} quote`);
@@ -23,32 +24,15 @@ const getSwapTransactionWrapper = (provider, getSwapTransaction) => __awaiter(vo
         throw err;
     }
 });
-export const getSwapTransaction = (suiClient, address, quote, slippagePercent, sdkMap, partnerIdMap, transaction, coinIn) => __awaiter(void 0, void 0, void 0, function* () {
-    if (quote.provider === QuoteProvider.AFTERMATH) {
-        return getSwapTransactionWrapper(QuoteProvider.AFTERMATH, () => __awaiter(void 0, void 0, void 0, function* () {
-            const { tx: transaction2, coinOutId: coinOut } = yield sdkMap[QuoteProvider.AFTERMATH]
-                .Router()
-                .addTransactionForCompleteTradeRoute({
-                tx: transaction,
-                walletAddress: address,
-                completeRoute: quote.quote,
-                slippage: slippagePercent / 100,
-                coinInId: coinIn,
-            });
-            return {
-                transaction: transaction2,
-                coinOut: coinOut,
-            };
-        }));
-    }
-    else if (quote.provider === QuoteProvider.CETUS) {
+export const getSwapTransaction = (suiGrpcClient, address, quote, slippagePercent, sdkMap, partnerIdMap, transaction, coinIn) => __awaiter(void 0, void 0, void 0, function* () {
+    if (quote.provider === QuoteProvider.CETUS) {
         return getSwapTransactionWrapper(QuoteProvider.CETUS, () => __awaiter(void 0, void 0, void 0, function* () {
             if (!coinIn) {
-                const allCoinsIn = yield getAllCoins(suiClient, address, quote.in.coinType);
+                const allCoinsIn = yield getAllCoins(suiGrpcClient, address, quote.in.coinType);
                 const mergeCoinIn = mergeAllCoins(quote.in.coinType, transaction, allCoinsIn);
                 [coinIn] = transaction.splitCoins(isSui(quote.in.coinType)
                     ? transaction.gas
-                    : transaction.object(mergeCoinIn.coinObjectId), [BigInt(quote.quote.amountIn.toString())]);
+                    : transaction.object(mergeCoinIn.objectId), [BigInt(quote.quote.amountIn.toString())]);
             }
             const coinOut = yield sdkMap[QuoteProvider.CETUS].routerSwap({
                 router: quote.quote,
@@ -93,11 +77,11 @@ export const getSwapTransaction = (suiClient, address, quote, slippagePercent, s
     else if (quote.provider === QuoteProvider.FLOWX) {
         return getSwapTransactionWrapper(QuoteProvider.FLOWX, () => __awaiter(void 0, void 0, void 0, function* () {
             if (!coinIn) {
-                const allCoinsIn = yield getAllCoins(suiClient, address, quote.in.coinType);
+                const allCoinsIn = yield getAllCoins(suiGrpcClient, address, quote.in.coinType);
                 const mergeCoinIn = mergeAllCoins(quote.in.coinType, transaction, allCoinsIn);
                 [coinIn] = transaction.splitCoins(isSui(quote.in.coinType)
                     ? transaction.gas
-                    : transaction.object(mergeCoinIn.coinObjectId), [BigInt(quote.quote.amountIn.toString())]);
+                    : transaction.object(mergeCoinIn.objectId), [BigInt(quote.quote.amountIn.toString())]);
             }
             const trade = new FlowXTradeBuilder("mainnet", quote.quote.routes)
                 .slippage((slippagePercent / 100) * 1e6)
@@ -105,7 +89,7 @@ export const getSwapTransaction = (suiClient, address, quote, slippagePercent, s
                 .build();
             const coinOut = yield trade.swap({
                 coinIn: coinIn,
-                client: suiClient,
+                client: createJsonRpcAdapter(suiGrpcClient),
                 tx: transaction,
             });
             return { transaction, coinOut: coinOut };

package/utils/events.d.ts

@@ -1,4 +1,5 @@
-import { SuiEvent, SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
+import { SuiClientTypes } from "@mysten/sui/client";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 type TypeName = {
     name: string;
 };
@@ -25,8 +26,8 @@ export declare enum SuilendTransactionModule {
     Reserve = "reserve"
 }
 declare class TypedParamsSuiEvent<T> {
-    event: SuiEvent;
-    constructor(event: SuiEvent);
+    event: SuiClientTypes.Event;
+    constructor(event: SuiClientTypes.Event);
     params(): T;
     isType(module: SuilendTransactionModule, eventType: SuilendEventType): boolean;
 }
@@ -171,6 +172,6 @@ export declare class ObligationDataEvent extends TypedParamsSuiEvent<{
     closable: boolean;
 }> {
 }
-export declare function getEvents(client: SuiJsonRpcClient, digest: string): Promise<GenericSuilendEvent[]>;
-export declare function getRedeemEvent(client: SuiJsonRpcClient, digest: string): Promise<RedeemEvent | null>;
+export declare function getEvents(suiGrpcClient: SuiGrpcClient, digest: string): Promise<GenericSuilendEvent[]>;
+export declare function getRedeemEvent(suiGrpcClient: SuiGrpcClient, digest: string): Promise<RedeemEvent | null>;
 export {};

package/utils/events.js

@@ -31,10 +31,10 @@ class TypedParamsSuiEvent {
         this.event = event;
     }
     params() {
-        return this.event.parsedJson;
+        return this.event.json;
     }
     isType(module, eventType) {
-        return this.event.type.includes(`${module}::${eventType}`);
+        return this.event.eventType.includes(`${module}::${eventType}`);
     }
 }
 export class GenericSuilendEvent extends TypedParamsSuiEvent {
@@ -61,22 +61,25 @@ export class ClaimRewardEvent extends TypedParamsSuiEvent {
 }
 export class ObligationDataEvent extends TypedParamsSuiEvent {
 }
-export function getEvents(client, digest) {
+export function getEvents(suiGrpcClient, digest) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tx = yield client.getTransactionBlock({
+        const result = yield suiGrpcClient.getTransaction({
             digest,
-            options: { showEvents: true },
+            include: { events: true },
         });
+        const tx = result.$kind === "Transaction"
+            ? result.Transaction
+            : result.FailedTransaction;
         const events = [];
-        for (const event of tx.events || []) {
+        for (const event of (tx === null || tx === void 0 ? void 0 : tx.events) || []) {
             events.push(new GenericSuilendEvent(event));
         }
         return events;
     });
 }
-export function getRedeemEvent(client, digest) {
+export function getRedeemEvent(suiGrpcClient, digest) {
     return __awaiter(this, void 0, void 0, function* () {
-        const events = yield getEvents(client, digest);
+        const events = yield getEvents(suiGrpcClient, digest);
         for (const event of events) {
             if (event.isType(SuilendTransactionModule.LendingMarket, SuilendEventType.RedeemEvent)) {
                 return event;

package/utils/obligation.d.ts

@@ -1,8 +1,9 @@
-import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
+import { SuiGraphQLClient } from "@mysten/sui/graphql";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 import { Obligation } from "../_generated/suilend/obligation/structs";
 import { ParsedObligation } from "../parsers";
-export declare function fetchAllObligationsForMarketWithHandler(client: SuiJsonRpcClient, lendingMarketId: string, lendingMarketType: string, chunkHandler: (obligations: Obligation<string>[]) => Promise<void>): Promise<void>;
-export declare function fetchAllObligationsForMarket(client: SuiJsonRpcClient, lendingMarketId: string, lendingMarketType: string): Promise<Obligation<string>[]>;
+export declare function fetchAllObligationsForMarketWithHandler(suiGrpcClient: SuiGrpcClient, lendingMarketId: string, lendingMarketType: string, chunkHandler: (obligations: Obligation<string>[]) => Promise<void>): Promise<void>;
+export declare function fetchAllObligationsForMarket(suiGrpcClient: SuiGrpcClient, lendingMarketId: string, lendingMarketType: string): Promise<Obligation<string>[]>;
 export type FormattedObligationHistory = NonLiquidationHistoryEvent | LiquidationHistoryEvent;
 export type NonLiquidationHistoryEvent = {
     reserveId: string;
@@ -20,8 +21,8 @@ export type LiquidationHistoryEvent = {
     timestampMs: number;
     digest: string;
 };
-export declare function getObligationHistoryPage(client: SuiJsonRpcClient, obligationId: string, maxQuantity: number, cursor: string | null): Promise<{
-    cursor: string | null | undefined;
+export declare function getObligationHistoryPage(suiGraphQLClient: SuiGraphQLClient, obligationId: string, maxQuantity: number, cursor: string | null): Promise<{
+    cursor: string | null;
     history: FormattedObligationHistory[];
 }>;
 export declare const getWeightedBorrowsUsd: (obligation: ParsedObligation) => BigNumber;