@scallop-io/sui-scallop-sdk 1.5.3 → 2.0.0-alpha.10

package/src/builders/sCoinBuilder.ts

@@ -21,25 +21,26 @@ const generateSCoinNormalMethod: GenerateSCoinNormalMethod = ({
 
   return {
     mintSCoin: (marketCoinName, marketCoin) => {
+      const sCoinType = builder.utils.parseSCoinType(marketCoinName);
+      if (!sCoinType)
+        throw new Error(`Invalid marketCoinName name: ${marketCoinName}`);
+
       return builder.moveCall(
         txBlock,
         `${sCoinPkgIds.pkgId}::s_coin_converter::mint_s_coin`,
         [builder.utils.getSCoinTreasury(marketCoinName), marketCoin],
-        [
-          builder.utils.parseSCoinType(marketCoinName),
-          builder.utils.parseUnderlyingSCoinType(marketCoinName),
-        ]
+        [sCoinType, builder.utils.parseUnderlyingSCoinType(marketCoinName)]
       );
     },
     burnSCoin: (sCoinName, sCoin) => {
+      const sCoinType = builder.utils.parseSCoinType(sCoinName);
+      if (!sCoinType) throw new Error(`Invalid sCoin name: ${sCoinName}`);
+
       return builder.moveCall(
         txBlock,
         `${sCoinPkgIds.pkgId}::s_coin_converter::burn_s_coin`,
         [builder.utils.getSCoinTreasury(sCoinName), sCoin],
-        [
-          builder.utils.parseSCoinType(sCoinName),
-          builder.utils.parseUnderlyingSCoinType(sCoinName),
-        ]
+        [sCoinType, builder.utils.parseUnderlyingSCoinType(sCoinName)]
       );
     },
   };

package/src/builders/spoolBuilder.ts

@@ -1,7 +1,6 @@
 import { Transaction } from '@mysten/sui/transactions';
 import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
-import { spoolRewardCoins } from '../constants/enum';
 import { getStakeAccounts } from '../queries/spoolQuery';
 import { requireSender } from '../utils';
 import type { SuiAddressArg } from '@scallop-io/sui-kit';
@@ -13,7 +12,6 @@ import type {
   GenerateSpoolQuickMethod,
   SuiTxBlockWithSpoolNormalMethods,
   SpoolTxBlock,
-  SupportStakeMarketCoins,
   ScallopTxBlock,
   SuiTxBlockWithSCoin,
 } from '../types';
@@ -35,7 +33,7 @@ const requireStakeAccountIds = async (
   ...params: [
     builder: ScallopBuilder,
     txBlock: SuiKitTxBlock,
-    stakeMarketCoinName: SupportStakeMarketCoins,
+    stakeMarketCoinName: string,
     stakeAccountId?: SuiAddressArg,
   ]
 ) => {
@@ -66,7 +64,7 @@ const requireStakeAccounts = async (
   ...params: [
     builder: ScallopBuilder,
     txBlock: SuiKitTxBlock,
-    stakeMarketCoinName: SupportStakeMarketCoins,
+    stakeMarketCoinName: string,
     stakeAccountId?: SuiAddressArg,
   ]
 ) => {
@@ -90,7 +88,7 @@ const stakeHelper = async (
   builder: ScallopBuilder,
   txBlock: SuiTxBlockWithSpoolNormalMethods,
   stakeAccount: SuiAddressArg,
-  coinName: SupportStakeMarketCoins,
+  coinName: string,
   amount: number,
   sender: string,
   isSCoin: boolean = false
@@ -181,7 +179,7 @@ const generateSpoolNormalMethod: GenerateSpoolNormalMethod = ({
       ) as string;
       const marketCoinType =
         builder.utils.parseMarketCoinType(stakeMarketCoinName);
-      const rewardCoinName = spoolRewardCoins[stakeMarketCoinName];
+      const rewardCoinName = builder.utils.getSpoolRewardCoinName();
       const rewardCoinType = builder.utils.parseCoinType(rewardCoinName);
       return builder.moveCall(
         txBlock,

package/src/constants/common.ts

@@ -4,24 +4,12 @@ export const SDK_API_BASE_URL = 'https://sdk.api.scallop.io' as const;
 export const IS_VE_SCA_TEST: boolean = false;
 export const USE_TEST_ADDRESS: boolean = false;
 
-export const ADDRESS_ID =
-  IS_VE_SCA_TEST || USE_TEST_ADDRESS
-    ? ('65fb07c39c845425d71d7b18' as const)
-    : ('67c44a103fe1b8c454eb9699' as const);
+// export const ADDRESS_ID =
+//   IS_VE_SCA_TEST || USE_TEST_ADDRESS
+//     ? ('65fb07c39c845425d71d7b18' as const)
+//     : ('67c44a103fe1b8c454eb9699' as const);
 // : ('66f8e7ed9bb9e07fdfb86bbb' as const);
 
-export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
-  ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
-  : ('0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf' as const);
-// export const PROTOCOL_OBJECT_ID =
-//   '0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1' as const;
-
-export const BORROW_FEE_PROTOCOL_ID = IS_VE_SCA_TEST
-  ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const) // test environment
-  : ('0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da' as const);
-// export const BORROW_FEE_PROTOCOL_ID =
-//   '0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1' as const;
-
 export const SCA_COIN_TYPE = IS_VE_SCA_TEST
   ? (`0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524::sca::SCA` as const)
   : ('0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA' as const);
@@ -29,121 +17,121 @@ export const SCA_COIN_TYPE = IS_VE_SCA_TEST
 export const OLD_BORROW_INCENTIVE_PROTOCOL_ID =
   '0xc63072e7f5f4983a2efaf5bdba1480d5e7d74d57948e1c7cc436f8e22cbeb410' as const;
 
-export const SUPPORT_POOLS = [
-  'usdc', // native USDC
-  'sbeth', // sui bridge ETH
-  'sbusdt', // sui bridge USDT
-  'sbwbtc', // sui bridge WBTC
-  'weth',
-  'wbtc',
-  'wusdc',
-  'wusdt',
-  'sui',
-  'wapt',
-  'wsol',
-  'cetus',
-  'afsui',
-  'hasui',
-  'vsui',
-  'sca',
-  'fud',
-  'deep',
-  'fdusd',
-  'blub',
-  'musd',
-  'ns',
-  'usdy',
-] as const;
+// export const SUPPORT_POOLS = [
+//   'usdc', // native USDC
+//   'sbeth', // sui bridge ETH
+//   'sbusdt', // sui bridge USDT
+//   'sbwbtc', // sui bridge WBTC
+//   'weth',
+//   'wbtc',
+//   'wusdc',
+//   'wusdt',
+//   'sui',
+//   'wapt',
+//   'wsol',
+//   'cetus',
+//   'afsui',
+//   'hasui',
+//   'vsui',
+//   'sca',
+//   'fud',
+//   'deep',
+//   'fdusd',
+//   'blub',
+//   'musd',
+//   'ns',
+//   'usdy',
+// ] as const;
 
-export const SUPPORT_COLLATERALS = [
-  'usdc', // native USDC
-  'sbeth', // sui bridge ETH
-  'sbusdt', // sui bridge USDT
-  'sbwbtc', // sui bridge WBTC
-  'weth',
-  'wbtc',
-  'wusdc',
-  'wusdt',
-  'sui',
-  'wapt',
-  'wsol',
-  'cetus',
-  'afsui',
-  'hasui',
-  'vsui',
-  'sca',
-  'fdusd',
-  'usdy',
-] as const;
+// export const SUPPORT_COLLATERALS = [
+//   'usdc', // native USDC
+//   'sbeth', // sui bridge ETH
+//   'sbusdt', // sui bridge USDT
+//   'sbwbtc', // sui bridge WBTC
+//   'weth',
+//   'wbtc',
+//   'wusdc',
+//   'wusdt',
+//   'sui',
+//   'wapt',
+//   'wsol',
+//   'cetus',
+//   'afsui',
+//   'hasui',
+//   'vsui',
+//   'sca',
+//   'fdusd',
+//   'usdy',
+// ] as const;
 
-export const SUPPORT_SPOOLS = [
-  'susdc',
-  'sweth',
-  'ssui',
-  'swusdc',
-  'swusdt',
-  'scetus',
-  'safsui',
-  'shasui',
-  'svsui',
-] as const;
+// export const SUPPORT_SPOOLS = [
+//   'susdc',
+//   'sweth',
+//   'ssui',
+//   'swusdc',
+//   'swusdt',
+//   'scetus',
+//   'safsui',
+//   'shasui',
+//   'svsui',
+// ] as const;
 
-export const SUPPORT_SCOIN = [
-  'susdc',
-  'ssbeth',
-  'ssbusdt',
-  'ssbwbtc',
-  'ssui',
-  'swusdc',
-  'swusdt',
-  'safsui',
-  'shasui',
-  'svsui',
-  'sweth',
-  'ssca',
-  'scetus',
-  'swsol',
-  'swbtc',
-  'sdeep',
-  'sfud',
-  'sfdusd',
-  'sblub',
-  'smusd',
-  'sns',
-  'susdy',
-] as const;
+// export const SUPPORT_SCOIN = [
+//   'susdc',
+//   'ssbeth',
+//   'ssbusdt',
+//   'ssbwbtc',
+//   'ssui',
+//   'swusdc',
+//   'swusdt',
+//   'safsui',
+//   'shasui',
+//   'svsui',
+//   'sweth',
+//   'ssca',
+//   'scetus',
+//   'swsol',
+//   'swbtc',
+//   'sdeep',
+//   'sfud',
+//   'sfdusd',
+//   'sblub',
+//   'smusd',
+//   'sns',
+//   'susdy',
+// ] as const;
 
-export const SUPPORT_SUI_BRIDGE = ['sbeth', 'sbusdt', 'sbwbtc'] as const;
-export const SUPPORT_WORMHOLE = [
-  'wusdc',
-  'wusdt',
-  'weth',
-  'wbtc',
-  'wapt',
-  'wsol',
-] as const;
+// export const SUPPORT_SUI_BRIDGE = ['sbeth', 'sbusdt', 'sbwbtc'] as const;
+// export const SUPPORT_WORMHOLE = [
+//   'wusdc',
+//   'wusdt',
+//   'weth',
+//   'wbtc',
+//   'wapt',
+//   'wsol',
+// ] as const;
 
-export const SUPPORT_SPOOLS_REWARDS = ['sui'] as const;
+// export const SUPPORT_SPOOLS_REWARDS = ['sui'] as const;
 
-export const SUPPORT_BORROW_INCENTIVE_POOLS = [...SUPPORT_POOLS] as const;
+// export const SUPPORT_BORROW_INCENTIVE_POOLS = [...SUPPORT_POOLS] as const;
 
-export const SUPPORT_BORROW_INCENTIVE_REWARDS = [
-  ...SUPPORT_POOLS,
-  ...SUPPORT_SCOIN,
-] as const;
-export const SUPPORT_ORACLES = ['supra', 'switchboard', 'pyth'] as const;
+// export const SUPPORT_BORROW_INCENTIVE_REWARDS = [
+//   ...SUPPORT_POOLS,
+//   ...SUPPORT_SCOIN,
+// ] as const;
+// export const SUPPORT_ORACLES = ['supra', 'switchboard', 'pyth'] as const;
 
-export const SUPPORT_PACKAGES = [
-  'coinDecimalsRegistry',
-  'math',
-  'whitelist',
-  'x',
-  'protocol',
-  'protocolWhitelist',
-  'query',
-  'supra',
-  'pyth',
-  'switchboard',
-  'xOracle',
-  'testCoin',
-] as const;
+// export const SUPPORT_PACKAGES = [
+//   'coinDecimalsRegistry',
+//   'math',
+//   'whitelist',
+//   'x',
+//   'protocol',
+//   'protocolWhitelist',
+//   'query',
+//   'supra',
+//   'pyth',
+//   'switchboard',
+//   'xOracle',
+//   'testCoin',
+// ] as const;

package/src/constants/index.ts

@@ -1,10 +1,5 @@
 export * from './cache';
-export * from './coinGecko';
 export * from './common';
-export * from './enum';
-export * from './flashloan';
-export * from './poolAddress';
-export * from './pyth';
 export * from './queryKeys';
 export * from './rpc';
 export * from './testAddress';

package/src/constants/pyth.ts

@@ -1,34 +1,25 @@
-import { SupportPoolCoins } from 'src/types';
-
-export const PYTH_ENDPOINTS: {
-  [k in 'mainnet' | 'testnet']: string[];
-} = {
-  testnet: ['https://hermes-beta.pyth.network'],
-  mainnet: ['https://hermes.pyth.network', 'https://scallop.rpc.p2p.world'],
-};
-
-export const PYTH_FEED_IDS: Record<SupportPoolCoins, string> = {
-  usdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-  sbeth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
-  sbusdt: '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
-  sbwbtc: 'e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
-  weth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
-  wbtc: 'e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
-  wusdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-  wusdt: '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
-  sui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  wapt: '03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5',
-  wsol: 'ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
-  cetus: 'e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef',
-  afsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  hasui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  vsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  sca: '7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc',
-  fdusd: 'ccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979',
-  deep: '29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff',
-  fud: '6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75',
-  blub: '5fc11ffe4975b624be495be038da30e30bee2004d8ae6282b5364577ef4ca92c',
-  musd: '2ee09cdb656959379b9262f89de5ff3d4dfed0dd34c072b3e22518496a65249c',
-  ns: 'bb5ff26e47a3a6cc7ec2fce1db996c2a145300edc5acaabe43bf9ff7c5dd5d32',
-  usdy: 'e3d1723999820435ebab53003a542ff26847720692af92523eea613a9a28d500',
-};
+// export const PYTH_FEED_IDS: Record<string, string> = {
+//   usdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+//   sbeth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
+//   sbusdt: '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
+//   sbwbtc: 'e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
+//   weth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
+//   wbtc: 'e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
+//   wusdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+//   wusdt: '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
+//   sui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+//   wapt: '03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5',
+//   wsol: 'ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
+//   cetus: 'e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef',
+//   afsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+//   hasui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+//   vsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+//   sca: '7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc',
+//   fdusd: 'ccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979',
+//   deep: '29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff',
+//   fud: '6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75',
+//   blub: '5fc11ffe4975b624be495be038da30e30bee2004d8ae6282b5364577ef4ca92c',
+//   musd: '2ee09cdb656959379b9262f89de5ff3d4dfed0dd34c072b3e22518496a65249c',
+//   ns: 'bb5ff26e47a3a6cc7ec2fce1db996c2a145300edc5acaabe43bf9ff7c5dd5d32',
+//   usdy: 'e3d1723999820435ebab53003a542ff26847720692af92523eea613a9a28d500',
+// };

package/src/constants/queryKeys.ts

@@ -14,6 +14,8 @@ export const queryKeys = {
       'getAddresses',
       { addressId },
     ],
+    getWhiteList: () => ['api', 'getWhiteList'],
+    getPoolAddresses: () => ['api', 'getPoolAddresses'],
     getMarket: () => ['api', 'getMarket'],
     getSpools: () => ['api', 'getSpools'],
     getBorrowIncentivePool: () => ['api', 'getBorrowIncentivePools'],