@scallop-io/sui-scallop-sdk 1.4.24-alpha.1 → 1.5.0-alpha.1

package/dist/index.js

@@ -84,7 +84,8 @@ __export(src_exports, {
   stakeMarketCoins: () => stakeMarketCoins,
   suiBridgeCoins: () => suiBridgeCoins,
   voloCoinIds: () => voloCoinIds,
-  wormholeCoinIds: () => wormholeCoinIds
+  wormholeCoinIds: () => wormholeCoinIds,
+  xOracleList: () => xOracleList
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -100,35 +101,26 @@ var DEFAULT_CACHE_OPTIONS = {
 
 // src/constants/coinGecko.ts
 var COIN_GECKGO_IDS = {
-  // Sui Bridge
+  usdc: "usdc",
   sbeth: "ethereum",
   sbusdt: "tether",
   sbwbtc: "bitcoin",
-  // Wormhole
   weth: "ethereum",
   wbtc: "bitcoin",
   wusdc: "usdc",
   wusdt: "tether",
+  sui: "sui",
   wapt: "aptos",
   wsol: "solana",
-  // Sui Native
-  usdc: "usdc",
-  // Sui LST
-  sui: "sui",
+  cetus: "cetus-protocol",
   afsui: "sui",
   hasui: "sui",
   vsui: "sui",
-  // Stable
-  fdusd: "first-digital-usd",
-  // DeFi
-  cetus: "cetus-protocol",
   sca: "scallop-2",
+  fdusd: "first-digital-usd",
   deep: "deepbook",
-  // Isolated Asset
   fud: "fud-the-pug",
-  blub: "blub",
-  musd: ""
-  // @TODO: add coinGecko id
+  blub: "blub"
 };
 
 // src/constants/common.ts
@@ -165,8 +157,7 @@ var SUPPORT_POOLS = [
   "fud",
   "deep",
   "fdusd",
-  "blub",
-  "musd"
+  "blub"
 ];
 var SUPPORT_COLLATERALS = [
   "usdc",
@@ -221,8 +212,7 @@ var SUPPORT_SCOIN = [
   "sdeep",
   "sfud",
   "sfdusd",
-  "sblub",
-  "smusd"
+  "sblub"
 ];
 var SUPPORT_SUI_BRIDGE = ["sbeth", "sbusdt", "sbwbtc"];
 var SUPPORT_WORMHOLE = [
@@ -277,7 +267,6 @@ var coinDecimals = {
   deep: 6,
   fud: 5,
   blub: 2,
-  musd: 9,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
@@ -297,8 +286,7 @@ var coinDecimals = {
   sfdusd: 6,
   sdeep: 6,
   sfud: 5,
-  sblub: 2,
-  smusd: 9
+  sblub: 2
 };
 var assetCoins = {
   usdc: "usdc",
@@ -320,8 +308,7 @@ var assetCoins = {
   fdusd: "fdusd",
   deep: "deep",
   fud: "fud",
-  blub: "blub",
-  musd: "musd"
+  blub: "blub"
 };
 var marketCoins = {
   susdc: "susdc",
@@ -343,8 +330,7 @@ var marketCoins = {
   sfdusd: "sfdusd",
   sdeep: "sdeep",
   sfud: "sfud",
-  sblub: "sblub",
-  smusd: "smusd"
+  sblub: "sblub"
 };
 var sCoins = {
   susdc: "susdc",
@@ -365,8 +351,7 @@ var sCoins = {
   sfdusd: "sfdusd",
   sfud: "sfud",
   sdeep: "sdeep",
-  sblub: "sblub",
-  smusd: "smusd"
+  sblub: "sblub"
 };
 var stakeMarketCoins = {
   susdc: "susdc",
@@ -420,8 +405,7 @@ var coinIds = {
   // Sui bridge assets
   sbeth: "0xd0e89b2af5e4910726fbcd8b8dd37bb79b29e5f83f7491bca830e94f7f226d29",
   sbusdt: "0x375f70cf2ae4c00bf37117d0c85a2c71545e6ee05c4a5c7d282cd66a4504b068",
-  sbwbtc: "0xaafb102dd0902f5055cadecd687fb5b71ca82ef0e0285d90afde828ec58ca96b",
-  musd: "0xe44df51c0b21a27ab915fa1fe2ca610cd3eaa6d9666fe5e62b988bf7f0bd8722"
+  sbwbtc: "0xaafb102dd0902f5055cadecd687fb5b71ca82ef0e0285d90afde828ec58ca96b"
 };
 var wormholeCoinIds = {
   weth: "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5",
@@ -435,8 +419,10 @@ var voloCoinIds = {
   vsui: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55"
 };
 var sCoinIds = {
-  ssui: "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI",
-  ssca: "0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA",
+  // ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI', // @TODO: restore on prod
+  ssui: "0x88618204de2dfdc2597681a8441ee726b0dc13494c41e319c3264eb7b35fea90::scallop_sui::SCALLOP_SUI",
+  // ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA', // @TODO: restore on prod
+  ssca: "0x9f64a180373a6b66595025ae16a4ab701f0af1dd5c7ce1ac91dc112e52c2a3f8::scallop_sca::SCALLOP_SCA",
   scetus: "0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS",
   // Wormhole assets
   sweth: "0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH",
@@ -447,19 +433,25 @@ var sCoinIds = {
   shasui: "0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI",
   svsui: "0xe1a1cc6bcf0001a015eab84bcc6713393ce20535f55b8b6f35c142e057a25fbe::scallop_v_sui::SCALLOP_V_SUI",
   // stable coins
-  susdc: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
+  susdc: (
+    // '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC', // @TODO: restore on prod
+    "0x55ed015f9f006c0c96ad36ebe3b3570d088e8498f52defea48e5634c110e485c::scallop_usdc::SCALLOP_USDC"
+  ),
   swusdc: "0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
   swusdt: "0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
   sfdusd: "0x6711551c1e7652a270d9fbf0eee25d99594c157cde3cb5fbb49035eb59b1b001::scallop_fdusd::SCALLOP_FDUSD",
   // isolated assets
-  sdeep: "0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP",
-  sfud: "0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD",
+  sdeep: (
+    // '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP', // @TODO: restore on prod
+    "0x34f0a2e793e1f79ceac72cfe3bb95f65541da449418289ccd12922d16140c882::scallop_deep::SCALLOP_DEEP"
+  ),
+  // sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD', // @TODO: restore on prod
+  sfud: "0x3b23c05f917052255a0b16a534dbd4446911aa4a30bd3497cdf5b736551e7ef8::scallop_fud::SCALLOP_FUD",
   sblub: "0xe72f65446eabfad2103037af2d49d24599106fb44bf4c046c1e7e9acf6844dd0::scallop_blub::SCALLOP_BLUB",
   // Sui bridge assets
   ssbeth: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
   ssbusdt: "0xb1d7df34829d1513b73ba17cb7ad90c88d1e104bb65ab8f62f13e0cc103783d3::scallop_sb_usdt::SCALLOP_SB_USDT",
-  ssbwbtc: "0x08c0fe357d3a138f4552bee393ce3a28a45bebcca43373d6a90bc44ab76f82e2::scallop_sb_wbtc::SCALLOP_SB_WBTC",
-  smusd: "0x0a228d1c59071eccf3716076a1f71216846ee256d9fb07ea11fb7c1eb56435a5::scallop_musd::SCALLOP_MUSD"
+  ssbwbtc: "0x08c0fe357d3a138f4552bee393ce3a28a45bebcca43373d6a90bc44ab76f82e2::scallop_sb_wbtc::SCALLOP_SB_WBTC"
 };
 var sCoinTypeToName = Object.entries(sCoinIds).reduce(
   (acc, [coinName, coinType]) => {
@@ -561,30 +553,54 @@ var POOL_ADDRESSES = {
     pythFeedObjectId: "0x9a62b4863bdeaabdc9500fce769cf7e72d5585eeb28a6d26e4cafadc13f76ab2"
   },
   usdc: {
-    coinName: "usdc",
-    symbol: "USDC",
-    lendingPoolAddress: "0xd3be98bf540f7603eeb550c0c0a19dbfc78822f25158b5fa84ebd9609def415f",
-    collateralPoolAddress: "0x8f0d529ba179c5b3d508213003eab813aaae31f78226099639b9a69d1aec17af",
-    borrowDynamic: "0x77837ecd4f26fac9a410fff594f2c0bd3288904a15492ca77cb8a52684dbb866",
-    interestModel: "0xaae3f179d63009380cbdcb9acb12907afc9c3cb79cc3460be296a9c6d28f3ff3",
-    riskModel: "0x198b24db213bfeb8b3c80ae63dde92e32fd24984d25da8233ff777b851edd574",
-    borrowFeeKey: "0xd37c5316cfe0a5967d14264fa6b423f880518b294a1ee6581ccbb49ccc401fb8",
-    supplyLimitKey: "0x4be9ae54ac4d320f4f9c14cae78cb85c8e0e67791dd9bdba6d2db20614a28a24",
-    borrowLimitKey: "0x6b01093cba95b835181f00e3a2c31ed8dfc8d64fe3db0fb80933a09f66e1ccf1",
-    spool: "0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918",
-    spoolReward: "0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166",
-    sCoinTreasury: "0xbe6b63021f3d82e0e7e977cdd718ed7c019cf2eba374b7b546220402452f938e",
-    sCoinType: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
-    sCoinName: "susdc",
-    sCoinSymbol: "sUSDC",
-    coinMetadataId: "0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6",
-    coinType: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
-    sCoinMetadataId: "0x763a21eba338e00bc684aaad80491c89eea5f247b59c47df45b17610c9ad58f2",
-    spoolName: "susdc",
-    decimals: 6,
-    pythFeed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
-    pythFeedObjectId: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
+    ...{
+      coinName: "usdc",
+      symbol: "USDC",
+      lendingPoolAddress: "0xd3be98bf540f7603eeb550c0c0a19dbfc78822f25158b5fa84ebd9609def415f",
+      collateralPoolAddress: "0x8f0d529ba179c5b3d508213003eab813aaae31f78226099639b9a69d1aec17af",
+      borrowDynamic: "0x77837ecd4f26fac9a410fff594f2c0bd3288904a15492ca77cb8a52684dbb866",
+      interestModel: "0xaae3f179d63009380cbdcb9acb12907afc9c3cb79cc3460be296a9c6d28f3ff3",
+      riskModel: "0x198b24db213bfeb8b3c80ae63dde92e32fd24984d25da8233ff777b851edd574",
+      borrowFeeKey: "0xd37c5316cfe0a5967d14264fa6b423f880518b294a1ee6581ccbb49ccc401fb8",
+      supplyLimitKey: "0x4be9ae54ac4d320f4f9c14cae78cb85c8e0e67791dd9bdba6d2db20614a28a24",
+      borrowLimitKey: "0x6b01093cba95b835181f00e3a2c31ed8dfc8d64fe3db0fb80933a09f66e1ccf1",
+      spool: "0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918",
+      spoolReward: "0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166",
+      sCoinTreasury: "0xbe6b63021f3d82e0e7e977cdd718ed7c019cf2eba374b7b546220402452f938e",
+      sCoinType: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
+      sCoinName: "susdc",
+      sCoinSymbol: "sUSDC",
+      coinMetadataId: "0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6",
+      coinType: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
+      sCoinMetadataId: "0x763a21eba338e00bc684aaad80491c89eea5f247b59c47df45b17610c9ad58f2",
+      spoolName: "susdc",
+      decimals: 6,
+      pythFeed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+      pythFeedObjectId: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
+    },
+    ...{
+      coinName: "usdc",
+      symbol: "USDC",
+      lendingPoolAddress: "0x13319d295914b390b22484373f20f822bca10314c34c227ae6e28df3d9aa8e01",
+      collateralPoolAddress: "0x2fdcf63682577f6bfdd4296500067543ba9877d5d5e41ebd9e51b97ab071ce69",
+      borrowDynamic: "0x7fd0660f0102789ad039542165c6cbc2d90ba3c1d9dbd4ac4ae8804d80817542",
+      interestModel: "0xd4e7b06a79f63706523167f055296db641b0f8ddd6734c05e205f2de0fcefdd0",
+      riskModel: "0x19e5993350186f192ffeb2cba0650b04c291390e149c8ac9b324ecf394daaa1a",
+      spool: "0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918",
+      spoolReward: "0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166",
+      sCoinTreasury: "0x6ef82ef94472dcb8c2cdeac8df38874024c08570ca165986ba56d1e38fe0c0a3",
+      sCoinType: "0x55ed015f9f006c0c96ad36ebe3b3570d088e8498f52defea48e5634c110e485c::scallop_usdc::SCALLOP_USDC",
+      sCoinName: "susdc",
+      sCoinSymbol: "sUSDC",
+      coinMetadataId: "0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6",
+      coinType: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
+      spoolName: "susdc",
+      decimals: 6,
+      pythFeed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+      pythFeedObjectId: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
+    }
   },
+  // @TODO: restore on prod
   weth: {
     coinName: "weth",
     symbol: "wETH",
@@ -683,30 +699,54 @@ var POOL_ADDRESSES = {
     pythFeedObjectId: "0x985e3db9f93f76ee8bace7c3dd5cc676a096accd5d9e09e9ae0fb6e492b14572"
   },
   sui: {
-    coinName: "sui",
-    symbol: "SUI",
-    lendingPoolAddress: "0x9c9077abf7a29eebce41e33addbcd6f5246a5221dd733e56ea0f00ae1b25c9e8",
-    collateralPoolAddress: "0x75aacfb7dcbf92ee0111fc1bf975b12569e4ba632e81ed7ae5ac090d40cd3acb",
-    borrowDynamic: "0xbf68e6159c99dcaf87717385f1143d2891c2d19663bd51f0bc9b6909e4bb7c27",
-    interestModel: "0x0dad9baa89b863c15a0487575de7cc428b01f1aa3998ad7a9e9752d96e83ffa9",
-    riskModel: "0xcd6675864690b5648a6e309f2f02a66914b2b2bd9c31936f4e0f7fc0f792bc86",
-    borrowFeeKey: "0xda5ede87a05c0677b17511c859b22d0a2b0229ee374d5d7a1274cb836b9fe5f8",
-    supplyLimitKey: "0x0602418e66fb7a73fa997077bd66f248ad5b090d43344a14b9f1db598ecc1d47",
-    borrowLimitKey: "0x2b33a7efdcf6a6df24f4d8a356dd52f58d75bc023c3f171d99502d4d008b53f0",
-    spool: "0x4f0ba970d3c11db05c8f40c64a15b6a33322db3702d634ced6536960ab6f3ee4",
-    spoolReward: "0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9",
-    sCoinTreasury: "0x5c1678c8261ac9eec024d4d630006a9f55c80dc0b1aa38a003fcb1d425818c6b",
-    sCoinType: "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI",
-    sCoinName: "ssui",
-    sCoinSymbol: "sSUI",
-    coinMetadataId: "0x9258181f5ceac8dbffb7030890243caed69a9599d2886d957a9cb7656af3bdb3",
-    coinType: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI",
-    sCoinMetadataId: "0xac724644f481f4870ecdc29b9549aa8ea5180f10827c0d97b493f9f65a91455d",
-    spoolName: "ssui",
-    decimals: 9,
-    pythFeed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-    pythFeedObjectId: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
+    ...{
+      coinName: "sui",
+      symbol: "SUI",
+      lendingPoolAddress: "0x9c9077abf7a29eebce41e33addbcd6f5246a5221dd733e56ea0f00ae1b25c9e8",
+      collateralPoolAddress: "0x75aacfb7dcbf92ee0111fc1bf975b12569e4ba632e81ed7ae5ac090d40cd3acb",
+      borrowDynamic: "0xbf68e6159c99dcaf87717385f1143d2891c2d19663bd51f0bc9b6909e4bb7c27",
+      interestModel: "0x0dad9baa89b863c15a0487575de7cc428b01f1aa3998ad7a9e9752d96e83ffa9",
+      riskModel: "0xcd6675864690b5648a6e309f2f02a66914b2b2bd9c31936f4e0f7fc0f792bc86",
+      borrowFeeKey: "0xda5ede87a05c0677b17511c859b22d0a2b0229ee374d5d7a1274cb836b9fe5f8",
+      supplyLimitKey: "0x0602418e66fb7a73fa997077bd66f248ad5b090d43344a14b9f1db598ecc1d47",
+      borrowLimitKey: "0x2b33a7efdcf6a6df24f4d8a356dd52f58d75bc023c3f171d99502d4d008b53f0",
+      spool: "0x4f0ba970d3c11db05c8f40c64a15b6a33322db3702d634ced6536960ab6f3ee4",
+      spoolReward: "0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9",
+      sCoinTreasury: "0x5c1678c8261ac9eec024d4d630006a9f55c80dc0b1aa38a003fcb1d425818c6b",
+      sCoinType: "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI",
+      sCoinName: "ssui",
+      sCoinSymbol: "sSUI",
+      coinMetadataId: "0x9258181f5ceac8dbffb7030890243caed69a9599d2886d957a9cb7656af3bdb3",
+      coinType: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI",
+      sCoinMetadataId: "0xac724644f481f4870ecdc29b9549aa8ea5180f10827c0d97b493f9f65a91455d",
+      spoolName: "ssui",
+      decimals: 9,
+      pythFeed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+      pythFeedObjectId: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
+    },
+    ...{
+      coinName: "sui",
+      symbol: "SUI",
+      lendingPoolAddress: "0xeb86ad67543c1ac2c4cbaf178d38a45ab27c2e69d60f0f8badd83f563f012c3c",
+      collateralPoolAddress: "0xcba7bb07d4d3ce01d81e71d9def680aa8b417347bfd7834aee8fc3b85b61c9a1",
+      borrowDynamic: "0xd47c2fd3dbb95ed06e5da92f6b99611ba94a36efa6a13d9b33b02519761cc84e",
+      interestModel: "0x4742bb49aa49ab4e5d9dfa119cddc027d1b7811ac42ca1ce794818d4a4da68e7",
+      riskModel: "0x6dc356e829cfca2d79f0d68a79b5ddd5296ad0c955a38e2fc397485e2b629367",
+      spool: "0xb9617f83c06ebdeac0a8834782b1015e1cc7ea23739e30c132c4bfb95c37a579",
+      spoolReward: "0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a",
+      sCoinTreasury: "0x03f1d94a40bd9f5d556bacb5c5245732b185572f6a29b36ad8b555d9a8a24f09",
+      sCoinType: "0x88618204de2dfdc2597681a8441ee726b0dc13494c41e319c3264eb7b35fea90::scallop_sui::SCALLOP_SUI",
+      sCoinName: "ssui",
+      sCoinSymbol: "sSUI",
+      coinMetadataId: "0x9258181f5ceac8dbffb7030890243caed69a9599d2886d957a9cb7656af3bdb3",
+      coinType: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI",
+      spoolName: "ssui",
+      decimals: 9,
+      pythFeed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+      pythFeedObjectId: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
+    }
   },
+  // @TODO: restore on prod
   wapt: {
     coinName: "wapt",
     symbol: "wAPT",
@@ -845,48 +885,88 @@ var POOL_ADDRESSES = {
     pythFeedObjectId: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
   },
   sca: {
-    coinName: "sca",
-    symbol: "SCA",
-    lendingPoolAddress: "0x6fc7d4211fc7018b6c75e7b908b88f2e0536443239804a3d32af547637bd28d7",
-    collateralPoolAddress: "0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31",
-    borrowDynamic: "0x4e24f52edd739dab59ca4c6353ca430b7ce57e7f333abd0957958570a7cd09ca",
-    interestModel: "0xbdcd48cf5b1a814911dc2d5c72d393a980c87820199fe5d799289ce94f4c47df",
-    riskModel: "0xc437c24b67b8e2676907700fa395af337ad6463d2c0b4f4fa2e9276414026089",
-    borrowFeeKey: "0xee55ba0f9800a62d9e7aef667f87e658258f41814d2c9fa02e25590671b4e5ad",
-    supplyLimitKey: "0x8dd938856b972a10ea27ecab2af7ed78e48fc5f6ccedaf2b2119959f747dc2e3",
-    borrowLimitKey: "0x04c7de61c5b42972f9bf6a8b1848e5fea2d037ee8deba81741ecd4a70aa80d30",
-    sCoinTreasury: "0xe04bfc95e00252bd654ee13c08edef9ac5e4b6ae4074e8390db39e9a0109c529",
-    sCoinType: "0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA",
-    sCoinName: "ssca",
-    sCoinSymbol: "sSCA",
-    coinMetadataId: "0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844",
-    coinType: "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA",
-    sCoinMetadataId: "0x27e3877491b308dfac46fb3d9f7dfa6a1e8b7dc3c374e92ecda7976055746964",
-    decimals: 9,
-    pythFeed: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
-    pythFeedObjectId: "0xf6de1d3279a269a597d813cbaca59aa906543ab9a8c64e84a4722f1a20863985"
+    ...{
+      coinName: "sca",
+      symbol: "SCA",
+      lendingPoolAddress: "0x6fc7d4211fc7018b6c75e7b908b88f2e0536443239804a3d32af547637bd28d7",
+      collateralPoolAddress: "0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31",
+      borrowDynamic: "0x4e24f52edd739dab59ca4c6353ca430b7ce57e7f333abd0957958570a7cd09ca",
+      interestModel: "0xbdcd48cf5b1a814911dc2d5c72d393a980c87820199fe5d799289ce94f4c47df",
+      riskModel: "0xc437c24b67b8e2676907700fa395af337ad6463d2c0b4f4fa2e9276414026089",
+      borrowFeeKey: "0xee55ba0f9800a62d9e7aef667f87e658258f41814d2c9fa02e25590671b4e5ad",
+      supplyLimitKey: "0x8dd938856b972a10ea27ecab2af7ed78e48fc5f6ccedaf2b2119959f747dc2e3",
+      borrowLimitKey: "0x04c7de61c5b42972f9bf6a8b1848e5fea2d037ee8deba81741ecd4a70aa80d30",
+      sCoinTreasury: "0xe04bfc95e00252bd654ee13c08edef9ac5e4b6ae4074e8390db39e9a0109c529",
+      sCoinType: "0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA",
+      sCoinName: "ssca",
+      sCoinSymbol: "sSCA",
+      coinMetadataId: "0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844",
+      coinType: "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA",
+      sCoinMetadataId: "0x27e3877491b308dfac46fb3d9f7dfa6a1e8b7dc3c374e92ecda7976055746964",
+      decimals: 9,
+      pythFeed: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
+      pythFeedObjectId: "0xf6de1d3279a269a597d813cbaca59aa906543ab9a8c64e84a4722f1a20863985"
+    },
+    ...{
+      coinName: "sca",
+      symbol: "SCA",
+      lendingPoolAddress: "0xd08ef85bc753616ce0f1e3ac01bbc8bd1ee53e03b1e82aaa9690db5cd285ef4c",
+      collateralPoolAddress: "0x4f59b8ef2cdd195830890cf0c01e29c159e48a6a6c766c64fd4b26cfa9ee58c6",
+      borrowDynamic: "0x7f6e11fbd32b5d0223f03bfda67a5b48c551a09cfff88edc187591f9a4b0ab10",
+      interestModel: "0xcb10daf0fee6f416463444f5b47aac0f0197a889bc60be2c4f90916f6a8d2faa",
+      riskModel: "0x043f21a35bd1e1060a7c579db46e10cfd039d0b75d6bfd758de97b60434ae708",
+      sCoinTreasury: "0x1b05d2cd8b20dba19da073a54195fc52d2f438ea19dea0713bae7a7dab308199",
+      sCoinType: "0x9f64a180373a6b66595025ae16a4ab701f0af1dd5c7ce1ac91dc112e52c2a3f8::scallop_sca::SCALLOP_SCA",
+      sCoinName: "ssca",
+      sCoinSymbol: "sSCA",
+      coinMetadataId: "0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844",
+      coinType: "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA",
+      decimals: 9,
+      pythFeed: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
+      pythFeedObjectId: "0xf6de1d3279a269a597d813cbaca59aa906543ab9a8c64e84a4722f1a20863985"
+    }
   },
+  // @TODO: restore on prod
   fud: {
-    coinName: "fud",
-    symbol: "FUD",
-    lendingPoolAddress: "0xefed2cbe76b344792ac724523c8b2236740d1cea2100d46a0ed0dc760c7f4231",
-    borrowDynamic: "0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb",
-    interestModel: "0x2600ac100ef154eb2329ffd3aad47aca308ff9f9348de3e8e94aaeb906ec2303",
-    borrowFeeKey: "0xa87e8b26e07ff35ac9fb57adcc779be2883080fc7d12de2d9e7e16d8d8d5e529",
-    supplyLimitKey: "0xf98419aecc37a3c5de716f8ec590f8991a5be34da72ce1a2da09531ff45adf7d",
-    borrowLimitKey: "0x3d928a001c453c50004baa54e14b0a0e1b0907d9c613dfd76064fd7ed4e8beb8",
-    isolatedAssetKey: "0xfcb533e9e4e31f9c9f32d6cbf7fbb3425f1d60474e229a363a2dc7f835d587e2",
-    sCoinTreasury: "0xf25212f11d182decff7a86165699a73e3d5787aced203ca539f43cfbc10db867",
-    sCoinType: "0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD",
-    sCoinName: "sfud",
-    sCoinSymbol: "sFUD",
-    coinMetadataId: "0x01087411ef48aaac1eb6e24803213e3a60a03b147dac930e5e341f17a85e524e",
-    coinType: "0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1::fud::FUD",
-    sCoinMetadataId: "0x4e03390de36b8c84e0a8297d3d0d08a8a34bed93787e37fcb26bfc26df33226c",
-    decimals: 5,
-    pythFeed: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75",
-    pythFeedObjectId: "0x4531c3ed0d22f21f5fce882905372006c9aafa30f01db03b789e95a6c50de7b2"
+    ...{
+      coinName: "fud",
+      symbol: "FUD",
+      lendingPoolAddress: "0xefed2cbe76b344792ac724523c8b2236740d1cea2100d46a0ed0dc760c7f4231",
+      borrowDynamic: "0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb",
+      interestModel: "0x2600ac100ef154eb2329ffd3aad47aca308ff9f9348de3e8e94aaeb906ec2303",
+      borrowFeeKey: "0xa87e8b26e07ff35ac9fb57adcc779be2883080fc7d12de2d9e7e16d8d8d5e529",
+      supplyLimitKey: "0xf98419aecc37a3c5de716f8ec590f8991a5be34da72ce1a2da09531ff45adf7d",
+      borrowLimitKey: "0x3d928a001c453c50004baa54e14b0a0e1b0907d9c613dfd76064fd7ed4e8beb8",
+      isolatedAssetKey: "0xfcb533e9e4e31f9c9f32d6cbf7fbb3425f1d60474e229a363a2dc7f835d587e2",
+      sCoinTreasury: "0xf25212f11d182decff7a86165699a73e3d5787aced203ca539f43cfbc10db867",
+      sCoinType: "0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD",
+      sCoinName: "sfud",
+      sCoinSymbol: "sFUD",
+      coinMetadataId: "0x01087411ef48aaac1eb6e24803213e3a60a03b147dac930e5e341f17a85e524e",
+      coinType: "0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1::fud::FUD",
+      sCoinMetadataId: "0x4e03390de36b8c84e0a8297d3d0d08a8a34bed93787e37fcb26bfc26df33226c",
+      decimals: 5,
+      pythFeed: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75",
+      pythFeedObjectId: "0x4531c3ed0d22f21f5fce882905372006c9aafa30f01db03b789e95a6c50de7b2"
+    },
+    ...{
+      coinName: "fud",
+      symbol: "FUD",
+      lendingPoolAddress: "0xc8a078d15ee7bbff49a14835f36951833d2d55c91ffd2972251dadbff8045ca8",
+      borrowDynamic: "0x345a2fa0fe5d5d704fd8ad609a9b7529f22e3cda738ad26756ad2a85e5d43777",
+      interestModel: "0xc84a22d8bca58e5f05673d1de2a7406b1b7bc9dcd15fd848ba6555c7ecab9d83",
+      sCoinTreasury: "0x858c492d51425b922c040c1a389e185b3b00d565e7d72ead1a81dc733104660d",
+      sCoinType: "0x3b23c05f917052255a0b16a534dbd4446911aa4a30bd3497cdf5b736551e7ef8::scallop_fud::SCALLOP_FUD",
+      sCoinName: "sfud",
+      sCoinSymbol: "sFUD",
+      coinMetadataId: "0x01087411ef48aaac1eb6e24803213e3a60a03b147dac930e5e341f17a85e524e",
+      coinType: "0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1::fud::FUD",
+      decimals: 5,
+      pythFeed: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75",
+      pythFeedObjectId: "0x4531c3ed0d22f21f5fce882905372006c9aafa30f01db03b789e95a6c50de7b2"
+    }
   },
+  // @TODO: restore on prod
   blub: {
     coinName: "blub",
     symbol: "BLUB",
@@ -907,26 +987,45 @@ var POOL_ADDRESSES = {
     pythFeedObjectId: "0x246658c3324f2477568c78cca622518fbc6969a004b841d81409d24a7ec39b18"
   },
   deep: {
-    coinName: "deep",
-    symbol: "DEEP",
-    lendingPoolAddress: "0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03",
-    borrowDynamic: "0x95e00d7466f97a100e70f08bd37788dc49335796f6f49fab996d40dd0681c6d3",
-    interestModel: "0x4143c298506a332d92ea8a995e6f3991ee3215f58f6fc6441752835d275b9a69",
-    borrowFeeKey: "0xb14ee43f4ad2a2c40bac8c4406a401690e93c982e289cf3802fedf74a159cab2",
-    supplyLimitKey: "0x599528fdfdc253e90dfd0acf4f4a166b391e2aac1ca6528abbff63225b548fee",
-    borrowLimitKey: "0xf4217e8ef9d9c32e8992092e910a77535a8124c19b8a762a673f227f5f765a4e",
-    isolatedAssetKey: "0x208d3a24ba369dcfc8f0387333d1512b98199eb150d2f2a69359ff708cf761e3",
-    sCoinTreasury: "0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88",
-    sCoinType: "0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP",
-    sCoinName: "sdeep",
-    sCoinSymbol: "sDEEP",
-    coinMetadataId: "0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0",
-    coinType: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP",
-    sCoinMetadataId: "0x2443014594a500a9119e11c6c6a86e865834f496c4614280ce8cace33c0b072e",
-    decimals: 6,
-    pythFeed: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
-    pythFeedObjectId: "0x8c7f3a322b94cc69db2a2ac575cbd94bf5766113324c3a3eceac91e3e88a51ed"
+    ...{
+      coinName: "deep",
+      symbol: "DEEP",
+      lendingPoolAddress: "0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03",
+      borrowDynamic: "0x95e00d7466f97a100e70f08bd37788dc49335796f6f49fab996d40dd0681c6d3",
+      interestModel: "0x4143c298506a332d92ea8a995e6f3991ee3215f58f6fc6441752835d275b9a69",
+      borrowFeeKey: "0xb14ee43f4ad2a2c40bac8c4406a401690e93c982e289cf3802fedf74a159cab2",
+      supplyLimitKey: "0x599528fdfdc253e90dfd0acf4f4a166b391e2aac1ca6528abbff63225b548fee",
+      borrowLimitKey: "0xf4217e8ef9d9c32e8992092e910a77535a8124c19b8a762a673f227f5f765a4e",
+      isolatedAssetKey: "0x208d3a24ba369dcfc8f0387333d1512b98199eb150d2f2a69359ff708cf761e3",
+      sCoinTreasury: "0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88",
+      sCoinType: "0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP",
+      sCoinName: "sdeep",
+      sCoinSymbol: "sDEEP",
+      coinMetadataId: "0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0",
+      coinType: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP",
+      sCoinMetadataId: "0x2443014594a500a9119e11c6c6a86e865834f496c4614280ce8cace33c0b072e",
+      decimals: 6,
+      pythFeed: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
+      pythFeedObjectId: "0x8c7f3a322b94cc69db2a2ac575cbd94bf5766113324c3a3eceac91e3e88a51ed"
+    },
+    ...{
+      coinName: "deep",
+      symbol: "DEEP",
+      lendingPoolAddress: "0xfb8e4f68c9b14034da7f1f4703013dda69ebbb4578f835825bcf92ab89c3b5ae",
+      borrowDynamic: "0xbf983b12a8707b174c0b037096ba2fbf1b30e6efb9cce14fc35207de0a696f79",
+      interestModel: "0xb7f04cd3aaaefe671a79f9aed8646ae085a7e6812c1604044977c9355e0769c8",
+      sCoinTreasury: "0x71d41465cf2d16fa0206126526bebdf65c8871d1fcfbd0c2237db2306afd67ba",
+      sCoinType: "0x34f0a2e793e1f79ceac72cfe3bb95f65541da449418289ccd12922d16140c882::scallop_deep::SCALLOP_DEEP",
+      sCoinName: "sdeep",
+      sCoinSymbol: "sDEEP",
+      coinMetadataId: "0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0",
+      coinType: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP",
+      decimals: 6,
+      pythFeed: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
+      pythFeedObjectId: "0x8c7f3a322b94cc69db2a2ac575cbd94bf5766113324c3a3eceac91e3e88a51ed"
+    }
   },
+  // @TODO: restore on prod
   fdusd: {
     coinName: "fdusd",
     symbol: "FDUSD",
@@ -947,29 +1046,6 @@ var POOL_ADDRESSES = {
     decimals: 6,
     pythFeed: "0xccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979",
     pythFeedObjectId: "0x5f6583b2b0fe1ecf94aaffeaab8a838794693960cea48c0da282d5f4a24be027"
-  },
-  // @TODO: add pyth feed
-  musd: {
-    coinName: "musd",
-    symbol: "mUSD",
-    lendingPoolAddress: "0x0565254220e7ca857a87341898bdebeb9e5d6f8f8fe68eb25dd3e257d41a0b0c",
-    collateralPoolAddress: void 0,
-    borrowDynamic: "0x9448dc2ae8054d5b735fd617fb4ca57046ddc98bfff91ce31de1df452f3bf695",
-    interestModel: "0xc3b57c57814e22ac42c7062922a0437ebf40495e37aee32cbb94cba0693970ed",
-    riskModel: void 0,
-    borrowFeeKey: "0xfdb02d76dc67553fd15f42f1de49ca79cd2812bdaf8bcd079cfe17ce23ed9fc4",
-    supplyLimitKey: "0x340aaae070f9489b59c4257610babf6f170abf43fbe51cf7de1e2e04492f6823",
-    isolatedAssetKey: "0xe10f03b13d2cdb46543130bafaf1884c9a5a7712b5932aae15b2f8d4fc31a774",
-    sCoinTreasury: "0xadfd554635ccc87e992f23ca838f0f16c14874e324a1b79b77f6bfe118edea9f",
-    sCoinType: "0x0a228d1c59071eccf3716076a1f71216846ee256d9fb07ea11fb7c1eb56435a5::scallop_musd::SCALLOP_MUSD",
-    sCoinName: "smusd",
-    sCoinSymbol: "smUSD",
-    coinMetadataId: "0xc154abd271b24032a2c80d96c1b82109490bb600ed189ef881d8c9467ed44a4f",
-    coinType: "0xe44df51c0b21a27ab915fa1fe2ca610cd3eaa6d9666fe5e62b988bf7f0bd8722::musd::MUSD",
-    sCoinMetadataId: "0xb924f8c3d4b993172d4fc553c1ea242e8ca539e83edc3edaf5512ae44dfa6863",
-    decimals: 0,
-    pythFeed: "",
-    pythFeedObjectId: ""
   }
 };
 
@@ -998,9 +1074,7 @@ var PYTH_FEED_IDS = {
   fdusd: "0xccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979",
   deep: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
   fud: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75",
-  blub: "5fc11ffe4975b624be495be038da30e30bee2004d8ae6282b5364577ef4ca92c",
-  musd: ""
-  // @TODO: add mUSD pyth
+  blub: "5fc11ffe4975b624be495be038da30e30bee2004d8ae6282b5364577ef4ca92c"
 };
 
 // src/constants/queryKeys.ts
@@ -1108,21 +1182,13 @@ var RPC_PROVIDERS = [
 // src/constants/testAddress.ts
 var TEST_ADDRESSES = {
   core: {
-    // version:
-    //   '0x07871c4b3c847a0f674510d4978d5cf6f960452795e8ff6f189fd2088a3f6ac7',
-    version: "0xd318de9b0f6873879a82cbfcc2daa1d1591a8b54e7cea9f4b567da63c692a52b",
+    version: "0xee15d07800e2ad4852505c57cd86afea774af02c17388f8bd907de75f915b4f4",
     versionCap: "0x590a4011cb649b3878f3ea14b3a78674642a9548d79b7e091ef679574b158a07",
-    // object:
-    //   '0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf',
-    object: "0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d",
-    // market:
-    //   '0xa757975255146dc9686aa823b7838b507f315d704f428cbadad2f4ea061939d9',
-    market: "0x9d6434e97f3f98fd9b0c0e1dca22632073985abcd22541feae7ee1e34cbe3af2",
+    object: "0xb03fa00e2d9f17d78a9d48bd94d8852abec68c19d55e819096b1e062e69bfad1",
+    market: "0xa7f41efe3b551c20ad6d6cea6ccd0fd68d2e2eaaacdca5e62d956209f6a51312",
     adminCap: "0x09689d018e71c337d9db6d67cbca06b74ed92196103624028ccc3ecea411777c",
     coinDecimalsRegistry: "0x200abe9bf19751cc566ae35aa58e2b7e4ff688fc1130f8d8909ea09bc137d668",
-    // obligationAccessStore:
-    //   '0x733e30b7c94d619d78cb8f5bc4bfbb759ced9a531239028caabb2474e5be59c9',
-    obligationAccessStore: "0x46e9b44a77ee9c9d33cc2689ecdfbb8f681935cbc6bdf6ac3df048e396c36c82",
+    obligationAccessStore: "0xb7d7e1464936fbdcdd4913308b40335e662401029635289bdb317c7dde9d6c68",
     coins: {
       usdc: {
         id: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7",
@@ -1137,97 +1203,6 @@ var TEST_ADDRESSES = {
           }
         }
       },
-      cetus: {
-        id: "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b",
-        metaData: "0x4c0dce55eff2db5419bbd2d239d1aa22b4a400c01bbb648b058a9883989025da",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef",
-            feedObject: "0x24c0247fb22457a719efac7f670cdc79be321b521460bd6bd2ccfa9f80713b14"
-          }
-        }
-      },
-      wapt: {
-        id: "0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37",
-        metaData: "0xc969c5251f372c0f34c32759f1d315cf1ea0ee5e4454b52aea08778eacfdd0a8",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5",
-            feedObject: "0x7c5b7837c44a69b469325463ac0673ac1aa8435ff44ddb4191c9ae380463647f"
-          }
-        }
-      },
-      wsol: {
-        id: "0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8",
-        metaData: "0x4d2c39082b4477e3e79dc4562d939147ab90c42fc5f3e4acf03b94383cd69b6e",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
-            feedObject: "0x9d0d275efbd37d8a8855f6f2c761fa5983293dd8ce202ee5196626de8fcd4469"
-          }
-        }
-      },
-      wbtc: {
-        id: "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881",
-        metaData: "0x5d3c6e60eeff8a05b693b481539e7847dfe33013e7070cdcb387f5c0cac05dfd",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43",
-            feedObject: "0x9a62b4863bdeaabdc9500fce769cf7e72d5585eeb28a6d26e4cafadc13f76ab2"
-          }
-        }
-      },
-      weth: {
-        id: "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5",
-        metaData: "0x8900e4ceede3363bef086d6b50ca89d816d0e90bf6bc46efefe1f8455e08f50f",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
-            feedObject: "0x9193fd47f9a0ab99b6e365a464c8a9ae30e6150fc37ed2a89c1586631f6fc4ab"
-          }
-        }
-      },
-      wusdc: {
-        id: "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf",
-        metaData: "0x4fbf84f3029bd0c0b77164b587963be957f853eccf834a67bb9ecba6ec80f189",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
-            feedObject: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
-          }
-        }
-      },
-      wusdt: {
-        id: "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c",
-        metaData: "0xfb0e3eb97dd158a5ae979dddfa24348063843c5b20eb8381dd5fa7c93699e45c",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b",
-            feedObject: "0x985e3db9f93f76ee8bace7c3dd5cc676a096accd5d9e09e9ae0fb6e492b14572"
-          }
-        }
-      },
       sui: {
         id: "0x0000000000000000000000000000000000000000000000000000000000000002",
         metaData: "0x9258181f5ceac8dbffb7030890243caed69a9599d2886d957a9cb7656af3bdb3",
@@ -1241,45 +1216,6 @@ var TEST_ADDRESSES = {
           }
         }
       },
-      afsui: {
-        id: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc",
-        metaData: "0x2f9217f533e51334873a39b8026a4aa6919497b47f49d0986a4f1aec66f8a34d",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
-          }
-        }
-      },
-      hasui: {
-        id: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d",
-        metaData: "0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
-          }
-        }
-      },
-      vsui: {
-        id: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55",
-        metaData: "0xabd84a23467b33854ab25cf862006fd97479f8f6f53e50fe732c43a274d939bd",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
-          }
-        }
-      },
       sca: {
         id: "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6",
         metaData: "0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844",
@@ -1293,41 +1229,6 @@ var TEST_ADDRESSES = {
           }
         }
       },
-      sbeth: {
-        id: "0xd0e89b2af5e4910726fbcd8b8dd37bb79b29e5f83f7491bca830e94f7f226d29",
-        metaData: "0x89b04ba87f8832d4d76e17a1c9dce72eb3e64d372cf02012b8d2de5384faeef0",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
-            feedObject: "0x9193fd47f9a0ab99b6e365a464c8a9ae30e6150fc37ed2a89c1586631f6fc4ab"
-          }
-        }
-      },
-      // @TODO: add test address
-      // @ts-ignore
-      sbusdt: {},
-      // @ts-ignore
-      sbwbtc: {},
-      // @ts-ignore
-      blub: {},
-      // @ts-ignore
-      musd: {},
-      fdusd: {
-        id: "0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a",
-        metaData: "0xdebee5265a67c186ed87fe93303d33dfe1de53e3b4fd7d9329c2852860acd3e7",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "0xccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979",
-            feedObject: "0x5f6583b2b0fe1ecf94aaffeaab8a838794693960cea48c0da282d5f4a24be027"
-          }
-        }
-      },
       deep: {
         id: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270",
         metaData: "0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0",
@@ -1356,12 +1257,12 @@ var TEST_ADDRESSES = {
       }
     },
     oracles: {
-      xOracle: "0x93d5bf0936b71eb27255941e532fac33b5a5c7759e377b4923af0a1359ad494f",
+      xOracle: "0x0c09daac413e834f2fe69601c41e836022fa9a185df6b56a80f6bcd8a3ecb8a2",
       xOracleCap: "0x1edeae568fde99e090dbdec4bcdbd33a15f53a1ce1f87aeef1a560dedf4b4a90",
       supra: { registry: "", registryCap: "", holder: "" },
       switchboard: { registry: "", registryCap: "" },
       pyth: {
-        registry: "0xedc293f9413a5a7a5d53bdba1fd889d0a4030894469228f0acdae4aa3c55a213",
+        registry: "0xdcf813893649521abd27816ba8d946b0cb7fc98d776cc9adcecba54688ccc109",
         registryCap: "0xbcb07141eb1f7e01fbda4130ecf5f5adaeabb77f5d9c32158b7532bcd2197acd",
         state: "0x1f9310238ee9298fb703c3419030b35b22bb1cc37113e3bb5007c99aec79e5b8",
         wormhole: "0x5306f64e312b581766351c07af79c72fcb1cd25147157fdc2f8ad76de9a3fb6a",
@@ -1386,46 +1287,36 @@ var TEST_ADDRESSES = {
         upgradeCap: "0x3f203f6fff6a69d151e4f1cd931f22b68c489ef2759765662fc7baf673943c9e"
       },
       protocol: {
-        id: "0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e",
+        id: "0xb03fa00e2d9f17d78a9d48bd94d8852abec68c19d55e819096b1e062e69bfad1",
         upgradeCap: "0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a"
       },
-      // protocol: {
-      //   id: '0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e',
-      //   upgradeCap:
-      //     '0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a',
-      // },
       protocolWhitelist: {
         id: "0x4c262d9343dac53ecb28f482a2a3f62c73d0ebac5b5f03d57383d56ff219acdf",
         upgradeCap: "0x4a5e88a75039b00988f633f811f58117f31b8627a46bf822aa114d9010049449"
       },
-      // query: {
-      //   id: '0xb8d603a39114a5efef3dd0bf84df0bed1be1fbd39b78b7dd6e8a61ccc5e6006f',
-      //   upgradeCap:
-      //     '0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f',
-      // },
       query: {
-        id: "0x89706958f43fb170de134579e3fbc53972b946ee78bd2442d8e1adc36074fbdc",
+        id: "0x3a0dbce719fc56a96bf8e8dd53cd57eb9c313642a88d99b86f51208762eba258",
+        object: "",
         upgradeCap: "0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f"
       },
-      supra: { id: "", upgradeCap: "" },
+      supra: { id: "", object: "", upgradeCap: "" },
       pyth: {
-        id: "0x910f30cbc7f601f75a5141a01265cd47c62d468707c5e1aecb32a18f448cb25a",
+        id: "0xe622909f9252d4ef1737c41ea430ef44203d8f5dc8e01e1b3950a31405bc54eb",
+        object: "0xe622909f9252d4ef1737c41ea430ef44203d8f5dc8e01e1b3950a31405bc54eb",
         upgradeCap: "0xdf0ffbae1ea5bb25fbca5efba433dcf00c7cced65679af2f04728901275c6157"
       },
       switchboard: { id: "", upgradeCap: "" },
       xOracle: {
-        id: "0x1478a432123e4b3d61878b629f2c692969fdb375644f1251cd278a4b1e7d7cd6",
+        id: "0xe7511600c924f1d0ac4b3fa5de3ae26b8845545902b015dc5fc7894307365d7b",
+        object: "0xe7511600c924f1d0ac4b3fa5de3ae26b8845545902b015dc5fc7894307365d7b",
         upgradeCap: "0x0f928a6b2e26b73330fecaf9b44acfc9800a4a9794d6415c2a3153bc70e3c1f0"
       },
       testCoin: { id: "", upgradeCap: "" }
     }
   },
   spool: {
-    // id: '0x7c4fdabe81c31b19a45d1e572a52a539997a90903fbb5bfab71480abe0fa62c3',
     id: "0x1742655fe5872dfa6456673f9e38612a4965e6979e6cd7696a7f1225f28bae21",
     adminCap: "0xdd8a047cbbf802bfcde5288b8ef1910965d789cc614da11d39af05fca0bd020a",
-    // object:
-    //   '0xe87f1b2d498106a2c61421cec75b7b5c5e348512b0dc263949a0e7a3c256571a',
     object: "0x1742655fe5872dfa6456673f9e38612a4965e6979e6cd7696a7f1225f28bae21",
     pools: {
       sweth: {
@@ -1433,72 +1324,48 @@ var TEST_ADDRESSES = {
         rewardPoolId: "0x957de68a18d87817de8309b30c1ec269a4d87ae513abbeed86b5619cb9ce1077"
       },
       ssui: {
-        // id: '0x4f0ba970d3c11db05c8f40c64a15b6a33322db3702d634ced6536960ab6f3ee4',
         id: "0xb9617f83c06ebdeac0a8834782b1015e1cc7ea23739e30c132c4bfb95c37a579",
-        rewardPoolId: (
-          // '0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9',
-          "0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a"
-        )
+        rewardPoolId: "0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a"
       },
       susdc: {
         id: "0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918",
         rewardPoolId: "0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166"
       },
       swusdc: {
-        // id: '0x4ace6648ddc64e646ba47a957c562c32c9599b3bba8f5ac1aadb2ae23a2f8ca0',
         id: "0xf1b383b9cf2e9f515fc69567df1053098f273849d09cd84b0278a773429bd2b2",
-        rewardPoolId: (
-          // '0xf4268cc9b9413b9bfe09e8966b8de650494c9e5784bf0930759cfef4904daff8',
-          "0xc71c53ee6505d928ba15bea4fe4f45d98c9c31eced94b72d00a7827d4b7ba3ff"
-        )
+        rewardPoolId: "0xc71c53ee6505d928ba15bea4fe4f45d98c9c31eced94b72d00a7827d4b7ba3ff"
       },
       swusdt: {
-        // id: '0xcb328f7ffa7f9342ed85af3fdb2f22919e1a06dfb2f713c04c73543870d7548f',
         id: "0xb5567dfa5c7fc17a249e959732664c50713dd8c23db1a11376b27df800c17418",
-        rewardPoolId: (
-          // '0x2c9f934d67a5baa586ceec2cc24163a2f049a6af3d5ba36b84d8ac40f25c4080',
-          "0x60768b0687ff0235e376a039709a683e4c436098785e473b67b32dbab47b69ab"
-        )
+        rewardPoolId: "0x60768b0687ff0235e376a039709a683e4c436098785e473b67b32dbab47b69ab"
       },
       scetus: {
         id: "0xac1bb13bf4472a637c18c2415fb0e3c1227ea2bcf35242e50563c98215bd298e",
         rewardPoolId: "0x6835c1224126a45086fc6406adc249e3f30df18d779ca4f4e570e38716a17f3f"
       },
       safsui: {
-        // id: '0xeedf438abcaa6ce4d9625ffca110920592d5867e4c5637d84ad9f466c4feb800',
         id: "0xc568bb4c991258e839aa54802ecda04fcd9838c826bc3b42b40af81b23c458c8",
-        rewardPoolId: (
-          // '0x89255a2f86ed7fbfef35ab8b7be48cc7667015975be2685dd9a55a9a64baf76e',
-          "0x389a3cbeda742b918941bb24fd00e077bad3367484394d6234f8209b9a6aa03d"
-        )
+        rewardPoolId: "0x389a3cbeda742b918941bb24fd00e077bad3367484394d6234f8209b9a6aa03d"
       },
       shasui: {
-        // id: '0xa6148bc1b623e936d39a952ceb5bea79e8b37228a8f595067bf1852efd3c34aa',
         id: "0x93f3f4499bf89f2d05ddc1f8b15f51701a7c6c4d0ac0b9c3bc99462cbbd8e321",
-        rewardPoolId: (
-          // '0x6f3563644d3e2ef13176dbf9d865bd93479df60ccbe07b7e66db57f6309f5a66',
-          "0x94cee1be7f5ff34193f3aabef0b14142cb28af4d905fe487a9a7d85a15edb6aa"
-        )
+        rewardPoolId: "0x94cee1be7f5ff34193f3aabef0b14142cb28af4d905fe487a9a7d85a15edb6aa"
       },
       svsui: {
-        // id: '0x69ce8e537e750a95381e6040794afa5ab1758353a1a2e1de7760391b01f91670',
         id: "0xa970e9087f80cb59e9299b8e7af7175d977ad6c9af0322aa4440e138fbd7ae00",
-        rewardPoolId: (
-          // '0xbca914adce058ad0902c7f3cfcd698392a475f00dcfdc3f76001d0370b98777a',
-          "0x38eee9699c4fc132a6623e54b865f047df4fc6eb83af807300f44e8f4b235ff0"
-        )
+        rewardPoolId: "0x38eee9699c4fc132a6623e54b865f047df4fc6eb83af807300f44e8f4b235ff0"
       }
     },
     config: ""
   },
   borrowIncentive: {
-    id: "0x85769d63565ce99c7622f8e336ca1460926ddf29738ad2a39407b5cac29f61fe",
+    id: "0x8fe05c796e779c71e7739dcaecefb8757ff9482f62e419dbd0dd9c35b740054f",
     adminCap: "0x56ac8e6f2b360b2b35c0168d72cc6cd17d9592afb83709865cb87af24bb2025b",
-    object: "0x85769d63565ce99c7622f8e336ca1460926ddf29738ad2a39407b5cac29f61fe",
-    query: "0x8e0d00f8ff1199d7c5fe56cea0e901a525daeefff0445a1635ace8282ae3302c",
-    incentivePools: "0x9d564c93128c6ab0c0d3e050a47f11df0b91494f3bb779bdc1301c1c637f15eb",
-    incentiveAccounts: "0x09e6040e798246de04941bc79a3ba62d3eca6d7a218cc30f21fb07f478fa2926",
-    config: "0x43d4ca1dfc90b161c4240facd119e74e4b850cca2957f88c2ec289c9380da064"
+    object: "0x8fe05c796e779c71e7739dcaecefb8757ff9482f62e419dbd0dd9c35b740054f",
+    query: "0x5fba54ac5862f087112c54c02339623bd245721f5e21ea3330fc8c8afc8f51f4",
+    incentivePools: "0xcace4f4736229043d9f897667d046370b8a4d6534bfd307787c40b4c9f42514a",
+    incentiveAccounts: "0x41ff558f580ca0f711910fd6ef687fce9df76ee8e7fc5e150bdfae08e17fae62",
+    config: "0x9636e7b947b806b9fe438d037f02bb24026c5b2691d2f6bad349c2e117f77cc3"
   },
   referral: {
     id: "0x1bf5a8ce77050d8052549d743e16b469f15aa6b81b752b78b6ebb65179665f5a",
@@ -1510,8 +1377,6 @@ var TEST_ADDRESSES = {
     revenueTableId: "0x595baa3654c297bff84ab7786a2d250f019cefc66e8df8e89fd9d41e02bd30dd",
     referralTiers: "0x144350f3db9b46d11b140084cd54e6de0b9c3b8d265ce8059b51d0ef58ea464b",
     tiersTableId: "0xeac755a7a8b7798530905ac79e8c114f19d0f130f6eab012954f08faac29c75d",
-    // authorizedWitnessList:
-    //   '0xf21b0ed043c9bb70842c0129159f4943dbcc3c9ef2f2f808af65f8be25cfd20e',
     authorizedWitnessList: "0x9d6223dc52015b8a3986a573590ef2af8f1b8f3e4685513888c052f001b87e7f",
     version: "0x3545849eb97723e676a476ec9d4fe5f2eb0eb2c6b78972851114fd4c7ed4639f"
   },
@@ -1531,19 +1396,19 @@ var TEST_ADDRESSES = {
     userRewardTableId: "0x748a80395849ed37db1b0e14f2ab5d1d96458d2359ab3a84eb079d0f4ac7cf2e"
   },
   scoin: {
-    id: "0x773dab39c90fe05439b06a2d061795e52a974ff92c2aef90b2ee467acf7f33c8",
+    id: "0x826a4934bee9487e558eed603cf42f30cdc4321d6f31083930791b95f903b9f9",
     coins: {
       ssui: {
-        coinType: "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI",
-        treasury: "0x0e499640a12c38dd9cc44532f5bc5fd1b6da86d2f9a8810357250f4b26e9e5c7"
-      },
-      scetus: {
-        coinType: "0x8b71e6d323ed78515af2bead13bf3d0da1562ba4a99234eb7c4f14fd39ef0427::scallop_cetus::SCALLOP_CETUS",
-        treasury: "0xd786f4b2d26278cc7911a3445b1b085eab60f269ef9dbb6b87e803d52f155003"
+        coinType: "0x88618204de2dfdc2597681a8441ee726b0dc13494c41e319c3264eb7b35fea90::scallop_sui::SCALLOP_SUI",
+        treasury: "0x03f1d94a40bd9f5d556bacb5c5245732b185572f6a29b36ad8b555d9a8a24f09"
       },
       ssca: {
-        coinType: "0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA",
-        treasury: "0x5f1c5de1df7341075d119570269b7b452af50afe8363080638f1ae29a554c038"
+        coinType: "0x9f64a180373a6b66595025ae16a4ab701f0af1dd5c7ce1ac91dc112e52c2a3f8::scallop_sca::SCALLOP_SCA",
+        treasury: "0x1b05d2cd8b20dba19da073a54195fc52d2f438ea19dea0713bae7a7dab308199"
+      },
+      susdc: {
+        coinType: "0x55ed015f9f006c0c96ad36ebe3b3570d088e8498f52defea48e5634c110e485c::scallop_usdc::SCALLOP_USDC",
+        treasury: "0x6ef82ef94472dcb8c2cdeac8df38874024c08570ca165986ba56d1e38fe0c0a3"
       },
       swusdc: {
         coinType: "0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
@@ -1578,12 +1443,12 @@ var TEST_ADDRESSES = {
         treasury: "0xdad9bc6293e694f67a5274ea51b596e0bdabfafc585ae6d7e82888e65f1a03e0"
       },
       sdeep: {
-        coinType: "0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP",
-        treasury: "0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88"
+        coinType: "0x34f0a2e793e1f79ceac72cfe3bb95f65541da449418289ccd12922d16140c882::scallop_deep::SCALLOP_DEEP",
+        treasury: "0x71d41465cf2d16fa0206126526bebdf65c8871d1fcfbd0c2237db2306afd67ba"
       },
       sfud: {
-        coinType: "0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD",
-        treasury: "0xf25212f11d182decff7a86165699a73e3d5787aced203ca539f43cfbc10db867"
+        coinType: "0x3b23c05f917052255a0b16a534dbd4446911aa4a30bd3497cdf5b736551e7ef8::scallop_fud::SCALLOP_FUD",
+        treasury: "0x858c492d51425b922c040c1a389e185b3b00d565e7d72ead1a81dc733104660d"
       }
     }
   }
@@ -1596,6 +1461,31 @@ var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
 var MIN_INITIAL_LOCK_AMOUNT = 1e10;
 var MIN_TOP_UP_AMOUNT = 1e9;
 
+// src/constants/xoracle.ts
+var xOracleList = {
+  // @TODO: Update to real oracle list
+  usdc: { primary: ["pyth"], secondary: [] },
+  sbeth: { primary: [], secondary: [] },
+  sbusdt: { primary: [], secondary: [] },
+  sbwbtc: { primary: [], secondary: [] },
+  weth: { primary: [], secondary: [] },
+  wbtc: { primary: [], secondary: [] },
+  wusdc: { primary: [], secondary: [] },
+  wusdt: { primary: [], secondary: [] },
+  sui: { primary: ["pyth"], secondary: [] },
+  wapt: { primary: [], secondary: [] },
+  wsol: { primary: [], secondary: [] },
+  cetus: { primary: [], secondary: [] },
+  afsui: { primary: [], secondary: [] },
+  hasui: { primary: [], secondary: [] },
+  vsui: { primary: [], secondary: [] },
+  sca: { primary: ["pyth"], secondary: [] },
+  fud: { primary: ["pyth"], secondary: [] },
+  deep: { primary: ["pyth"], secondary: [] },
+  fdusd: { primary: [], secondary: [] },
+  blub: { primary: [], secondary: [] }
+};
+
 // src/models/scallopCache.ts
 var import_query_core = require("@tanstack/query-core");
 var import_sui_kit2 = require("@scallop-io/sui-kit");
@@ -3134,13 +3024,10 @@ var parseAssetSymbol = (coinName) => {
     return `w${coinName.slice(1).toUpperCase()}`;
   }
   if (isSuiBridgeAsset(coinName)) {
-    switch (coinName) {
-      case "sbwbtc":
-        return "sbwBTC";
-      default: {
-        return `sb${coinName.slice(2).toUpperCase()}`;
-      }
+    if (coinName.startsWith("sbw") && coinName.length > 3) {
+      return `sbw${coinName.slice(3).toUpperCase()}`;
     }
+    return `sb${coinName.slice(2).toUpperCase()}`;
   }
   if (isMarketCoin(coinName)) {
     const assetCoinName = coinName.slice(1).toLowerCase();
@@ -3153,8 +3040,6 @@ var parseAssetSymbol = (coinName) => {
       return "haSUI";
     case "vsui":
       return "vSUI";
-    case "musd":
-      return "mUSD";
     default:
       return coinName.toUpperCase();
   }
@@ -3172,7 +3057,7 @@ var parseDataFromPythPriceFeed = (feed, address) => {
       publishTime: Number(feed.price.publishTime) * 10 ** 3
     };
   } else {
-    throw new Error("Invalid feed id");
+    throw new Error(`Invalid feed id: ${feed.id}`);
   }
 };
 var findClosestUnlockRound = (unlockAtInSecondTimestamp) => {
@@ -4161,7 +4046,7 @@ var getObligations = async ({
   address
 }, ownerAddress) => {
   const owner = ownerAddress;
-  const protocolObjectId = address.get("core.object") ?? PROTOCOL_OBJECT_ID;
+  const protocolObjectId = address.get("core.object") || PROTOCOL_OBJECT_ID;
   const keyObjectsResponse = [];
   let hasNextPage = false;
   let nextCursor = null;
@@ -4222,10 +4107,19 @@ var getObligationLocked = async (cache, obligation) => {
 };
 var queryObligation = async ({
   address
-}, obligationId) => {
+}, obligationId, version = address.get("core.version"), market = address.get("core.market")) => {
   const packageId = address.get("core.packages.query.id");
   const queryTarget = `${packageId}::obligation_query::obligation_data`;
-  const args = [obligationId];
+  const args = [
+    version,
+    market,
+    obligationId,
+    {
+      objectId: import_utils5.SUI_CLOCK_OBJECT_ID,
+      mutable: false,
+      initialSharedVersion: "1"
+    }
+  ];
   const queryResult = await address.cache.queryInspectTxn(
     { queryTarget, args }
     // txBlock
@@ -5179,9 +5073,9 @@ var getPythPrices = async ({
     {}
   );
 };
-var getAllCoinPrices = async (query, marketPools, coinPrices) => {
-  coinPrices = coinPrices ?? await query.utils.getCoinPrices();
-  marketPools = marketPools ?? (await query.getMarketPools(void 0, { coinPrices })).pools;
+var getAllCoinPrices = async (query, marketPools, coinPrices, indexer = false) => {
+  coinPrices = coinPrices ?? (indexer ? await query.getCoinPricesByIndexer() : await query.utils.getCoinPrices());
+  marketPools = marketPools ?? (await query.getMarketPools(void 0, { coinPrices, indexer })).pools;
   if (!marketPools) {
     throw new Error(`Failed to fetch market pool for getAllCoinPrices`);
   }
@@ -5762,25 +5656,15 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
   const veScaConfig = utils.address.get("vesca.config");
   veScaTreasury = veScaTreasury ?? utils.address.get("vesca.treasury");
   const txb = new import_sui_kit4.SuiTxBlock();
+  const clockObjectRef = txb.sharedObjectRef({
+    objectId: import_sui_kit4.SUI_CLOCK_OBJECT_ID,
+    mutable: false,
+    initialSharedVersion: "1"
+  });
   const refreshQueryTarget = `${veScaPkgId}::treasury::refresh`;
-  const refreshArgs = [
-    veScaConfig,
-    veScaTreasury,
-    txb.sharedObjectRef({
-      objectId: import_sui_kit4.SUI_CLOCK_OBJECT_ID,
-      mutable: false,
-      initialSharedVersion: "1"
-    })
-  ];
+  const refreshArgs = [veScaConfig, veScaTreasury, clockObjectRef];
   const veScaAmountQueryTarget = `${veScaPkgId}::treasury::total_ve_sca_amount`;
-  const veScaAmountArgs = [
-    veScaTreasury,
-    txb.sharedObjectRef({
-      objectId: import_sui_kit4.SUI_CLOCK_OBJECT_ID,
-      mutable: false,
-      initialSharedVersion: "1"
-    })
-  ];
+  const veScaAmountArgs = [veScaTreasury, clockObjectRef];
   const resolvedRefreshArgs = await Promise.all(
     refreshArgs.map(async (arg) => {
       if (typeof arg === "string") {
@@ -5844,7 +5728,7 @@ var getVeScaTreasuryInfo = async (utils) => {
 };
 
 // src/queries/poolAddressesQuery.ts
-var getAllAddresses = async (query, pools) => {
+var getAllAddresses = async (query, pools = [...SUPPORT_POOLS]) => {
   const results = {};
   const marketId = query.address.get("core.market");
   const marketObject = (await query.cache.queryGetObject(marketId))?.data;
@@ -5969,6 +5853,78 @@ var getAllAddresses = async (query, pools) => {
   return results;
 };
 
+// src/queries/xOracleQuery.ts
+var PRIMARY_PRICE_UPDATE_POLICY = "0xbcd908d0ee6d63d726e61676f3feeec3d19817f4849bbecf372dd3399f247f6b";
+var SECONDARY_PRICE_UPDDATE_POLICY = "0x624a6f120777bb30e718b86e836c205ef4229448052377dc3d78272a6662b2c0";
+var getPriceUpdatePolicies = async (address) => {
+  const priceUpdatePolicyRulesKeyType = `${address.get("core.packages.xOracle.object")}::price_update_policy::PriceUpdatePolicyRulesKey`;
+  const [primaryPriceUpdatePolicyTable, secondaryPriceUpdatePolicyTable] = await Promise.all([
+    address.cache.queryGetDynamicFieldObject({
+      parentId: PRIMARY_PRICE_UPDATE_POLICY,
+      name: {
+        type: priceUpdatePolicyRulesKeyType,
+        value: { dummy_field: false }
+      }
+    }),
+    address.cache.queryGetDynamicFieldObject({
+      parentId: SECONDARY_PRICE_UPDDATE_POLICY,
+      name: {
+        type: priceUpdatePolicyRulesKeyType,
+        value: { dummy_field: false }
+      }
+    })
+  ]);
+  return {
+    primary: primaryPriceUpdatePolicyTable,
+    secondary: secondaryPriceUpdatePolicyTable
+  };
+};
+var PRIMARY_PRICE_UPDATE_POLICY_VECSET_ID = "0xfb1330aa028ed6a159b742c71b5a79b3b6824cf71efa40ea82b52486ad209264";
+var SECONDARY_PRICE_UPDATE_POLICY_VECSET_ID = "0x4b827acc73f3f53f808dd73a7ee0a60ae61e84322176bece72b26467030b467c";
+var getAssetOracles = async (utils, ruleType) => {
+  const ruleTypeNameToOracleType = {
+    [`${utils.address.get("core.packages.pyth.object")}::rule::Rule`]: "pyth",
+    [`${utils.address.get("core.packages.supra.object")}::rule::Rule`]: "supra",
+    [`${utils.address.get("core.packages.switchboard.object")}::rule::Rule`]: "switchboard"
+  };
+  const assetPrimaryOracles = {};
+  let cursor = null;
+  do {
+    const response = await utils.cache.queryGetDynamicFields({
+      parentId: ruleType === "primary" ? PRIMARY_PRICE_UPDATE_POLICY_VECSET_ID : SECONDARY_PRICE_UPDATE_POLICY_VECSET_ID,
+      cursor,
+      limit: 10
+    });
+    if (!response)
+      break;
+    const { data, hasNextPage, nextCursor } = response;
+    cursor = nextCursor;
+    const objectIds = data.map((dynamicField) => dynamicField.objectId);
+    const objectResponses = await utils.cache.queryGetObjects(objectIds);
+    objectResponses.forEach((object) => {
+      if (!object.content || object.content.dataType !== "moveObject")
+        return;
+      const fields = object.content.fields;
+      const typeName = fields.name.fields.name;
+      const assetName = utils.parseCoinNameFromType(`0x${typeName}`);
+      if (!assetName)
+        throw new Error(`Invalid asset name: ${assetName}`);
+      if (!assetPrimaryOracles[assetName]) {
+        assetPrimaryOracles[assetName] = [];
+      }
+      const value = fields.value;
+      value.fields.contents.forEach((content) => {
+        assetPrimaryOracles[assetName].push(
+          ruleTypeNameToOracleType[`0x${content.fields.name}`]
+        );
+      });
+    });
+    if (!hasNextPage)
+      break;
+  } while (cursor);
+  return assetPrimaryOracles;
+};
+
 // src/models/scallopUtils.ts
 var ScallopUtils = class {
   constructor(params, instance) {
@@ -6160,7 +6116,7 @@ var ScallopUtils = class {
    * @return Market coin type.
    */
   parseMarketCoinType(coinName) {
-    const protocolObjectId = this.address.get("core.object") ?? PROTOCOL_OBJECT_ID;
+    const protocolObjectId = this.address.get("core.object") || PROTOCOL_OBJECT_ID;
     const coinType = this.parseCoinType(coinName, true);
     return `${protocolObjectId}::reserve::MarketCoin<${coinType}>`;
   }
@@ -6457,13 +6413,19 @@ var import_sui_kit5 = require("@scallop-io/sui-kit");
 // src/builders/oracle.ts
 var import_utils12 = require("@mysten/sui/utils");
 var import_pyth_sui_js2 = require("@pythnetwork/pyth-sui-js");
-var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePythPullModel: true }) => {
+var updateOracles = async (builder, txBlock, assetCoinNames = [
+  .../* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
+], options = { usePythPullModel: true }) => {
   const usePythPullModel = builder.params.usePythPullModel ?? options.usePythPullModel;
-  assetCoinNames = assetCoinNames ?? [
-    .../* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
+  const flattenedRules = [
+    ...new Set(
+      Object.values(xOracleList).flatMap(({ primary, secondary }) => [
+        ...primary,
+        ...secondary
+      ])
+    )
   ];
-  const rules = builder.isTestnet ? ["pyth"] : ["pyth"];
-  if (usePythPullModel && rules.includes("pyth")) {
+  if (flattenedRules.includes("pyth") && usePythPullModel) {
     const pythClient = new import_pyth_sui_js2.SuiPythClient(
       builder.suiKit.client(),
       builder.address.get("core.oracles.pyth.state"),
@@ -6493,7 +6455,12 @@ var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePyth
   }
   const updateAssetCoinNames = [...new Set(assetCoinNames)];
   for (const assetCoinName of updateAssetCoinNames) {
-    await updateOracle(builder, txBlock, assetCoinName, rules);
+    await updateOracle(
+      builder,
+      txBlock,
+      assetCoinName,
+      xOracleList[assetCoinName]
+    );
   }
 };
 var updateOracle = async (builder, txBlock, assetCoinName, rules) => {
@@ -6523,37 +6490,42 @@ var updatePrice = (txBlock, rules, xOraclePackageId, xOracleId, pythPackageId, p
     xOracleId,
     coinType
   );
-  if (rules.includes("pyth")) {
-    updatePythPrice(
-      txBlock,
-      pythPackageId,
-      request,
-      pythStateId,
-      pythFeedObjectId,
-      pythRegistryId,
-      coinType
-    );
-  }
-  if (rules.includes("switchboard")) {
-    updateSwitchboardPrice(
-      txBlock,
-      switchboardPackageId,
-      request,
-      switchboardAggregatorId,
-      switchboardRegistryId,
-      coinType
-    );
-  }
-  if (rules.includes("supra")) {
-    updateSupraPrice(
-      txBlock,
-      supraPackageId,
-      request,
-      supraHolderId,
-      supraRegistryId,
-      coinType
-    );
-  }
+  Object.entries(rules).forEach(([type, rule]) => {
+    if (rule.includes("pyth")) {
+      updatePythPrice(
+        type,
+        txBlock,
+        pythPackageId,
+        request,
+        pythStateId,
+        pythFeedObjectId,
+        pythRegistryId,
+        coinType
+      );
+    }
+    if (rule.includes("supra")) {
+      updateSupraPrice(
+        type,
+        txBlock,
+        supraPackageId,
+        request,
+        supraHolderId,
+        supraRegistryId,
+        coinType
+      );
+    }
+    if (rule.includes("switchboard")) {
+      updateSwitchboardPrice(
+        type,
+        txBlock,
+        switchboardPackageId,
+        request,
+        switchboardAggregatorId,
+        switchboardRegistryId,
+        coinType
+      );
+    }
+  });
   confirmPriceUpdateRequest(
     txBlock,
     xOraclePackageId,
@@ -6586,41 +6558,41 @@ var confirmPriceUpdateRequest = (txBlock, packageId, xOracleId, request, coinTyp
   );
   return txBlock;
 };
-var updateSupraPrice = (txBlock, packageId, request, holderId, registryId, coinType) => {
+var updateSupraPrice = (type, txBlock, packageId, request, holderId, registryId, coinType) => {
   txBlock.moveCall(
-    `${packageId}::rule::set_price`,
+    `${packageId}::rule::set_price_as_${type}`,
     [
       request,
       holderId,
       registryId,
       txBlock.sharedObjectRef({
         objectId: import_utils12.SUI_CLOCK_OBJECT_ID,
-        mutable: false,
-        initialSharedVersion: "1"
+        initialSharedVersion: "1",
+        mutable: false
       })
     ],
     [coinType]
   );
 };
-var updateSwitchboardPrice = (txBlock, packageId, request, aggregatorId, registryId, coinType) => {
+var updateSwitchboardPrice = (type, txBlock, packageId, request, aggregatorId, registryId, coinType) => {
   txBlock.moveCall(
-    `${packageId}::rule::set_price`,
+    `${packageId}::rule::set_price_as_${type}`,
     [
       request,
       aggregatorId,
       registryId,
       txBlock.sharedObjectRef({
         objectId: import_utils12.SUI_CLOCK_OBJECT_ID,
-        mutable: false,
-        initialSharedVersion: "1"
+        initialSharedVersion: "1",
+        mutable: false
       })
     ],
     [coinType]
   );
 };
-var updatePythPrice = (txBlock, packageId, request, stateId, feedObjectId, registryId, coinType) => {
+var updatePythPrice = (type, txBlock, packageId, request, stateId, feedObjectId, registryId, coinType) => {
   txBlock.moveCall(
-    `${packageId}::rule::set_price`,
+    `${packageId}::rule::set_price_as_${type}`,
     [
       request,
       stateId,
@@ -6628,8 +6600,8 @@ var updatePythPrice = (txBlock, packageId, request, stateId, feedObjectId, regis
       registryId,
       txBlock.sharedObjectRef({
         objectId: import_utils12.SUI_CLOCK_OBJECT_ID,
-        mutable: false,
-        initialSharedVersion: "1"
+        initialSharedVersion: "1",
+        mutable: false
       })
     ],
     [coinType]
@@ -6666,6 +6638,11 @@ var generateCoreNormalMethod = ({
   };
   const referralPkgId = builder.address.get("referral.id");
   const referralWitnessType = `${referralPkgId}::scallop_referral_program::REFERRAL_WITNESS`;
+  const clockObjectRef = txBlock.sharedObjectRef({
+    objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
+    mutable: false,
+    initialSharedVersion: "1"
+  });
   return {
     openObligation: () => {
       const [obligation, obligationKey, obligationHotPotato] = builder.moveCall(
@@ -6711,11 +6688,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           txBlock.pure.u64(amount),
           coreIds.xOracle,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         [coinType]
       );
@@ -6725,16 +6698,7 @@ var generateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::mint::mint`,
-        [
-          coreIds.version,
-          coreIds.market,
-          coin,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [coreIds.version, coreIds.market, coin, clockObjectRef],
         [coinType]
       );
     },
@@ -6743,16 +6707,7 @@ var generateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::mint::mint_entry`,
-        [
-          coreIds.version,
-          coreIds.market,
-          coin,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [coreIds.version, coreIds.market, coin, clockObjectRef],
         [coinType]
       );
     },
@@ -6761,16 +6716,7 @@ var generateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::redeem::redeem`,
-        [
-          coreIds.version,
-          coreIds.market,
-          marketCoin,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [coreIds.version, coreIds.market, marketCoin, clockObjectRef],
         [coinType]
       );
     },
@@ -6779,16 +6725,7 @@ var generateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::redeem::redeem_entry`,
-        [
-          coreIds.version,
-          coreIds.market,
-          marketCoin,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [coreIds.version, coreIds.market, marketCoin, clockObjectRef],
         [coinType]
       );
     },
@@ -6805,11 +6742,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         [coinType]
       );
@@ -6828,11 +6761,7 @@ var generateCoreNormalMethod = ({
           borrowReferral,
           typeof amount === "number" ? txBlock.pure.u64(amount) : amount,
           coreIds.xOracle,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         [coinType, referralWitnessType]
       );
@@ -6850,11 +6779,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           txBlock.pure.u64(amount),
           coreIds.xOracle,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         [coinType]
       );
@@ -6864,17 +6789,7 @@ var generateCoreNormalMethod = ({
       builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::repay::repay`,
-        [
-          coreIds.version,
-          obligation,
-          coreIds.market,
-          coin,
-          txBlock.sharedObjectRef({
-            objectId: import_utils13.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [coreIds.version, obligation, coreIds.market, coin, clockObjectRef],
         [coinType]
       );
     },
@@ -7019,7 +6934,7 @@ var generateCoreQuickMethod = ({
       ) ?? [];
       const updateCoinNames = [...obligationCoinNames, poolCoinName];
       await updateOracles(builder, txBlock, updateCoinNames);
-      return await txBlock.borrow(
+      return txBlock.borrow(
         obligationInfo.obligationId,
         obligationInfo.obligationKey,
         amount,
@@ -7157,6 +7072,11 @@ var generateSpoolNormalMethod = ({
   const spoolIds = {
     spoolPkg: builder.address.get("spool.id")
   };
+  const clockObjectRef = txBlock.sharedObjectRef({
+    objectId: import_utils15.SUI_CLOCK_OBJECT_ID,
+    mutable: false,
+    initialSharedVersion: "1"
+  });
   return {
     createStakeAccount: (stakeMarketCoinName) => {
       const marketCoinType = builder.utils.parseMarketCoinType(stakeMarketCoinName);
@@ -7166,14 +7086,7 @@ var generateSpoolNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${spoolIds.spoolPkg}::user::new_spool_account`,
-        [
-          stakePoolId,
-          txBlock.sharedObjectRef({
-            objectId: import_utils15.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [stakePoolId, clockObjectRef],
         [marketCoinType]
       );
     },
@@ -7185,16 +7098,7 @@ var generateSpoolNormalMethod = ({
       builder.moveCall(
         txBlock,
         `${spoolIds.spoolPkg}::user::stake`,
-        [
-          stakePoolId,
-          stakeAccount,
-          coin,
-          txBlock.sharedObjectRef({
-            objectId: import_utils15.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [stakePoolId, stakeAccount, coin, clockObjectRef],
         [marketCoinType]
       );
     },
@@ -7206,16 +7110,7 @@ var generateSpoolNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${spoolIds.spoolPkg}::user::unstake`,
-        [
-          stakePoolId,
-          stakeAccount,
-          amount,
-          txBlock.sharedObjectRef({
-            objectId: import_utils15.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [stakePoolId, stakeAccount, amount, clockObjectRef],
         [marketCoinType]
       );
     },
@@ -7232,16 +7127,7 @@ var generateSpoolNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${spoolIds.spoolPkg}::user::redeem_rewards`,
-        [
-          stakePoolId,
-          rewardPoolId,
-          stakeAccount,
-          txBlock.sharedObjectRef({
-            objectId: import_utils15.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
-        ],
+        [stakePoolId, rewardPoolId, stakeAccount, clockObjectRef],
         [marketCoinType, rewardCoinType]
       );
     }
@@ -7416,6 +7302,11 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
     treasury: builder.address.get("vesca.treasury"),
     config: builder.address.get("vesca.config")
   };
+  const clockObjectRef = txBlock.sharedObjectRef({
+    objectId: import_sui_kit7.SUI_CLOCK_OBJECT_ID,
+    mutable: false,
+    initialSharedVersion: "1"
+  });
   return {
     stakeObligation: (obligationId, obligationKey) => {
       builder.moveCall(
@@ -7428,11 +7319,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           obligationKey,
           obligationId,
           borrowIncentiveIds.obligationAccessStore,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit7.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ]
       );
     },
@@ -7451,11 +7338,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           veScaIds.treasury,
           veScaIds.table,
           veScaKey,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit7.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         []
       );
@@ -7470,11 +7353,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligationKey,
           obligationId,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit7.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ]
       );
     },
@@ -7489,11 +7368,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligationKey,
           obligationId,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit7.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         [rewardType]
       );
@@ -7508,11 +7383,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligation,
           veScaKey,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit7.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ]
       );
     }
@@ -7652,6 +7523,11 @@ var generateNormalVeScaMethod = ({
     treasury: builder.address.get("vesca.treasury"),
     config: builder.address.get("vesca.config")
   };
+  const clockObjectRef = txBlock.sharedObjectRef({
+    objectId: import_sui_kit8.SUI_CLOCK_OBJECT_ID,
+    mutable: false,
+    initialSharedVersion: "1"
+  });
   return {
     lockSca: (scaCoin, unlockAtInSecondTimestamp) => {
       return builder.moveCall(
@@ -7663,11 +7539,7 @@ var generateNormalVeScaMethod = ({
           veScaIds.treasury,
           scaCoin,
           unlockAtInSecondTimestamp,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit8.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         []
       );
@@ -7682,11 +7554,7 @@ var generateNormalVeScaMethod = ({
           veScaIds.table,
           veScaIds.treasury,
           newUnlockAtInSecondTimestamp,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit8.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         []
       );
@@ -7701,11 +7569,7 @@ var generateNormalVeScaMethod = ({
           veScaIds.table,
           veScaIds.treasury,
           scaCoin,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit8.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         []
       );
@@ -7721,11 +7585,7 @@ var generateNormalVeScaMethod = ({
           veScaIds.treasury,
           scaCoin,
           newUnlockAtInSecondTimestamp,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit8.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         []
       );
@@ -7739,11 +7599,7 @@ var generateNormalVeScaMethod = ({
           veScaKey,
           veScaIds.table,
           veScaIds.treasury,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit8.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         []
       );
@@ -7888,7 +7744,7 @@ var generateQuickVeScaMethod = ({
       const veSca = await requireVeSca(builder, txBlock, veScaKey);
       checkVesca(veSca?.unlockAt);
       if (veSca) {
-        const sca = await txBlock.redeemSca(veSca.keyId);
+        const sca = txBlock.redeemSca(veSca.keyId);
         if (transferSca) {
           txBlock.transferObjects([sca], sender);
           return;
@@ -7943,6 +7799,11 @@ var generateReferralNormalMethod = ({
     version: builder.address.get("referral.version")
   };
   const veScaTable = builder.address.get("vesca.table");
+  const clockObjectRef = txBlock.sharedObjectRef({
+    objectId: import_sui_kit9.SUI_CLOCK_OBJECT_ID,
+    mutable: false,
+    initialSharedVersion: "1"
+  });
   return {
     bindToReferral: (veScaKeyId) => {
       builder.moveCall(
@@ -7952,11 +7813,7 @@ var generateReferralNormalMethod = ({
           referralIds.referralBindings,
           txBlock.pure.id(veScaKeyId),
           veScaTable,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit9.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         []
       );
@@ -7972,11 +7829,7 @@ var generateReferralNormalMethod = ({
           referralIds.referralBindings,
           referralIds.authorizedWitnessList,
           referralIds.referralTiers,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit9.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         [coinType]
       );
@@ -7990,11 +7843,7 @@ var generateReferralNormalMethod = ({
           referralIds.version,
           ticket,
           referralIds.referralRevenuePool,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit9.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         [coinType]
       );
@@ -8008,11 +7857,7 @@ var generateReferralNormalMethod = ({
           referralIds.version,
           referralIds.referralRevenuePool,
           veScaKey,
-          txBlock.sharedObjectRef({
-            objectId: import_sui_kit9.SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: "1"
-          })
+          clockObjectRef
         ],
         [coinType]
       );
@@ -8453,6 +8298,16 @@ var ScallopIndexer = class {
   async getCoinPrice(poolCoinName) {
     return (await this.getMarketPool(poolCoinName))?.coinPrice ?? 0;
   }
+  async getCoinPrices() {
+    const marketPools = await this.getMarketPools();
+    return Object.entries(marketPools).reduce(
+      (prev, [coinName, market]) => {
+        prev[coinName] = market.coinPrice;
+        return prev;
+      },
+      {}
+    );
+  }
 };
 
 // src/models/scallopQuery.ts
@@ -8611,8 +8466,8 @@ var ScallopQuery = class {
    * @param obligationId - The obligation id.
    * @return Obligation data.
    */
-  async queryObligation(obligationId) {
-    return queryObligation(this, obligationId);
+  async queryObligation(obligationId, args) {
+    return queryObligation(this, obligationId, args?.version, args?.market);
   }
   /**
    * Get all asset coin amounts.
@@ -9030,19 +8885,31 @@ var ScallopQuery = class {
   async getCoinPriceByIndexer(poolName) {
     return this.indexer.getCoinPrice(poolName);
   }
+  /**
+   * Get all supported pool price from indexer
+   * @returns prices data
+   */
+  async getCoinPricesByIndexer() {
+    return this.indexer.getCoinPrices();
+  }
   /**
    * Get all coin prices, including sCoin
    * @returns prices data
    */
   async getAllCoinPrices(args) {
-    return getAllCoinPrices(this, args?.marketPools, args?.coinPrices);
+    return getAllCoinPrices(
+      this,
+      args?.marketPools,
+      args?.coinPrices,
+      args?.indexer
+    );
   }
   /**
    * Query all address (lending pool, collateral pool, borrow dynamics, interest models, etc.) of all pool
    * @returns
    */
-  async getPoolAddresses(pools = [...SUPPORT_POOLS]) {
-    return getAllAddresses(this, pools);
+  async getPoolAddresses(poolNames) {
+    return getAllAddresses(this, poolNames);
   }
   /**
    * Get user portfolio
@@ -9054,6 +8921,33 @@ var ScallopQuery = class {
       args?.indexer ?? false
     );
   }
+  /**
+   * Get both primary and secondary price update policy objects
+   * @returns price update policies
+   */
+  async getPriceUpdatePolicies() {
+    return await getPriceUpdatePolicies(this.address);
+  }
+  /**
+   * Return the supported primary and secondary oracles for all supported pool assets
+   * @returns
+   */
+  async getAssetOracles() {
+    const [primary, secondary] = await Promise.all([
+      getAssetOracles(this.utils, "primary"),
+      getAssetOracles(this.utils, "secondary")
+    ]);
+    return SUPPORT_POOLS.reduce(
+      (acc, pool) => {
+        acc[pool] = {
+          primary: primary[pool] ?? [],
+          secondary: secondary[pool] ?? []
+        };
+        return acc;
+      },
+      {}
+    );
+  }
 };
 
 // src/models/scallopBuilder.ts
@@ -10066,6 +9960,7 @@ var Scallop = class {
   stakeMarketCoins,
   suiBridgeCoins,
   voloCoinIds,
-  wormholeCoinIds
+  wormholeCoinIds,
+  xOracleList
 });
 //# sourceMappingURL=index.js.map