@scallop-io/sui-scallop-sdk 1.3.4-alpha.1 → 1.3.4-alpha.2

package/dist/index.js

@@ -79,6 +79,7 @@ __export(src_exports, {
   marketCoins: () => marketCoins,
   queryKeys: () => queryKeys,
   sCoinIds: () => sCoinIds,
+  sCoinTypeToName: () => sCoinTypeToName,
   sCoins: () => sCoins,
   spoolRewardCoins: () => spoolRewardCoins,
   stakeMarketCoins: () => stakeMarketCoins,
@@ -372,20 +373,11 @@ var voloCoinIds = {
 var sCoinIds = {
   susdc: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
   ssbeth: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
-  // TODO: Change this to the correct value on production release
-  ssui: "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI",
-  // ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
+  ssui: "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI",
   scetus: "0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS",
-  // TODO: Change this to the correct value on production release
-  ssca: "0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA",
-  // '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
-  // TODO: Change this to the correct value on production release
-  swusdc: "0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
-  // '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-  swusdt: (
-    // '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
-    "0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT"
-  ),
+  ssca: "0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA",
+  swusdc: "0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
+  swusdt: "0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::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",
@@ -393,6 +385,13 @@ var sCoinIds = {
   swsol: "0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL",
   swbtc: "0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC"
 };
+var sCoinTypeToName = Object.entries(sCoinIds).reduce(
+  (acc, [coinName, coinType]) => {
+    acc[coinType] = coinName;
+    return acc;
+  },
+  {}
+);
 
 // src/constants/flashloan.ts
 var FlashLoanFeeObjectMap = {
@@ -568,11 +567,7 @@ var queryKeys = {
     ]
   },
   oracle: {
-    getPythLatestPriceFeed: (pythPriceId, endpoint) => [
-      "oracle",
-      "getPythPriceId",
-      { pythPriceId, endpoint }
-    ]
+    getPythLatestPriceFeeds: () => ["oracle", "getPythPriceIds"]
   }
 };
 
@@ -581,33 +576,20 @@ var TEST_ADDRESSES = {
   core: {
     // version:
     //   '0x07871c4b3c847a0f674510d4978d5cf6f960452795e8ff6f189fd2088a3f6ac7',
-    version: "0xd318de9b0f6873879a82cbfcc2daa1d1591a8b54e7cea9f4b567da63c692a52b",
+    version: "0x6156d5cd1538bec8a167a40fe1209a4ec9cf8137921fe0a697f191ac561f0b09",
     versionCap: "0x590a4011cb649b3878f3ea14b3a78674642a9548d79b7e091ef679574b158a07",
     // object:
     //   '0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf',
-    object: "0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d",
+    object: "0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1",
     // market:
     //   '0xa757975255146dc9686aa823b7838b507f315d704f428cbadad2f4ea061939d9',
-    market: "0x9d6434e97f3f98fd9b0c0e1dca22632073985abcd22541feae7ee1e34cbe3af2",
+    market: "0x8606ed145cc887985b8ed793f7753ff5dc762a42c379dac035f568e1bac58490",
     adminCap: "0x09689d018e71c337d9db6d67cbca06b74ed92196103624028ccc3ecea411777c",
     coinDecimalsRegistry: "0x200abe9bf19751cc566ae35aa58e2b7e4ff688fc1130f8d8909ea09bc137d668",
     // obligationAccessStore:
     //   '0x733e30b7c94d619d78cb8f5bc4bfbb759ced9a531239028caabb2474e5be59c9',
-    obligationAccessStore: "0x46e9b44a77ee9c9d33cc2689ecdfbb8f681935cbc6bdf6ac3df048e396c36c82",
+    obligationAccessStore: "0x48b472d68ca910c45f7f3b6c26836b6aa6d2569810d94b1b939023da05ae0a23",
     coins: {
-      usdc: {
-        id: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7",
-        metaData: "0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
-            feedObject: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
-          }
-        }
-      },
       cetus: {
         id: "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b",
         metaData: "0x4c0dce55eff2db5419bbd2d239d1aa22b4a400c01bbb648b058a9883989025da",
@@ -763,19 +745,6 @@ var TEST_ADDRESSES = {
             feedObject: "0xf6de1d3279a269a597d813cbaca59aa906543ab9a8c64e84a4722f1a20863985"
           }
         }
-      },
-      sbeth: {
-        id: "0xd0e89b2af5e4910726fbcd8b8dd37bb79b29e5f83f7491bca830e94f7f226d29",
-        metaData: "0x89b04ba87f8832d4d76e17a1c9dce72eb3e64d372cf02012b8d2de5384faeef0",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
-            feedObject: "0x9193fd47f9a0ab99b6e365a464c8a9ae30e6150fc37ed2a89c1586631f6fc4ab"
-          }
-        }
       }
     },
     oracles: {
@@ -809,7 +778,7 @@ var TEST_ADDRESSES = {
         upgradeCap: "0x3f203f6fff6a69d151e4f1cd931f22b68c489ef2759765662fc7baf673943c9e"
       },
       protocol: {
-        id: "0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d",
+        id: "0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1",
         upgradeCap: "0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a"
       },
       // protocol: {
@@ -827,7 +796,7 @@ var TEST_ADDRESSES = {
       //     '0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f',
       // },
       query: {
-        id: "0x89706958f43fb170de134579e3fbc53972b946ee78bd2442d8e1adc36074fbdc",
+        id: "0xe4f9d62d17746d5b9dbf0d5557747430021a71575780b515161210cdba0a4c1c",
         upgradeCap: "0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f"
       },
       supra: { id: "", upgradeCap: "" },
@@ -863,10 +832,6 @@ var TEST_ADDRESSES = {
           "0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a"
         )
       },
-      susdc: {
-        id: "0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918",
-        rewardPoolId: "0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166"
-      },
       swusdc: {
         // id: '0x4ace6648ddc64e646ba47a957c562c32c9599b3bba8f5ac1aadb2ae23a2f8ca0',
         id: "0xf1b383b9cf2e9f515fc69567df1053098f273849d09cd84b0278a773429bd2b2",
@@ -915,37 +880,37 @@ var TEST_ADDRESSES = {
     config: ""
   },
   borrowIncentive: {
-    id: "0x85769d63565ce99c7622f8e336ca1460926ddf29738ad2a39407b5cac29f61fe",
-    adminCap: "0x56ac8e6f2b360b2b35c0168d72cc6cd17d9592afb83709865cb87af24bb2025b",
-    object: "0x85769d63565ce99c7622f8e336ca1460926ddf29738ad2a39407b5cac29f61fe",
-    query: "0x8e0d00f8ff1199d7c5fe56cea0e901a525daeefff0445a1635ace8282ae3302c",
-    incentivePools: "0x9d564c93128c6ab0c0d3e050a47f11df0b91494f3bb779bdc1301c1c637f15eb",
-    incentiveAccounts: "0x09e6040e798246de04941bc79a3ba62d3eca6d7a218cc30f21fb07f478fa2926",
-    config: "0x43d4ca1dfc90b161c4240facd119e74e4b850cca2957f88c2ec289c9380da064"
+    id: "0x6152f696fc3a658f33c4b891764731a59153125ffedfa8bff7167c42823f58a9",
+    adminCap: "0xc486afa253646f4d381e81d7f1df8aa4723b845a6bb356f69bad635ffefffe2c",
+    object: "0x002875153e09f8145ab63527bc85c00f2bd102e12f9573c47f8cdf1a1cb62934",
+    query: "0x529edc54a3dce2207703ceebbccb0ac14133f7825c1f528775ba0d85a4063489",
+    incentivePools: "0x6547e143d406b5ccd5f46aae482497de279cc1a68c406f701df70a05f9212ab4",
+    incentiveAccounts: "0xc4701fdbc1c92f9a636d334d66012b3027659e9fb8aff27279a82edfb6b77d02",
+    config: "0xdf5d04b4691cc67e82fd4db8394d89ff44823a9de29716c924f74bb4f11cc1f7"
   },
   referral: {
-    id: "0x1bf5a8ce77050d8052549d743e16b469f15aa6b81b752b78b6ebb65179665f5a",
+    id: "0xa3654ebb63eb06c0f4ff52f8aa6512df9f164f7772bdf15dac3709bd3798dda9",
     object: "0x5658d4bf5ddcba27e4337b4262108b3ad1716643cac8c2054ac341538adc72ec",
     adminCap: "0xc5dc06b9074291259f2cac460c940012c781c4430e42125c541cc43101c3bcbd",
-    referralBindings: "0xcf184487782bed962bf678001efe775d31fb94b9992333a57594cf15d79d5ced",
-    bindingTableId: "0x41a50e258c0a266ce84e0e1a618dbf70b878cc943909e613089a50afcceb2bc0",
-    referralRevenuePool: "0xc24e3e5e37032f29a3dd91a9a1f057af8821b7e6c148e9683900ac8b6d30f0c6",
+    referralBindings: "0xf63299d58789d99de94092b9011323466e55ca0c1ea1a7a3786a589af46e1c09",
+    bindingTableId: "0x1c8202b17267ec8d6cf97ca013615354181a04f179570e42601ff2dae19294b1",
+    referralRevenuePool: "0x6abd852caf90769c1b185cdf636d841673fa95528f0550f018b8a138bd283c07",
     revenueTableId: "0x595baa3654c297bff84ab7786a2d250f019cefc66e8df8e89fd9d41e02bd30dd",
-    referralTiers: "0x144350f3db9b46d11b140084cd54e6de0b9c3b8d265ce8059b51d0ef58ea464b",
+    referralTiers: "0x962cb903d8d7346190c5204785ccbb91b61086aa764f674c8145df82335cf83e",
     tiersTableId: "0xeac755a7a8b7798530905ac79e8c114f19d0f130f6eab012954f08faac29c75d",
     // authorizedWitnessList:
     //   '0xf21b0ed043c9bb70842c0129159f4943dbcc3c9ef2f2f808af65f8be25cfd20e',
     authorizedWitnessList: "0x9d6223dc52015b8a3986a573590ef2af8f1b8f3e4685513888c052f001b87e7f",
-    version: "0x3545849eb97723e676a476ec9d4fe5f2eb0eb2c6b78972851114fd4c7ed4639f"
+    version: "0x1bd4b7285f72e11c316b828c7c47b3f4da18dcec9f9b3dba6d8629cbb6f93e5e"
   },
   vesca: {
-    id: "0x1158813b32962c2d22888fae257d5f2365b03631f0cd5d5b912ccdf51ff4e2f2",
-    object: "0x1158813b32962c2d22888fae257d5f2365b03631f0cd5d5b912ccdf51ff4e2f2",
+    id: "0xb15b6e0cdd85afb5028bea851dd249405e734d800a259147bbc24980629723a4",
+    object: "0xb15b6e0cdd85afb5028bea851dd249405e734d800a259147bbc24980629723a4",
     adminCap: "0x8ffa76135c5b85c5fbd73a6448a4a733d826cb63a267ab817656acb77c72d4a5",
-    tableId: "0x0a0b7f749baeb61e3dfee2b42245e32d0e6b484063f0a536b33e771d573d7246",
-    table: "0xd3a4632b1080f7d96e1c2487d4dabf2c1196916937c505a69954ac9f393be8d0",
-    treasury: "0xafa4b6231e49c15a22d641ce33fda761baaf650fa21899dfa2eb1716146e7306",
-    config: "0x7cbcb0a342179577a117dfdff974cf1ab765d3b571067bf22ddf5f9e3a667922"
+    tableId: "0xe3153b2bf124be0b86cb8bd468346a861efd0da52fc42197b54d2f616488a311",
+    table: "0x611cb8d9d4d90867467b5ebdf4cc447a0047ed5b01334a28a29fcfe733e3d609",
+    treasury: "0xe8c112c09b88158dc6c8e23d1fbae5b3c7136cdee54b7dafc08e65db28c4a5bc",
+    config: "0xe0a2ff281e73c1d53cfa85807080f87e833e4f1a7f93dcf8800b3865269a76b9"
   },
   loyaltyProgram: {
     id: "0xd17bcf8b5a59652c36225d478564a8593ae0ed7d650bcacdda1d6fe179127907",
@@ -954,27 +919,27 @@ var TEST_ADDRESSES = {
     userRewardTableId: "0x748a80395849ed37db1b0e14f2ab5d1d96458d2359ab3a84eb079d0f4ac7cf2e"
   },
   scoin: {
-    id: "0x773dab39c90fe05439b06a2d061795e52a974ff92c2aef90b2ee467acf7f33c8",
+    id: "0xad2ca2aa5089df94bb2d444d5eb3520378c2f2dfb3a0bd2a2c994145ac4b0a53",
     coins: {
       ssui: {
-        coinType: "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI",
-        treasury: "0x0e499640a12c38dd9cc44532f5bc5fd1b6da86d2f9a8810357250f4b26e9e5c7"
+        coinType: "0xfac769100bccc0caebcf4f4e2d00ac2f8883f07f724be28940df90605f5e7e9a::scallop_sui::SCALLOP_SUI",
+        treasury: "0x9cb4551b36c17d37e19d700147fa819ea1c487ff8bcf18374de2cceb2e9d4845"
       },
       scetus: {
         coinType: "0x8b71e6d323ed78515af2bead13bf3d0da1562ba4a99234eb7c4f14fd39ef0427::scallop_cetus::SCALLOP_CETUS",
         treasury: "0xd786f4b2d26278cc7911a3445b1b085eab60f269ef9dbb6b87e803d52f155003"
       },
       ssca: {
-        coinType: "0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA",
-        treasury: "0x5f1c5de1df7341075d119570269b7b452af50afe8363080638f1ae29a554c038"
+        coinType: "0x0a9d3c6c9af9f6e8def82921541bcbd17f73ed31bed3adcb684f2a4c267e42f0::scallop_sca::SCALLOP_SCA",
+        treasury: "0xe818636d1d6c46d6ea1a2dce9d94696d7cbc18ce27451b603eeaa47aba8d75e0"
       },
       swusdc: {
-        coinType: "0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
-        treasury: "0x471fbab72578bab577263006fe32543b6e76153fffa2bef69affe4bc4934258f"
+        coinType: "0xaedc3ab75db8680b81a755015fa90124d217be93457b893c05bac033817defaf::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
+        treasury: "0xfc6971648f867f7fd6928d1b873af71577e2eaf2c7543ef8bc82c431d833ae78"
       },
       swusdt: {
-        coinType: "0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
-        treasury: "0x921a4ed4bb4b4f11f51a462c83f4c0f6b60a90e441d1bc0d26d6fd893146bf4d"
+        coinType: "0xbf02fc87ddc104b342ad8414c85ceadf5b0c823c055a06fb0ed776272c01a52a::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
+        treasury: "0xb9593e2c3a0ba796ee815012b75ae46468ea78cda0188b9ac6816efe65503521"
       },
       sweth: {
         coinType: "0x27d54f43e3eda701be56b82e5756e41c84467cd202f5cf713d5f9e45a9f1b6bc::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH",
@@ -990,18 +955,14 @@ var TEST_ADDRESSES = {
       },
       svsui: {
         coinType: "0x97023a317320c4498cc4cd239dd02fd30c28246e5e8f81325d63f2bd8d70f6b3::scallop_v_sui::SCALLOP_V_SUI",
-        treasury: "0x327114f0bf3559d7e2de10282147ed76a236c7c6775029165c4db09a6062ead6"
-      },
-      ssbeth: {
-        coinType: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
-        treasury: "0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed"
+        treasury: "0x327114f0bf3559d7e2de10282147ed76a236c7c6775029165c4db09a6062ead6\u0192"
       }
     }
   }
 };
 
 // src/constants/tokenBucket.ts
-var DEFAULT_TOKENS_PER_INTERVAL = 50;
+var DEFAULT_TOKENS_PER_INTERVAL = 10;
 var DEFAULT_INTERVAL_IN_MS = 300;
 
 // src/constants/vesca.ts
@@ -1011,9 +972,6 @@ var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
 var MIN_INITIAL_LOCK_AMOUNT = 1e10;
 var MIN_TOP_UP_AMOUNT = 1e9;
 
-// src/models/scallop.ts
-var import_sui_kit16 = require("@scallop-io/sui-kit");
-
 // src/models/scallopAddress.ts
 var import_sui_kit2 = require("@scallop-io/sui-kit");
 
@@ -1606,7 +1564,7 @@ var TokenBucket = class {
     return false;
   }
 };
-var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 15, backoffFactor = 1.25) => {
+var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 30, backoffFactor = 1.25) => {
   let retries = 0;
   const tryRequest = async () => {
     if (tokenBucket.removeTokens(1)) {
@@ -1825,7 +1783,7 @@ var ScallopCache = class {
   async queryGetCoinBalance(input) {
     if (!input.coinType)
       return "0";
-    return (await this.queryGetAllCoinBalances(input.owner) || {})[(0, import_sui_kit.normalizeStructTag)(input.coinType)] ?? "0";
+    return (await this.queryGetAllCoinBalances(input.owner) ?? {})[(0, import_sui_kit.normalizeStructTag)(input.coinType)] ?? "0";
   }
 };
 
@@ -2186,12 +2144,12 @@ var ScallopAddress = class {
         "Content-Type": "application/json",
         Accept: "application/json"
       },
-      timeout: 3e4
+      timeout: 8e3
     });
     if (auth)
       this._auth = auth;
     this._id = id;
-    this._network = network || "mainnet";
+    this._network = network ?? "mainnet";
     this._addressesMap = USE_TEST_ADDRESS ? /* @__PURE__ */ new Map([["mainnet", TEST_ADDRESSES]]) : /* @__PURE__ */ new Map();
     if (USE_TEST_ADDRESS)
       this._currentAddresses = TEST_ADDRESSES;
@@ -2494,11 +2452,9 @@ var ScallopAddress = class {
 
 // src/models/scallopClient.ts
 var import_utils25 = require("@mysten/sui/utils");
-var import_sui_kit15 = require("@scallop-io/sui-kit");
 
 // src/models/scallopUtils.ts
 var import_utils10 = require("@mysten/sui/utils");
-var import_sui_kit4 = require("@scallop-io/sui-kit");
 var import_pyth_sui_js = require("@pythnetwork/pyth-sui-js");
 
 // src/queries/coreQuery.ts
@@ -2540,103 +2496,20 @@ var getSupplyLimit = async (utils, poolName) => {
   return parsedData.data.fields.value;
 };
 
-// src/queries/isolatedAsset.ts
-var import_zod2 = require("zod");
-var isolatedAssetZod = import_zod2.z.object({
-  dataType: import_zod2.z.string(),
-  type: import_zod2.z.string(),
-  hasPublicTransfer: import_zod2.z.boolean(),
-  fields: import_zod2.z.object({
-    id: import_zod2.z.object({
-      id: import_zod2.z.string()
-    }),
-    name: import_zod2.z.object({
-      type: import_zod2.z.string()
-    }),
-    value: import_zod2.z.boolean()
-  })
-});
-var getIsolatedAssets = async (address) => {
-  try {
-    const marketObject = address.get("core.market");
-    const protocolObject = address.get("core.packages.protocol.id");
-    const ISOLATED_ASSET_KEY = `${protocolObject}::market_dynamic_keys::IsolatedAssetKey`;
-    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 protocolObject = utils.address.get("core.packages.protocol.id");
-    const ISOLATED_ASSET_KEY = `${protocolObject}::market_dynamic_keys::IsolatedAssetKey`;
-    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/coreQuery.ts
-var queryMarket = async (query, indexer = false) => {
-  const coinPrices = await query.utils.getCoinPrices();
+var queryMarket = async (query, indexer = false, coinPrices) => {
+  coinPrices = coinPrices ?? await query.utils.getCoinPrices() ?? {};
   const pools = {};
   const collaterals = {};
   if (indexer) {
     const marketIndexer = await query.indexer.getMarket();
     const updatePools = (item) => {
-      item.coinPrice = coinPrices[item.coinName] || item.coinPrice;
+      item.coinPrice = coinPrices[item.coinName] ?? item.coinPrice;
       item.coinWrappedType = query.utils.getCoinWrappedType(item.coinName);
       pools[item.coinName] = item;
     };
     const updateCollaterals = (item) => {
-      item.coinPrice = coinPrices[item.coinName] || item.coinPrice;
+      item.coinPrice = coinPrices[item.coinName] ?? item.coinPrice;
       item.coinWrappedType = query.utils.getCoinWrappedType(item.coinName);
       collaterals[item.coinName] = item;
     };
@@ -2707,8 +2580,8 @@ var queryMarket = async (query, indexer = false) => {
       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,
       ...calculatedMarketPoolData
     };
@@ -2747,7 +2620,6 @@ var queryMarket = async (query, indexer = false) => {
       liquidationDiscount: parsedMarketCollateralData.liquidationDiscount,
       liquidationPanelty: parsedMarketCollateralData.liquidationPanelty,
       liquidationReserveFactor: parsedMarketCollateralData.liquidationReserveFactor,
-      isIsolated: await isIsolatedAsset(query.utils, collateralCoinName),
       ...calculatedMarketCollateralData
     };
   }
@@ -2757,19 +2629,19 @@ var queryMarket = async (query, indexer = false) => {
     // data: marketData,
   };
 };
-var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer = false) => {
+var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer = false, coinPrices) => {
   const marketId = query.address.get("core.market");
   const marketObjectResponse = await query.cache.queryGetObject(marketId, {
     showContent: true
   });
-  const coinPrices = await query.utils.getCoinPrices(poolCoinNames) ?? {};
+  coinPrices = await query.utils.getCoinPrices(poolCoinNames) ?? {};
   const marketPools = {};
   if (indexer) {
     const marketPoolsIndexer = await query.indexer.getMarketPools();
     const updateMarketPool = (marketPool) => {
       if (!poolCoinNames.includes(marketPool.coinName))
         return;
-      marketPool.coinPrice = coinPrices[marketPool.coinName] || marketPool.coinPrice;
+      marketPool.coinPrice = coinPrices[marketPool.coinName] ?? marketPool.coinPrice;
       marketPool.coinWrappedType = query.utils.getCoinWrappedType(
         marketPool.coinName
       );
@@ -2795,73 +2667,85 @@ var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer =
   return marketPools;
 };
 var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, coinPrice) => {
-  try {
-    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 && 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)
+  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)
+          }
         }
+      });
+      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 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)
+      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 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)
+      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: {
@@ -2873,11 +2757,18 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
           }
         }
       });
-      const borrowFeeDynamicFieldObject = borrowFeeDynamicFieldObjectResponse?.data;
-      if (!(borrowFeeDynamicFieldObject && borrowFeeDynamicFieldObject.content && "fields" in borrowFeeDynamicFieldObject.content))
-        return { value: "0" };
-      return borrowFeeDynamicFieldObject.content.fields.value.fields;
-    };
+      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 parsedMarketPoolData = parseOriginMarketPoolData({
       type: interestModel.type.fields,
       maxBorrowRate: interestModel.max_borrow_rate.fields,
@@ -2891,7 +2782,7 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
       reserve: balanceSheet.revenue,
       reserveFactor: interestModel.revenue_factor.fields,
       borrowWeight: interestModel.borrow_weight.fields,
-      borrowFeeRate: await getBorrowFee(),
+      borrowFeeRate: borrowFeeRate ?? { value: "0" },
       baseBorrowRatePerSec: interestModel.base_borrow_rate_per_sec.fields,
       borrowRateOnHighKink: interestModel.borrow_rate_on_high_kink.fields,
       borrowRateOnMidKink: interestModel.borrow_rate_on_mid_kink.fields,
@@ -2907,7 +2798,7 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
     const maxSupplyCoin = (0, import_bignumber2.default)(
       await getSupplyLimit(query.utils, poolCoinName) ?? "0"
     ).shiftedBy(-coinDecimal).toNumber();
-    return {
+    marketPool = {
       coinName: poolCoinName,
       symbol: query.utils.parseSymbol(poolCoinName),
       coinType: query.utils.parseCoinType(poolCoinName),
@@ -2926,13 +2817,12 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
       maxSupplyCoin,
-      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
-      // isIsolated: false,
+      // isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+      isIsolated: false,
       ...calculatedMarketPoolData
     };
-  } catch (e) {
-    console.error(e);
   }
+  return marketPool;
 };
 var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLATERALS], indexer = false) => {
   const marketId = query.address.get("core.market");
@@ -2943,7 +2833,7 @@ var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLA
     const updateMarketCollateral = (marketCollateral) => {
       if (!collateralCoinNames.includes(marketCollateral.coinName))
         return;
-      marketCollateral.coinPrice = coinPrices[marketCollateral.coinName] || marketCollateral.coinPrice;
+      marketCollateral.coinPrice = coinPrices[marketCollateral.coinName] ?? marketCollateral.coinPrice;
       marketCollateral.coinWrappedType = query.utils.getCoinWrappedType(
         marketCollateral.coinName
       );
@@ -2975,88 +2865,97 @@ var getMarketCollateral = async (query, collateralCoinName, indexer = false, mar
   coinPrice = coinPrice || (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName];
   if (indexer) {
     const marketCollateralIndexer = await query.indexer.getMarketCollateral(collateralCoinName);
-    marketCollateralIndexer.coinPrice = coinPrice || marketCollateralIndexer.coinPrice;
+    marketCollateralIndexer.coinPrice = coinPrice ?? marketCollateralIndexer.coinPrice;
     marketCollateralIndexer.coinWrappedType = query.utils.getCoinWrappedType(
       marketCollateralIndexer.coinName
     );
     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 && 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)
+  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;
       }
-    }
-  });
-  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)
+      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 collateralStatDynamicFieldObject = collateralStatDynamicFieldObjectResponse?.data;
-  if (!(collateralStatDynamicFieldObject && collateralStatDynamicFieldObject.content && "fields" in collateralStatDynamicFieldObject.content))
-    throw new Error(
-      `Failed to fetch collateralStatDynamicFieldObject for ${collateralCoinName}: ${collateralStatDynamicFieldObjectResponse?.error?.code.toString()}`
+  }
+  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 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
-  };
+    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;
 };
 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;
@@ -3123,7 +3022,7 @@ var queryObligation = async ({
   return queryResult?.events[0]?.parsedJson;
 };
 var getCoinAmounts = async (query, assetCoinNames = [...SUPPORT_POOLS], ownerAddress) => {
-  const owner = ownerAddress || query.suiKit.currentAddress();
+  const owner = ownerAddress ?? query.suiKit.currentAddress();
   const assetCoins2 = {};
   await Promise.allSettled(
     assetCoinNames.map(async (assetCoinName) => {
@@ -3134,7 +3033,7 @@ var getCoinAmounts = async (query, assetCoinNames = [...SUPPORT_POOLS], ownerAdd
   return assetCoins2;
 };
 var getCoinAmount = async (query, assetCoinName, ownerAddress) => {
-  const owner = ownerAddress || query.suiKit.currentAddress();
+  const owner = ownerAddress ?? query.suiKit.currentAddress();
   const coinType = query.utils.parseCoinType(assetCoinName);
   const amount = await query.cache.queryGetCoinBalance({
     owner,
@@ -3146,7 +3045,7 @@ var getMarketCoinAmounts = async (query, marketCoinNames, ownerAddress) => {
   marketCoinNames = marketCoinNames || [...SUPPORT_POOLS].map(
     (poolCoinName) => query.utils.parseMarketCoinName(poolCoinName)
   );
-  const owner = ownerAddress || query.suiKit.currentAddress();
+  const owner = ownerAddress ?? query.suiKit.currentAddress();
   const marketCoins2 = {};
   await Promise.allSettled(
     marketCoinNames.map(async (marketCoinName) => {
@@ -3161,7 +3060,7 @@ var getMarketCoinAmounts = async (query, marketCoinNames, ownerAddress) => {
   return marketCoins2;
 };
 var getMarketCoinAmount = async (query, marketCoinName, ownerAddress) => {
-  const owner = ownerAddress || query.suiKit.currentAddress();
+  const owner = ownerAddress ?? query.suiKit.currentAddress();
   const marketCoinType = query.utils.parseMarketCoinType(marketCoinName);
   const amount = await query.cache.queryGetCoinBalance({
     owner,
@@ -3230,18 +3129,14 @@ var getFlashLoanFees = async (query, assetNames) => {
 
 // src/queries/spoolQuery.ts
 var import_utils5 = require("@mysten/sui/utils");
-var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexer = false) => {
+var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexer = false, marketPools, coinPrices) => {
   const stakeCoinNames = stakeMarketCoinNames.map(
     (stakeMarketCoinName) => query.utils.parseCoinName(stakeMarketCoinName)
   );
-  const rewardCoinNames = stakeMarketCoinNames.map((stakeMarketCoinName) => {
-    const rewardCoinName = query.utils.getSpoolRewardCoinName(stakeMarketCoinName);
-    return rewardCoinName;
-  });
-  const coinPrices = await query.utils.getCoinPrices([
-    .../* @__PURE__ */ new Set([...stakeCoinNames, ...rewardCoinNames])
-  ]) ?? {};
-  const marketPools = await query.getMarketPools(stakeCoinNames, indexer);
+  coinPrices = coinPrices ?? await query.utils.getCoinPrices() ?? {};
+  marketPools = marketPools ?? await query.getMarketPools(stakeCoinNames, indexer);
+  if (!marketPools)
+    throw new Error(`Fail to fetch marketPools for ${stakeCoinNames}`);
   const spools = {};
   if (indexer) {
     const spoolsIndexer = await query.indexer.getSpools();
@@ -3255,9 +3150,9 @@ var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexe
         spool.marketCoinName
       );
       const marketPool = marketPools[coinName];
-      spool.coinPrice = coinPrices[coinName] || spool.coinPrice;
-      spool.marketCoinPrice = (coinPrices[coinName] ?? 0) * (marketPool ? marketPool.conversionRate : 0) || spool.marketCoinPrice;
-      spool.rewardCoinPrice = coinPrices[rewardCoinName] || spool.rewardCoinPrice;
+      spool.coinPrice = coinPrices[coinName] ?? spool.coinPrice;
+      spool.marketCoinPrice = coinPrices[coinName] ? (coinPrices[coinName] ?? 0) * (marketPool ? marketPool.conversionRate : 0) : spool.marketCoinPrice;
+      spool.rewardCoinPrice = coinPrices[rewardCoinName] ?? spool.rewardCoinPrice;
       spools[spool.marketCoinName] = spool;
     };
     Object.values(spoolsIndexer).forEach(updateSpools);
@@ -3282,7 +3177,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(`Failed to fetch marketPool for ${marketCoinName}`);
+    throw new Error(`Fail to fetch marketPool for ${coinName}`);
   }
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
   const rewardPoolId = query.address.get(
@@ -3569,20 +3464,15 @@ var queryBorrowIncentivePools = async (address) => {
 };
 var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
   ...SUPPORT_BORROW_INCENTIVE_POOLS
-], indexer = false) => {
+], indexer = false, coinPrices) => {
   const borrowIncentivePools = {};
-  const coinPrices = await query.utils.getCoinPrices([
-    .../* @__PURE__ */ new Set([
-      ...borrowIncentiveCoinNames,
-      ...SUPPORT_BORROW_INCENTIVE_REWARDS
-    ])
-  ]) ?? {};
+  coinPrices = coinPrices ?? await query.utils.getCoinPrices() ?? {};
   if (indexer) {
     const borrowIncentivePoolsIndexer = await query.indexer.getBorrowIncentivePools();
     const updateBorrowIncentivePool = (pool) => {
       if (!borrowIncentiveCoinNames.includes(pool.coinName))
         return;
-      pool.coinPrice = coinPrices[pool.coinName] || pool.coinPrice;
+      pool.coinPrice = coinPrices[pool.coinName] ?? pool.coinPrice;
       borrowIncentivePools[pool.coinName] = pool;
     };
     Object.values(borrowIncentivePoolsIndexer).forEach(
@@ -3829,20 +3719,18 @@ var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress
   const stakeMarketCoinNames = marketCoinNames.filter(
     (marketCoinName) => SUPPORT_SPOOLS.includes(marketCoinName)
   );
-  const [
+  const coinPrices = await query.utils.getCoinPrices(poolCoinNames);
+  const marketPools = await query.getMarketPools(poolCoinNames, indexer, {
+    coinPrices
+  });
+  const spools = await query.getSpools(stakeMarketCoinNames, indexer, {
     marketPools,
-    spools,
-    coinAmounts,
-    marketCoinAmounts,
-    allStakeAccounts,
     coinPrices
-  ] = await Promise.all([
-    query.getMarketPools(poolCoinNames, indexer),
-    query.getSpools(stakeMarketCoinNames, indexer),
+  });
+  const [coinAmounts, marketCoinAmounts, allStakeAccounts] = await Promise.all([
     query.getCoinAmounts(poolCoinNames, ownerAddress),
     query.getMarketCoinAmounts(marketCoinNames, ownerAddress),
-    query.getAllStakeAccounts(ownerAddress),
-    query.utils.getCoinPrices(poolCoinNames)
+    query.getAllStakeAccounts(ownerAddress)
   ]);
   const lendings = {};
   await Promise.allSettled(
@@ -3858,7 +3746,7 @@ var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress
         indexer,
         marketPools?.[poolCoinName],
         stakeMarketCoinName ? spools[stakeMarketCoinName] : void 0,
-        stakeMarketCoinName ? allStakeAccounts[stakeMarketCoinName] : void 0,
+        stakeMarketCoinName ? allStakeAccounts[stakeMarketCoinName] : [],
         coinAmounts?.[poolCoinName],
         marketCoinAmounts?.[marketCoinName],
         coinPrices?.[poolCoinName] ?? 0
@@ -3869,8 +3757,22 @@ var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress
 };
 var getLending = async (query, poolCoinName, ownerAddress, indexer = false, marketPool, spool, stakeAccounts, coinAmount, marketCoinAmount, coinPrice, sCoinAmount) => {
   const marketCoinName = query.utils.parseMarketCoinName(poolCoinName);
-  marketPool = marketPool || await query.getMarketPool(poolCoinName, indexer);
-  spool = spool || SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getSpool(marketCoinName, indexer) : void 0;
+  coinPrice = coinPrice ?? (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName] ?? 0;
+  marketPool = marketPool ?? await query.getMarketPool(poolCoinName, indexer, {
+    coinPrice
+  });
+  if (!marketPool)
+    throw new Error(`Failed to fetch marketPool for ${poolCoinName}`);
+  spool = spool ?? SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getSpool(
+    marketCoinName,
+    indexer,
+    {
+      marketPool,
+      coinPrices: {
+        [poolCoinName]: coinPrice
+      }
+    }
+  ) : void 0;
   stakeAccounts = stakeAccounts || SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getStakeAccounts(
     marketCoinName,
     ownerAddress
@@ -3878,7 +3780,6 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
   coinAmount = coinAmount || await query.getCoinAmount(poolCoinName, ownerAddress);
   marketCoinAmount = marketCoinAmount || await query.getMarketCoinAmount(marketCoinName, ownerAddress);
   sCoinAmount = sCoinAmount || await query.getSCoinAmount(marketCoinName, ownerAddress);
-  coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
   const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
   let stakedMarketAmount = (0, import_bignumber4.default)(0);
   let stakedMarketCoin = (0, import_bignumber4.default)(0);
@@ -3990,10 +3891,12 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
   return lending;
 };
 var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
-  const market = await query.queryMarket(indexer);
   const coinPrices = await query.utils.getCoinPrices();
-  const coinAmounts = await query.getCoinAmounts(void 0, ownerAddress);
-  const obligations = await query.getObligations(ownerAddress);
+  const market = await query.queryMarket(indexer, { coinPrices });
+  const [coinAmounts, obligations] = await Promise.all([
+    query.getCoinAmounts(void 0, ownerAddress),
+    query.getObligations(ownerAddress)
+  ]);
   const obligationAccounts = {};
   await Promise.allSettled(
     obligations.map(async (obligation) => {
@@ -4011,19 +3914,19 @@ var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
   return obligationAccounts;
 };
 var getObligationAccount = async (query, obligationId, ownerAddress, indexer = false, market, coinPrices, coinAmounts) => {
-  market = market || await query.queryMarket(indexer);
-  const poolAssetCoinNames = [
-    .../* @__PURE__ */ new Set([...Object.values(market.pools).map((pool) => pool.coinName)])
+  const collateralAssetCoinNames = [
+    ...SUPPORT_COLLATERALS
   ];
-  const obligationQuery = await query.queryObligation(obligationId);
-  const borrowIncentivePools = await query.getBorrowIncentivePools(
-    void 0,
-    indexer
-  );
-  const borrowIncentiveAccounts = await query.getBorrowIncentiveAccounts(obligationId);
-  coinPrices = coinPrices || await query.utils.getCoinPrices(poolAssetCoinNames);
-  coinAmounts = coinAmounts || await query.getCoinAmounts(poolAssetCoinNames, ownerAddress);
-  console.log(coinPrices);
+  coinPrices = coinPrices ?? await query.utils.getCoinPrices(collateralAssetCoinNames);
+  market = market ?? await query.queryMarket(indexer, { coinPrices });
+  coinAmounts = coinAmounts || await query.getCoinAmounts(collateralAssetCoinNames, ownerAddress);
+  const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] = await Promise.all([
+    query.queryObligation(obligationId),
+    query.getBorrowIncentivePools(void 0, indexer, {
+      coinPrices
+    }),
+    query.getBorrowIncentiveAccounts(obligationId)
+  ]);
   const collaterals = {};
   const debts = {};
   const borrowIncentives = {};
@@ -4035,7 +3938,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   let totalRewardedPools = 0;
   let totalBorrowedValue = (0, import_bignumber4.default)(0);
   let totalBorrowedValueWithWeight = (0, import_bignumber4.default)(0);
-  for (const assetCoinName of poolAssetCoinNames) {
+  for (const assetCoinName of collateralAssetCoinNames) {
     const collateral = obligationQuery?.collaterals.find((collateral2) => {
       const collateralCoinName = query.utils.parseCoinNameFromType(
         collateral2.type.name
@@ -4340,7 +4243,7 @@ var getTotalValueLocked = async (query, indexer = false) => {
 var import_bignumber5 = __toESM(require("bignumber.js"));
 var import_sui_kit3 = require("@scallop-io/sui-kit");
 var import_bcs = require("@mysten/sui/bcs");
-var import_zod3 = require("zod");
+var import_zod2 = require("zod");
 var import_assert = __toESM(require("assert"));
 var getVescaKeys = async (utils, ownerAddress) => {
   const owner = ownerAddress || utils.suiKit.currentAddress();
@@ -4389,10 +4292,10 @@ var getVeScas = async ({
   }
   return result;
 };
-var SuiObjectRefZod = import_zod3.z.object({
-  objectId: import_zod3.z.string(),
-  digest: import_zod3.z.string(),
-  version: import_zod3.z.string()
+var SuiObjectRefZod = import_zod2.z.object({
+  objectId: import_zod2.z.string(),
+  digest: import_zod2.z.string(),
+  version: import_zod2.z.string()
 });
 var getVeSca = async (utils, veScaKey) => {
   const tableId = utils.address.get(`vesca.tableId`);
@@ -4525,16 +4428,16 @@ var queryVeScaKeyIdFromReferralBindings = async (address, refereeAddress) => {
 
 // src/queries/loyaltyProgramQuery.ts
 var import_bignumber6 = __toESM(require("bignumber.js"));
-var import_zod4 = require("zod");
-var rewardPoolFieldsZod = import_zod4.z.object({
-  balance: import_zod4.z.string(),
-  enable_claim: import_zod4.z.boolean()
+var import_zod3 = require("zod");
+var rewardPoolFieldsZod = import_zod3.z.object({
+  balance: import_zod3.z.string(),
+  enable_claim: import_zod3.z.boolean()
 }).transform((value) => ({
   totalPoolReward: (0, import_bignumber6.default)(value.balance).shiftedBy(-9).toNumber(),
   isClaimEnabled: value.enable_claim
 }));
-var userRewardFieldsZod = import_zod4.z.object({
-  value: import_zod4.z.string()
+var userRewardFieldsZod = import_zod3.z.object({
+  value: import_zod3.z.string()
 }).transform((value) => (0, import_bignumber6.default)(value.value).shiftedBy(-9).toNumber());
 var getLoyaltyProgramInformations = async (query, veScaKey) => {
   const rewardPool = query.address.get("loyaltyProgram.rewardPool");
@@ -4552,7 +4455,7 @@ var getLoyaltyProgramInformations = async (query, veScaKey) => {
     totalPoolReward,
     isClaimEnabled
   };
-  veScaKey = veScaKey || (await query.getVeScas())[0]?.keyObject;
+  veScaKey = veScaKey ?? (await query.getVeScas())[0]?.keyObject;
   if (!veScaKey)
     return result;
   const userRewardTableId = query.address.get(
@@ -4574,10 +4477,39 @@ var getLoyaltyProgramInformations = async (query, veScaKey) => {
   return result;
 };
 
+// src/models/suiKit.ts
+var import_sui_kit4 = require("@scallop-io/sui-kit");
+
+// src/constants/rpc.ts
+var import_client = require("@mysten/sui/client");
+var RPC_PROVIDERS = [
+  (0, import_client.getFullnodeUrl)("mainnet"),
+  "https://sui-mainnet.public.blastapi.io",
+  "https://sui-mainnet-ca-2.cosmostation.io",
+  "https://sui-mainnet-eu-4.cosmostation.io",
+  "https://sui-mainnet-endpoint.blockvision.org",
+  "https://sui-rpc.publicnode.com",
+  "https://sui-mainnet-rpc.allthatnode.com",
+  "https://mainnet.suiet.app",
+  "https://mainnet.sui.rpcpool.com",
+  "https://sui1mainnet-rpc.chainode.tech",
+  "https://fullnode.mainnet.apis.scallop.io",
+  "https://sui-mainnet-us-2.cosmostation.io"
+];
+
+// src/models/suiKit.ts
+var newSuiKit = (params) => {
+  return new import_sui_kit4.SuiKit({
+    ...params,
+    fullnodeUrls: Array.from(
+      /* @__PURE__ */ new Set([...params.fullnodeUrls ?? [], ...RPC_PROVIDERS])
+    )
+  });
+};
+
 // src/models/scallopUtils.ts
 var ScallopUtils = class {
   constructor(params, instance) {
-    this._priceMap = /* @__PURE__ */ new Map();
     /**
      * Get reward type of spool.
      *
@@ -4600,7 +4532,7 @@ var ScallopUtils = class {
       pythEndpoints: params.pythEndpoints ?? PYTH_ENDPOINTS["mainnet"],
       ...params
     };
-    this.suiKit = instance?.suiKit ?? instance?.address?.cache._suiKit ?? new import_sui_kit4.SuiKit(params);
+    this.suiKit = instance?.suiKit ?? instance?.address?.cache._suiKit ?? newSuiKit(params);
     this.walletAddress = params.walletAddress ?? this.suiKit.currentAddress();
     if (instance?.address) {
       this.address = instance.address;
@@ -4614,7 +4546,7 @@ var ScallopUtils = class {
       );
       this.address = instance?.address ?? new ScallopAddress(
         {
-          id: params?.addressesId || ADDRESSES_ID,
+          id: params?.addressesId ?? ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface
         },
@@ -4639,10 +4571,10 @@ var ScallopUtils = class {
    * @param address - ScallopAddress instance.
    */
   async init(force = false, address) {
-    if (address && !this.address)
-      this.address = address;
-    if (force || !this.address.getAddresses()) {
+    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
       await this.address.read();
+    } else {
+      this.address = address;
     }
   }
   /**
@@ -4728,6 +4660,14 @@ var ScallopUtils = class {
   parseSCoinType(sCoinName) {
     return sCoinIds[sCoinName];
   }
+  /**
+   * Convert sCoinType into sCoin name
+   * @param sCoinType
+   * @returns sCoin name
+   */
+  parseSCoinNameFromType(sCoinType) {
+    return sCoinTypeToName[sCoinType];
+  }
   /**
    * Convert sCoin name into its underlying coin type
    * @param sCoinName
@@ -4753,7 +4693,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);
     return `${protocolObjectId}::reserve::MarketCoin<${coinType}>`;
   }
@@ -4762,7 +4702,7 @@ var ScallopUtils = class {
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes("reserve::MarketCoin");
-    coinType = coinTypeMatch?.[1] || coinType;
+    coinType = coinTypeMatch?.[1] ?? coinType;
     const wormHoleCoinTypeMap = {
       [`${this.address.get("core.coins.wusdc.id") ?? wormholeCoinIds.wusdc}::coin::COIN`]: "wusdc",
       [`${this.address.get("core.coins.wusdt.id") ?? wormholeCoinIds.wusdt}::coin::COIN`]: "wusdt",
@@ -4840,7 +4780,7 @@ var ScallopUtils = class {
    * @return The selected transaction coin arguments.
    */
   async selectCoins(amount, coinType = import_utils10.SUI_TYPE_ARG, ownerAddress) {
-    ownerAddress = ownerAddress || this.suiKit.currentAddress();
+    ownerAddress = ownerAddress ?? this.suiKit.currentAddress();
     const coins = await this.suiKit.suiInteractor.selectCoins(
       ownerAddress,
       amount,
@@ -4908,94 +4848,59 @@ var ScallopUtils = class {
    * @param assetCoinNames - Specific an array of support asset coin name.
    * @return  Asset coin price.
    */
-  async getCoinPrices(assetCoinNames = [
+  async getCoinPrices(_ = [
     .../* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
   ]) {
-    const coinPrices = {};
-    const existPricesCoinNames = [];
-    const lackPricesCoinNames = [];
-    assetCoinNames.forEach((assetCoinName) => {
-      if (this._priceMap.has(assetCoinName) && Date.now() - this._priceMap.get(assetCoinName).publishTime < 1e3 * 60) {
-        existPricesCoinNames.push(assetCoinName);
-      } else {
-        lackPricesCoinNames.push(assetCoinName);
-        this.cache.queryClient.invalidateQueries({
-          queryKey: queryKeys.oracle.getPythLatestPriceFeed(
-            this.address.get(`core.coins.${assetCoinName}.oracle.pyth.feed`)
-          )
-        });
-      }
-    });
-    if (existPricesCoinNames.length > 0) {
-      for (const coinName of existPricesCoinNames) {
-        coinPrices[coinName] = this._priceMap.get(coinName).price;
-      }
-    }
-    if (lackPricesCoinNames.length > 0) {
-      const endpoints = this.params.pythEndpoints ?? PYTH_ENDPOINTS[this.isTestnet ? "testnet" : "mainnet"];
-      const failedRequests = new Set(
-        lackPricesCoinNames
+    let coinPrices = {};
+    const endpoints = this.params.pythEndpoints ?? PYTH_ENDPOINTS[this.isTestnet ? "testnet" : "mainnet"];
+    const failedRequests = /* @__PURE__ */ new Set([
+      ...SUPPORT_POOLS,
+      ...SUPPORT_COLLATERALS
+    ]);
+    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`
+          );
+          acc.push([coinName, priceId]);
+          return acc;
+        },
+        []
       );
-      for (const endpoint of endpoints) {
-        const priceIds = Array.from(failedRequests.values()).reduce(
-          (acc, coinName) => {
-            const priceId = this.address.get(
-              `core.coins.${coinName}.oracle.pyth.feed`
-            );
-            if (priceId) {
-              acc[coinName] = priceId;
-            }
-            return acc;
+      const priceIds = priceIdPairs.map(([_2, priceId]) => priceId);
+      const pythConnection = new import_pyth_sui_js.SuiPriceServiceConnection(endpoint, {
+        timeout: 2e3
+      });
+      try {
+        const feeds = await this.cache.queryClient.fetchQuery({
+          queryKey: queryKeys.oracle.getPythLatestPriceFeeds(),
+          queryFn: async () => {
+            return await pythConnection.getLatestPriceFeeds(priceIds);
           },
-          {}
-        );
-        await Promise.allSettled(
-          Object.entries(priceIds).filter(([_, priceId]) => !!priceId).map(async ([coinName, priceId]) => {
-            const pythConnection = new import_pyth_sui_js.SuiPriceServiceConnection(endpoint);
-            try {
-              const feed = await this.cache.queryClient.fetchQuery({
-                queryKey: queryKeys.oracle.getPythLatestPriceFeed(
-                  priceId,
-                  endpoint
-                ),
-                queryFn: async () => {
-                  return await pythConnection.getLatestPriceFeeds([priceId]) ?? [];
-                }
-              });
-              if (feed[0]) {
-                const data = parseDataFromPythPriceFeed(
-                  feed[0],
-                  this.address
-                );
-                this._priceMap.set(coinName, {
-                  price: data.price,
-                  publishTime: data.publishTime
-                });
-                coinPrices[coinName] = data.price;
-                failedRequests.delete(coinName);
-              }
-            } catch (e) {
-              console.warn(
-                `Failed to get price ${coinName} feeds with endpoint ${endpoint}: ${e}`
-              );
-            }
-          })
-        );
-        if (failedRequests.size === 0)
-          break;
-      }
-      if (failedRequests.size > 0) {
-        await Promise.allSettled(
-          Array.from(failedRequests.values()).map(async (coinName) => {
-            const price = await getPythPrice(this, coinName);
-            this._priceMap.set(coinName, {
-              price,
-              publishTime: Date.now()
-            });
-            coinPrices[coinName] = price;
-          })
-        );
+          staleTime: 3e4,
+          gcTime: 3e4
+        });
+        if (feeds) {
+          feeds.forEach((feed, idx) => {
+            const coinName = priceIdPairs[idx][0];
+            const data = parseDataFromPythPriceFeed(feed, this.address);
+            coinPrices[coinName] = data.price;
+            failedRequests.delete(coinName);
+          });
+        }
+      } catch (e) {
+        console.error(e.message);
       }
+      if (failedRequests.size === 0)
+        break;
+    }
+    if (failedRequests.size > 0) {
+      coinPrices = {
+        ...coinPrices,
+        ...await getPythPrices(this, Array.from(failedRequests.values()))
+      };
+      failedRequests.clear();
     }
     return coinPrices;
   }
@@ -5075,7 +4980,6 @@ var ScallopUtils = class {
 
 // src/models/scallopBuilder.ts
 var import_utils24 = require("@mysten/sui/utils");
-var import_sui_kit14 = require("@scallop-io/sui-kit");
 
 // src/builders/coreBuilder.ts
 var import_transactions = require("@mysten/sui/transactions");
@@ -6509,7 +6413,7 @@ var generateLoyaltyProgramQuickMethod = ({
 }) => {
   return {
     claimLoyaltyRevenueQuick: async (veScaKey) => {
-      veScaKey = veScaKey || (await builder.query.getVeScas())[0]?.keyObject;
+      veScaKey = veScaKey ?? (await builder.query.getVeScas())[0]?.keyObject;
       const sender = requireSender(txBlock);
       if (!veScaKey)
         throw new Error(`No veScaKey found for user ${sender}`);
@@ -6673,9 +6577,6 @@ var newScallopTxBlock = (builder, initTxBlock) => {
   });
 };
 
-// src/models/scallopQuery.ts
-var import_sui_kit13 = require("@scallop-io/sui-kit");
-
 // src/models/scallopIndexer.ts
 var import_axios2 = __toESM(require("axios"));
 var import_sui_kit12 = require("@scallop-io/sui-kit");
@@ -6948,12 +6849,94 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
 
 // src/models/scallopQuery.ts
 var import_utils23 = require("@mysten/sui/utils");
+
+// src/queries/isolatedAsset.ts
+var import_zod4 = require("zod");
+var isolatedAssetZod = import_zod4.z.object({
+  dataType: import_zod4.z.string(),
+  type: import_zod4.z.string(),
+  hasPublicTransfer: import_zod4.z.boolean(),
+  fields: import_zod4.z.object({
+    id: import_zod4.z.object({
+      id: import_zod4.z.string()
+    }),
+    name: import_zod4.z.object({
+      type: import_zod4.z.string()
+    }),
+    value: import_zod4.z.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/models/scallopQuery.ts
 var ScallopQuery = class {
   constructor(params, instance) {
     this.params = params;
-    this.suiKit = instance?.suiKit ?? instance?.utils?.suiKit ?? new import_sui_kit13.SuiKit(params);
+    this.suiKit = instance?.suiKit ?? instance?.utils?.suiKit ?? newSuiKit(params);
     this.walletAddress = (0, import_utils23.normalizeSuiAddress)(
-      params.walletAddress || this.suiKit.currentAddress()
+      params.walletAddress ?? this.suiKit.currentAddress()
     );
     if (instance?.utils) {
       this.utils = instance.utils;
@@ -6967,7 +6950,7 @@ var ScallopQuery = class {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId || ADDRESSES_ID,
+          id: params?.addressesId ?? ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface
         },
@@ -7017,11 +7000,10 @@ var ScallopQuery = class {
    * @param address - ScallopAddress instance.
    */
   async init(force = false, address) {
-    if (address && !this.address) {
-      this.address = address;
-    }
-    if (force || !this.address.getAddresses()) {
+    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
       await this.address.read();
+    } else {
+      this.address = address;
     }
     await this.utils.init(force, this.address);
   }
@@ -7031,8 +7013,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market data.
    */
-  async queryMarket(indexer = false) {
-    return await queryMarket(this, indexer);
+  async queryMarket(indexer = false, args) {
+    return await queryMarket(this, indexer, args?.coinPrices);
   }
   /**
    * Get market pools.
@@ -7045,8 +7027,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market pools data.
    */
-  async getMarketPools(poolCoinNames, indexer = false) {
-    return await getMarketPools(this, poolCoinNames, indexer);
+  async getMarketPools(poolCoinNames, indexer = false, args) {
+    return await getMarketPools(this, poolCoinNames, indexer, args?.coinPrices);
   }
   /**
    * Get  market pool
@@ -7055,8 +7037,14 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market pool data.
    */
-  async getMarketPool(poolCoinName, indexer = false) {
-    return await getMarketPool(this, poolCoinName, indexer);
+  async getMarketPool(poolCoinName, indexer = false, args) {
+    return await getMarketPool(
+      this,
+      poolCoinName,
+      indexer,
+      args?.marketObject,
+      args?.coinPrice
+    );
   }
   /**
    * Get market collaterals.
@@ -7166,8 +7154,14 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Spools data.
    */
-  async getSpools(stakeMarketCoinNames, indexer = false) {
-    return await getSpools(this, stakeMarketCoinNames, indexer);
+  async getSpools(stakeMarketCoinNames, indexer = false, args) {
+    return await getSpools(
+      this,
+      stakeMarketCoinNames,
+      indexer,
+      args?.marketPools,
+      args?.coinPrices
+    );
   }
   /**
    * Get spool data.
@@ -7176,8 +7170,14 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Spool data.
    */
-  async getSpool(stakeMarketCoinName, indexer = false) {
-    return await getSpool(this, stakeMarketCoinName, indexer);
+  async getSpool(stakeMarketCoinName, indexer = false, args) {
+    return await getSpool(
+      this,
+      stakeMarketCoinName,
+      indexer,
+      args?.marketPool,
+      args?.coinPrices
+    );
   }
   /**
    * Get stake accounts data for all stake pools (spools).
@@ -7277,8 +7277,13 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Borrow incentive pools data.
    */
-  async getBorrowIncentivePools(coinNames, indexer = false) {
-    return await getBorrowIncentivePools(this, coinNames, indexer);
+  async getBorrowIncentivePools(coinNames, indexer = false, args) {
+    return await getBorrowIncentivePools(
+      this,
+      coinNames,
+      indexer,
+      args?.coinPrices
+    );
   }
   /**
    * Get borrow incentive accounts data.
@@ -7491,10 +7496,10 @@ var ScallopQuery = class {
 // src/models/scallopBuilder.ts
 var ScallopBuilder = class {
   constructor(params, instance) {
-    this.suiKit = instance?.suiKit ?? new import_sui_kit14.SuiKit(params);
+    this.suiKit = instance?.suiKit ?? newSuiKit(params);
     this.params = params;
     this.walletAddress = (0, import_utils24.normalizeSuiAddress)(
-      params?.walletAddress || this.suiKit.currentAddress()
+      params?.walletAddress ?? this.suiKit.currentAddress()
     );
     if (instance?.query) {
       this.query = instance.query;
@@ -7509,7 +7514,7 @@ var ScallopBuilder = class {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId || ADDRESSES_ID,
+          id: params?.addressesId ?? ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface
         },
@@ -7538,10 +7543,10 @@ var ScallopBuilder = class {
    * @param address - ScallopAddress instance.
    */
   async init(force = false, address) {
-    if (address && !this.address)
-      this.address = address;
-    if (force || !this.address.getAddresses()) {
+    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
       await this.address.read();
+    } else {
+      this.address = address;
     }
     await this.query.init(force, this.address);
     await this.utils.init(force, this.address);
@@ -7639,9 +7644,9 @@ var ScallopBuilder = class {
 var ScallopClient = class {
   constructor(params, instance) {
     this.params = params;
-    this.suiKit = instance?.suiKit ?? instance?.builder?.suiKit ?? new import_sui_kit15.SuiKit(params);
+    this.suiKit = instance?.suiKit ?? instance?.builder?.suiKit ?? newSuiKit(params);
     this.walletAddress = (0, import_utils25.normalizeSuiAddress)(
-      params?.walletAddress || this.suiKit.currentAddress()
+      params?.walletAddress ?? this.suiKit.currentAddress()
     );
     if (instance?.builder) {
       this.builder = instance.builder;
@@ -7657,7 +7662,7 @@ var ScallopClient = class {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId || ADDRESSES_ID,
+          id: params?.addressesId ?? ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface
         },
@@ -7711,7 +7716,7 @@ var ScallopClient = class {
    * @return Obligations data.
    */
   async getObligations(ownerAddress) {
-    const owner = ownerAddress || this.walletAddress;
+    const owner = ownerAddress ?? this.walletAddress;
     return await this.query.getObligations(owner);
   }
   /**
@@ -7736,7 +7741,7 @@ var ScallopClient = class {
    * @return All stake accounts data.
    */
   async getAllStakeAccounts(ownerAddress) {
-    const owner = ownerAddress || this.walletAddress;
+    const owner = ownerAddress ?? this.walletAddress;
     return await this.query.getAllStakeAccounts(owner);
   }
   /**
@@ -7750,7 +7755,7 @@ var ScallopClient = class {
    * @return Stake accounts data.
    */
   async getStakeAccounts(stakeMarketCoinName, ownerAddress) {
-    const owner = ownerAddress || this.walletAddress;
+    const owner = ownerAddress ?? this.walletAddress;
     return await this.query.getStakeAccounts(stakeMarketCoinName, owner);
   }
   /**
@@ -7790,10 +7795,10 @@ var ScallopClient = class {
   }
   async depositCollateral(collateralCoinName, amount, sign = true, obligationId, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const obligations = await this.query.getObligations(sender);
-    const specificObligationId = obligationId || obligations[0]?.id;
+    const specificObligationId = obligationId ?? obligations[0]?.id;
     if (specificObligationId) {
       await txBlock.addCollateralQuick(
         amount,
@@ -7827,7 +7832,7 @@ var ScallopClient = class {
    */
   async withdrawCollateral(collateralCoinName, amount, sign = true, obligationId, obligationKey, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const collateralCoin = await txBlock.takeCollateralQuick(
       amount,
@@ -7846,7 +7851,7 @@ var ScallopClient = class {
   }
   async deposit(poolCoinName, amount, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const sCoin = await txBlock.depositQuick(amount, poolCoinName);
     txBlock.transferObjects([sCoin], sender);
@@ -7860,11 +7865,11 @@ var ScallopClient = class {
   }
   async depositAndStake(stakeCoinName, amount, sign = true, stakeAccountId, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const stakeMarketCoinName = this.utils.parseMarketCoinName(stakeCoinName);
     const stakeAccounts = await this.query.getStakeAccounts(stakeMarketCoinName);
-    const targetStakeAccount = stakeAccountId || stakeAccounts[0]?.id;
+    const targetStakeAccount = stakeAccountId ?? stakeAccounts[0]?.id;
     const marketCoin = await txBlock.depositQuick(amount, stakeCoinName, false);
     if (targetStakeAccount) {
       await txBlock.stakeQuick(
@@ -7887,7 +7892,7 @@ var ScallopClient = class {
   }
   async withdraw(poolCoinName, amount, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const coin = await txBlock.withdrawQuick(amount, poolCoinName);
     txBlock.transferObjects([coin], sender);
@@ -7912,7 +7917,7 @@ var ScallopClient = class {
    */
   async borrow(poolCoinName, amount, sign = true, obligationId, obligationKey, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const availableStake = SUPPORT_BORROW_INCENTIVE_POOLS.includes(poolCoinName);
     if (sign && availableStake) {
@@ -7948,7 +7953,7 @@ var ScallopClient = class {
    */
   async repay(poolCoinName, amount, sign = true, obligationId, obligationKey, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const availableStake = SUPPORT_BORROW_INCENTIVE_POOLS.includes(poolCoinName);
     if (sign && availableStake) {
@@ -7968,7 +7973,7 @@ var ScallopClient = class {
   }
   async flashLoan(poolCoinName, amount, callback, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const [coin, loan] = txBlock.borrowFlashLoan(amount, poolCoinName);
     txBlock.repayFlashLoan(await callback(txBlock, coin), loan, poolCoinName);
@@ -7982,7 +7987,7 @@ var ScallopClient = class {
   }
   async createStakeAccount(marketCoinName, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const stakeAccount = txBlock.createStakeAccount(marketCoinName);
     txBlock.transferObjects([stakeAccount], sender);
@@ -7996,10 +8001,10 @@ var ScallopClient = class {
   }
   async stake(stakeMarketCoinName, amount, sign = true, stakeAccountId, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const stakeAccounts = await this.query.getStakeAccounts(stakeMarketCoinName);
-    const targetStakeAccount = stakeAccountId || stakeAccounts[0]?.id;
+    const targetStakeAccount = stakeAccountId ?? stakeAccounts[0]?.id;
     if (targetStakeAccount) {
       await txBlock.stakeQuick(amount, stakeMarketCoinName, targetStakeAccount);
     } else {
@@ -8017,7 +8022,7 @@ var ScallopClient = class {
   }
   async unstake(stakeMarketCoinName, amount, sign = true, stakeAccountId, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const sCoin = await txBlock.unstakeQuick(
       amount,
@@ -8043,7 +8048,7 @@ var ScallopClient = class {
   }
   async unstakeAndWithdraw(stakeMarketCoinName, amount, sign = true, stakeAccountId, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const stakeMarketCoin = await txBlock.unstakeQuick(
       amount,
@@ -8074,7 +8079,7 @@ var ScallopClient = class {
   }
   async claim(stakeMarketCoinName, sign = true, stakeAccountId, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const rewardCoins = await txBlock.claimQuick(
       stakeMarketCoinName,
@@ -8101,7 +8106,7 @@ var ScallopClient = class {
    */
   async stakeObligation(obligationId, obligationKeyId, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKeyId);
     if (sign) {
@@ -8123,7 +8128,7 @@ var ScallopClient = class {
    */
   async unstakeObligation(obligationId, obligationKeyId, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     await txBlock.unstakeObligationQuick(obligationId, obligationKeyId);
     if (sign) {
@@ -8146,7 +8151,7 @@ var ScallopClient = class {
    */
   async claimBorrowIncentive(coinName, obligationId, obligationKeyId, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress || this.walletAddress;
+    const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
     const rewardCoins = [];
     for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
@@ -8292,7 +8297,7 @@ var ScallopClient = class {
       throw new Error("Only be used on the test network.");
     }
     const txBlock = this.builder.createTxBlock();
-    const recipient = receiveAddress || this.walletAddress;
+    const recipient = receiveAddress ?? this.walletAddress;
     const packageId = this.address.get("core.packages.testCoin.id");
     const treasuryId = this.address.get(`core.coins.${assetCoinName}.treasury`);
     const target = `${packageId}::${assetCoinName}::mint`;
@@ -8312,7 +8317,7 @@ var ScallopClient = class {
 var Scallop = class {
   constructor(params, cacheOptions, tokenBucket, queryClient) {
     this.params = params;
-    this.suiKit = new import_sui_kit16.SuiKit(params);
+    this.suiKit = newSuiKit(params);
     this.cache = new ScallopCache(
       this.suiKit,
       params.walletAddress,
@@ -8322,7 +8327,7 @@ var Scallop = class {
     );
     this.address = new ScallopAddress(
       {
-        id: params?.addressesId || ADDRESSES_ID,
+        id: params?.addressesId ?? ADDRESSES_ID,
         network: params?.networkType,
         forceInterface: params?.forceAddressesInterface
       },
@@ -8473,6 +8478,7 @@ var Scallop = class {
   marketCoins,
   queryKeys,
   sCoinIds,
+  sCoinTypeToName,
   sCoins,
   spoolRewardCoins,
   stakeMarketCoins,