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

package/src/builders/sCoinBuilder.ts

@@ -8,8 +8,8 @@ import {
   ScallopTxBlock,
   SuiTxBlockWithSCoinNormalMethods,
   sCoinPkgIds,
-} from 'src/types/builder';
-import { requireSender } from './utils';
+} from 'src/types';
+import { requireSender } from 'src/utils';
 
 const generateSCoinNormalMethod: GenerateSCoinNormalMethod = ({
   builder,
@@ -36,10 +36,6 @@ const generateSCoinNormalMethod: GenerateSCoinNormalMethod = ({
       const sCoinType = builder.utils.parseSCoinType(sCoinName);
       if (!sCoinType) throw new Error(`Invalid sCoin name: ${sCoinName}`);
 
-      console.log({
-        sCoinName,
-        treasury: builder.utils.getSCoinTreasury(sCoinName),
-      });
       return builder.moveCall(
         txBlock,
         `${sCoinPkgIds.pkgId}::s_coin_converter::burn_s_coin`,

package/src/builders/spoolBuilder.ts

@@ -2,7 +2,7 @@ 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 { getStakeAccounts } from '../queries/spoolQuery';
-import { requireSender } from './utils';
+import { requireSender } from '../utils';
 import type { SuiAddressArg } from '@scallop-io/sui-kit';
 import type { TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from 'src/models';
@@ -14,7 +14,7 @@ import type {
   SpoolTxBlock,
   ScallopTxBlock,
   SuiTxBlockWithSCoin,
-} from 'src/types/builder';
+} from 'src/types';
 
 /**
  * Check and get stake account id from transaction block.

package/src/builders/vescaBuilder.ts

@@ -4,9 +4,9 @@ import {
   Transaction,
   SuiTxBlock as SuiKitTxBlock,
 } from '@scallop-io/sui-kit';
-import { SCA_COIN_TYPE } from 'src/constants/common';
+import { SCA_COIN_TYPE } from 'src/constants';
 import { ScallopBuilder } from 'src/models';
-import { getVeSca, getVeScas } from 'src/queries/vescaQuery';
+import { getVeSca, getVeScas } from 'src/queries';
 import {
   requireSender,
   checkLockSca,
@@ -14,21 +14,21 @@ import {
   checkExtendLockAmount,
   checkRenewExpiredVeSca,
   checkVesca,
-} from './utils';
+} from 'src/utils';
 import type {
   TransactionObjectArgument,
   SuiObjectArg,
 } from '@scallop-io/sui-kit';
 import type {
+  AddressesInterface,
   GenerateVeScaNormalMethod,
   GenerateVeScaQuickMethod,
   QuickMethodReturnType,
   ScallopTxBlock,
   SuiTxBlockWithVeScaNormalMethods,
   VeScaTxBlock,
-} from 'src/types/builder';
+} from 'src/types';
 import { SuiObjectData } from '@mysten/sui/client';
-import { AddressesInterface } from 'src/types/address';
 
 /**
  * Check and get veSCA data from transaction block.

package/src/constants/common.ts

@@ -1,3 +1,6 @@
+export const API_BASE_URL = 'https://sui.apis.scallop.io' as const;
+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;
 

package/src/constants/index.ts

@@ -1,8 +1,8 @@
-export * from './api';
 export * from './cache';
 export * from './common';
 export * from './queryKeys';
 export * from './rpc';
 export * from './testAddress';
 export * from './vesca';
+export * from './testAddress';
 export * from './xoracle';

package/src/constants/queryKeys.ts

@@ -11,7 +11,7 @@ export const queryKeys = {
     getPoolAddresses: () => ['api', 'getPoolAddresses'],
     getMarket: () => ['api', 'getMarket'],
     getSpools: () => ['api', 'getSpools'],
-    getBorrowIncentivePool: () => ['api', 'getBorrowIncentivePools'],
+    getBorrowIncentivePools: () => ['api', 'getBorrowIncentivePools'],
     getTotalValueLocked: () => ['api', 'getTotalValueLocked'],
   },
 

package/src/constants/testAddress.ts

@@ -1,4 +1,4 @@
-import { AddressesInterface } from 'src/types/address';
+import { AddressesInterface } from 'src/types';
 
 export const TEST_ADDRESSES: AddressesInterface = {
   core: {
@@ -48,7 +48,8 @@ export const TEST_ADDRESSES: AddressesInterface = {
         oracle: {
           supra: '',
           switchboard:
-            '0xbca474133638352ba83ccf7b5c931d50f764b09550e16612c9f70f1e21f3f594',
+            // '0xbca474133638352ba83ccf7b5c931d50f764b09550e16612c9f70f1e21f3f594',
+            '0xaebdb50e0a95c5aa20c60bde5f574dac90aef83b508d64146cf29b5f63c35d4f ',
           pyth: {
             feed: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
             feedObject:
@@ -56,31 +57,11 @@ export const TEST_ADDRESSES: AddressesInterface = {
           },
         },
       },
-      afsui: {
-        id: '0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc',
-        metaData:
-          '0x2f9217f533e51334873a39b8026a4aa6919497b47f49d0986a4f1aec66f8a34d',
-        treasury: '',
-        coinType:
-          '0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI',
-        symbol: 'afSUI',
-        decimals: 9,
-        oracle: {
-          supra: '',
-          switchboard: '',
-          pyth: {
-            feed: '17cd845b16e874485b2684f8b8d1517d744105dbb904eec30222717f4bc9ee0d',
-            feedObject:
-              '0xd779885c5246357e24cbde7348f2d81f756d9650975c02d81346b15d8b557ebf',
-          },
-        },
-      },
       sca: {
         id: '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
         metaData:
           '0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844',
-        treasury:
-          '0x54e81607d636c3520a697b803a99a167fce7ccdf1bad7d210e2941d264515351',
+        treasury: '',
         coinType:
           '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA',
         symbol: 'SCA',
@@ -141,12 +122,16 @@ export const TEST_ADDRESSES: AddressesInterface = {
         '0x1edeae568fde99e090dbdec4bcdbd33a15f53a1ce1f87aeef1a560dedf4b4a90',
       primaryPriceUpdatePolicyObject:
         '0xbcd908d0ee6d63d726e61676f3feeec3d19817f4849bbecf372dd3399f247f6b',
+      // '0x56e48a141f20a3a6a6d3fc43e58b01fc63f756c08224870e7890c80ec9d2afee' // prod
       secondaryPriceUpdatePolicyObject:
         '0x624a6f120777bb30e718b86e836c205ef4229448052377dc3d78272a6662b2c0',
+      // '0xef4d9430ae42c1b24199ac55e87ddd7262622447ee3c7de8868efe839b3d8705' // prod
       primaryPriceUpdatePolicyVecsetId:
         '0xfb1330aa028ed6a159b742c71b5a79b3b6824cf71efa40ea82b52486ad209264',
+      // '0xc22c9d691ee4c780de09db91d8b487d863211ebf08720772144bcf716318826c', // prod
       secondaryPriceUpdatePolicyVecsetId:
         '0x4b827acc73f3f53f808dd73a7ee0a60ae61e84322176bece72b26467030b467c',
+      // '0x3b184ff859f5de30eeaf186898e5224925be6bb6d2baa74347ef471a8cd1c0d3' // prod
       supra: {
         registry: '',
         registryCap: '',
@@ -155,9 +140,10 @@ export const TEST_ADDRESSES: AddressesInterface = {
       switchboard: {
         registry:
           '0x9b1b415f384af6af0ff31c22decdc88b3b83d0188cf63ef9c58fd122bca77219',
-        registryCap: '',
-        registryTableId: '',
+        registryTableId:
+          '0x9f75c071b0db2e80da3f5c98686ffdedf3a633684290499501595277a5350b8c',
         state: '',
+        registryCap: '',
       },
       pyth: {
         registry:
@@ -170,16 +156,6 @@ export const TEST_ADDRESSES: AddressesInterface = {
           '0x5306f64e312b581766351c07af79c72fcb1cd25147157fdc2f8ad76de9a3fb6a',
         wormholeState:
           '0xaeab97f96cf9877fee2883315d459552b2b921edc16d7ceac6eab944dd88919c',
-        lst: {
-          afsui: {
-            safeId:
-              '0xeb685899830dd5837b47007809c76d91a098d52aabbf61e8ac467c59e5cc4610',
-            stakedSuiVaultId:
-              '0x2f8f6d5da7f13ea37daa397724280483ed062769813b6f31e9788e59cc88994d',
-            configId:
-              '0x67103edaadcd38b76f5df76d99adcad989260a5f16bfd411a67efbf858b2f7a2',
-          },
-        },
       },
     },
     packages: {
@@ -218,26 +194,18 @@ export const TEST_ADDRESSES: AddressesInterface = {
         upgradeCap:
           '0x14220f035f4cfc2ce442c30703fb44d24f00846eb7077907a231a56051a1d9b2',
       },
-      supra: {
-        id: '',
-        upgradeCap: '',
-      },
+      supra: { id: '', object: '', upgradeCap: '' },
       pyth: {
         id: '0xe622909f9252d4ef1737c41ea430ef44203d8f5dc8e01e1b3950a31405bc54eb',
         object:
           '0xe622909f9252d4ef1737c41ea430ef44203d8f5dc8e01e1b3950a31405bc54eb',
         upgradeCap:
           '0xb1f167889643ff766df31745b6e93b92462d8165b0a4f1b095499e15180370f7',
-        lst: {
-          afsui: {
-            id: '0xd45b20f4bbc7ab4b2b3874a4fa38aa440505d8010bba052df914892537e6b418',
-            object:
-              '0xd45b20f4bbc7ab4b2b3874a4fa38aa440505d8010bba052df914892537e6b418',
-          },
-        },
       },
       switchboard: {
         id: '0x248f5cb31c12eed6ab8fd4c6176466b982be42ce87e6bf8ff896fb8097a1660d',
+        object:
+          '0x248f5cb31c12eed6ab8fd4c6176466b982be42ce87e6bf8ff896fb8097a1660d',
         upgradeCap: '',
       },
       xOracle: {
@@ -249,81 +217,43 @@ export const TEST_ADDRESSES: AddressesInterface = {
       },
       testCoin: {
         id: '',
+        upgradeCap: '',
       },
     },
   },
   spool: {
-    id: '0x472fc7d4c3534a8ec8c2f5d7a557a43050eab057aaab853e8910968ddc84fc9f',
+    id: '0x1742655fe5872dfa6456673f9e38612a4965e6979e6cd7696a7f1225f28bae21',
     adminCap:
       '0xdd8a047cbbf802bfcde5288b8ef1910965d789cc614da11d39af05fca0bd020a',
     object:
       '0xe87f1b2d498106a2c61421cec75b7b5c5e348512b0dc263949a0e7a3c256571a',
     pools: {
-      sweth: {
-        id: '0xeec40beccb07c575bebd842eeaabb835f77cd3dab73add433477e57f583a6787',
-        rewardPoolId:
-          '0x957de68a18d87817de8309b30c1ec269a4d87ae513abbeed86b5619cb9ce1077',
-      },
       ssui: {
-        id: '0x4f0ba970d3c11db05c8f40c64a15b6a33322db3702d634ced6536960ab6f3ee4',
+        id: '0xb9617f83c06ebdeac0a8834782b1015e1cc7ea23739e30c132c4bfb95c37a579',
         rewardPoolId:
-          '0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9',
+          '0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a',
       },
       susdc: {
         id: '0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918',
         rewardPoolId:
           '0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166',
       },
-      swusdc: {
-        id: '0x4ace6648ddc64e646ba47a957c562c32c9599b3bba8f5ac1aadb2ae23a2f8ca0',
-        rewardPoolId:
-          '0xf4268cc9b9413b9bfe09e8966b8de650494c9e5784bf0930759cfef4904daff8',
-      },
-      swusdt: {
-        id: '0xcb328f7ffa7f9342ed85af3fdb2f22919e1a06dfb2f713c04c73543870d7548f',
-        rewardPoolId:
-          '0x2c9f934d67a5baa586ceec2cc24163a2f049a6af3d5ba36b84d8ac40f25c4080',
-      },
-      scetus: {
-        id: '0xac1bb13bf4472a637c18c2415fb0e3c1227ea2bcf35242e50563c98215bd298e',
-        rewardPoolId:
-          '0x6835c1224126a45086fc6406adc249e3f30df18d779ca4f4e570e38716a17f3f',
-      },
-      safsui: {
-        id: '0xeedf438abcaa6ce4d9625ffca110920592d5867e4c5637d84ad9f466c4feb800',
-        rewardPoolId:
-          '0x89255a2f86ed7fbfef35ab8b7be48cc7667015975be2685dd9a55a9a64baf76e',
-      },
-      shasui: {
-        id: '0xa6148bc1b623e936d39a952ceb5bea79e8b37228a8f595067bf1852efd3c34aa',
-        rewardPoolId:
-          '0x6f3563644d3e2ef13176dbf9d865bd93479df60ccbe07b7e66db57f6309f5a66',
-      },
-      svsui: {
-        id: '0x69ce8e537e750a95381e6040794afa5ab1758353a1a2e1de7760391b01f91670',
-        rewardPoolId:
-          '0xbca914adce058ad0902c7f3cfcd698392a475f00dcfdc3f76001d0370b98777a',
-      },
     },
-    // version: '',
-    // versionCap: '',
     config: '',
   },
   borrowIncentive: {
     id: '0x045811c127a4063d78683ea61fa987b9252a798b0d3ae9e927e25adcbe5549e2',
-    adminCap:
-      '0xc486afa253646f4d381e81d7f1df8aa4723b845a6bb356f69bad635ffefffe2c',
+    config:
+      '0xe5fec608d3a30a1f75b24d2c67d227524075aa6f5ee22e5eccedacd9145b1d9d',
     object:
       '0x045811c127a4063d78683ea61fa987b9252a798b0d3ae9e927e25adcbe5549e2',
-    query: '0xdbc22fe051d384691634cd3b9fe473b09723084a1e4c128728c42e2de3b2228f',
     incentivePools:
-      '0xd214b7055554dd65f27a2c74366377dde63e66c498508ef3fc9f7d76a32b4465',
+      '0xb06657692f7f4d9eb0d7b7d6ac24db30e6fdaed64b09dee49664b496f687de46',
     incentiveAccounts:
-      '0x717cd4d3e78e8c45f7570c0857f696f8c7a68248218a258aa49bff99b3ff7175',
-    config:
-      '0xe5fec608d3a30a1f75b24d2c67d227524075aa6f5ee22e5eccedacd9145b1d9d',
-    // version: '',
-    // versionCap: '',
+      '0x0bf8168d983c18edcc6b2c2b2e85d2bdac84764babfecf1b567f98801fbf4942',
+    query: '0xdbc22fe051d384691634cd3b9fe473b09723084a1e4c128728c42e2de3b2228f',
+    adminCap:
+      '0xc486afa253646f4d381e81d7f1df8aa4723b845a6bb356f69bad635ffefffe2c',
   },
   vesca: {
     id: '0x0c7f5568dbd69488437ee95f2d9a028724e1de12432965ff8acca7c67310ba46',
@@ -341,32 +271,32 @@ export const TEST_ADDRESSES: AddressesInterface = {
     subsTable:
       '0x4756b716670ff62760b22bebed73c6eb2c2cb118674a2eea3a56ebea9e27ae76',
     subsTableId:
-      '0xe9fa5d464d28fe30ad060ea32af577c68c9e82aca48ad1f10f13f35338472778',
+      '0x924b56d383b45445984a80002185b670aa2e72cd7df496d345f45f9407a12c07',
     subsWhitelist:
       '0xfc72adae643da4f2fe080adc1e2cca981eadcb518facb02324eeaab169752ffb',
   },
   referral: {
-    id: '0x709ce9b97a63c6815c385ffd31c354dcd8f760984610581be23b838af4c6f60b',
+    id: '0x1bf5a8ce77050d8052549d743e16b469f15aa6b81b752b78b6ebb65179665f5a',
     object:
       '0x5658d4bf5ddcba27e4337b4262108b3ad1716643cac8c2054ac341538adc72ec',
     adminCap:
       '0xc5dc06b9074291259f2cac460c940012c781c4430e42125c541cc43101c3bcbd',
     referralBindings:
-      '0xf63299d58789d99de94092b9011323466e55ca0c1ea1a7a3786a589af46e1c09',
+      '0xcf184487782bed962bf678001efe775d31fb94b9992333a57594cf15d79d5ced',
     bindingTableId:
-      '0x1c8202b17267ec8d6cf97ca013615354181a04f179570e42601ff2dae19294b1',
+      '0x41a50e258c0a266ce84e0e1a618dbf70b878cc943909e613089a50afcceb2bc0',
     referralRevenuePool:
-      '0x6abd852caf90769c1b185cdf636d841673fa95528f0550f018b8a138bd283c07',
+      '0xc24e3e5e37032f29a3dd91a9a1f057af8821b7e6c148e9683900ac8b6d30f0c6',
     revenueTableId:
-      '0x595baa3654c297bff84ab7786a2d250f019cefc66e8df8e89fd9d41e02bd30dd',
+      '0x669dfb0f47fccbbe2ae8a0bfce2672a994ef3f1c7049621405cce2f91733bdc1',
     referralTiers:
-      '0x962cb903d8d7346190c5204785ccbb91b61086aa764f674c8145df82335cf83e',
+      '0x144350f3db9b46d11b140084cd54e6de0b9c3b8d265ce8059b51d0ef58ea464b',
     tiersTableId:
-      '0xeac755a7a8b7798530905ac79e8c114f19d0f130f6eab012954f08faac29c75d',
+      '0xad5e36fce7358a3ef94a56eb89ee7f1968100c1a9d967c1731154083e1dda1fb',
     authorizedWitnessList:
       '0xf21b0ed043c9bb70842c0129159f4943dbcc3c9ef2f2f808af65f8be25cfd20e',
     version:
-      '0x1bd4b7285f72e11c316b828c7c47b3f4da18dcec9f9b3dba6d8629cbb6f93e5e',
+      '0x3545849eb97723e676a476ec9d4fe5f2eb0eb2c6b78972851114fd4c7ed4639f',
   },
   loyaltyProgram: {
     id: '0xab7c4e6d53ef862a1115d0c381fd33e05f9c206b79f322a54990b1e8c2fe3446',
@@ -378,15 +308,15 @@ export const TEST_ADDRESSES: AddressesInterface = {
       '0x574a11f8a0fbaa05b8f559cb65634e8eb20f26b1ec29e7d58de9167f3cedd0f7',
   },
   veScaLoyaltyProgram: {
-    id: '0x120dd97cb2be154d3c0e65e697594bf9cd4a7ce36f0eea0f1d70601f4a0b83eb',
+    id: '0x51bd8c455caedad9d7fd47f9ee75876668c4d6bbede95af39c0aebde46043f00',
     object:
-      '0x120dd97cb2be154d3c0e65e697594bf9cd4a7ce36f0eea0f1d70601f4a0b83eb',
+      '0x51bd8c455caedad9d7fd47f9ee75876668c4d6bbede95af39c0aebde46043f00',
     adminCap:
-      '0x9877e840e32705b80cb375115d5ff9dcd58f0c68204b7e15aa431b8cb547aaca',
+      '0xb2d52e0ebb260cb42699be6a9804e12d6fa17b79ef1e43f9996df5ca71bac0ae',
     veScaRewardPool:
-      '0x1b4f09e30dbb6e1442f6710c52568295d120cc4ff2ae02449a11070b3faf2c86',
+      '0x4fe34992bf2261c3c6c14b2dbf9606ce65a505c45ff778ac129ce7dea9b0cadf',
     veScaRewardTableId:
-      '0xb63dc27b258ae4066544f58a987931a5a2f78ebe872319381b62eb65c3ac5560',
+      '0x85d3e557d9bbed617b9cbc09982a0c9a6f6f4fc9ecce49b59124206c409c4774',
   },
   scoin: {
     id: '0x826a4934bee9487e558eed603cf42f30cdc4321d6f31083930791b95f903b9f9',
@@ -394,62 +324,89 @@ export const TEST_ADDRESSES: AddressesInterface = {
       ssui: {
         coinType:
           '0x88618204de2dfdc2597681a8441ee726b0dc13494c41e319c3264eb7b35fea90::scallop_sui::SCALLOP_SUI',
+        metaData: '',
+        symbol: 'sSUI',
         treasury:
           '0x03f1d94a40bd9f5d556bacb5c5245732b185572f6a29b36ad8b555d9a8a24f09',
-        metaData:
-          '0xfc9f2b2aa98be8d2dc95603cd531bdb38bcb894c82929d435d84a1985282e838',
-        symbol: 'sSUI',
       },
       ssca: {
         coinType:
           '0x9f64a180373a6b66595025ae16a4ab701f0af1dd5c7ce1ac91dc112e52c2a3f8::scallop_sca::SCALLOP_SCA',
-        treasury:
-          '0x1b05d2cd8b20dba19da073a54195fc52d2f438ea19dea0713bae7a7dab308199',
-        metaData:
-          '0xf1bf00be79b48c064f99fa5d1d4389e44776a269888b57b2f9a923080882ea73',
+        metaData: '',
         symbol: 'sSCA',
-      },
-      safsui: {
-        coinType:
-          '0xe66ae8fd59e37f78e355dafb130b7c167ca4ec8792a424031a1a1eac96244ada::scallop_af_sui::SCALLOP_AF_SUI',
         treasury:
-          '0xc57357a64593aa54bc23d7936129119b86876a200107481578f304762217061a',
-        metaData:
-          '0x42179b69f82ea26e3763345ee0fb1cea8b1bd355168b3241ceb727ec82bb0688',
-        symbol: 'safSUI',
+          '0x1b05d2cd8b20dba19da073a54195fc52d2f438ea19dea0713bae7a7dab308199',
       },
       susdc: {
         coinType:
           '0x55ed015f9f006c0c96ad36ebe3b3570d088e8498f52defea48e5634c110e485c::scallop_usdc::SCALLOP_USDC',
         treasury:
           '0x6ef82ef94472dcb8c2cdeac8df38874024c08570ca165986ba56d1e38fe0c0a3',
-        metaData:
-          '0xad94e42c05ab0eb54c9d9a1bcf3689bcd330710d6b300956213aa35387b727c9',
         symbol: 'sUSDC',
+        metaData:
+          '0x763a21eba338e00bc684aaad80491c89eea5f247b59c47df45b17610c9ad58f2',
       },
       sdeep: {
         coinType:
           '0x34f0a2e793e1f79ceac72cfe3bb95f65541da449418289ccd12922d16140c882::scallop_deep::SCALLOP_DEEP',
+        metaData: '',
+        symbol: 'sDEEP',
         treasury:
           '0x71d41465cf2d16fa0206126526bebdf65c8871d1fcfbd0c2237db2306afd67ba',
-        metaData:
-          '0x63e749a506bbae17ca63fd41a270e2b9b0a08dade1964bfa620ecba94c8be4f9',
-        symbol: 'sDEEP',
       },
       sfud: {
         coinType:
           '0x3b23c05f917052255a0b16a534dbd4446911aa4a30bd3497cdf5b736551e7ef8::scallop_fud::SCALLOP_FUD',
+        metaData: '',
+        symbol: 'sFUD',
         treasury:
           '0x858c492d51425b922c040c1a389e185b3b00d565e7d72ead1a81dc733104660d',
-        metaData:
-          '0x0cd9fb845663dd5e1f7c48a321ab1c523a54c70243711a5a115523945396e54f',
-        symbol: 'sFUD',
       },
     },
   },
+  // scoin: {
+  //   id: '0x826a4934bee9487e558eed603cf42f30cdc4321d6f31083930791b95f903b9f9',
+  //   coins: {
+  //     ssui: {
+  //       coinType:
+  //         '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
+  //       metaData: '0xac724644f481f4870ecdc29b9549aa8ea5180f10827c0d97b493f9f65a91455d',
+  //       symbol: 'sSUI',
+  //       treasury: '0x5c1678c8261ac9eec024d4d630006a9f55c80dc0b1aa38a003fcb1d425818c6b',
+  //     },
+  //     ssca: {
+  //       coinType:
+  //         '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
+  //       treasury: '0xe04bfc95e00252bd654ee13c08edef9ac5e4b6ae4074e8390db39e9a0109c529',
+  //       metaData: '0x27e3877491b308dfac46fb3d9f7dfa6a1e8b7dc3c374e92ecda7976055746964',
+  //       symbol: 'sSCA',
+  //     },
+  //     susdc: {
+  //       coinType:
+  //         '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
+  //       treasury: '0xbe6b63021f3d82e0e7e977cdd718ed7c019cf2eba374b7b546220402452f938e',
+  //       metaData: '0x763a21eba338e00bc684aaad80491c89eea5f247b59c47df45b17610c9ad58f2',
+  //       symbol: 'sUSDC',
+  //     },
+  //     sdeep: {
+  //       coinType:
+  //         '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
+  //       treasury: '0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88',
+  //       metaData: '0x2443014594a500a9119e11c6c6a86e865834f496c4614280ce8cace33c0b072e',
+  //       symbol: 'sDEEP',
+  //     },
+  //     sfud: {
+  //       coinType:
+  //         '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
+  //       treasury: '0xf25212f11d182decff7a86165699a73e3d5787aced203ca539f43cfbc10db867',
+  //       metaData: '0x4e03390de36b8c84e0a8297d3d0d08a8a34bed93787e37fcb26bfc26df33226c',
+  //       symbol: 'sFUD',
+  //     },
+  //   },
+  // },
 };
 
-export const TEST_WHITELIST = {
+export const WHITELIST = {
   lending: new Set([
     'usdc',
     // 'sbeth',
@@ -463,7 +420,7 @@ export const TEST_WHITELIST = {
     // 'wapt',
     // 'wsol',
     // 'cetus',
-    'afsui',
+    // 'afsui',
     // 'hasui',
     // 'vsui',
     'sca',
@@ -489,7 +446,7 @@ export const TEST_WHITELIST = {
     // 'wapt',
     // 'wsol',
     // 'cetus',
-    'afsui',
+    // 'afsui',
     // 'hasui',
     // 'vsui',
     'sca',
@@ -511,7 +468,7 @@ export const TEST_WHITELIST = {
     // 'wapt',
     // 'wsol',
     // 'cetus',
-    'afsui',
+    // 'afsui',
     // 'hasui',
     // 'vsui',
     'sca',
@@ -557,7 +514,7 @@ export const TEST_WHITELIST = {
     'ssui',
     // 'swusdc',
     // 'swusdt',
-    'safsui',
+    // 'safsui',
     // 'shasui',
     // 'svsui',
     // 'sweth',
@@ -584,7 +541,7 @@ export const TEST_WHITELIST = {
   emerging: new Set(['wal', 'deep', 'sca', 'cetus']),
 };
 
-export const TEST_POOL_ADDRESSES = {
+export const POOL_ADDRESSES = {
   usdc: {
     coinName: 'usdc',
     symbol: 'USDC',
@@ -792,49 +749,4 @@ export const TEST_POOL_ADDRESSES = {
     flashloanFeeObject:
       '0xd54dfb677e9e011e2451375a7a2e318b4f2225c2a0b369bde0afcef8cbb1a863',
   },
-  afsui: {
-    coinName: 'afsui',
-    symbol: 'afSUI',
-    lendingPoolAddress:
-      '0x8eb75cd4c5050c4c9950f11694bb32b644706d24b9129981df3b52d2080ad45d',
-    collateralPoolAddress:
-      '0x48c5455eb1a9f1422c617a89a41927e166cfb49b829100980d4369f9f079d75c',
-    borrowDynamic:
-      '0x8f5d749372526ef651b6ba6ffede9bf17b8a96f90cda2a64893366a1d5c89491',
-    interestModel:
-      '0x9e82e24542804156386df51ddce8399fca0981a77e710542847f981febf231e9',
-    riskModel:
-      '0xfe1b5c5a883d8693effb11b35965538f9777e3c3d89298db2b57252916df14bd',
-    borrowFeeKey:
-      '0xabc6422db2d4ee01635ddaeaa44ba68370eebd785d2c4632515f841ae9bc47d9',
-    supplyLimitKey:
-      '0x61a2054eb37f543c0d774da57f2c9542aad8d79a197f748ac08ef5df6cc47028',
-    borrowLimitKey:
-      '0x4459498a043872cd107ea917493fee0baf2d37a273c7538e1d6581cc61b92af8',
-    isolatedAssetKey: '',
-    isIsolated: false,
-    spool: '0xeedf438abcaa6ce4d9625ffca110920592d5867e4c5637d84ad9f466c4feb800',
-    spoolReward:
-      '0x89255a2f86ed7fbfef35ab8b7be48cc7667015975be2685dd9a55a9a64baf76e',
-    sCoinType:
-      '0xe66ae8fd59e37f78e355dafb130b7c167ca4ec8792a424031a1a1eac96244ada::scallop_af_sui::SCALLOP_AF_SUI',
-    sCoinTreasury:
-      '0xc57357a64593aa54bc23d7936129119b86876a200107481578f304762217061a',
-    sCoinMetadataId:
-      '0x42179b69f82ea26e3763345ee0fb1cea8b1bd355168b3241ceb727ec82bb0688',
-    sCoinSymbol: 'safSUI',
-    sCoinName: 'safsui',
-    coinMetadataId:
-      '0x2f9217f533e51334873a39b8026a4aa6919497b47f49d0986a4f1aec66f8a34d',
-    coinType:
-      '0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI',
-    spoolName: 'safsui',
-    decimals: 9,
-    pythFeed:
-      '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-    pythFeedObjectId:
-      '0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37',
-    flashloanFeeObject:
-      '0xac87fde83d434554ec300c1334c9a622aa5b59e82a04334dc99e1cc1f75d4eae',
-  },
 };

package/src/constants/xoracle.ts

@@ -1,12 +1,6 @@
-export const SUPPORT_ORACLES = ['supra', 'switchboard', 'pyth'] as const;
-export const X_ORACLE_RULES = ['primary', 'secondary'] as const;
-export const SUPPORT_ORACLE_LST = ['pyth'] as const;
-export const SUPPORT_SUI_LST = ['afsui'] as const;
+import { xOracleListType } from 'src/types';
 
-export const X_ORACLE_LIST: Record<
-  string,
-  Record<(typeof X_ORACLE_RULES)[number], (typeof SUPPORT_ORACLES)[number][]>
-> = {
+export const xOracleList: xOracleListType = {
   usdc: { primary: ['pyth'], secondary: [] },
   sbeth: { primary: ['pyth'], secondary: [] },
   sbusdt: { primary: ['pyth'], secondary: [] },

package/src/index.ts

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

package/src/models/index.ts

@@ -1,4 +1,3 @@
-// export type * from './interface';
 export { default as Scallop } from './scallop';
 export { default as ScallopClient } from './scallopClient';
 export { default as ScallopBuilder } from './scallopBuilder';
@@ -7,6 +6,6 @@ export { default as ScallopAxios } from './scallopAxios';
 export { default as ScallopConstants } from './scallopConstants';
 export { default as ScallopIndexer } from './scallopIndexer';
 export { default as ScallopQuery } from './scallopQuery';
-export { default as ScallopQueryClient } from './scallopQueryClient';
+export { default as ScallopQueryClient } from '../models/scallopQueryClient';
 export { default as ScallopUtils } from './scallopUtils';
 export { default as ScallopSuiKit } from './scallopSuiKit';

package/src/models/interface.ts

@@ -1,9 +1,9 @@
-import type { default as ScallopAddress } from './scallopAddress';
-import type { default as ScallopBuilder } from './scallopBuilder';
-import type { default as ScallopConstants } from './scallopConstants';
-import type { default as ScallopQuery } from './scallopQuery';
-import type { default as ScallopSuiKit } from './scallopSuiKit';
-import type { default as ScallopUtils } from './scallopUtils';
+import ScallopAddress from './scallopAddress';
+import ScallopBuilder from './scallopBuilder';
+import ScallopConstants from './scallopConstants';
+import ScallopQuery from './scallopQuery';
+import ScallopSuiKit from './scallopSuiKit';
+import ScallopUtils from './scallopUtils';
 
 interface ScallopBaseInterface {
   scallopSuiKit: ScallopSuiKit;