@suilend/sdk 3.0.2 → 3.0.4

package/margin/utils/index.d.ts

@@ -1,27 +1,27 @@
-import { BcsType, TypeTag, BcsStruct, BcsEnum, BcsTuple } from '@mysten/sui/bcs';
-import { TransactionArgument } from '@mysten/sui/transactions';
-import { ClientWithCoreApi, SuiClientTypes } from '@mysten/sui/client';
+import { BcsEnum, BcsStruct, BcsTuple, BcsType, TypeTag } from "@mysten/sui/bcs";
+import { ClientWithCoreApi, SuiClientTypes } from "@mysten/sui/client";
+import { TransactionArgument } from "@mysten/sui/transactions";
 export type RawTransactionArgument<T> = T | TransactionArgument;
-export interface GetOptions<Include extends Omit<SuiClientTypes.ObjectInclude, 'content'> = {}> extends SuiClientTypes.GetObjectOptions<Include> {
+export interface GetOptions<Include extends Omit<SuiClientTypes.ObjectInclude, "content"> = {}> extends SuiClientTypes.GetObjectOptions<Include> {
     client: ClientWithCoreApi;
 }
-export interface GetManyOptions<Include extends Omit<SuiClientTypes.ObjectInclude, 'content'> = {}> extends SuiClientTypes.GetObjectsOptions<Include> {
+export interface GetManyOptions<Include extends Omit<SuiClientTypes.ObjectInclude, "content"> = {}> extends SuiClientTypes.GetObjectsOptions<Include> {
     client: ClientWithCoreApi;
 }
 export declare function getPureBcsSchema(typeTag: string | TypeTag): BcsType<any> | null;
 export declare function normalizeMoveArguments(args: unknown[] | object, argTypes: readonly (string | null)[], parameterNames?: string[]): TransactionArgument[];
 export declare class MoveStruct<T extends Record<string, BcsType<any>>, const Name extends string = string> extends BcsStruct<T, Name> {
-    get<Include extends Omit<SuiClientTypes.ObjectInclude, 'content' | 'json'> = {}>({ objectId, ...options }: GetOptions<Include>): Promise<SuiClientTypes.Object<Include & {
+    get<Include extends Omit<SuiClientTypes.ObjectInclude, "content" | "json"> = {}>({ objectId, ...options }: GetOptions<Include>): Promise<SuiClientTypes.Object<Include & {
         content: true;
         json: true;
     }> & {
-        json: BcsStruct<T>['$inferType'];
+        json: BcsStruct<T>["$inferType"];
     }>;
-    getMany<Include extends Omit<SuiClientTypes.ObjectInclude, 'content' | 'json'> = {}>({ client, ...options }: GetManyOptions<Include>): Promise<Array<SuiClientTypes.Object<Include & {
+    getMany<Include extends Omit<SuiClientTypes.ObjectInclude, "content" | "json"> = {}>({ client, ...options }: GetManyOptions<Include>): Promise<Array<SuiClientTypes.Object<Include & {
         content: true;
         json: true;
     }> & {
-        json: BcsStruct<T>['$inferType'];
+        json: BcsStruct<T>["$inferType"];
     }>>;
 }
 export declare class MoveEnum<T extends Record<string, BcsType<any> | null>, const Name extends string> extends BcsEnum<T, Name> {

package/margin/utils/index.js

@@ -18,57 +18,60 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { bcs, TypeTagSerializer, BcsStruct, BcsEnum, BcsTuple, } from '@mysten/sui/bcs';
-import { normalizeSuiAddress } from '@mysten/sui/utils';
-import { isArgument } from '@mysten/sui/transactions';
-const MOVE_STDLIB_ADDRESS = normalizeSuiAddress('0x1');
-const SUI_FRAMEWORK_ADDRESS = normalizeSuiAddress('0x2');
+/* eslint-disable @typescript-eslint/no-empty-object-type */
+import { BcsEnum, BcsStruct, BcsTuple, TypeTagSerializer, bcs, } from "@mysten/sui/bcs";
+import { isArgument } from "@mysten/sui/transactions";
+import { normalizeSuiAddress } from "@mysten/sui/utils";
+const MOVE_STDLIB_ADDRESS = normalizeSuiAddress("0x1");
+const SUI_FRAMEWORK_ADDRESS = normalizeSuiAddress("0x2");
 export function getPureBcsSchema(typeTag) {
-    const parsedTag = typeof typeTag === 'string' ? TypeTagSerializer.parseFromStr(typeTag) : typeTag;
-    if ('u8' in parsedTag) {
+    const parsedTag = typeof typeTag === "string"
+        ? TypeTagSerializer.parseFromStr(typeTag)
+        : typeTag;
+    if ("u8" in parsedTag) {
         return bcs.U8;
     }
-    else if ('u16' in parsedTag) {
+    else if ("u16" in parsedTag) {
         return bcs.U16;
     }
-    else if ('u32' in parsedTag) {
+    else if ("u32" in parsedTag) {
         return bcs.U32;
     }
-    else if ('u64' in parsedTag) {
+    else if ("u64" in parsedTag) {
         return bcs.U64;
     }
-    else if ('u128' in parsedTag) {
+    else if ("u128" in parsedTag) {
         return bcs.U128;
     }
-    else if ('u256' in parsedTag) {
+    else if ("u256" in parsedTag) {
         return bcs.U256;
     }
-    else if ('address' in parsedTag) {
+    else if ("address" in parsedTag) {
         return bcs.Address;
     }
-    else if ('bool' in parsedTag) {
+    else if ("bool" in parsedTag) {
         return bcs.Bool;
     }
-    else if ('vector' in parsedTag) {
+    else if ("vector" in parsedTag) {
         const type = getPureBcsSchema(parsedTag.vector);
         return type ? bcs.vector(type) : null;
     }
-    else if ('struct' in parsedTag) {
+    else if ("struct" in parsedTag) {
         const structTag = parsedTag.struct;
         const pkg = normalizeSuiAddress(structTag.address);
         if (pkg === MOVE_STDLIB_ADDRESS) {
-            if ((structTag.module === 'ascii' || structTag.module === 'string') &&
-                structTag.name === 'String') {
+            if ((structTag.module === "ascii" || structTag.module === "string") &&
+                structTag.name === "String") {
                 return bcs.String;
             }
-            if (structTag.module === 'option' && structTag.name === 'Option') {
+            if (structTag.module === "option" && structTag.name === "Option") {
                 const type = getPureBcsSchema(structTag.typeParams[0]);
                 return type ? bcs.option(type) : null;
             }
         }
         if (pkg === SUI_FRAMEWORK_ADDRESS &&
-            structTag.module === 'object' &&
-            (structTag.name === 'ID' || structTag.name === 'UID')) {
+            structTag.module === "object" &&
+            (structTag.name === "ID" || structTag.name === "UID")) {
             return bcs.Address;
         }
     }
@@ -82,19 +85,19 @@ export function normalizeMoveArguments(args, argTypes, parameterNames) {
     const normalizedArgs = [];
     let index = 0;
     for (const [i, argType] of argTypes.entries()) {
-        if (argType === '0x2::clock::Clock') {
+        if (argType === "0x2::clock::Clock") {
             normalizedArgs.push((tx) => tx.object.clock());
             continue;
         }
-        if (argType === '0x2::random::Random') {
+        if (argType === "0x2::random::Random") {
             normalizedArgs.push((tx) => tx.object.random());
             continue;
         }
-        if (argType === '0x2::deny_list::DenyList') {
+        if (argType === "0x2::deny_list::DenyList") {
             normalizedArgs.push((tx) => tx.object.denyList());
             continue;
         }
-        if (argType === '0x3::sui_system::SuiSystemState') {
+        if (argType === "0x3::sui_system::SuiSystemState") {
             normalizedArgs.push((tx) => tx.object.system());
             continue;
         }
@@ -116,7 +119,7 @@ export function normalizeMoveArguments(args, argTypes, parameterNames) {
             }
         }
         index += 1;
-        if (typeof arg === 'function' || isArgument(arg)) {
+        if (typeof arg === "function" || isArgument(arg)) {
             normalizedArgs.push(arg);
             continue;
         }
@@ -127,7 +130,7 @@ export function normalizeMoveArguments(args, argTypes, parameterNames) {
             normalizedArgs.push((tx) => tx.pure(bytes));
             continue;
         }
-        else if (typeof arg === 'string') {
+        else if (typeof arg === "string") {
             normalizedArgs.push((tx) => tx.object(arg));
             continue;
         }
@@ -161,10 +164,10 @@ export class MoveEnum extends BcsEnum {
 export class MoveTuple extends BcsTuple {
 }
 function stringify(val) {
-    if (typeof val === 'object') {
+    if (typeof val === "object") {
         return JSON.stringify(val, (val) => val);
     }
-    if (typeof val === 'bigint') {
+    if (typeof val === "bigint") {
         return val.toString();
     }
     return val;

package/package.json

@@ -1 +1 @@
-{"name":"@suilend/sdk","version":"3.0.2","private":false,"description":"A TypeScript SDK for interacting with the Suilend program","author":"Suilend","license":"MIT","main":"./index.js","exports":{".":"./index.js","./client":"./client.js","./mmt":"./mmt.js","./strategies":"./strategies.js","./parsers/apiReserveAssetDataEvent":"./parsers/apiReserveAssetDataEvent.js","./parsers/obligation":"./parsers/obligation.js","./parsers":"./parsers/index.js","./parsers/lendingMarket":"./parsers/lendingMarket.js","./parsers/rateLimiter":"./parsers/rateLimiter.js","./parsers/reserve":"./parsers/reserve.js","./swap/transaction":"./swap/transaction.js","./swap/quote":"./swap/quote.js","./swap":"./swap/index.js","./utils/simulate":"./utils/simulate.js","./utils/events":"./utils/events.js","./utils/obligation":"./utils/obligation.js","./utils":"./utils/index.js","./lib/constants":"./lib/constants.js","./lib/pythAdapter":"./lib/pythAdapter.js","./lib/transactions":"./lib/transactions.js","./lib/types":"./lib/types.js","./lib/initialize":"./lib/initialize.js","./lib":"./lib/index.js","./lib/liquidityMining":"./lib/liquidityMining.js","./lib/strategyOwnerCap":"./lib/strategyOwnerCap.js","./lib/pyth":"./lib/pyth.js","./api/events":"./api/events.js","./api":"./api/index.js","./margin":"./margin/index.js","./margin/utils":"./margin/utils/index.js","./margin/margin/market":"./margin/margin/market.js","./margin/margin/version":"./margin/margin/version.js","./margin/margin/router":"./margin/margin/router.js","./margin/margin/admin_cap":"./margin/margin/admin_cap.js","./margin/margin/permissions":"./margin/margin/permissions.js","./margin/margin/position":"./margin/margin/position.js","./_generated/suilend":"./_generated/suilend/index.js","./_generated/_framework/util":"./_generated/_framework/util.js","./_generated/_framework/reified":"./_generated/_framework/reified.js","./_generated/_framework/vector":"./_generated/_framework/vector.js","./_generated/suilend/obligation/structs":"./_generated/suilend/obligation/structs.js","./_generated/suilend/decimal/structs":"./_generated/suilend/decimal/structs.js","./_generated/suilend/lending-market/functions":"./_generated/suilend/lending-market/functions.js","./_generated/suilend/lending-market/structs":"./_generated/suilend/lending-market/structs.js","./_generated/suilend/reserve-config/functions":"./_generated/suilend/reserve-config/functions.js","./_generated/suilend/reserve-config/structs":"./_generated/suilend/reserve-config/structs.js","./_generated/suilend/liquidity-mining/structs":"./_generated/suilend/liquidity-mining/structs.js","./_generated/suilend/cell/structs":"./_generated/suilend/cell/structs.js","./_generated/suilend/rate-limiter/functions":"./_generated/suilend/rate-limiter/functions.js","./_generated/suilend/rate-limiter/structs":"./_generated/suilend/rate-limiter/structs.js","./_generated/suilend/reserve/structs":"./_generated/suilend/reserve/structs.js","./_generated/suilend/lending-market-registry/functions":"./_generated/suilend/lending-market-registry/functions.js","./margin/margin/deps/sui/vec_set":"./margin/margin/deps/sui/vec_set.js","./margin/margin/deps/std/type_name":"./margin/margin/deps/std/type_name.js","./margin/margin/deps/suilend/lending_market":"./margin/margin/deps/suilend/lending_market.js","./_generated/_dependencies/source/0x2":"./_generated/_dependencies/source/0x2/index.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/index.js","./_generated/_dependencies/source/0x1":"./_generated/_dependencies/source/0x1/index.js","./_generated/_dependencies/source/0x2/object-table/structs":"./_generated/_dependencies/source/0x2/object-table/structs.js","./_generated/_dependencies/source/0x2/balance/structs":"./_generated/_dependencies/source/0x2/balance/structs.js","./_generated/_dependencies/source/0x2/object/structs":"./_generated/_dependencies/source/0x2/object/structs.js","./_generated/_dependencies/source/0x2/bag/structs":"./_generated/_dependencies/source/0x2/bag/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/i64/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/i64/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-feed/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-feed/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs.js","./_generated/_dependencies/source/0x1/ascii/structs":"./_generated/_dependencies/source/0x1/ascii/structs.js","./_generated/_dependencies/source/0x1/option/structs":"./_generated/_dependencies/source/0x1/option/structs.js","./_generated/_dependencies/source/0x1/type-name/structs":"./_generated/_dependencies/source/0x1/type-name/structs.js"},"types":"./index.js","scripts":{"build":"rm -rf ./dist && bun tsc","eslint":"eslint --fix src/","prettier":"prettier --write src/","lint":"bun eslint && bun prettier && bun tsc --noEmit","release":"bun run build && bun ./release.js && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/suilend/suilend-fe-public.git"},"bugs":{"url":"https://github.com/suilend/suilend-fe-public/issues"},"dependencies":{"@bluefin-exchange/bluefin7k-aggregator-sdk":"^6.0.0","@cetusprotocol/aggregator-sdk":"^1.5.3","@flowx-finance/sdk":"^1.15.0","@suilend/springsui-sdk":"^3.0.1","aftermath-ts-sdk":"^2.0.0","bignumber.js":"^9.1.2","bn.js":"^5.2.2","crypto-js":"^4.2.0","lodash":"^4.17.21","p-limit":"3.1.0","uuid":"^11.0.3"},"devDependencies":{"@types/bn.js":"^5.2.0","@types/lodash":"^4.17.20","ts-node":"^10.9.2"},"peerDependencies":{"@mysten/bcs":"2.0.1","@mysten/sui":"2.15.0","@suilend/sui-fe":"^3.0.1","@pythnetwork/pyth-sui-js":"2.2.0"},"overrides":{"chalk":"5.3.0","strip-ansi":"7.1.0","color-convert":"2.0.1","color-name":"1.1.4","is-core-module":"2.13.1","error-ex":"1.3.2","has-ansi":"5.0.1","axios":"<=1.11.0"}}
+{"name":"@suilend/sdk","version":"3.0.4","private":false,"description":"A TypeScript SDK for interacting with the Suilend program","author":"Suilend","license":"MIT","main":"./index.js","exports":{".":"./index.js","./client":"./client.js","./mmt":"./mmt.js","./strategies":"./strategies.js","./parsers/apiReserveAssetDataEvent":"./parsers/apiReserveAssetDataEvent.js","./parsers/obligation":"./parsers/obligation.js","./parsers":"./parsers/index.js","./parsers/lendingMarket":"./parsers/lendingMarket.js","./parsers/rateLimiter":"./parsers/rateLimiter.js","./parsers/reserve":"./parsers/reserve.js","./swap/transaction":"./swap/transaction.js","./swap/quote":"./swap/quote.js","./swap":"./swap/index.js","./utils/simulate":"./utils/simulate.js","./utils/events":"./utils/events.js","./utils/obligation":"./utils/obligation.js","./utils":"./utils/index.js","./lib/constants":"./lib/constants.js","./lib/pythAdapter":"./lib/pythAdapter.js","./lib/transactions":"./lib/transactions.js","./lib/types":"./lib/types.js","./lib/initialize":"./lib/initialize.js","./lib":"./lib/index.js","./lib/liquidityMining":"./lib/liquidityMining.js","./lib/strategyOwnerCap":"./lib/strategyOwnerCap.js","./lib/pyth":"./lib/pyth.js","./api/events":"./api/events.js","./api":"./api/index.js","./margin":"./margin/index.js","./margin/utils":"./margin/utils/index.js","./margin/margin/market":"./margin/margin/market.js","./margin/margin/version":"./margin/margin/version.js","./margin/margin/router":"./margin/margin/router.js","./margin/margin/admin_cap":"./margin/margin/admin_cap.js","./margin/margin/permissions":"./margin/margin/permissions.js","./margin/margin/position":"./margin/margin/position.js","./_generated/suilend":"./_generated/suilend/index.js","./_generated/_framework/util":"./_generated/_framework/util.js","./_generated/_framework/reified":"./_generated/_framework/reified.js","./_generated/_framework/vector":"./_generated/_framework/vector.js","./_generated/suilend/obligation/structs":"./_generated/suilend/obligation/structs.js","./_generated/suilend/decimal/structs":"./_generated/suilend/decimal/structs.js","./_generated/suilend/lending-market/functions":"./_generated/suilend/lending-market/functions.js","./_generated/suilend/lending-market/structs":"./_generated/suilend/lending-market/structs.js","./_generated/suilend/reserve-config/functions":"./_generated/suilend/reserve-config/functions.js","./_generated/suilend/reserve-config/structs":"./_generated/suilend/reserve-config/structs.js","./_generated/suilend/liquidity-mining/structs":"./_generated/suilend/liquidity-mining/structs.js","./_generated/suilend/cell/structs":"./_generated/suilend/cell/structs.js","./_generated/suilend/rate-limiter/functions":"./_generated/suilend/rate-limiter/functions.js","./_generated/suilend/rate-limiter/structs":"./_generated/suilend/rate-limiter/structs.js","./_generated/suilend/reserve/structs":"./_generated/suilend/reserve/structs.js","./_generated/suilend/lending-market-registry/functions":"./_generated/suilend/lending-market-registry/functions.js","./margin/margin/deps/sui/vec_set":"./margin/margin/deps/sui/vec_set.js","./margin/margin/deps/std/type_name":"./margin/margin/deps/std/type_name.js","./margin/margin/deps/suilend/lending_market":"./margin/margin/deps/suilend/lending_market.js","./_generated/_dependencies/source/0x2":"./_generated/_dependencies/source/0x2/index.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/index.js","./_generated/_dependencies/source/0x1":"./_generated/_dependencies/source/0x1/index.js","./_generated/_dependencies/source/0x2/object-table/structs":"./_generated/_dependencies/source/0x2/object-table/structs.js","./_generated/_dependencies/source/0x2/balance/structs":"./_generated/_dependencies/source/0x2/balance/structs.js","./_generated/_dependencies/source/0x2/object/structs":"./_generated/_dependencies/source/0x2/object/structs.js","./_generated/_dependencies/source/0x2/bag/structs":"./_generated/_dependencies/source/0x2/bag/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/i64/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/i64/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-feed/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-feed/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs.js","./_generated/_dependencies/source/0x1/ascii/structs":"./_generated/_dependencies/source/0x1/ascii/structs.js","./_generated/_dependencies/source/0x1/option/structs":"./_generated/_dependencies/source/0x1/option/structs.js","./_generated/_dependencies/source/0x1/type-name/structs":"./_generated/_dependencies/source/0x1/type-name/structs.js"},"types":"./index.js","scripts":{"build":"rm -rf ./dist && bun tsc","eslint":"eslint --fix src/","prettier":"prettier --write src/","lint":"bun eslint && bun prettier && bun tsc --noEmit","release":"bun run build && bun ./release.js && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/suilend/suilend-fe-public.git"},"bugs":{"url":"https://github.com/suilend/suilend-fe-public/issues"},"dependencies":{"@bluefin-exchange/bluefin7k-aggregator-sdk":"^7.3.0","@cetusprotocol/aggregator-sdk":"^1.5.7","@flowx-finance/sdk":"^2.1.0","@suilend/springsui-sdk":"^3.0.4","bignumber.js":"^9.1.2","bn.js":"^5.2.2","crypto-js":"^4.2.0","lodash":"^4.17.21","p-limit":"3.1.0","uuid":"^11.0.3"},"devDependencies":{"@types/bn.js":"^5.2.0","@types/lodash":"^4.17.20","ts-node":"^10.9.2"},"peerDependencies":{"@mysten/bcs":"2.0.1","@mysten/sui":"2.17.0","@suilend/sui-fe":"^3.0.7","@pythnetwork/pyth-sui-js":"2.2.0"},"overrides":{"chalk":"5.3.0","strip-ansi":"7.1.0","color-convert":"2.0.1","color-name":"1.1.4","is-core-module":"2.13.1","error-ex":"1.3.2","has-ansi":"5.0.1","axios":"<=1.11.0"}}

package/strategies.js

@@ -14,7 +14,7 @@ import BigNumber from "bignumber.js";
 import { BN } from "bn.js";
 import { cloneDeep } from "lodash";
 import { LstClient, SPRING_SUI_UPGRADE_CAP_ID, getLatestPackageId as getLatestSpringSuiPackageId, } from "@suilend/springsui-sdk";
-import { API_URL, MAX_U64, MS_PER_YEAR, NORMALIZED_AUSD_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_xBTC_COINTYPE, getAllCoins, isSui, mergeAllCoins, } from "@suilend/sui-fe";
+import { API_URL, MAX_U64, MS_PER_YEAR, NORMALIZED_AUSD_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_xBTC_COINTYPE, getSpendableCoin, isSui, } from "@suilend/sui-fe";
 import { getNetAprPercent } from "./lib";
 import { getRewardsMap } from "./lib/liquidityMining";
 import { STRATEGY_TYPE_INFO_MAP, StrategyType, strategyBorrow, strategyClaimRewardsAndMergeCoins, strategyDeposit, strategyWithdraw, } from "./lib/strategyOwnerCap";
@@ -48,7 +48,7 @@ export const STRATEGY_TYPE_FLASH_LOAN_OBJ_MAP = {
         poolId: "0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9", // suiUSDT-USDC 0.001% https://app.mmt.finance/liquidity/0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9
         coinTypeA: NORMALIZED_suiUSDT_COINTYPE,
         coinTypeB: NORMALIZED_USDC_COINTYPE,
-        borrowA: false,
+        borrowA: false, // Requires swap from USDT to USDsui
         feePercent: 0.001,
     },
     [StrategyType.eEARN_USDC_LOOPING]: {
@@ -56,7 +56,7 @@ export const STRATEGY_TYPE_FLASH_LOAN_OBJ_MAP = {
         poolId: "0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9", // suiUSDT-USDC 0.001% https://app.mmt.finance/liquidity/0x737ec6a4d3ed0c7e6cc18d8ba04e7ffd4806b726c97efd89867597368c4d06a9
         coinTypeA: NORMALIZED_suiUSDT_COINTYPE,
         coinTypeB: NORMALIZED_USDC_COINTYPE,
-        borrowA: false,
+        borrowA: false, // Requires swap from USDC to eEARN
         feePercent: 0.001,
     },
     [StrategyType.AUSD_sSUI_SUI_LOOPING]: {
@@ -1776,14 +1776,10 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
     // 1.2) LST
     else if (deposit.coinType === ((_c = depositReserves.lst) === null || _c === void 0 ? void 0 : _c.coinType)) {
         // 1.2.1) Split coins
-        const allCoinsLst = yield getAllCoins(suiGrpcClient, _address, depositReserves.lst.coinType);
-        const mergeCoinLst = mergeAllCoins(depositReserves.lst.coinType, transaction, allCoinsLst);
-        const lstCoin = transaction.splitCoins(transaction.object(mergeCoinLst.objectId), [
-            BigInt(deposit.depositedAmount
-                .times(10 ** LST_DECIMALS)
-                .integerValue(BigNumber.ROUND_DOWN)
-                .toString()),
-        ]);
+        const lstCoin = yield getSpendableCoin(suiGrpcClient, _address, depositReserves.lst.coinType, deposit.depositedAmount
+            .times(10 ** LST_DECIMALS)
+            .integerValue(BigNumber.ROUND_DOWN)
+            .toString(), transaction);
         // 1.2.2) Deposit LST (1x exposure)
         strategyDeposit(strategyType, lstCoin, depositReserves.lst.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserves.lst.coinType), transaction);
         // 1.2.3) Update state
@@ -1793,14 +1789,10 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
     else {
         const otherReserve = reserveMap[deposit.coinType];
         // 1.3.1) Split coins
-        const allCoinsOther = yield getAllCoins(suiGrpcClient, _address, otherReserve.coinType);
-        const mergeCoinOther = mergeAllCoins(otherReserve.coinType, transaction, allCoinsOther);
-        const otherCoin = transaction.splitCoins(transaction.object(mergeCoinOther.objectId), [
-            BigInt(deposit.depositedAmount
-                .times(10 ** otherReserve.token.decimals)
-                .integerValue(BigNumber.ROUND_DOWN)
-                .toString()),
-        ]);
+        const otherCoin = yield getSpendableCoin(suiGrpcClient, _address, otherReserve.coinType, deposit.depositedAmount
+            .times(10 ** otherReserve.token.decimals)
+            .integerValue(BigNumber.ROUND_DOWN)
+            .toString(), transaction);
         // 1.3.2) If the deposit coin is the same as the borrow coin, swap to base first
         if (deposit.coinType === borrowReserve.coinType && depositReserve) {
             const routers = yield cetusSdk.findRouters({
@@ -2359,7 +2351,7 @@ export const strategyDepositAdjustWithdrawTx = (
 reserveMap, 
 // Strategy
 lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _address, strategyOwnerCapId, obligationId, _deposits, _borrowedAmount, flashLoanBorrowedAmount, transaction, dryRunTransaction) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const strategyInfo = STRATEGY_TYPE_INFO_MAP[strategyType];
     const lst = strategyInfo.depositLstCoinType !== undefined
         ? lstMap[strategyInfo.depositLstCoinType]
@@ -2385,12 +2377,23 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
     let borrowedAmount = _borrowedAmount;
     // 1) Flash loan base/LST
     const flashLoanObj = STRATEGY_TYPE_FLASH_LOAN_OBJ_MAP[strategyType];
-    if (depositReserve.coinType === ((_b = depositReserves.lst) === null || _b === void 0 ? void 0 : _b.coinType)) {
+    const flashLoanCoinType = flashLoanObj.borrowA
+        ? flashLoanObj.coinTypeA
+        : flashLoanObj.coinTypeB;
+    const flashLoanCoinReserve = (_b = reserveMap[flashLoanCoinType]) !== null && _b !== void 0 ? _b : depositReserve;
+    const needsFlashLoanCoinSwap = flashLoanCoinType !== depositReserve.coinType;
+    if (depositReserve.coinType === ((_c = depositReserves.lst) === null || _c === void 0 ? void 0 : _c.coinType)) {
         // TODO: Account for LST mint fees
         flashLoanBorrowedAmount = flashLoanBorrowedAmount
-            .times((_c = lst === null || lst === void 0 ? void 0 : lst.lstToSuiExchangeRate) !== null && _c !== void 0 ? _c : 1)
+            .times((_d = lst === null || lst === void 0 ? void 0 : lst.lstToSuiExchangeRate) !== null && _d !== void 0 ? _d : 1)
             .decimalPlaces(SUI_DECIMALS, BigNumber.ROUND_UP);
     }
+    let flashLoanBorrowAmountForLoan = flashLoanBorrowedAmount;
+    if (needsFlashLoanCoinSwap) {
+        flashLoanBorrowAmountForLoan = flashLoanBorrowAmountForLoan
+            .times(1.01) // Buffer for swap slippage
+            .decimalPlaces(flashLoanCoinReserve.token.decimals, BigNumber.ROUND_UP);
+    }
     let borrowedBalanceA, borrowedBalanceB, receipt;
     if (flashLoanObj.provider === StrategyFlashLoanProvider.MMT) {
         [borrowedBalanceA, borrowedBalanceB, receipt] = transaction.moveCall({
@@ -2399,9 +2402,9 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
             arguments: [
                 transaction.object(flashLoanObj.poolId),
                 transaction.pure.u64(flashLoanObj.borrowA
-                    ? flashLoanBorrowedAmount
+                    ? flashLoanBorrowAmountForLoan
                         .times(10 **
-                        (depositReserve.coinType === ((_d = depositReserves.lst) === null || _d === void 0 ? void 0 : _d.coinType)
+                        (depositReserve.coinType === ((_e = depositReserves.lst) === null || _e === void 0 ? void 0 : _e.coinType)
                             ? SUI_DECIMALS
                             : depositReserve.token.decimals))
                         .integerValue(BigNumber.ROUND_DOWN)
@@ -2409,11 +2412,11 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
                     : 0),
                 transaction.pure.u64(flashLoanObj.borrowA
                     ? 0
-                    : flashLoanBorrowedAmount
+                    : flashLoanBorrowAmountForLoan
                         .times(10 **
-                        (depositReserve.coinType === ((_e = depositReserves.lst) === null || _e === void 0 ? void 0 : _e.coinType)
+                        (depositReserve.coinType === ((_f = depositReserves.lst) === null || _f === void 0 ? void 0 : _f.coinType)
                             ? SUI_DECIMALS
-                            : depositReserve.token.decimals))
+                            : flashLoanCoinReserve.token.decimals))
                         .integerValue(BigNumber.ROUND_DOWN)
                         .toString()),
                 transaction.object(MMT_VERSION_OBJECT_ID),
@@ -2426,9 +2429,9 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
     // 2) Deposit additional (to get back up to 100% health, so the user can then unloop back down to the max leverage shown in the UI)
     // 2.1) Deposit
     let depositedAmount = flashLoanBorrowedAmount;
-    if (depositReserve.coinType === ((_f = depositReserves.lst) === null || _f === void 0 ? void 0 : _f.coinType))
+    if (depositReserve.coinType === ((_g = depositReserves.lst) === null || _g === void 0 ? void 0 : _g.coinType))
         depositedAmount = new BigNumber(depositedAmount.minus(getStrategyLstMintFee(lstMap, depositReserve.coinType, depositedAmount)))
-            .times((_g = lst === null || lst === void 0 ? void 0 : lst.suiToLstExchangeRate) !== null && _g !== void 0 ? _g : 1)
+            .times((_h = lst === null || lst === void 0 ? void 0 : lst.suiToLstExchangeRate) !== null && _h !== void 0 ? _h : 1)
             .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_DOWN);
     let flashLoanBorrowedCoin = transaction.moveCall({
         target: "0x2::coin::from_balance",
@@ -2437,8 +2440,34 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
         ],
         arguments: [flashLoanObj.borrowA ? borrowedBalanceA : borrowedBalanceB],
     });
-    if (depositReserve.coinType === ((_h = depositReserves.lst) === null || _h === void 0 ? void 0 : _h.coinType))
+    if (depositReserve.coinType === ((_j = depositReserves.lst) === null || _j === void 0 ? void 0 : _j.coinType))
         flashLoanBorrowedCoin = lst.client.mint(transaction, flashLoanBorrowedCoin);
+    if (needsFlashLoanCoinSwap) {
+        const depositRouters = yield cetusSdk.findRouters({
+            from: flashLoanCoinType,
+            target: depositReserve.coinType,
+            amount: new BN(flashLoanBorrowAmountForLoan
+                .times(10 ** flashLoanCoinReserve.token.decimals)
+                .integerValue(BigNumber.ROUND_DOWN)
+                .toString()),
+            byAmountIn: true,
+            splitCount: 0,
+        });
+        if (!depositRouters)
+            throw new Error("No swap quote found");
+        try {
+            flashLoanBorrowedCoin = (yield cetusSdk.fixableRouterSwapV3({
+                router: depositRouters,
+                inputCoin: flashLoanBorrowedCoin,
+                slippage: 1 / 100,
+                txb: transaction,
+                partner: cetusPartnerId,
+            }));
+        }
+        catch (err) {
+            throw new Error("No swap quote found");
+        }
+    }
     strategyDeposit(strategyType, flashLoanBorrowedCoin, depositReserve.coinType, strategyOwnerCapId, suilendClient.findReserveArrayIndex(depositReserve.coinType), transaction);
     // 2.2) Update state
     deposits = addOrInsertStrategyDeposit(deposits, {
@@ -2463,14 +2492,18 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
     const dryRunResults = yield dryRunTransaction(transaction);
     const flashLoanRepayAmount = new BigNumber(bcs
         .u64()
-        .parse((_o = (_m = (_l = (_k = (_j = dryRunResults.commandResults) === null || _j === void 0 ? void 0 : _j[receiptDebts.Result]) === null || _k === void 0 ? void 0 : _k.returnValues) === null || _l === void 0 ? void 0 : _l[flashLoanObj.borrowA ? 0 : 1]) === null || _m === void 0 ? void 0 : _m.bcs) !== null && _o !== void 0 ? _o : new Uint8Array([0])))
-        .div(10 ** depositReserve.token.decimals)
-        .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_UP);
+        .parse((_p = (_o = (_m = (_l = (_k = dryRunResults.commandResults) === null || _k === void 0 ? void 0 : _k[receiptDebts.Result]) === null || _l === void 0 ? void 0 : _l.returnValues) === null || _m === void 0 ? void 0 : _m[flashLoanObj.borrowA ? 0 : 1]) === null || _o === void 0 ? void 0 : _o.bcs) !== null && _p !== void 0 ? _p : new Uint8Array([0])))
+        .div(10 ** flashLoanCoinReserve.token.decimals)
+        .decimalPlaces(flashLoanCoinReserve.token.decimals, BigNumber.ROUND_UP);
     // 4.1) Withdraw additional + fee
     let withdrawnAmount = flashLoanRepayAmount;
-    if (depositReserve.coinType === ((_p = depositReserves.lst) === null || _p === void 0 ? void 0 : _p.coinType))
+    if (needsFlashLoanCoinSwap)
+        withdrawnAmount = flashLoanRepayAmount
+            .times(1.01) // Buffer for swap slippage
+            .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_UP);
+    else if (depositReserve.coinType === ((_q = depositReserves.lst) === null || _q === void 0 ? void 0 : _q.coinType))
         withdrawnAmount = withdrawnAmount
-            .div(1 - +((_q = lst === null || lst === void 0 ? void 0 : lst.redeemFeePercent) !== null && _q !== void 0 ? _q : 0) / 100) // Potential rounding issue (max 1 MIST)
+            .div(1 - +((_r = lst === null || lst === void 0 ? void 0 : lst.redeemFeePercent) !== null && _r !== void 0 ? _r : 0) / 100) // Potential rounding issue (max 1 MIST)
             .decimalPlaces(depositReserve.token.decimals, BigNumber.ROUND_UP);
     const { deposits: newDeposits2, borrowedAmount: newBorrowedAmount2, transaction: newTransaction2, withdrawnCoin, } = yield strategyWithdrawTx(reserveMap, lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _address, strategyOwnerCapId, obligationId, deposits, borrowedAmount, {
         coinType: depositReserve.coinType,
@@ -2484,8 +2517,34 @@ lstMap, strategyType, suiGrpcClient, suilendClient, cetusSdk, cetusPartnerId, _a
     transaction = newTransaction2;
     // 4.3) Repay flash loan
     let flashLoanRepayCoin = withdrawnCoin;
-    if (depositReserve.coinType === ((_r = depositReserves.lst) === null || _r === void 0 ? void 0 : _r.coinType))
+    if (depositReserve.coinType === ((_s = depositReserves.lst) === null || _s === void 0 ? void 0 : _s.coinType))
         flashLoanRepayCoin = lst.client.redeem(transaction, flashLoanRepayCoin);
+    if (needsFlashLoanCoinSwap) {
+        const repayRouters = yield cetusSdk.findRouters({
+            from: depositReserve.coinType,
+            target: flashLoanCoinType,
+            amount: new BN(withdrawnAmount
+                .times(10 ** depositReserve.token.decimals)
+                .integerValue(BigNumber.ROUND_DOWN)
+                .toString()),
+            byAmountIn: true,
+            splitCount: 0,
+        });
+        if (!repayRouters)
+            throw new Error("No swap quote found");
+        try {
+            flashLoanRepayCoin = (yield cetusSdk.fixableRouterSwapV3({
+                router: repayRouters,
+                inputCoin: flashLoanRepayCoin,
+                slippage: 1 / 100,
+                txb: transaction,
+                partner: cetusPartnerId,
+            }));
+        }
+        catch (err) {
+            throw new Error("No swap quote found");
+        }
+    }
     const flashLoanRepayBalance = transaction.moveCall({
         target: "0x2::coin::into_balance",
         typeArguments: [

package/swap/transaction.js

@@ -9,8 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 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 { getSpendableCoin } from "@suilend/sui-fe";
 import { QuoteProvider } from "./quote";
 const getSwapTransactionWrapper = (provider, getSwapTransaction) => __awaiter(void 0, void 0, void 0, function* () {
     console.log(`[getSwapTransactionWrapper] fetching transaction for ${provider} quote`);
@@ -28,11 +27,7 @@ export const getSwapTransaction = (suiGrpcClient, address, quote, slippagePercen
     if (quote.provider === QuoteProvider.CETUS) {
         return getSwapTransactionWrapper(QuoteProvider.CETUS, () => __awaiter(void 0, void 0, void 0, function* () {
             if (!coinIn) {
-                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.objectId), [BigInt(quote.quote.amountIn.toString())]);
+                coinIn = yield getSpendableCoin(suiGrpcClient, address, quote.in.coinType, quote.quote.amountIn.toString(), transaction);
             }
             const coinOut = yield sdkMap[QuoteProvider.CETUS].routerSwap({
                 router: quote.quote,
@@ -77,11 +72,7 @@ export const getSwapTransaction = (suiGrpcClient, address, quote, slippagePercen
     else if (quote.provider === QuoteProvider.FLOWX) {
         return getSwapTransactionWrapper(QuoteProvider.FLOWX, () => __awaiter(void 0, void 0, void 0, function* () {
             if (!coinIn) {
-                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.objectId), [BigInt(quote.quote.amountIn.toString())]);
+                coinIn = yield getSpendableCoin(suiGrpcClient, address, quote.in.coinType, quote.quote.amountIn.toString(), transaction);
             }
             const trade = new FlowXTradeBuilder("mainnet", quote.quote.routes)
                 .slippage((slippagePercent / 100) * 1e6)
@@ -89,7 +80,7 @@ export const getSwapTransaction = (suiGrpcClient, address, quote, slippagePercen
                 .build();
             const coinOut = yield trade.swap({
                 coinIn: coinIn,
-                client: createJsonRpcAdapter(suiGrpcClient),
+                client: suiGrpcClient,
                 tx: transaction,
             });
             return { transaction, coinOut: coinOut };