@scallop-io/sui-scallop-sdk 2.3.0-lst-x-oracle-alpha.5 → 2.3.0-lst-x-oracle-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.3.0-lst-x-oracle-alpha.5",
+  "version": "2.3.0-lst-x-oracle-alpha.7",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/borrowIncentiveBuilder.ts

@@ -13,7 +13,7 @@ import type {
   SuiTxBlockWithBorrowIncentiveNormalMethods,
   BorrowIncentiveTxBlock,
   ScallopTxBlock,
-} from 'src/types';
+} from 'src/types/builder';
 import { OLD_BORROW_INCENTIVE_PROTOCOL_ID } from 'src/constants/common';
 import { getObligationLocked, getObligations } from 'src/queries/coreQuery';
 

package/src/builders/coreBuilder.ts

@@ -15,7 +15,7 @@ import type {
   ScallopTxBlock,
   NestedResult,
   SuiTxBlockWithSpool,
-} from 'src/types';
+} from 'src/types/builder';
 
 /**
  * Check and get Obligation information from transaction block.

package/src/builders/loyaltyProgramBuilder.ts

@@ -7,7 +7,7 @@ import {
   LoyaltyProgramTxBlock,
   ScallopTxBlock,
   SuiTxBlockWithLoyaltyProgramNormalMethods,
-} from 'src/types';
+} from 'src/types/builder';
 import { requireSender } from './utils';
 
 const generateLoyaltyProgramNormalMethod: GenerateLoyaltyProgramNormalMethod =

package/src/builders/oracles/index.ts

@@ -10,7 +10,7 @@ import {
 } from './priceFeedUpdater';
 import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from 'src/models';
-import type { SupportOracleType, xOracleRuleType } from 'src/types';
+import type { SupportOracleType, xOracleRuleType } from 'src/types/constant';
 import { PriceUpdateRequester } from './priceUpdateRequester';
 import { UnsupportedOracleError } from './error';
 

package/src/builders/oracles/oraclePackageRegistry.ts

@@ -5,11 +5,10 @@ import {
   BasePackage,
   OracleLst,
   OracleLstConfig,
-  SupportedOracleSuiLst,
   SupportOracleLst,
-  SupportOracleType,
-} from 'src/types';
+} from 'src/types/address';
 import { UnsupportedOracleError } from './error';
+import { SupportedOracleSuiLst, SupportOracleType } from 'src/types/constant';
 
 export type XOraclePackages = {
   xOraclePackageId: string;

package/src/builders/oracles/priceFeedUpdater.ts

@@ -4,7 +4,7 @@ import {
 } from '@pythnetwork/pyth-sui-js';
 import { SuiTxBlock } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
-import { SupportOracleType } from 'src/types';
+import { SupportOracleType } from 'src/types/constant';
 
 type PythPriceFeedUpdateOptions = {
   usePythPullModel: boolean;

package/src/builders/oracles/xOracleUpdateStrategy.ts

@@ -8,7 +8,7 @@ import {
   SupportedOracleSuiLst,
   SupportOracleType,
   xOracleRuleType,
-} from 'src/types';
+} from 'src/types/constant';
 import { UnsupportedLstOracleError } from './error';
 
 export interface IXOracleUpdateStrategy<

package/src/builders/oracles/xOracleUpdater.ts

@@ -1,5 +1,5 @@
 import { SuiTxBlock, TransactionArgument } from '@scallop-io/sui-kit';
-import { SupportOracleType, xOracleRuleType } from 'src/types';
+import { SupportOracleType, xOracleRuleType } from 'src/types/constant';
 import { SUPPORT_SUI_LST } from 'src/constants/xoracle';
 import { IOraclePackageRegistry } from './oraclePackageRegistry';
 import {

package/src/builders/referralBuilder.ts

@@ -1,5 +1,5 @@
 import { ScallopBuilder } from 'src/models';
-import { ScallopTxBlock } from 'src/types';
+import { ScallopTxBlock } from 'src/types/builder';
 import {
   SUI_CLOCK_OBJECT_ID,
   SuiTxBlock as SuiKitTxBlock,

package/src/builders/sCoinBuilder.ts

@@ -8,7 +8,7 @@ import {
   ScallopTxBlock,
   SuiTxBlockWithSCoinNormalMethods,
   sCoinPkgIds,
-} from 'src/types';
+} from 'src/types/builder';
 import { requireSender } from './utils';
 
 const generateSCoinNormalMethod: GenerateSCoinNormalMethod = ({

package/src/builders/spoolBuilder.ts

@@ -14,7 +14,7 @@ import type {
   SpoolTxBlock,
   ScallopTxBlock,
   SuiTxBlockWithSCoin,
-} from 'src/types';
+} from 'src/types/builder';
 
 /**
  * Check and get stake account id from transaction block.

package/src/builders/vescaBuilder.ts

@@ -20,15 +20,15 @@ import type {
   SuiObjectArg,
 } from '@scallop-io/sui-kit';
 import type {
-  AddressesInterface,
   GenerateVeScaNormalMethod,
   GenerateVeScaQuickMethod,
   QuickMethodReturnType,
   ScallopTxBlock,
   SuiTxBlockWithVeScaNormalMethods,
   VeScaTxBlock,
-} from 'src/types';
+} from 'src/types/builder';
 import { SuiObjectData } from '@mysten/sui/client';
+import { AddressesInterface } from 'src/types/address';
 
 /**
  * Check and get veSCA data from transaction block.

package/src/index.ts

@@ -10,3 +10,4 @@ export {
   ScallopIndexer,
   ScallopUtils,
 } from './models';
+export * from './types';

package/src/queries/coreQuery.ts

@@ -43,7 +43,7 @@ import {
   ScallopIndexer,
   ScallopAddress,
 } from 'src/models';
-import { CoinPrices, OptionalKeys } from 'src/types';
+import { CoinPrices, OptionalKeys } from 'src/types/util';
 
 /**
  * Query market data.

package/src/queries/loyaltyProgramQuery.ts

@@ -2,7 +2,7 @@ import { SuiObjectData } from '@mysten/sui/client';
 import BigNumber from 'bignumber.js';
 import { MAX_LOCK_DURATION } from 'src/constants/vesca';
 import { ScallopQuery } from 'src/models';
-import { LoyaltyProgramInfo, VeScaLoyaltyProgramInfo } from 'src/types';
+import { LoyaltyProgramInfo, VeScaLoyaltyProgramInfo } from 'src/types/query';
 import { z as zod } from 'zod';
 
 const rewardPoolFieldsZod = zod

package/src/queries/poolAddressesQuery.ts

@@ -1,5 +1,7 @@
 import { getFullnodeUrl, SuiClient, SuiParsedData } from '@mysten/sui/client';
-import { AddressesInterface, OptionalKeys, PoolAddress } from 'src/types';
+import { AddressesInterface } from 'src/types/address';
+import { PoolAddress } from 'src/types/constant';
+import { OptionalKeys } from 'src/types/util';
 
 const RPC_PROVIDERS = [
   getFullnodeUrl('mainnet'),

package/src/queries/priceQuery.ts

@@ -1,6 +1,7 @@
 import { SuiObjectData } from '@mysten/sui/client';
 import type { ScallopAddress, ScallopQuery, ScallopSuiKit } from 'src/models';
-import type { CoinPrices, MarketPools, OptionalKeys } from '../types';
+import type { MarketPools } from 'src/types/query';
+import type { CoinPrices } from 'src/types/util';
 import BigNumber from 'bignumber.js';
 
 /**
@@ -150,7 +151,7 @@ export const getAllCoinPrices = async (
     throw new Error(`Failed to fetch market pool for getAllCoinPrices`);
   }
 
-  const sCoinPrices: OptionalKeys<Record<string, number>> = {};
+  const sCoinPrices: CoinPrices = {};
   query.constants.whitelist.scoin.forEach((sCoinName) => {
     const coinName = query.utils.parseCoinName(sCoinName);
     sCoinPrices[sCoinName] = BigNumber(coinPrices[coinName] ?? 0)

package/src/queries/sCoinQuery.ts

@@ -2,7 +2,7 @@ import { bcs } from '@mysten/sui/bcs';
 import assert from 'assert';
 import BigNumber from 'bignumber.js';
 import { ScallopQuery, ScallopUtils } from 'src/models';
-import { OptionalKeys } from 'src/types';
+import { OptionalKeys } from 'src/types/util';
 
 /**
  * Get total supply of sCoin

package/src/queries/spoolQuery.ts

@@ -8,7 +8,6 @@ import {
 } from './utils';
 import type { SuiObjectData, SuiObjectResponse } from '@mysten/sui/client';
 import type { ScallopQuery, ScallopUtils } from 'src/models';
-import { CoinPrices } from 'src/types';
 import {
   OriginSpoolData,
   OriginSpoolRewardPoolData,
@@ -20,6 +19,7 @@ import {
   StakePool,
   StakeRewardPool,
 } from 'src/types/query';
+import { CoinPrices } from 'src/types/util';
 
 const queryRequiredSpoolObjects = async (
   query: ScallopQuery,
@@ -164,11 +164,11 @@ export const getSpools = async (
       if (!stakeMarketCoinNames.includes(spool.marketCoinName)) return;
       const coinName = query.utils.parseCoinName(spool.marketCoinName);
       const rewardCoinName = query.utils.getSpoolRewardCoinName();
-      spool.coinPrice = coinPrices[coinName] ?? spool.coinPrice;
+      spool.coinPrice = coinPrices?.[coinName] ?? spool.coinPrice;
       spool.marketCoinPrice =
-        coinPrices[spool.marketCoinName] ?? spool.marketCoinPrice;
+        coinPrices?.[spool.marketCoinName] ?? spool.marketCoinPrice;
       spool.rewardCoinPrice =
-        coinPrices[rewardCoinName] ?? spool.rewardCoinPrice;
+        coinPrices?.[rewardCoinName] ?? spool.rewardCoinPrice;
       spools[spool.marketCoinName] = spool;
     };
     Object.values(spoolsIndexer)

package/src/queries/vescaQuery.ts

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { VeScaTreasuryFields, VeScaTreasuryInfo, Vesca } from 'src/types';
+import { VeScaTreasuryFields, VeScaTreasuryInfo, Vesca } from 'src/types/query';
 import {
   type SuiObjectResponse,
   type SuiObjectData,

package/src/queries/xOracleQuery.ts

@@ -1,6 +1,6 @@
 import { SuiObjectResponse } from '@mysten/sui/client';
 import { ScallopAddress, ScallopSuiKit, ScallopUtils } from 'src/models';
-import { SupportOracleType, xOracleRuleType } from 'src/types';
+import { SupportOracleType, xOracleRuleType } from 'src/types/constant';
 
 /**
  * Query the price update policy table ids. Usually the value for these table will be constant.

package/src/types/builder/core.ts

@@ -16,12 +16,16 @@ export type CoreIds = {
 };
 
 export type NestedResult = Extract<Argument, { $kind: 'NestedResult' }>;
-type Obligation = NestedResult;
-type ObligationKey = NestedResult;
-type ObligationHotPotato = NestedResult;
+type ResultAsObligation = NestedResult;
+type ResultAsObligationKey = NestedResult;
+type ResultAsObligationHotPotato = NestedResult;
 
 export type CoreNormalMethods = {
-  openObligation: () => [Obligation, ObligationKey, ObligationHotPotato];
+  openObligation: () => [
+    ResultAsObligation,
+    ResultAsObligationKey,
+    ResultAsObligationHotPotato,
+  ];
   returnObligation: (
     obligation: SuiObjectArg,
     obligationHotPotato: SuiObjectArg

package/src/types/index.ts

@@ -0,0 +1,5 @@
+export type * from './builder';
+export type * from './constant';
+export type * from './query';
+export type * from './address';
+export type * from './util';