@scallop-io/sui-scallop-sdk 1.3.4-alpha.7 → 1.3.4-isolated-asset.2

package/dist/index.mjs

@@ -10,11 +10,11 @@ var DEFAULT_CACHE_OPTIONS = {
 
 // src/constants/coinGecko.ts
 var COIN_GECKGO_IDS = {
-  usdc: "usdc-coin",
+  usdc: "usdc",
   sbeth: "ethereum",
   weth: "ethereum",
   wbtc: "bitcoin",
-  wusdc: "usdc-coin",
+  wusdc: "usdc",
   wusdt: "tether",
   sui: "sui",
   wapt: "aptos",
@@ -23,7 +23,9 @@ var COIN_GECKGO_IDS = {
   afsui: "sui",
   hasui: "sui",
   vsui: "sui",
-  sca: "scallop-2"
+  sca: "scallop-2",
+  deep: "deepbook",
+  fud: "fud-the-pug"
 };
 
 // src/constants/common.ts
@@ -52,7 +54,9 @@ var SUPPORT_POOLS = [
   "afsui",
   "hasui",
   "vsui",
-  "sca"
+  "sca",
+  "fud",
+  "deep"
 ];
 var SUPPORT_COLLATERALS = [
   "usdc",
@@ -153,6 +157,8 @@ var coinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
+  deep: 6,
+  fud: 5,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
@@ -166,7 +172,9 @@ var coinDecimals = {
   safsui: 9,
   shasui: 9,
   svsui: 9,
-  ssca: 9
+  ssca: 9,
+  sdeep: 6,
+  sfud: 5
 };
 var assetCoins = {
   usdc: "usdc",
@@ -182,7 +190,9 @@ var assetCoins = {
   afsui: "afsui",
   hasui: "hasui",
   vsui: "vsui",
-  sca: "sca"
+  sca: "sca",
+  deep: "deep",
+  fud: "fud"
 };
 var marketCoins = {
   susdc: "susdc",
@@ -198,7 +208,9 @@ var marketCoins = {
   safsui: "safsui",
   shasui: "shasui",
   svsui: "svsui",
-  ssca: "ssca"
+  ssca: "ssca",
+  sdeep: "sdeep",
+  sfud: "sfud"
 };
 var sCoins = {
   susdc: "susdc",
@@ -266,7 +278,10 @@ var coinIds = {
   afsui: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc",
   hasui: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d",
   vsui: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55",
-  sca: IS_VE_SCA_TEST ? "0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524" : "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6"
+  sca: IS_VE_SCA_TEST ? "0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524" : "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6",
+  // isolated assets
+  deep: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP",
+  fud: "0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1::fud::FUD"
 };
 var wormholeCoinIds = {
   weth: "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5",
@@ -282,11 +297,27 @@ var voloCoinIds = {
 var sCoinIds = {
   susdc: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
   ssbeth: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
-  ssui: "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI",
+  ssui: (
+    // TODO: use prod value
+    // '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
+    "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI"
+  ),
   scetus: "0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS",
-  ssca: "0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA",
-  swusdc: "0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
-  swusdt: "0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
+  ssca: (
+    // TODO: use prod value
+    // '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
+    "0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA"
+  ),
+  swusdc: (
+    // TODO: use prod value
+    // '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+    "0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC"
+  ),
+  swusdt: (
+    // TODO: use prod value
+    // '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+    "0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT"
+  ),
   sweth: "0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH",
   safsui: "0x00671b1fa2a124f5be8bdae8b91ee711462c5d9e31bda232e70fd9607b523c88::scallop_af_sui::SCALLOP_AF_SUI",
   shasui: "0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI",
@@ -375,6 +406,12 @@ var POOL_ADDRESSES = {
   sca: {
     lendingPoolAddress: "0x6fc7d4211fc7018b6c75e7b908b88f2e0536443239804a3d32af547637bd28d7",
     collateralPoolAddress: "0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31"
+  },
+  fud: {
+    lendingPoolAddress: ""
+  },
+  deep: {
+    lendingPoolAddress: ""
   }
 };
 
@@ -397,7 +434,9 @@ var PYTH_FEED_IDS = {
   afsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
   hasui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
   vsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-  sca: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc"
+  sca: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
+  deep: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
+  fud: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75"
 };
 
 // src/constants/queryKeys.ts
@@ -502,20 +541,33 @@ var TEST_ADDRESSES = {
   core: {
     // version:
     //   '0x07871c4b3c847a0f674510d4978d5cf6f960452795e8ff6f189fd2088a3f6ac7',
-    version: "0x6156d5cd1538bec8a167a40fe1209a4ec9cf8137921fe0a697f191ac561f0b09",
+    version: "0xd318de9b0f6873879a82cbfcc2daa1d1591a8b54e7cea9f4b567da63c692a52b",
     versionCap: "0x590a4011cb649b3878f3ea14b3a78674642a9548d79b7e091ef679574b158a07",
     // object:
     //   '0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf',
-    object: "0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1",
+    object: "0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d",
     // market:
     //   '0xa757975255146dc9686aa823b7838b507f315d704f428cbadad2f4ea061939d9',
-    market: "0x8606ed145cc887985b8ed793f7753ff5dc762a42c379dac035f568e1bac58490",
+    market: "0x9d6434e97f3f98fd9b0c0e1dca22632073985abcd22541feae7ee1e34cbe3af2",
     adminCap: "0x09689d018e71c337d9db6d67cbca06b74ed92196103624028ccc3ecea411777c",
     coinDecimalsRegistry: "0x200abe9bf19751cc566ae35aa58e2b7e4ff688fc1130f8d8909ea09bc137d668",
     // obligationAccessStore:
     //   '0x733e30b7c94d619d78cb8f5bc4bfbb759ced9a531239028caabb2474e5be59c9',
-    obligationAccessStore: "0x48b472d68ca910c45f7f3b6c26836b6aa6d2569810d94b1b939023da05ae0a23",
+    obligationAccessStore: "0x46e9b44a77ee9c9d33cc2689ecdfbb8f681935cbc6bdf6ac3df048e396c36c82",
     coins: {
+      usdc: {
+        id: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7",
+        metaData: "0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+            feedObject: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
+          }
+        }
+      },
       cetus: {
         id: "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b",
         metaData: "0x4c0dce55eff2db5419bbd2d239d1aa22b4a400c01bbb648b058a9883989025da",
@@ -671,6 +723,19 @@ var TEST_ADDRESSES = {
             feedObject: "0xf6de1d3279a269a597d813cbaca59aa906543ab9a8c64e84a4722f1a20863985"
           }
         }
+      },
+      sbeth: {
+        id: "0xd0e89b2af5e4910726fbcd8b8dd37bb79b29e5f83f7491bca830e94f7f226d29",
+        metaData: "0x89b04ba87f8832d4d76e17a1c9dce72eb3e64d372cf02012b8d2de5384faeef0",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
+            feedObject: "0x9193fd47f9a0ab99b6e365a464c8a9ae30e6150fc37ed2a89c1586631f6fc4ab"
+          }
+        }
       }
     },
     oracles: {
@@ -704,7 +769,7 @@ var TEST_ADDRESSES = {
         upgradeCap: "0x3f203f6fff6a69d151e4f1cd931f22b68c489ef2759765662fc7baf673943c9e"
       },
       protocol: {
-        id: "0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1",
+        id: "0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e",
         upgradeCap: "0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a"
       },
       // protocol: {
@@ -722,7 +787,7 @@ var TEST_ADDRESSES = {
       //     '0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f',
       // },
       query: {
-        id: "0xe4f9d62d17746d5b9dbf0d5557747430021a71575780b515161210cdba0a4c1c",
+        id: "0x89706958f43fb170de134579e3fbc53972b946ee78bd2442d8e1adc36074fbdc",
         upgradeCap: "0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f"
       },
       supra: { id: "", upgradeCap: "" },
@@ -758,6 +823,10 @@ var TEST_ADDRESSES = {
           "0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a"
         )
       },
+      susdc: {
+        id: "0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918",
+        rewardPoolId: "0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166"
+      },
       swusdc: {
         // id: '0x4ace6648ddc64e646ba47a957c562c32c9599b3bba8f5ac1aadb2ae23a2f8ca0',
         id: "0xf1b383b9cf2e9f515fc69567df1053098f273849d09cd84b0278a773429bd2b2",
@@ -806,37 +875,37 @@ var TEST_ADDRESSES = {
     config: ""
   },
   borrowIncentive: {
-    id: "0x6152f696fc3a658f33c4b891764731a59153125ffedfa8bff7167c42823f58a9",
-    adminCap: "0xc486afa253646f4d381e81d7f1df8aa4723b845a6bb356f69bad635ffefffe2c",
-    object: "0x002875153e09f8145ab63527bc85c00f2bd102e12f9573c47f8cdf1a1cb62934",
-    query: "0x529edc54a3dce2207703ceebbccb0ac14133f7825c1f528775ba0d85a4063489",
-    incentivePools: "0x6547e143d406b5ccd5f46aae482497de279cc1a68c406f701df70a05f9212ab4",
-    incentiveAccounts: "0xc4701fdbc1c92f9a636d334d66012b3027659e9fb8aff27279a82edfb6b77d02",
-    config: "0xdf5d04b4691cc67e82fd4db8394d89ff44823a9de29716c924f74bb4f11cc1f7"
+    id: "0x85769d63565ce99c7622f8e336ca1460926ddf29738ad2a39407b5cac29f61fe",
+    adminCap: "0x56ac8e6f2b360b2b35c0168d72cc6cd17d9592afb83709865cb87af24bb2025b",
+    object: "0x85769d63565ce99c7622f8e336ca1460926ddf29738ad2a39407b5cac29f61fe",
+    query: "0x8e0d00f8ff1199d7c5fe56cea0e901a525daeefff0445a1635ace8282ae3302c",
+    incentivePools: "0x9d564c93128c6ab0c0d3e050a47f11df0b91494f3bb779bdc1301c1c637f15eb",
+    incentiveAccounts: "0x09e6040e798246de04941bc79a3ba62d3eca6d7a218cc30f21fb07f478fa2926",
+    config: "0x43d4ca1dfc90b161c4240facd119e74e4b850cca2957f88c2ec289c9380da064"
   },
   referral: {
-    id: "0xa3654ebb63eb06c0f4ff52f8aa6512df9f164f7772bdf15dac3709bd3798dda9",
+    id: "0x1bf5a8ce77050d8052549d743e16b469f15aa6b81b752b78b6ebb65179665f5a",
     object: "0x5658d4bf5ddcba27e4337b4262108b3ad1716643cac8c2054ac341538adc72ec",
     adminCap: "0xc5dc06b9074291259f2cac460c940012c781c4430e42125c541cc43101c3bcbd",
-    referralBindings: "0xf63299d58789d99de94092b9011323466e55ca0c1ea1a7a3786a589af46e1c09",
-    bindingTableId: "0x1c8202b17267ec8d6cf97ca013615354181a04f179570e42601ff2dae19294b1",
-    referralRevenuePool: "0x6abd852caf90769c1b185cdf636d841673fa95528f0550f018b8a138bd283c07",
+    referralBindings: "0xcf184487782bed962bf678001efe775d31fb94b9992333a57594cf15d79d5ced",
+    bindingTableId: "0x41a50e258c0a266ce84e0e1a618dbf70b878cc943909e613089a50afcceb2bc0",
+    referralRevenuePool: "0xc24e3e5e37032f29a3dd91a9a1f057af8821b7e6c148e9683900ac8b6d30f0c6",
     revenueTableId: "0x595baa3654c297bff84ab7786a2d250f019cefc66e8df8e89fd9d41e02bd30dd",
-    referralTiers: "0x962cb903d8d7346190c5204785ccbb91b61086aa764f674c8145df82335cf83e",
+    referralTiers: "0x144350f3db9b46d11b140084cd54e6de0b9c3b8d265ce8059b51d0ef58ea464b",
     tiersTableId: "0xeac755a7a8b7798530905ac79e8c114f19d0f130f6eab012954f08faac29c75d",
     // authorizedWitnessList:
     //   '0xf21b0ed043c9bb70842c0129159f4943dbcc3c9ef2f2f808af65f8be25cfd20e',
     authorizedWitnessList: "0x9d6223dc52015b8a3986a573590ef2af8f1b8f3e4685513888c052f001b87e7f",
-    version: "0x1bd4b7285f72e11c316b828c7c47b3f4da18dcec9f9b3dba6d8629cbb6f93e5e"
+    version: "0x3545849eb97723e676a476ec9d4fe5f2eb0eb2c6b78972851114fd4c7ed4639f"
   },
   vesca: {
-    id: "0xb15b6e0cdd85afb5028bea851dd249405e734d800a259147bbc24980629723a4",
-    object: "0xb15b6e0cdd85afb5028bea851dd249405e734d800a259147bbc24980629723a4",
+    id: "0x1158813b32962c2d22888fae257d5f2365b03631f0cd5d5b912ccdf51ff4e2f2",
+    object: "0x1158813b32962c2d22888fae257d5f2365b03631f0cd5d5b912ccdf51ff4e2f2",
     adminCap: "0x8ffa76135c5b85c5fbd73a6448a4a733d826cb63a267ab817656acb77c72d4a5",
-    tableId: "0xe3153b2bf124be0b86cb8bd468346a861efd0da52fc42197b54d2f616488a311",
-    table: "0x611cb8d9d4d90867467b5ebdf4cc447a0047ed5b01334a28a29fcfe733e3d609",
-    treasury: "0xe8c112c09b88158dc6c8e23d1fbae5b3c7136cdee54b7dafc08e65db28c4a5bc",
-    config: "0xe0a2ff281e73c1d53cfa85807080f87e833e4f1a7f93dcf8800b3865269a76b9"
+    tableId: "0x0a0b7f749baeb61e3dfee2b42245e32d0e6b484063f0a536b33e771d573d7246",
+    table: "0xd3a4632b1080f7d96e1c2487d4dabf2c1196916937c505a69954ac9f393be8d0",
+    treasury: "0xafa4b6231e49c15a22d641ce33fda761baaf650fa21899dfa2eb1716146e7306",
+    config: "0x7cbcb0a342179577a117dfdff974cf1ab765d3b571067bf22ddf5f9e3a667922"
   },
   loyaltyProgram: {
     id: "0xd17bcf8b5a59652c36225d478564a8593ae0ed7d650bcacdda1d6fe179127907",
@@ -845,27 +914,27 @@ var TEST_ADDRESSES = {
     userRewardTableId: "0x748a80395849ed37db1b0e14f2ab5d1d96458d2359ab3a84eb079d0f4ac7cf2e"
   },
   scoin: {
-    id: "0xad2ca2aa5089df94bb2d444d5eb3520378c2f2dfb3a0bd2a2c994145ac4b0a53",
+    id: "0x773dab39c90fe05439b06a2d061795e52a974ff92c2aef90b2ee467acf7f33c8",
     coins: {
       ssui: {
-        coinType: "0xfac769100bccc0caebcf4f4e2d00ac2f8883f07f724be28940df90605f5e7e9a::scallop_sui::SCALLOP_SUI",
-        treasury: "0x9cb4551b36c17d37e19d700147fa819ea1c487ff8bcf18374de2cceb2e9d4845"
+        coinType: "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI",
+        treasury: "0x0e499640a12c38dd9cc44532f5bc5fd1b6da86d2f9a8810357250f4b26e9e5c7"
       },
       scetus: {
         coinType: "0x8b71e6d323ed78515af2bead13bf3d0da1562ba4a99234eb7c4f14fd39ef0427::scallop_cetus::SCALLOP_CETUS",
         treasury: "0xd786f4b2d26278cc7911a3445b1b085eab60f269ef9dbb6b87e803d52f155003"
       },
       ssca: {
-        coinType: "0x0a9d3c6c9af9f6e8def82921541bcbd17f73ed31bed3adcb684f2a4c267e42f0::scallop_sca::SCALLOP_SCA",
-        treasury: "0xe818636d1d6c46d6ea1a2dce9d94696d7cbc18ce27451b603eeaa47aba8d75e0"
+        coinType: "0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA",
+        treasury: "0x5f1c5de1df7341075d119570269b7b452af50afe8363080638f1ae29a554c038"
       },
       swusdc: {
-        coinType: "0xaedc3ab75db8680b81a755015fa90124d217be93457b893c05bac033817defaf::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
-        treasury: "0xfc6971648f867f7fd6928d1b873af71577e2eaf2c7543ef8bc82c431d833ae78"
+        coinType: "0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
+        treasury: "0x471fbab72578bab577263006fe32543b6e76153fffa2bef69affe4bc4934258f"
       },
       swusdt: {
-        coinType: "0xbf02fc87ddc104b342ad8414c85ceadf5b0c823c055a06fb0ed776272c01a52a::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
-        treasury: "0xb9593e2c3a0ba796ee815012b75ae46468ea78cda0188b9ac6816efe65503521"
+        coinType: "0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
+        treasury: "0x921a4ed4bb4b4f11f51a462c83f4c0f6b60a90e441d1bc0d26d6fd893146bf4d"
       },
       sweth: {
         coinType: "0x27d54f43e3eda701be56b82e5756e41c84467cd202f5cf713d5f9e45a9f1b6bc::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH",
@@ -881,7 +950,11 @@ var TEST_ADDRESSES = {
       },
       svsui: {
         coinType: "0x97023a317320c4498cc4cd239dd02fd30c28246e5e8f81325d63f2bd8d70f6b3::scallop_v_sui::SCALLOP_V_SUI",
-        treasury: "0x327114f0bf3559d7e2de10282147ed76a236c7c6775029165c4db09a6062ead6\u0192"
+        treasury: "0x327114f0bf3559d7e2de10282147ed76a236c7c6775029165c4db09a6062ead6"
+      },
+      ssbeth: {
+        coinType: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
+        treasury: "0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed"
       }
     }
   }
@@ -2588,23 +2661,148 @@ var supplyLimitZod = zod.object({
     value: zod.string()
   })
 });
-var SUPPLY_LIMIT_KEY = "0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey";
+var supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
 var getSupplyLimit = async (utils, poolName) => {
-  const poolCoinType = utils.parseCoinType(poolName).slice(2);
-  const marketObject = utils.address.get("core.market");
-  if (!marketObject)
-    return null;
-  const object = await utils.cache.queryGetDynamicFieldObject({
-    parentId: marketObject,
-    name: {
-      type: SUPPLY_LIMIT_KEY,
-      value: poolCoinType
+  try {
+    const poolCoinType = utils.parseCoinType(poolName).slice(2);
+    const marketObject = utils.address.get("core.market");
+    if (!marketObject)
+      return null;
+    const object = await utils.cache.queryGetDynamicFieldObject({
+      parentId: marketObject,
+      name: {
+        type: supplyLimitKeyType,
+        value: poolCoinType
+      }
+    });
+    const parsedData = supplyLimitZod.safeParse(object?.data?.content);
+    if (!parsedData.success)
+      return null;
+    return parsedData.data.fields.value;
+  } catch (e) {
+    console.error(`Error in getSupplyLimit for ${poolName}: ${e.message}`);
+    return "0";
+  }
+};
+
+// src/queries/isolatedAssetQuery.ts
+import { z as zod2 } from "zod";
+var isolatedAssetZod = zod2.object({
+  dataType: zod2.string(),
+  type: zod2.string(),
+  hasPublicTransfer: zod2.boolean(),
+  fields: zod2.object({
+    id: zod2.object({
+      id: zod2.string()
+    }),
+    name: zod2.object({
+      type: zod2.string()
+    }),
+    value: zod2.boolean()
+  })
+});
+var isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
+var getIsolatedAssets = async (address) => {
+  try {
+    const marketObject = address.get("core.market");
+    const isolatedAssets = [];
+    if (!marketObject)
+      return isolatedAssets;
+    let hasNextPage = false;
+    let nextCursor = null;
+    const isIsolatedDynamicField = (dynamicField) => {
+      return dynamicField.name.type === isolatedAssetKeyType;
+    };
+    do {
+      const response = await address.cache.queryGetDynamicFields({
+        parentId: marketObject,
+        cursor: nextCursor,
+        limit: 10
+      });
+      if (!response)
+        break;
+      const isolatedAssetCoinTypes = response.data.filter(isIsolatedDynamicField).map(({ name }) => `0x${name.value.type.name}`);
+      isolatedAssets.push(...isolatedAssetCoinTypes);
+      if (response && response.hasNextPage && response.nextCursor) {
+        hasNextPage = true;
+        nextCursor = response.nextCursor;
+      } else {
+        hasNextPage = false;
+      }
+    } while (hasNextPage);
+    return isolatedAssets;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
+};
+var isIsolatedAsset = async (utils, coinName) => {
+  try {
+    const marketObject = utils.address.get("core.market");
+    const cachedData = utils.address.cache.queryClient.getQueryData([
+      "getDynamicFields",
+      marketObject
+    ]);
+    if (cachedData) {
+      const coinType2 = utils.parseCoinType(coinName);
+      return cachedData.includes(coinType2);
     }
-  });
-  const parsedData = supplyLimitZod.safeParse(object?.data?.content);
-  if (!parsedData.success)
-    return null;
-  return parsedData.data.fields.value;
+    const coinType = utils.parseCoinType(coinName).slice(2);
+    const object = await utils.cache.queryGetDynamicFieldObject({
+      parentId: marketObject,
+      name: {
+        type: isolatedAssetKeyType,
+        value: coinType
+      }
+    });
+    const parsedData = isolatedAssetZod.safeParse(object?.data?.content);
+    if (!parsedData.success)
+      return false;
+    return parsedData.data.fields.value;
+  } catch (e) {
+    console.error(e);
+    return false;
+  }
+};
+
+// src/queries/borrowLimitQuery.ts
+import { z as zod3 } from "zod";
+var borrowLimitZod = zod3.object({
+  dataType: zod3.string(),
+  type: zod3.string(),
+  hasPublicTransfer: zod3.boolean(),
+  fields: zod3.object({
+    id: zod3.object({
+      id: zod3.string()
+    }),
+    name: zod3.object({
+      type: zod3.string()
+    }),
+    value: zod3.string()
+  })
+});
+var borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
+var getBorrowLimit = async (utils, poolName) => {
+  try {
+    const poolCoinType = utils.parseCoinType(poolName).slice(2);
+    const marketObject = utils.address.get("core.market");
+    if (!marketObject)
+      return null;
+    const object = await utils.cache.queryGetDynamicFieldObject({
+      parentId: marketObject,
+      name: {
+        type: borrowLimitKeyType,
+        value: poolCoinType
+      }
+    });
+    const parsedData = borrowLimitZod.safeParse(object?.data?.content);
+    if (!parsedData.success)
+      return null;
+    return parsedData.data.fields.value;
+  } catch (e) {
+    console.error(`Error in getBorrowLimit for ${poolName}: ${e.message}`);
+    return "0";
+  }
 };
 
 // src/queries/coreQuery.ts
@@ -2673,6 +2871,9 @@ var queryMarket = async (query, indexer = false, coinPrices) => {
     const maxSupplyCoin = BigNumber3(
       await getSupplyLimit(query.utils, poolCoinName) ?? "0"
     ).shiftedBy(-coinDecimal).toNumber();
+    const maxBorrowCoin = BigNumber3(
+      await getBorrowLimit(query.utils, poolCoinName) ?? "0"
+    ).shiftedBy(-coinDecimal).toNumber();
     pools[poolCoinName] = {
       coinName: poolCoinName,
       symbol: query.utils.parseSymbol(poolCoinName),
@@ -2691,9 +2892,10 @@ var queryMarket = async (query, indexer = false, coinPrices) => {
       borrowFee: parsedMarketPoolData.borrowFee,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
-      // isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
-      isIsolated: false,
+      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+      // isIsolated: false,
       maxSupplyCoin,
+      maxBorrowCoin,
       ...calculatedMarketPoolData
     };
   }
@@ -2731,6 +2933,7 @@ var queryMarket = async (query, indexer = false, coinPrices) => {
       liquidationDiscount: parsedMarketCollateralData.liquidationDiscount,
       liquidationPanelty: parsedMarketCollateralData.liquidationPanelty,
       liquidationReserveFactor: parsedMarketCollateralData.liquidationReserveFactor,
+      isIsolated: await isIsolatedAsset(query.utils, collateralCoinName),
       ...calculatedMarketCollateralData
     };
   }
@@ -2778,85 +2981,76 @@ var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer =
   return marketPools;
 };
 var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, coinPrice) => {
-  let marketPool;
-  let balanceSheet;
-  let borrowIndex;
-  let interestModel;
-  let borrowFeeRate;
-  coinPrice = coinPrice ?? (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
-  if (indexer) {
-    const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
-    marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
-    marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
-      marketPoolIndexer.coinName
-    );
-    return marketPoolIndexer;
-  }
-  const marketId = query.address.get("core.market");
-  marketObject = marketObject ?? (await query.cache.queryGetObject(marketId, {
-    showContent: true
-  }))?.data;
-  if (marketObject) {
-    if (marketObject.content && "fields" in marketObject.content) {
-      const fields = marketObject.content.fields;
-      const coinType = query.utils.parseCoinType(poolCoinName);
-      const balanceSheetParentId = fields.vault.fields.balance_sheets.fields.table.fields.id.id;
-      const balanceSheetDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-        parentId: balanceSheetParentId,
-        name: {
-          type: "0x1::type_name::TypeName",
-          value: {
-            name: coinType.substring(2)
-          }
+  try {
+    coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
+    if (indexer) {
+      const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
+      if (!marketPoolIndexer) {
+        return void 0;
+      }
+      marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
+      marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
+        marketPoolIndexer.coinName
+      );
+      return marketPoolIndexer;
+    }
+    const marketId = query.address.get("core.market");
+    marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
+      showContent: true
+    }))?.data;
+    if (!(marketObject && marketObject.content?.dataType === "moveObject"))
+      throw new Error(`Failed to fetch marketObject`);
+    const fields = marketObject.content.fields;
+    const coinType = query.utils.parseCoinType(poolCoinName);
+    const balanceSheetParentId = fields.vault.fields.balance_sheets.fields.table.fields.id.id;
+    const balanceSheetDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+      parentId: balanceSheetParentId,
+      name: {
+        type: "0x1::type_name::TypeName",
+        value: {
+          name: coinType.substring(2)
         }
-      });
-      if (!balanceSheetDynamicFieldObjectResponse)
-        throw new Error(
-          `Failed to fetch balanceSheetDynamicFieldObjectResponse for ${poolCoinName}`
-        );
-      const balanceSheetDynamicFieldObject = balanceSheetDynamicFieldObjectResponse.data;
-      if (balanceSheetDynamicFieldObject && balanceSheetDynamicFieldObject.content && "fields" in balanceSheetDynamicFieldObject.content) {
-        const dynamicFields = balanceSheetDynamicFieldObject.content.fields;
-        balanceSheet = dynamicFields.value.fields;
       }
-      const borrowIndexParentId = fields.borrow_dynamics.fields.table.fields.id.id;
-      const borrowIndexDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-        parentId: borrowIndexParentId,
-        name: {
-          type: "0x1::type_name::TypeName",
-          value: {
-            name: coinType.substring(2)
-          }
+    });
+    const balanceSheetDynamicFieldObject = balanceSheetDynamicFieldObjectResponse?.data;
+    if (!(balanceSheetDynamicFieldObject && balanceSheetDynamicFieldObject.content && "fields" in balanceSheetDynamicFieldObject.content))
+      throw new Error(
+        `Failed to fetch balanceSheetDynamicFieldObject for ${poolCoinName}: ${balanceSheetDynamicFieldObjectResponse?.error?.code.toString()}`
+      );
+    const balanceSheet = balanceSheetDynamicFieldObject.content.fields.value.fields;
+    const borrowIndexParentId = fields.borrow_dynamics.fields.table.fields.id.id;
+    const borrowIndexDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+      parentId: borrowIndexParentId,
+      name: {
+        type: "0x1::type_name::TypeName",
+        value: {
+          name: coinType.substring(2)
         }
-      });
-      if (!borrowIndexDynamicFieldObjectResponse)
-        throw new Error(
-          `Failed to fetch borrowIndexDynamicFieldObjectResponse for ${poolCoinName}`
-        );
-      const borrowIndexDynamicFieldObject = borrowIndexDynamicFieldObjectResponse.data;
-      if (borrowIndexDynamicFieldObject && borrowIndexDynamicFieldObject.content && "fields" in borrowIndexDynamicFieldObject.content) {
-        const dynamicFields = borrowIndexDynamicFieldObject.content.fields;
-        borrowIndex = dynamicFields.value.fields;
       }
-      const interestModelParentId = fields.interest_models.fields.table.fields.id.id;
-      const interestModelDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-        parentId: interestModelParentId,
-        name: {
-          type: "0x1::type_name::TypeName",
-          value: {
-            name: coinType.substring(2)
-          }
+    });
+    const borrowIndexDynamicFieldObject = borrowIndexDynamicFieldObjectResponse?.data;
+    if (!(borrowIndexDynamicFieldObject && borrowIndexDynamicFieldObject.content && "fields" in borrowIndexDynamicFieldObject.content))
+      throw new Error(
+        `Failed to fetch borrowIndexDynamicFieldObject for ${poolCoinName}`
+      );
+    const borrowIndex = borrowIndexDynamicFieldObject.content.fields.value.fields;
+    const interestModelParentId = fields.interest_models.fields.table.fields.id.id;
+    const interestModelDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+      parentId: interestModelParentId,
+      name: {
+        type: "0x1::type_name::TypeName",
+        value: {
+          name: coinType.substring(2)
         }
-      });
-      if (!interestModelDynamicFieldObjectResponse)
-        throw new Error(
-          `Failed to fetch interestModelDynamicFieldObjectResponse for ${poolCoinName}`
-        );
-      const interestModelDynamicFieldObject = interestModelDynamicFieldObjectResponse.data;
-      if (interestModelDynamicFieldObject && interestModelDynamicFieldObject.content && "fields" in interestModelDynamicFieldObject.content) {
-        const dynamicFields = interestModelDynamicFieldObject.content.fields;
-        interestModel = dynamicFields.value.fields;
       }
+    });
+    const interestModelDynamicFieldObject = interestModelDynamicFieldObjectResponse?.data;
+    if (!(interestModelDynamicFieldObject && interestModelDynamicFieldObject.content && "fields" in interestModelDynamicFieldObject.content))
+      throw new Error(
+        `Failed to fetch interestModelDynamicFieldObject for ${poolCoinName}: ${interestModelDynamicFieldObject}`
+      );
+    const interestModel = interestModelDynamicFieldObject.content.fields.value.fields;
+    const getBorrowFee = async () => {
       const borrowFeeDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
         parentId: marketId,
         name: {
@@ -2868,18 +3062,11 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
           }
         }
       });
-      if (!borrowFeeDynamicFieldObjectResponse)
-        throw new Error(
-          `Failed to fetch borrowFeeDynamicFieldObjectResponse for ${poolCoinName}`
-        );
-      const borrowFeeDynamicFieldObject = borrowFeeDynamicFieldObjectResponse.data;
-      if (borrowFeeDynamicFieldObject && borrowFeeDynamicFieldObject.content && "fields" in borrowFeeDynamicFieldObject.content) {
-        const dynamicFields = borrowFeeDynamicFieldObject.content.fields;
-        borrowFeeRate = dynamicFields.value.fields;
-      }
-    }
-  }
-  if (balanceSheet && borrowIndex && interestModel && (USE_TEST_ADDRESS || borrowFeeRate)) {
+      const borrowFeeDynamicFieldObject = borrowFeeDynamicFieldObjectResponse?.data;
+      if (!(borrowFeeDynamicFieldObject && borrowFeeDynamicFieldObject.content && "fields" in borrowFeeDynamicFieldObject.content))
+        return { value: "0" };
+      return borrowFeeDynamicFieldObject.content.fields.value.fields;
+    };
     const parsedMarketPoolData = parseOriginMarketPoolData({
       type: interestModel.type.fields,
       maxBorrowRate: interestModel.max_borrow_rate.fields,
@@ -2893,7 +3080,7 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
       reserve: balanceSheet.revenue,
       reserveFactor: interestModel.revenue_factor.fields,
       borrowWeight: interestModel.borrow_weight.fields,
-      borrowFeeRate: borrowFeeRate ?? { value: "0" },
+      borrowFeeRate: await getBorrowFee(),
       baseBorrowRatePerSec: interestModel.base_borrow_rate_per_sec.fields,
       borrowRateOnHighKink: interestModel.borrow_rate_on_high_kink.fields,
       borrowRateOnMidKink: interestModel.borrow_rate_on_mid_kink.fields,
@@ -2909,7 +3096,10 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
     const maxSupplyCoin = BigNumber3(
       await getSupplyLimit(query.utils, poolCoinName) ?? "0"
     ).shiftedBy(-coinDecimal).toNumber();
-    marketPool = {
+    const maxBorrowCoin = BigNumber3(
+      await getBorrowLimit(query.utils, poolCoinName) ?? "0"
+    ).shiftedBy(-coinDecimal).toNumber();
+    return {
       coinName: poolCoinName,
       symbol: query.utils.parseSymbol(poolCoinName),
       coinType: query.utils.parseCoinType(poolCoinName),
@@ -2928,12 +3118,13 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
       maxSupplyCoin,
-      // isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
-      isIsolated: false,
+      maxBorrowCoin,
+      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
       ...calculatedMarketPoolData
     };
+  } catch (e) {
+    console.error(e.message);
   }
-  return marketPool;
 };
 var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLATERALS], indexer = false) => {
   const marketId = query.address.get("core.market");
@@ -2982,85 +3173,76 @@ var getMarketCollateral = async (query, collateralCoinName, indexer = false, mar
     );
     return marketCollateralIndexer;
   }
-  let marketCollateral;
-  let riskModel;
-  let collateralStat;
   const marketId = query.address.get("core.market");
   marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
     showContent: true
   }))?.data;
-  if (marketObject) {
-    if (marketObject.content && "fields" in marketObject.content) {
-      const fields = marketObject.content.fields;
-      const coinType = query.utils.parseCoinType(collateralCoinName);
-      const riskModelParentId = fields.risk_models.fields.table.fields.id.id;
-      const riskModelDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-        parentId: riskModelParentId,
-        name: {
-          type: "0x1::type_name::TypeName",
-          value: {
-            name: coinType.substring(2)
-          }
-        }
-      });
-      if (!riskModelDynamicFieldObjectResponse)
-        return void 0;
-      const riskModelDynamicFieldObject = riskModelDynamicFieldObjectResponse.data;
-      if (riskModelDynamicFieldObject && riskModelDynamicFieldObject.content && "fields" in riskModelDynamicFieldObject.content) {
-        const dynamicFields = riskModelDynamicFieldObject.content.fields;
-        riskModel = dynamicFields.value.fields;
+  if (!(marketObject && marketObject.content?.dataType === "moveObject"))
+    throw new Error(`Failed to fetch marketObject`);
+  const fields = marketObject.content.fields;
+  const coinType = query.utils.parseCoinType(collateralCoinName);
+  const riskModelParentId = fields.risk_models.fields.table.fields.id.id;
+  const riskModelDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+    parentId: riskModelParentId,
+    name: {
+      type: "0x1::type_name::TypeName",
+      value: {
+        name: coinType.substring(2)
       }
-      const collateralStatParentId = fields.collateral_stats.fields.table.fields.id.id;
-      const collateralStatDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-        parentId: collateralStatParentId,
-        name: {
-          type: "0x1::type_name::TypeName",
-          value: {
-            name: coinType.substring(2)
-          }
-        }
-      });
-      if (!collateralStatDynamicFieldObjectResponse)
-        return void 0;
-      const collateralStatDynamicFieldObject = collateralStatDynamicFieldObjectResponse.data;
-      if (collateralStatDynamicFieldObject && collateralStatDynamicFieldObject.content && "fields" in collateralStatDynamicFieldObject.content) {
-        const dynamicFields = collateralStatDynamicFieldObject.content.fields;
-        collateralStat = dynamicFields.value.fields;
+    }
+  });
+  const riskModelDynamicFieldObject = riskModelDynamicFieldObjectResponse?.data;
+  if (!(riskModelDynamicFieldObject && riskModelDynamicFieldObject.content && "fields" in riskModelDynamicFieldObject.content))
+    throw new Error(
+      `Failed to fetch riskModelDynamicFieldObject for ${riskModelDynamicFieldObjectResponse?.error?.code.toString()}: `
+    );
+  const riskModel = riskModelDynamicFieldObject.content.fields.value.fields;
+  const collateralStatParentId = fields.collateral_stats.fields.table.fields.id.id;
+  const collateralStatDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+    parentId: collateralStatParentId,
+    name: {
+      type: "0x1::type_name::TypeName",
+      value: {
+        name: coinType.substring(2)
       }
     }
-  }
-  if (riskModel && collateralStat) {
-    const parsedMarketCollateralData = parseOriginMarketCollateralData({
-      type: riskModel.type.fields,
-      collateralFactor: riskModel.collateral_factor.fields,
-      liquidationFactor: riskModel.liquidation_factor.fields,
-      liquidationDiscount: riskModel.liquidation_discount.fields,
-      liquidationPanelty: riskModel.liquidation_penalty.fields,
-      liquidationReserveFactor: riskModel.liquidation_revenue_factor.fields,
-      maxCollateralAmount: riskModel.max_collateral_amount,
-      totalCollateralAmount: collateralStat.amount
-    });
-    const calculatedMarketCollateralData = calculateMarketCollateralData(
-      query.utils,
-      parsedMarketCollateralData
+  });
+  const collateralStatDynamicFieldObject = collateralStatDynamicFieldObjectResponse?.data;
+  if (!(collateralStatDynamicFieldObject && collateralStatDynamicFieldObject.content && "fields" in collateralStatDynamicFieldObject.content))
+    throw new Error(
+      `Failed to fetch collateralStatDynamicFieldObject for ${collateralCoinName}: ${collateralStatDynamicFieldObjectResponse?.error?.code.toString()}`
     );
-    marketCollateral = {
-      coinName: collateralCoinName,
-      symbol: query.utils.parseSymbol(collateralCoinName),
-      coinType: query.utils.parseCoinType(collateralCoinName),
-      marketCoinType: query.utils.parseMarketCoinType(collateralCoinName),
-      coinWrappedType: query.utils.getCoinWrappedType(collateralCoinName),
-      coinDecimal: query.utils.getCoinDecimal(collateralCoinName),
-      coinPrice: coinPrice ?? 0,
-      collateralFactor: parsedMarketCollateralData.collateralFactor,
-      liquidationFactor: parsedMarketCollateralData.liquidationFactor,
-      liquidationDiscount: parsedMarketCollateralData.liquidationDiscount,
-      liquidationPanelty: parsedMarketCollateralData.liquidationPanelty,
-      liquidationReserveFactor: parsedMarketCollateralData.liquidationReserveFactor,
-      ...calculatedMarketCollateralData
-    };
-  }
-  return marketCollateral;
+  const collateralStat = collateralStatDynamicFieldObject.content.fields.value.fields;
+  const parsedMarketCollateralData = parseOriginMarketCollateralData({
+    type: riskModel.type.fields,
+    collateralFactor: riskModel.collateral_factor.fields,
+    liquidationFactor: riskModel.liquidation_factor.fields,
+    liquidationDiscount: riskModel.liquidation_discount.fields,
+    liquidationPanelty: riskModel.liquidation_penalty.fields,
+    liquidationReserveFactor: riskModel.liquidation_revenue_factor.fields,
+    maxCollateralAmount: riskModel.max_collateral_amount,
+    totalCollateralAmount: collateralStat.amount
+  });
+  const calculatedMarketCollateralData = calculateMarketCollateralData(
+    query.utils,
+    parsedMarketCollateralData
+  );
+  return {
+    coinName: collateralCoinName,
+    symbol: query.utils.parseSymbol(collateralCoinName),
+    coinType: query.utils.parseCoinType(collateralCoinName),
+    marketCoinType: query.utils.parseMarketCoinType(collateralCoinName),
+    coinWrappedType: query.utils.getCoinWrappedType(collateralCoinName),
+    coinDecimal: query.utils.getCoinDecimal(collateralCoinName),
+    coinPrice: coinPrice ?? 0,
+    collateralFactor: parsedMarketCollateralData.collateralFactor,
+    liquidationFactor: parsedMarketCollateralData.liquidationFactor,
+    liquidationDiscount: parsedMarketCollateralData.liquidationDiscount,
+    liquidationPanelty: parsedMarketCollateralData.liquidationPanelty,
+    liquidationReserveFactor: parsedMarketCollateralData.liquidationReserveFactor,
+    isIsolated: await isIsolatedAsset(query.utils, collateralCoinName),
+    ...calculatedMarketCollateralData
+  };
 };
 var getObligations = async ({
   address
@@ -3238,98 +3420,18 @@ var getFlashLoanFees = async (query, assetNames) => {
   );
 };
 
-// src/queries/isolatedAssetQuery.ts
-import { z as zod2 } from "zod";
-var isolatedAssetZod = zod2.object({
-  dataType: zod2.string(),
-  type: zod2.string(),
-  hasPublicTransfer: zod2.boolean(),
-  fields: zod2.object({
-    id: zod2.object({
-      id: zod2.string()
-    }),
-    name: zod2.object({
-      type: zod2.string()
-    }),
-    value: zod2.boolean()
-  })
-});
-var ISOLATED_ASSET_KEY = "0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::IsolatedAssetKey";
-var getIsolatedAssets = async (address) => {
-  try {
-    const marketObject = address.get("core.market");
-    const isolatedAssets = [];
-    if (!marketObject)
-      return isolatedAssets;
-    let hasNextPage = false;
-    let nextCursor = null;
-    const isIsolatedDynamicField = (dynamicField) => {
-      return dynamicField.name.type === ISOLATED_ASSET_KEY;
-    };
-    do {
-      const response = await address.cache.queryGetDynamicFields({
-        parentId: marketObject,
-        cursor: nextCursor,
-        limit: 10
-      });
-      if (!response)
-        break;
-      const isolatedAssetCoinTypes = response.data.filter(isIsolatedDynamicField).map(({ name }) => `0x${name.value.type.name}`);
-      isolatedAssets.push(...isolatedAssetCoinTypes);
-      if (response && response.hasNextPage && response.nextCursor) {
-        hasNextPage = true;
-        nextCursor = response.nextCursor;
-      } else {
-        hasNextPage = false;
-      }
-    } while (hasNextPage);
-    return isolatedAssets;
-  } catch (e) {
-    console.error(e);
-    return [];
-  }
-};
-var isIsolatedAsset = async (utils, coinName) => {
-  try {
-    const marketObject = utils.address.get("core.market");
-    const cachedData = utils.address.cache.queryClient.getQueryData([
-      "getDynamicFields",
-      marketObject
-    ]);
-    if (cachedData) {
-      const coinType2 = utils.parseCoinType(coinName);
-      return cachedData.includes(coinType2);
-    }
-    const coinType = utils.parseCoinType(coinName).slice(2);
-    const object = await utils.cache.queryGetDynamicFieldObject({
-      parentId: marketObject,
-      name: {
-        type: ISOLATED_ASSET_KEY,
-        value: coinType
-      }
-    });
-    const parsedData = isolatedAssetZod.safeParse(object?.data?.content);
-    if (!parsedData.success)
-      return false;
-    return parsedData.data.fields.value;
-  } catch (e) {
-    console.error(e);
-    return false;
-  }
-};
-
 // src/queries/loyaltyProgramQuery.ts
 import BigNumber4 from "bignumber.js";
-import { z as zod3 } from "zod";
-var rewardPoolFieldsZod = zod3.object({
-  balance: zod3.string(),
-  enable_claim: zod3.boolean()
+import { z as zod4 } from "zod";
+var rewardPoolFieldsZod = zod4.object({
+  balance: zod4.string(),
+  enable_claim: zod4.boolean()
 }).transform((value) => ({
   totalPoolReward: BigNumber4(value.balance).shiftedBy(-9).toNumber(),
   isClaimEnabled: value.enable_claim
 }));
-var userRewardFieldsZod = zod3.object({
-  value: zod3.string()
+var userRewardFieldsZod = zod4.object({
+  value: zod4.string()
 }).transform((value) => BigNumber4(value.value).shiftedBy(-9).toNumber());
 var getLoyaltyProgramInformations = async (query, veScaKey) => {
   const rewardPool = query.address.get("loyaltyProgram.rewardPool");
@@ -4138,7 +4240,7 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
   const coinName = query.utils.parseCoinName(marketCoinName);
   marketPool = marketPool || await query.getMarketPool(coinName, indexer);
   if (!marketPool) {
-    throw new Error(`Fail to fetch marketPool for ${coinName}`);
+    throw new Error(`Failed to fetch marketPool for ${marketCoinName}`);
   }
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
   const rewardPoolId = query.address.get(
@@ -4412,7 +4514,7 @@ var getStakeRewardPool = async ({
 import BigNumber7 from "bignumber.js";
 import { SUI_CLOCK_OBJECT_ID, SuiTxBlock as SuiTxBlock2 } from "@scallop-io/sui-kit";
 import { bcs as bcs2 } from "@mysten/sui/bcs";
-import { z as zod4 } from "zod";
+import { z as zod5 } from "zod";
 import assert2 from "assert";
 var getVescaKeys = async (utils, ownerAddress) => {
   const owner = ownerAddress || utils.suiKit.currentAddress();
@@ -4461,10 +4563,10 @@ var getVeScas = async ({
   }
   return result;
 };
-var SuiObjectRefZod = zod4.object({
-  objectId: zod4.string(),
-  digest: zod4.string(),
-  version: zod4.string()
+var SuiObjectRefZod = zod5.object({
+  objectId: zod5.string(),
+  digest: zod5.string(),
+  version: zod5.string()
 });
 var getVeSca = async (utils, veScaKey) => {
   const tableId = utils.address.get(`vesca.tableId`);
@@ -4654,10 +4756,10 @@ var ScallopUtils = class {
    * @param address - ScallopAddress instance.
    */
   async init(force = false, address) {
-    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
-      await this.address.read();
-    } else {
+    if (address && !this.address)
       this.address = address;
+    if (force || !this.address.getAddresses()) {
+      await this.address.read();
     }
   }
   /**
@@ -4943,9 +5045,7 @@ var ScallopUtils = class {
     for (const endpoint of endpoints) {
       const priceIdPairs = Array.from(failedRequests.values()).reduce(
         (acc, coinName) => {
-          const priceId = this.address.get(
-            `core.coins.${coinName}.oracle.pyth.feed`
-          );
+          const priceId = this.address.get(`core.coins.${coinName}.oracle.pyth.feed`) ?? PYTH_FEED_IDS[coinName];
           acc.push([coinName, priceId]);
           return acc;
         },
@@ -6919,11 +7019,12 @@ var ScallopQuery = class {
    * @param address - ScallopAddress instance.
    */
   async init(force = false, address) {
-    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
-      await this.address.read();
-    } else {
+    if (address && !this.address) {
       this.address = address;
     }
+    if (force || !this.address.getAddresses()) {
+      await this.address.read();
+    }
     await this.utils.init(force, this.address);
   }
   /* ==================== Core Query Methods ==================== */
@@ -7385,11 +7486,17 @@ var ScallopQuery = class {
     return await getFlashLoanFees(this, assetCoinNames);
   }
   /**
-   * Get supply limit of supply pool
+   * Get supply limit of lending pool
    */
   async getPoolSupplyLimit(poolName) {
     return await getSupplyLimit(this.utils, poolName);
   }
+  /**
+   * Get borrow limit of borrow pool
+   */
+  async getPoolBorrowLimit(poolName) {
+    return await getBorrowLimit(this.utils, poolName);
+  }
   /**
    * Get list of isolated assets
    */
@@ -7462,10 +7569,10 @@ var ScallopBuilder = class {
    * @param address - ScallopAddress instance.
    */
   async init(force = false, address) {
-    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
-      await this.address.read();
-    } else {
+    if (address && !this.address)
       this.address = address;
+    if (force || !this.address.getAddresses()) {
+      await this.address.read();
     }
     await this.query.init(force, this.address);
     await this.utils.init(force, this.address);