@scallop-io/sui-scallop-sdk 1.3.4-alpha.3 → 1.3.4-alpha.5

package/src/models/scallopIndexer.ts

@@ -1,6 +1,6 @@
 import axios, { AxiosInstance } from 'axios';
-import { SDK_API_BASE_URL } from '../constants';
-import type {
+import { DEFAULT_CACHE_OPTIONS, SDK_API_BASE_URL } from 'src/constants';
+import {
   Market,
   MarketPools,
   MarketPool,
@@ -20,9 +20,8 @@ import type {
   BorrowIncentivePoolPoints,
   SupportBorrowIncentiveRewardCoins,
   ScallopIndexerInstanceParams,
-} from '../types';
+} from 'src/types';
 import { ScallopCache } from './scallopCache';
-import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import { SuiKit } from '@scallop-io/sui-kit';
 import { queryKeys } from 'src/constants';
 

package/src/models/scallopQuery.ts

@@ -1,5 +1,10 @@
 import { SuiKit } from '@scallop-io/sui-kit';
-import { ADDRESSES_ID, SUPPORT_POOLS, SUPPORT_SPOOLS } from '../constants';
+import {
+  ADDRESSES_ID,
+  SUPPORT_POOLS,
+  SUPPORT_SPOOLS,
+  DEFAULT_CACHE_OPTIONS,
+} from 'src/constants';
 import {
   queryMarket,
   getObligations,
@@ -34,7 +39,7 @@ import {
   getFlashLoanFees,
   getVeSca,
   getBorrowIncentivePools,
-} from '../queries';
+} from 'src/queries';
 import {
   ScallopQueryParams,
   SupportStakeMarketCoins,
@@ -50,12 +55,11 @@ import {
   MarketPool,
   CoinPrices,
   MarketPools,
-} from '../types';
+} from 'src/types';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
-import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import { SuiObjectData } from '@mysten/sui/client';
 import {
   getSCoinAmount,
@@ -64,9 +68,12 @@ import {
   getSCoinTotalSupply,
 } from 'src/queries/sCoinQuery';
 import { normalizeSuiAddress } from '@mysten/sui/utils';
-import { getSupplyLimit } from 'src/queries/supplyLimit';
+import {
+  getSupplyLimit,
+  getIsolatedAssets,
+  isIsolatedAsset,
+} from 'src/queries';
 import { withIndexerFallback } from 'src/utils/indexer';
-import { getIsolatedAssets, isIsolatedAsset } from 'src/queries/isolatedAsset';
 import { newSuiKit } from './suiKit';
 
 /**

package/src/models/scallopUtils.ts

@@ -21,8 +21,8 @@ import {
   COIN_GECKGO_IDS,
   POOL_ADDRESSES,
   sCoinTypeToName,
-} from '../constants';
-import { getPythPrices, queryObligation } from '../queries';
+} from 'src/constants';
+import { getPythPrices, queryObligation } from 'src/queries';
 import {
   parseDataFromPythPriceFeed,
   isMarketCoin,
@@ -30,11 +30,15 @@ import {
   findClosestUnlockRound,
   isSuiBridgeAsset,
   isWormholeAsset,
-} from '../utils';
-import { PYTH_ENDPOINTS, PYTH_FEED_IDS } from 'src/constants/pyth';
+} from 'src/utils';
+import {
+  DEFAULT_CACHE_OPTIONS,
+  PYTH_ENDPOINTS,
+  PYTH_FEED_IDS,
+  queryKeys,
+} from 'src/constants';
 import { ScallopCache } from './scallopCache';
-import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
-import type {
+import {
   ScallopUtilsParams,
   SupportCoins,
   SupportAssetCoins,
@@ -48,8 +52,7 @@ import type {
   SupportSuiBridgeCoins,
   SupportWormholeCoins,
   PoolAddressInfo,
-} from '../types';
-import { queryKeys } from 'src/constants';
+} from 'src/types';
 import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
 import { newSuiKit } from './suiKit';
 

package/src/models/suiKit.ts

@@ -1,5 +1,5 @@
 import { SuiKit, SuiKitParams } from '@scallop-io/sui-kit';
-import { RPC_PROVIDERS } from 'src/constants/rpc';
+import { RPC_PROVIDERS } from 'src/constants';
 
 export const newSuiKit = (params: SuiKitParams) => {
   return new SuiKit({

package/src/queries/borrowIncentiveQuery.ts

@@ -1,12 +1,12 @@
 import { normalizeStructTag } from '@mysten/sui/utils';
-import { SUPPORT_BORROW_INCENTIVE_POOLS } from '../constants';
+import { SUPPORT_BORROW_INCENTIVE_POOLS } from 'src/constants';
 import {
   parseOriginBorrowIncentivePoolData,
   parseOriginBorrowIncentiveAccountData,
   calculateBorrowIncentivePoolPointData,
-} from '../utils';
-import type { ScallopAddress, ScallopQuery, ScallopUtils } from '../models';
-import type {
+} from 'src/utils';
+import type { ScallopAddress, ScallopQuery, ScallopUtils } from 'src/models';
+import {
   BorrowIncentivePoolsQueryInterface,
   BorrowIncentivePools,
   BorrowIncentiveAccountsQueryInterface,
@@ -17,7 +17,7 @@ import type {
   OptionalKeys,
   BorrowIncentivePool,
   CoinPrices,
-} from '../types';
+} from 'src/types';
 import BigNumber from 'bignumber.js';
 
 /**

package/src/queries/coreQuery.ts

@@ -6,16 +6,16 @@ import {
   BORROW_FEE_PROTOCOL_ID,
   USE_TEST_ADDRESS,
   FlashLoanFeeObjectMap,
-} from '../constants';
+} from 'src/constants';
 import {
   parseOriginMarketPoolData,
   calculateMarketPoolData,
   parseOriginMarketCollateralData,
   calculateMarketCollateralData,
-} from '../utils';
+} from 'src/utils';
 import type { SuiObjectResponse, SuiObjectData } from '@mysten/sui/client';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
-import type { ScallopAddress, ScallopCache, ScallopQuery } from '../models';
+import type { ScallopAddress, ScallopCache, ScallopQuery } from 'src/models';
 import {
   Market,
   MarketPools,
@@ -36,9 +36,9 @@ import {
   SupportMarketCoins,
   OptionalKeys,
   CoinPrices,
-} from '../types';
+} from 'src/types';
 import BigNumber from 'bignumber.js';
-import { getSupplyLimit } from './supplyLimit';
+import { getSupplyLimit } from './supplyLimitQuery';
 // import { isIsolatedAsset } from './isolatedAsset';
 
 /**

package/src/queries/index.ts

@@ -1,8 +1,11 @@
-export * from './coreQuery';
-export * from './spoolQuery';
 export * from './borrowIncentiveQuery';
-export * from './priceQuery';
+export * from './coreQuery';
+export * from './isolatedAssetQuery';
+export * from './loyaltyProgramQuery';
 export * from './portfolioQuery';
-export * from './vescaQuery';
+export * from './priceQuery';
 export * from './referralQuery';
-export * from './loyaltyProgramQuery';
+export * from './sCoinQuery';
+export * from './spoolQuery';
+export * from './supplyLimitQuery';
+export * from './vescaQuery';

package/src/queries/portfolioQuery.ts

@@ -4,10 +4,10 @@ import {
   SUPPORT_COLLATERALS,
   SUPPORT_POOLS,
   SUPPORT_SPOOLS,
-} from '../constants';
+} from 'src/constants';
 import { minBigNumber, estimatedFactor } from 'src/utils';
-import type { ScallopQuery } from '../models';
-import type {
+import type { ScallopQuery } from 'src/models';
+import {
   Market,
   SupportPoolCoins,
   MarketPool,
@@ -26,7 +26,7 @@ import type {
   SupportBorrowIncentiveCoins,
   ObligationBorrowIcentiveReward,
   SupportBorrowIncentiveRewardCoins,
-} from '../types';
+} from 'src/types';
 
 /**
  * Get user lending infomation for specific pools.

package/src/queries/priceQuery.ts

@@ -1,6 +1,6 @@
 import { SuiObjectData } from '@mysten/sui/client';
-import type { ScallopAddress } from '../models';
-import type { SupportAssetCoins } from '../types';
+import type { ScallopAddress } from 'src/models';
+import { SupportAssetCoins } from 'src/types';
 
 /**
  * Get price from pyth fee object.

package/src/queries/spoolQuery.ts

@@ -1,15 +1,15 @@
 import { normalizeStructTag } from '@mysten/sui/utils';
-import { SUPPORT_SPOOLS } from '../constants';
+import { SUPPORT_SPOOLS } from 'src/constants';
 import {
   parseOriginSpoolData,
   calculateSpoolData,
   parseOriginSpoolRewardPoolData,
   calculateSpoolRewardPoolData,
   isMarketCoin,
-} from '../utils';
+} from 'src/utils';
 import type { SuiObjectResponse } from '@mysten/sui/client';
-import type { ScallopQuery, ScallopUtils } from '../models';
-import type {
+import type { ScallopQuery, ScallopUtils } from 'src/models';
+import {
   MarketPool,
   Spools,
   Spool,
@@ -20,7 +20,7 @@ import type {
   SupportStakeCoins,
   CoinPrices,
   MarketPools,
-} from '../types';
+} from 'src/types';
 
 /**
  * Get spools data.

package/src/queries/vescaQuery.ts

@@ -1,17 +1,17 @@
 import BigNumber from 'bignumber.js';
-import { VeScaTreasuryFields, VeScaTreasuryInfo, Vesca } from '../types';
 import {
   type SuiObjectResponse,
   type SuiObjectData,
   DevInspectResults,
 } from '@mysten/sui/client';
-import type { ScallopUtils } from '../models';
+import type { ScallopUtils } from 'src/models';
 import { MAX_LOCK_DURATION } from 'src/constants';
 import { SUI_CLOCK_OBJECT_ID, SuiTxBlock } from '@scallop-io/sui-kit';
 import { bcs } from '@mysten/sui/bcs';
 import { z as zod } from 'zod';
 import { queryKeys } from 'src/constants';
 import assert from 'assert';
+import { Vesca, VeScaTreasuryFields, VeScaTreasuryInfo } from 'src/types';
 /**
  * Query all owned veSca key.
  *

package/src/test.ts

@@ -0,0 +1,30 @@
+// import { ScallopQuery } from './models';
+// const main = async () => {
+//   try {
+//     const query = new ScallopQuery({
+//       walletAddress:
+//         '0x61819c99588108d9f7710047e6ad8f2da598de8e98a26ea62bd7ad9847f5123c',
+//     });
+//     await query.init();
+//     const { suppliedValue: haSuiLendingValue } =
+//       await query.getLending('hasui');
+//     const obligations = await query.getObligationAccounts();
+
+//     const haSuiCollateralUsdValue = Object.values(obligations).reduce(
+//       (acc, obligation) => {
+//         acc += obligation?.collaterals.hasui?.depositedValue ?? 0;
+//         return acc;
+//       },
+//       0
+//     );
+
+//     const totalStaked = haSuiCollateralUsdValue + haSuiLendingValue;
+//     console.log(totalStaked);
+//   } catch (e) {
+//     console.error(e);
+//   } finally {
+//     process.exit(0);
+//   }
+// };
+
+// main();

package/src/types/address.ts

@@ -1,4 +1,4 @@
-import { SUPPORT_ORACLES } from '../constants';
+import { SUPPORT_ORACLES } from 'src/constants';
 import type {
   SupportAssetCoins,
   SupportOracleType,

package/src/types/builder/borrowIncentive.ts

@@ -3,11 +3,11 @@ import type {
   SuiObjectArg,
 } from '@scallop-io/sui-kit';
 import type { TransactionResult } from '@mysten/sui/transactions';
-import type { ScallopBuilder } from '../../models';
-import type {
+import type { ScallopBuilder } from 'src/models';
+import {
   SupportBorrowIncentiveCoins,
   SupportBorrowIncentiveRewardCoins,
-} from '../constant';
+} from 'src/types';
 
 export type BorrowIncentiveIds = {
   borrowIncentivePkg: string;

package/src/types/builder/core.ts

@@ -3,12 +3,12 @@ import type {
   SuiObjectArg,
 } from '@scallop-io/sui-kit';
 import type { Argument, TransactionResult } from '@mysten/sui/transactions';
-import type { ScallopBuilder } from '../../models';
-import type {
+import type { ScallopBuilder } from 'src/models';
+import {
   SupportCollateralCoins,
   SupportPoolCoins,
   SupportAssetCoins,
-} from '../constant';
+} from 'src/types';
 import { SuiTxBlockWithSpool } from '.';
 
 export type CoreIds = {

package/src/types/builder/index.ts

@@ -5,14 +5,15 @@ import type { VeScaTxBlock } from './vesca';
 import type { ReferralTxBlock } from './referral';
 import { LoyaltyProgramTxBlock } from './loyaltyProgram';
 import { SCoinTxBlock } from './sCoin';
-import { SupportAssetCoins } from '../constant';
+import { SupportAssetCoins } from 'src/types';
 
-export type * from './core';
-export type * from './spool';
 export type * from './borrowIncentive';
-export type * from './vesca';
+export type * from './core';
 export type * from './loyaltyProgram';
+export type * from './referral';
 export type * from './sCoin';
+export type * from './spool';
+export type * from './vesca';
 
 export type BaseScallopTxBlock = ReferralTxBlock &
   LoyaltyProgramTxBlock &

package/src/types/builder/referral.ts

@@ -4,7 +4,7 @@ import {
   SuiTxBlock as SuiKitTxBlock,
 } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
-import { SupportPoolCoins } from '../constant';
+import { SupportPoolCoins } from 'src/types';
 
 export type ReferralIds = {
   referralPgkId: string;

package/src/types/builder/sCoin.ts

@@ -3,7 +3,7 @@ import {
   SuiTxBlock as SuiKitTxBlock,
   TransactionResult,
 } from '@scallop-io/sui-kit';
-import { SupportSCoin } from '../constant';
+import { SupportSCoin } from 'src/types';
 import { ScallopBuilder } from 'src/models';
 import { BaseScallopTxBlock } from '.';
 

package/src/types/builder/spool.ts

@@ -4,8 +4,8 @@ import type {
   SuiObjectArg,
 } from '@scallop-io/sui-kit';
 import type { TransactionResult } from '@mysten/sui/transactions';
-import type { ScallopBuilder } from '../../models';
-import type { SupportStakeMarketCoins } from '../constant';
+import type { ScallopBuilder } from 'src/models';
+import { SupportStakeMarketCoins } from 'src/types';
 import { SuiTxBlockWithSCoin } from '.';
 
 export type SpoolIds = {

package/src/types/constant/common.ts

@@ -10,7 +10,7 @@ import {
   SUPPORT_SCOIN,
   SUPPORT_SUI_BRIDGE,
   SUPPORT_WORMHOLE,
-} from '../../constants';
+} from 'src/constants';
 
 type ParseMarketCoins<T extends string> = `s${T}`;
 type ParseCoins<T extends string> = T extends `s${infer R}` ? R : never;

package/src/types/model.ts

@@ -7,8 +7,8 @@ import type {
   ScallopUtils,
   ScallopBuilder,
   ScallopIndexer,
-} from '../models';
-import { ScallopCache } from 'src/models/scallopCache';
+} from 'src/models';
+import { ScallopCache } from 'src/models';
 import { AddressesInterface } from './address';
 
 export type ScallopClientFnReturnType<T extends boolean> = T extends true

package/src/types/query/borrowIncentive.ts

@@ -1,7 +1,7 @@
-import type {
+import {
   SupportBorrowIncentiveCoins,
   SupportBorrowIncentiveRewardCoins,
-} from '../constant';
+} from 'src/types';
 
 export interface BorrowIncentiveAccountKey {
   id: string;

package/src/types/query/core.ts

@@ -4,7 +4,7 @@ import type {
   SupportMarketCoins,
   CoinWrappedType,
   SupportSCoin,
-} from '../constant';
+} from 'src/types';
 
 type OptionalKeys<T> = {
   [K in keyof T]?: T[K];

package/src/types/query/portfolio.ts

@@ -1,10 +1,10 @@
 import type { MarketPool } from './core';
 import type { Spool } from './spool';
-import type {
+import {
   SupportPoolCoins,
   SupportCollateralCoins,
   SupportBorrowIncentiveRewardCoins,
-} from '../constant';
+} from 'src/types';
 
 type OptionalKeys<T> = {
   [K in keyof T]?: T[K];

package/src/types/query/spool.ts

@@ -1,4 +1,4 @@
-import type { SupportStakeMarketCoins } from '../constant';
+import { SupportStakeMarketCoins } from 'src/types';
 
 type OptionalKeys<T> = {
   [K in keyof T]?: T[K];

package/src/utils/builder.ts

@@ -5,7 +5,7 @@ import {
   MAX_LOCK_ROUNDS,
   MIN_INITIAL_LOCK_AMOUNT,
   MIN_TOP_UP_AMOUNT,
-} from '../constants';
+} from 'src/constants';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 
 /**

package/src/utils/index.ts

@@ -1,5 +1,5 @@
 export * from './builder';
+export * from './indexer';
 export * from './query';
-export * from './util';
 export * from './tokenBucket';
-export * from './indexer';
+export * from './util';

package/src/utils/query.ts

@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js';
 import { normalizeStructTag, parseStructTag } from '@mysten/sui/utils';
-import type { ScallopUtils } from '../models';
-import type {
+import type { ScallopUtils } from 'src/models';
+import {
   OriginMarketPoolData,
   ParsedMarketPoolData,
   CalculatedMarketPoolData,
@@ -26,7 +26,7 @@ import type {
   OriginBorrowIncentiveAccountPoolData,
   ParsedBorrowIncentiveAccountPoolData,
   SupportBorrowIncentiveRewardCoins,
-} from '../types';
+} from 'src/types';
 
 /**
  *  Parse origin market pool data to a more readable format.

package/src/utils/tokenBucket.ts

@@ -1,4 +1,4 @@
-import { DEFAULT_INTERVAL_IN_MS } from 'src/constants/tokenBucket';
+import { DEFAULT_INTERVAL_IN_MS } from 'src/constants';
 
 class TokenBucket {
   private tokensPerInterval: number;

package/src/utils/util.ts

@@ -8,16 +8,16 @@ import {
   SUPPORT_SCOIN,
   SUPPORT_SUI_BRIDGE,
   SUPPORT_WORMHOLE,
-} from '../constants';
-import type { ScallopAddress } from '../models';
-import type {
+} from 'src/constants';
+import type { ScallopAddress } from 'src/models';
+import {
   SupportAssetCoins,
   SupportCoins,
   SupportMarketCoins,
   SupportSCoin,
   SupportSuiBridgeCoins,
   SupportWormholeCoins,
-} from '../types';
+} from 'src/types';
 
 const COIN_SET = Array.from(
   new Set([