@scallop-io/sui-scallop-sdk 1.3.2 → 1.3.3-alpha.2

package/dist/index.mjs

@@ -254,11 +254,20 @@ var voloCoinIds = {
 var sCoinIds = {
   susdc: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
   ssbeth: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
-  ssui: "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI",
+  // TODO: Change this to the correct value on production release
+  ssui: "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI",
+  // ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::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",
+  // 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"
+  ),
   sweth: "0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH",
   safsui: "0x00671b1fa2a124f5be8bdae8b91ee711462c5d9e31bda232e70fd9607b523c88::scallop_af_sui::SCALLOP_AF_SUI",
   shasui: "0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI",
@@ -359,10 +368,10 @@ var queryKeys = {
     ]
   },
   oracle: {
-    getPythLatestPriceFeed: (pythPriceId) => [
+    getPythLatestPriceFeed: (pythPriceId, endpoint) => [
       "oracle",
       "getPythPriceId",
-      { pythPriceId }
+      { pythPriceId, endpoint }
     ]
   }
 };
@@ -374,6 +383,430 @@ var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
 var MIN_INITIAL_LOCK_AMOUNT = 1e10;
 var MIN_TOP_UP_AMOUNT = 1e9;
 
+// src/constants/testAddress.ts
+var TEST_ADDRESSES = {
+  core: {
+    // version:
+    //   '0x07871c4b3c847a0f674510d4978d5cf6f960452795e8ff6f189fd2088a3f6ac7',
+    version: "0xd318de9b0f6873879a82cbfcc2daa1d1591a8b54e7cea9f4b567da63c692a52b",
+    versionCap: "0x590a4011cb649b3878f3ea14b3a78674642a9548d79b7e091ef679574b158a07",
+    // object:
+    //   '0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf',
+    object: "0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d",
+    // market:
+    //   '0xa757975255146dc9686aa823b7838b507f315d704f428cbadad2f4ea061939d9',
+    market: "0x9d6434e97f3f98fd9b0c0e1dca22632073985abcd22541feae7ee1e34cbe3af2",
+    adminCap: "0x09689d018e71c337d9db6d67cbca06b74ed92196103624028ccc3ecea411777c",
+    coinDecimalsRegistry: "0x200abe9bf19751cc566ae35aa58e2b7e4ff688fc1130f8d8909ea09bc137d668",
+    // obligationAccessStore:
+    //   '0x733e30b7c94d619d78cb8f5bc4bfbb759ced9a531239028caabb2474e5be59c9',
+    obligationAccessStore: "0x46e9b44a77ee9c9d33cc2689ecdfbb8f681935cbc6bdf6ac3df048e396c36c82",
+    coins: {
+      usdc: {
+        id: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7",
+        metaData: "0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+            feedObject: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
+          }
+        }
+      },
+      cetus: {
+        id: "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b",
+        metaData: "0x4c0dce55eff2db5419bbd2d239d1aa22b4a400c01bbb648b058a9883989025da",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef",
+            feedObject: "0x24c0247fb22457a719efac7f670cdc79be321b521460bd6bd2ccfa9f80713b14"
+          }
+        }
+      },
+      wapt: {
+        id: "0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37",
+        metaData: "0xc969c5251f372c0f34c32759f1d315cf1ea0ee5e4454b52aea08778eacfdd0a8",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5",
+            feedObject: "0x7c5b7837c44a69b469325463ac0673ac1aa8435ff44ddb4191c9ae380463647f"
+          }
+        }
+      },
+      wsol: {
+        id: "0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8",
+        metaData: "0x4d2c39082b4477e3e79dc4562d939147ab90c42fc5f3e4acf03b94383cd69b6e",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
+            feedObject: "0x9d0d275efbd37d8a8855f6f2c761fa5983293dd8ce202ee5196626de8fcd4469"
+          }
+        }
+      },
+      wbtc: {
+        id: "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881",
+        metaData: "0x5d3c6e60eeff8a05b693b481539e7847dfe33013e7070cdcb387f5c0cac05dfd",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43",
+            feedObject: "0x9a62b4863bdeaabdc9500fce769cf7e72d5585eeb28a6d26e4cafadc13f76ab2"
+          }
+        }
+      },
+      weth: {
+        id: "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5",
+        metaData: "0x8900e4ceede3363bef086d6b50ca89d816d0e90bf6bc46efefe1f8455e08f50f",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
+            feedObject: "0x9193fd47f9a0ab99b6e365a464c8a9ae30e6150fc37ed2a89c1586631f6fc4ab"
+          }
+        }
+      },
+      wusdc: {
+        id: "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf",
+        metaData: "0x4fbf84f3029bd0c0b77164b587963be957f853eccf834a67bb9ecba6ec80f189",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+            feedObject: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
+          }
+        }
+      },
+      wusdt: {
+        id: "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c",
+        metaData: "0xfb0e3eb97dd158a5ae979dddfa24348063843c5b20eb8381dd5fa7c93699e45c",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b",
+            feedObject: "0x985e3db9f93f76ee8bace7c3dd5cc676a096accd5d9e09e9ae0fb6e492b14572"
+          }
+        }
+      },
+      sui: {
+        id: "0x0000000000000000000000000000000000000000000000000000000000000002",
+        metaData: "0x9258181f5ceac8dbffb7030890243caed69a9599d2886d957a9cb7656af3bdb3",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "0xbca474133638352ba83ccf7b5c931d50f764b09550e16612c9f70f1e21f3f594",
+          pyth: {
+            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
+          }
+        }
+      },
+      afsui: {
+        id: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc",
+        metaData: "0x2f9217f533e51334873a39b8026a4aa6919497b47f49d0986a4f1aec66f8a34d",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
+          }
+        }
+      },
+      hasui: {
+        id: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d",
+        metaData: "0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
+          }
+        }
+      },
+      vsui: {
+        id: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55",
+        metaData: "0xabd84a23467b33854ab25cf862006fd97479f8f6f53e50fe732c43a274d939bd",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
+          }
+        }
+      },
+      sca: {
+        id: "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6",
+        metaData: "0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
+            feedObject: "0xf6de1d3279a269a597d813cbaca59aa906543ab9a8c64e84a4722f1a20863985"
+          }
+        }
+      },
+      sbeth: {
+        id: "0xd0e89b2af5e4910726fbcd8b8dd37bb79b29e5f83f7491bca830e94f7f226d29",
+        metaData: "0x89b04ba87f8832d4d76e17a1c9dce72eb3e64d372cf02012b8d2de5384faeef0",
+        treasury: "",
+        oracle: {
+          supra: "",
+          switchboard: "",
+          pyth: {
+            feed: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
+            feedObject: "0x9193fd47f9a0ab99b6e365a464c8a9ae30e6150fc37ed2a89c1586631f6fc4ab"
+          }
+        }
+      }
+    },
+    oracles: {
+      xOracle: "0x93d5bf0936b71eb27255941e532fac33b5a5c7759e377b4923af0a1359ad494f",
+      xOracleCap: "0x1edeae568fde99e090dbdec4bcdbd33a15f53a1ce1f87aeef1a560dedf4b4a90",
+      supra: { registry: "", registryCap: "", holder: "" },
+      switchboard: { registry: "", registryCap: "" },
+      pyth: {
+        registry: "0xedc293f9413a5a7a5d53bdba1fd889d0a4030894469228f0acdae4aa3c55a213",
+        registryCap: "0xbcb07141eb1f7e01fbda4130ecf5f5adaeabb77f5d9c32158b7532bcd2197acd",
+        state: "0x1f9310238ee9298fb703c3419030b35b22bb1cc37113e3bb5007c99aec79e5b8",
+        wormhole: "0x5306f64e312b581766351c07af79c72fcb1cd25147157fdc2f8ad76de9a3fb6a",
+        wormholeState: "0xaeab97f96cf9877fee2883315d459552b2b921edc16d7ceac6eab944dd88919c"
+      }
+    },
+    packages: {
+      coinDecimalsRegistry: {
+        id: "0xca5a5a62f01c79a104bf4d31669e29daa387f325c241de4edbe30986a9bc8b0d",
+        upgradeCap: "0x34e76a945d29f195bc53ca704fa70877d1cf3a5d7bbfdda1b13e633fff13c0f6"
+      },
+      math: {
+        id: "0xad013d5fde39e15eabda32b3dbdafd67dac32b798ce63237c27a8f73339b9b6f",
+        upgradeCap: "0x3a329598231de02e6135c62284b66005b41cad1d9ab7ca2dc79c08293aba2ec6"
+      },
+      whitelist: {
+        id: "0x1318fdc90319ec9c24df1456d960a447521b0a658316155895014a6e39b5482f",
+        upgradeCap: "0xf5a22aea23db664f7b69855b6a546747f17c1ec4230319cfc17225e462b05761"
+      },
+      x: {
+        id: "0x779b5c547976899f5474f3a5bc0db36ddf4697ad7e5a901db0415c2281d28162",
+        upgradeCap: "0x3f203f6fff6a69d151e4f1cd931f22b68c489ef2759765662fc7baf673943c9e"
+      },
+      protocol: {
+        id: "0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d",
+        upgradeCap: "0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a"
+      },
+      // protocol: {
+      //   id: '0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e',
+      //   upgradeCap:
+      //     '0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a',
+      // },
+      protocolWhitelist: {
+        id: "0x4c262d9343dac53ecb28f482a2a3f62c73d0ebac5b5f03d57383d56ff219acdf",
+        upgradeCap: "0x4a5e88a75039b00988f633f811f58117f31b8627a46bf822aa114d9010049449"
+      },
+      // query: {
+      //   id: '0xb8d603a39114a5efef3dd0bf84df0bed1be1fbd39b78b7dd6e8a61ccc5e6006f',
+      //   upgradeCap:
+      //     '0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f',
+      // },
+      query: {
+        id: "0x89706958f43fb170de134579e3fbc53972b946ee78bd2442d8e1adc36074fbdc",
+        upgradeCap: "0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f"
+      },
+      supra: { id: "", upgradeCap: "" },
+      pyth: {
+        id: "0x910f30cbc7f601f75a5141a01265cd47c62d468707c5e1aecb32a18f448cb25a",
+        upgradeCap: "0xdf0ffbae1ea5bb25fbca5efba433dcf00c7cced65679af2f04728901275c6157"
+      },
+      switchboard: { id: "", upgradeCap: "" },
+      xOracle: {
+        id: "0x1478a432123e4b3d61878b629f2c692969fdb375644f1251cd278a4b1e7d7cd6",
+        upgradeCap: "0x0f928a6b2e26b73330fecaf9b44acfc9800a4a9794d6415c2a3153bc70e3c1f0"
+      },
+      testCoin: { id: "", upgradeCap: "" }
+    }
+  },
+  spool: {
+    // id: '0x7c4fdabe81c31b19a45d1e572a52a539997a90903fbb5bfab71480abe0fa62c3',
+    id: "0x1742655fe5872dfa6456673f9e38612a4965e6979e6cd7696a7f1225f28bae21",
+    adminCap: "0xdd8a047cbbf802bfcde5288b8ef1910965d789cc614da11d39af05fca0bd020a",
+    // object:
+    //   '0xe87f1b2d498106a2c61421cec75b7b5c5e348512b0dc263949a0e7a3c256571a',
+    object: "0x1742655fe5872dfa6456673f9e38612a4965e6979e6cd7696a7f1225f28bae21",
+    pools: {
+      sweth: {
+        id: "0xeec40beccb07c575bebd842eeaabb835f77cd3dab73add433477e57f583a6787",
+        rewardPoolId: "0x957de68a18d87817de8309b30c1ec269a4d87ae513abbeed86b5619cb9ce1077"
+      },
+      ssui: {
+        // id: '0x4f0ba970d3c11db05c8f40c64a15b6a33322db3702d634ced6536960ab6f3ee4',
+        id: "0xb9617f83c06ebdeac0a8834782b1015e1cc7ea23739e30c132c4bfb95c37a579",
+        rewardPoolId: (
+          // '0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9',
+          "0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a"
+        )
+      },
+      susdc: {
+        id: "0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918",
+        rewardPoolId: "0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166"
+      },
+      swusdc: {
+        // id: '0x4ace6648ddc64e646ba47a957c562c32c9599b3bba8f5ac1aadb2ae23a2f8ca0',
+        id: "0xf1b383b9cf2e9f515fc69567df1053098f273849d09cd84b0278a773429bd2b2",
+        rewardPoolId: (
+          // '0xf4268cc9b9413b9bfe09e8966b8de650494c9e5784bf0930759cfef4904daff8',
+          "0xc71c53ee6505d928ba15bea4fe4f45d98c9c31eced94b72d00a7827d4b7ba3ff"
+        )
+      },
+      swusdt: {
+        // id: '0xcb328f7ffa7f9342ed85af3fdb2f22919e1a06dfb2f713c04c73543870d7548f',
+        id: "0xb5567dfa5c7fc17a249e959732664c50713dd8c23db1a11376b27df800c17418",
+        rewardPoolId: (
+          // '0x2c9f934d67a5baa586ceec2cc24163a2f049a6af3d5ba36b84d8ac40f25c4080',
+          "0x60768b0687ff0235e376a039709a683e4c436098785e473b67b32dbab47b69ab"
+        )
+      },
+      scetus: {
+        id: "0xac1bb13bf4472a637c18c2415fb0e3c1227ea2bcf35242e50563c98215bd298e",
+        rewardPoolId: "0x6835c1224126a45086fc6406adc249e3f30df18d779ca4f4e570e38716a17f3f"
+      },
+      safsui: {
+        // id: '0xeedf438abcaa6ce4d9625ffca110920592d5867e4c5637d84ad9f466c4feb800',
+        id: "0xc568bb4c991258e839aa54802ecda04fcd9838c826bc3b42b40af81b23c458c8",
+        rewardPoolId: (
+          // '0x89255a2f86ed7fbfef35ab8b7be48cc7667015975be2685dd9a55a9a64baf76e',
+          "0x389a3cbeda742b918941bb24fd00e077bad3367484394d6234f8209b9a6aa03d"
+        )
+      },
+      shasui: {
+        // id: '0xa6148bc1b623e936d39a952ceb5bea79e8b37228a8f595067bf1852efd3c34aa',
+        id: "0x93f3f4499bf89f2d05ddc1f8b15f51701a7c6c4d0ac0b9c3bc99462cbbd8e321",
+        rewardPoolId: (
+          // '0x6f3563644d3e2ef13176dbf9d865bd93479df60ccbe07b7e66db57f6309f5a66',
+          "0x94cee1be7f5ff34193f3aabef0b14142cb28af4d905fe487a9a7d85a15edb6aa"
+        )
+      },
+      svsui: {
+        // id: '0x69ce8e537e750a95381e6040794afa5ab1758353a1a2e1de7760391b01f91670',
+        id: "0xa970e9087f80cb59e9299b8e7af7175d977ad6c9af0322aa4440e138fbd7ae00",
+        rewardPoolId: (
+          // '0xbca914adce058ad0902c7f3cfcd698392a475f00dcfdc3f76001d0370b98777a',
+          "0x38eee9699c4fc132a6623e54b865f047df4fc6eb83af807300f44e8f4b235ff0"
+        )
+      }
+    },
+    config: ""
+  },
+  borrowIncentive: {
+    id: "0x85769d63565ce99c7622f8e336ca1460926ddf29738ad2a39407b5cac29f61fe",
+    adminCap: "0x56ac8e6f2b360b2b35c0168d72cc6cd17d9592afb83709865cb87af24bb2025b",
+    object: "0x85769d63565ce99c7622f8e336ca1460926ddf29738ad2a39407b5cac29f61fe",
+    query: "0x8e0d00f8ff1199d7c5fe56cea0e901a525daeefff0445a1635ace8282ae3302c",
+    incentivePools: "0x9d564c93128c6ab0c0d3e050a47f11df0b91494f3bb779bdc1301c1c637f15eb",
+    incentiveAccounts: "0x09e6040e798246de04941bc79a3ba62d3eca6d7a218cc30f21fb07f478fa2926",
+    config: "0x43d4ca1dfc90b161c4240facd119e74e4b850cca2957f88c2ec289c9380da064"
+  },
+  referral: {
+    id: "0x1bf5a8ce77050d8052549d743e16b469f15aa6b81b752b78b6ebb65179665f5a",
+    object: "0x5658d4bf5ddcba27e4337b4262108b3ad1716643cac8c2054ac341538adc72ec",
+    adminCap: "0xc5dc06b9074291259f2cac460c940012c781c4430e42125c541cc43101c3bcbd",
+    referralBindings: "0xcf184487782bed962bf678001efe775d31fb94b9992333a57594cf15d79d5ced",
+    bindingTableId: "0x41a50e258c0a266ce84e0e1a618dbf70b878cc943909e613089a50afcceb2bc0",
+    referralRevenuePool: "0xc24e3e5e37032f29a3dd91a9a1f057af8821b7e6c148e9683900ac8b6d30f0c6",
+    revenueTableId: "0x595baa3654c297bff84ab7786a2d250f019cefc66e8df8e89fd9d41e02bd30dd",
+    referralTiers: "0x144350f3db9b46d11b140084cd54e6de0b9c3b8d265ce8059b51d0ef58ea464b",
+    tiersTableId: "0xeac755a7a8b7798530905ac79e8c114f19d0f130f6eab012954f08faac29c75d",
+    // authorizedWitnessList:
+    //   '0xf21b0ed043c9bb70842c0129159f4943dbcc3c9ef2f2f808af65f8be25cfd20e',
+    authorizedWitnessList: "0x9d6223dc52015b8a3986a573590ef2af8f1b8f3e4685513888c052f001b87e7f",
+    version: "0x3545849eb97723e676a476ec9d4fe5f2eb0eb2c6b78972851114fd4c7ed4639f"
+  },
+  vesca: {
+    id: "0x1158813b32962c2d22888fae257d5f2365b03631f0cd5d5b912ccdf51ff4e2f2",
+    object: "0x1158813b32962c2d22888fae257d5f2365b03631f0cd5d5b912ccdf51ff4e2f2",
+    adminCap: "0x8ffa76135c5b85c5fbd73a6448a4a733d826cb63a267ab817656acb77c72d4a5",
+    tableId: "0x0a0b7f749baeb61e3dfee2b42245e32d0e6b484063f0a536b33e771d573d7246",
+    table: "0xd3a4632b1080f7d96e1c2487d4dabf2c1196916937c505a69954ac9f393be8d0",
+    treasury: "0xafa4b6231e49c15a22d641ce33fda761baaf650fa21899dfa2eb1716146e7306",
+    config: "0x7cbcb0a342179577a117dfdff974cf1ab765d3b571067bf22ddf5f9e3a667922"
+  },
+  loyaltyProgram: {
+    id: "0xd17bcf8b5a59652c36225d478564a8593ae0ed7d650bcacdda1d6fe179127907",
+    object: "0xd17bcf8b5a59652c36225d478564a8593ae0ed7d650bcacdda1d6fe179127907",
+    rewardPool: "0xf9c090492ef476bd542109d0913ffe871cbfa28578b7114eca2a8c0e5671786f",
+    userRewardTableId: "0x748a80395849ed37db1b0e14f2ab5d1d96458d2359ab3a84eb079d0f4ac7cf2e"
+  },
+  scoin: {
+    id: "0x773dab39c90fe05439b06a2d061795e52a974ff92c2aef90b2ee467acf7f33c8",
+    coins: {
+      ssui: {
+        coinType: "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI",
+        treasury: "0x0e499640a12c38dd9cc44532f5bc5fd1b6da86d2f9a8810357250f4b26e9e5c7"
+      },
+      scetus: {
+        coinType: "0x8b71e6d323ed78515af2bead13bf3d0da1562ba4a99234eb7c4f14fd39ef0427::scallop_cetus::SCALLOP_CETUS",
+        treasury: "0xd786f4b2d26278cc7911a3445b1b085eab60f269ef9dbb6b87e803d52f155003"
+      },
+      ssca: {
+        coinType: "0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA",
+        treasury: "0x5f1c5de1df7341075d119570269b7b452af50afe8363080638f1ae29a554c038"
+      },
+      swusdc: {
+        coinType: "0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
+        treasury: "0x471fbab72578bab577263006fe32543b6e76153fffa2bef69affe4bc4934258f"
+      },
+      swusdt: {
+        coinType: "0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
+        treasury: "0x921a4ed4bb4b4f11f51a462c83f4c0f6b60a90e441d1bc0d26d6fd893146bf4d"
+      },
+      sweth: {
+        coinType: "0x27d54f43e3eda701be56b82e5756e41c84467cd202f5cf713d5f9e45a9f1b6bc::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH",
+        treasury: "0x032b4c8fac94c038dbe986f7587e9b1e4ef580b5ee06d2ef249d85459b7ef05d"
+      },
+      safsui: {
+        coinType: "0xb75b46d975d8d80670b53a6bee90baaa8ce2e0b7d397f079447d641eef6b44ad::scallop_af_sui::SCALLOP_AF_SUI",
+        treasury: "0x21450ef0570ef3d224ffa3b873ab802e439ece7b93cc7efad10ae0c1e3b3fcfe"
+      },
+      shasui: {
+        coinType: "0xd973a723874e2c7cde196602a79155a1343a933f8cf87d9b1bb7408bc1acbc58::scallop_ha_sui::SCALLOP_HA_SUI",
+        treasury: "0xf822fc1402207e47d2e3ba8ff6e1e594bf1de777dc5ebd2744619cd2726e3b0d"
+      },
+      svsui: {
+        coinType: "0x97023a317320c4498cc4cd239dd02fd30c28246e5e8f81325d63f2bd8d70f6b3::scallop_v_sui::SCALLOP_V_SUI",
+        treasury: "0x327114f0bf3559d7e2de10282147ed76a236c7c6775029165c4db09a6062ead6"
+      },
+      ssbeth: {
+        coinType: "0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH",
+        treasury: "0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed"
+      }
+    }
+  }
+};
+
 // src/models/scallop.ts
 import { SuiKit as SuiKit7 } from "@scallop-io/sui-kit";
 
@@ -1068,541 +1501,149 @@ var ScallopCache = class {
   async invalidateAllCache() {
     return Object.values(queryKeys.rpc).map(
       (t) => this.queryClient.invalidateQueries({
-        queryKey: t(),
-        type: "all"
-      })
-    );
-  }
-  /**
-   * @description Provides cache for inspectTxn of the SuiKit.
-   * @param QueryInspectTxnParams
-   * @param txBlock
-   * @returns Promise<DevInspectResults>
-   */
-  async queryInspectTxn({
-    queryTarget,
-    args,
-    typeArgs
-  }) {
-    const txBlock = new SuiTxBlock();
-    txBlock.moveCall(queryTarget, args, typeArgs);
-    const query = await this.queryClient.fetchQuery({
-      queryKey: queryKeys.rpc.getInspectTxn(queryTarget, args, typeArgs),
-      queryFn: async () => {
-        return await callWithRateLimit(
-          this.tokenBucket,
-          () => this.suiKit.inspectTxn(txBlock)
-        );
-      }
-    });
-    return query;
-  }
-  /**
-   * @description Provides cache for getObject of the SuiKit.
-   * @param objectId
-   * @param QueryObjectParams
-   * @returns Promise<SuiObjectResponse>
-   */
-  async queryGetObject(objectId, options) {
-    return this.queryClient.fetchQuery({
-      queryKey: queryKeys.rpc.getObject(objectId, this.walletAddress, options),
-      queryFn: async () => {
-        return await callWithRateLimit(
-          this.tokenBucket,
-          () => this.client.getObject({
-            id: objectId,
-            options
-          })
-        );
-      }
-    });
-  }
-  /**
-   * @description Provides cache for getObjects of the SuiKit.
-   * @param objectIds
-   * @returns Promise<SuiObjectData[]>
-   */
-  async queryGetObjects(objectIds, options = {
-    showContent: true
-  }) {
-    if (objectIds.length === 0)
-      return [];
-    return this.queryClient.fetchQuery({
-      queryKey: queryKeys.rpc.getObjects(
-        objectIds,
-        this.walletAddress,
-        options
-      ),
-      queryFn: async () => {
-        return await callWithRateLimit(
-          this.tokenBucket,
-          () => this.suiKit.getObjects(objectIds, options)
-        );
-      }
-    });
+        queryKey: t(),
+        type: "all"
+      })
+    );
   }
   /**
-   * @description Provides cache for getOwnedObjects of the SuiKit.
-   * @param input
-   * @returns Promise<PaginatedObjectsResponse>
+   * @description Provides cache for inspectTxn of the SuiKit.
+   * @param QueryInspectTxnParams
+   * @param txBlock
+   * @returns Promise<DevInspectResults>
    */
-  async queryGetOwnedObjects(input) {
-    return this.queryClient.fetchQuery({
-      queryKey: queryKeys.rpc.getOwnedObjects(input),
-      queryFn: async () => {
-        return await callWithRateLimit(
-          this.tokenBucket,
-          () => this.client.getOwnedObjects(input)
-        );
-      }
-    });
-  }
-  async queryGetDynamicFields(input) {
-    return this.queryClient.fetchQuery({
-      queryKey: queryKeys.rpc.getDynamicFields(input),
+  async queryInspectTxn({
+    queryTarget,
+    args,
+    typeArgs
+  }) {
+    const txBlock = new SuiTxBlock();
+    txBlock.moveCall(queryTarget, args, typeArgs);
+    const query = await this.queryClient.fetchQuery({
+      queryKey: queryKeys.rpc.getInspectTxn(queryTarget, args, typeArgs),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.client.getDynamicFields(input)
+          () => this.suiKit.inspectTxn(txBlock)
         );
       }
     });
+    return query;
   }
-  async queryGetDynamicFieldObject(input) {
+  /**
+   * @description Provides cache for getObject of the SuiKit.
+   * @param objectId
+   * @param QueryObjectParams
+   * @returns Promise<SuiObjectResponse>
+   */
+  async queryGetObject(objectId, options) {
     return this.queryClient.fetchQuery({
-      queryKey: queryKeys.rpc.getDynamicFieldObject(input),
+      queryKey: queryKeys.rpc.getObject(objectId, this.walletAddress, options),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.client.getDynamicFieldObject(input)
-        );
-      }
-    });
-  }
-  async queryGetAllCoinBalances(owner) {
-    return this.queryClient.fetchQuery({
-      queryKey: queryKeys.rpc.getAllCoinBalances(owner),
-      queryFn: async () => {
-        const allBalances = await callWithRateLimit(
-          this.tokenBucket,
-          () => this.client.getAllBalances({ owner })
-        );
-        if (!allBalances)
-          return {};
-        const balances = allBalances.reduce(
-          (acc, coinBalance) => {
-            if (coinBalance.totalBalance !== "0") {
-              acc[normalizeStructTag2(coinBalance.coinType)] = coinBalance.totalBalance;
-            }
-            return acc;
-          },
-          {}
+          () => this.client.getObject({
+            id: objectId,
+            options
+          })
         );
-        return balances;
       }
     });
-  }
-  async queryGetCoinBalance(input) {
-    if (!input.coinType)
-      return "0";
-    return (await this.queryGetAllCoinBalances(input.owner) || {})[normalizeStructTag2(input.coinType)] ?? "0";
-  }
-};
-
-// src/models/scallopAddress.ts
-import axios from "axios";
-
-// src/constants/testAddress.ts
-var TEST_ADDRESSES = {
-  core: {
-    // version:
-    //   '0x07871c4b3c847a0f674510d4978d5cf6f960452795e8ff6f189fd2088a3f6ac7',
-    version: "0x6156d5cd1538bec8a167a40fe1209a4ec9cf8137921fe0a697f191ac561f0b09",
-    versionCap: "0x590a4011cb649b3878f3ea14b3a78674642a9548d79b7e091ef679574b158a07",
-    // object:
-    //   '0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf',
-    object: "0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1",
-    // market:
-    //   '0xa757975255146dc9686aa823b7838b507f315d704f428cbadad2f4ea061939d9',
-    market: "0x8606ed145cc887985b8ed793f7753ff5dc762a42c379dac035f568e1bac58490",
-    adminCap: "0x09689d018e71c337d9db6d67cbca06b74ed92196103624028ccc3ecea411777c",
-    coinDecimalsRegistry: "0x200abe9bf19751cc566ae35aa58e2b7e4ff688fc1130f8d8909ea09bc137d668",
-    // obligationAccessStore:
-    //   '0x733e30b7c94d619d78cb8f5bc4bfbb759ced9a531239028caabb2474e5be59c9',
-    obligationAccessStore: "0x48b472d68ca910c45f7f3b6c26836b6aa6d2569810d94b1b939023da05ae0a23",
-    coins: {
-      cetus: {
-        id: "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b",
-        metaData: "0x4c0dce55eff2db5419bbd2d239d1aa22b4a400c01bbb648b058a9883989025da",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef",
-            feedObject: "0x24c0247fb22457a719efac7f670cdc79be321b521460bd6bd2ccfa9f80713b14"
-          }
-        }
-      },
-      wapt: {
-        id: "0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37",
-        metaData: "0xc969c5251f372c0f34c32759f1d315cf1ea0ee5e4454b52aea08778eacfdd0a8",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5",
-            feedObject: "0x7c5b7837c44a69b469325463ac0673ac1aa8435ff44ddb4191c9ae380463647f"
-          }
-        }
-      },
-      wsol: {
-        id: "0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8",
-        metaData: "0x4d2c39082b4477e3e79dc4562d939147ab90c42fc5f3e4acf03b94383cd69b6e",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
-            feedObject: "0x9d0d275efbd37d8a8855f6f2c761fa5983293dd8ce202ee5196626de8fcd4469"
-          }
-        }
-      },
-      wbtc: {
-        id: "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881",
-        metaData: "0x5d3c6e60eeff8a05b693b481539e7847dfe33013e7070cdcb387f5c0cac05dfd",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43",
-            feedObject: "0x9a62b4863bdeaabdc9500fce769cf7e72d5585eeb28a6d26e4cafadc13f76ab2"
-          }
-        }
-      },
-      weth: {
-        id: "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5",
-        metaData: "0x8900e4ceede3363bef086d6b50ca89d816d0e90bf6bc46efefe1f8455e08f50f",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
-            feedObject: "0x9193fd47f9a0ab99b6e365a464c8a9ae30e6150fc37ed2a89c1586631f6fc4ab"
-          }
-        }
-      },
-      wusdc: {
-        id: "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf",
-        metaData: "0x4fbf84f3029bd0c0b77164b587963be957f853eccf834a67bb9ecba6ec80f189",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
-            feedObject: "0x5dec622733a204ca27f5a90d8c2fad453cc6665186fd5dff13a83d0b6c9027ab"
-          }
-        }
-      },
-      wusdt: {
-        id: "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c",
-        metaData: "0xfb0e3eb97dd158a5ae979dddfa24348063843c5b20eb8381dd5fa7c93699e45c",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b",
-            feedObject: "0x985e3db9f93f76ee8bace7c3dd5cc676a096accd5d9e09e9ae0fb6e492b14572"
-          }
-        }
-      },
-      sui: {
-        id: "0x0000000000000000000000000000000000000000000000000000000000000002",
-        metaData: "0x9258181f5ceac8dbffb7030890243caed69a9599d2886d957a9cb7656af3bdb3",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "0xbca474133638352ba83ccf7b5c931d50f764b09550e16612c9f70f1e21f3f594",
-          pyth: {
-            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
-          }
-        }
-      },
-      afsui: {
-        id: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc",
-        metaData: "0x2f9217f533e51334873a39b8026a4aa6919497b47f49d0986a4f1aec66f8a34d",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
-          }
-        }
-      },
-      hasui: {
-        id: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d",
-        metaData: "0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
-          }
-        }
-      },
-      vsui: {
-        id: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55",
-        metaData: "0xabd84a23467b33854ab25cf862006fd97479f8f6f53e50fe732c43a274d939bd",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-            feedObject: "0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37"
-          }
-        }
-      },
-      sca: {
-        id: "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6",
-        metaData: "0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844",
-        treasury: "",
-        oracle: {
-          supra: "",
-          switchboard: "",
-          pyth: {
-            feed: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
-            feedObject: "0xf6de1d3279a269a597d813cbaca59aa906543ab9a8c64e84a4722f1a20863985"
-          }
-        }
+  }
+  /**
+   * @description Provides cache for getObjects of the SuiKit.
+   * @param objectIds
+   * @returns Promise<SuiObjectData[]>
+   */
+  async queryGetObjects(objectIds, options = {
+    showContent: true
+  }) {
+    if (objectIds.length === 0)
+      return [];
+    return this.queryClient.fetchQuery({
+      queryKey: queryKeys.rpc.getObjects(
+        objectIds,
+        this.walletAddress,
+        options
+      ),
+      queryFn: async () => {
+        return await callWithRateLimit(
+          this.tokenBucket,
+          () => this.suiKit.getObjects(objectIds, options)
+        );
       }
-    },
-    oracles: {
-      xOracle: "0x93d5bf0936b71eb27255941e532fac33b5a5c7759e377b4923af0a1359ad494f",
-      xOracleCap: "0x1edeae568fde99e090dbdec4bcdbd33a15f53a1ce1f87aeef1a560dedf4b4a90",
-      supra: { registry: "", registryCap: "", holder: "" },
-      switchboard: { registry: "", registryCap: "" },
-      pyth: {
-        registry: "0xedc293f9413a5a7a5d53bdba1fd889d0a4030894469228f0acdae4aa3c55a213",
-        registryCap: "0xbcb07141eb1f7e01fbda4130ecf5f5adaeabb77f5d9c32158b7532bcd2197acd",
-        state: "0x1f9310238ee9298fb703c3419030b35b22bb1cc37113e3bb5007c99aec79e5b8",
-        wormhole: "0x5306f64e312b581766351c07af79c72fcb1cd25147157fdc2f8ad76de9a3fb6a",
-        wormholeState: "0xaeab97f96cf9877fee2883315d459552b2b921edc16d7ceac6eab944dd88919c"
+    });
+  }
+  /**
+   * @description Provides cache for getOwnedObjects of the SuiKit.
+   * @param input
+   * @returns Promise<PaginatedObjectsResponse>
+   */
+  async queryGetOwnedObjects(input) {
+    return this.queryClient.fetchQuery({
+      queryKey: queryKeys.rpc.getOwnedObjects(input),
+      queryFn: async () => {
+        return await callWithRateLimit(
+          this.tokenBucket,
+          () => this.client.getOwnedObjects(input)
+        );
       }
-    },
-    packages: {
-      coinDecimalsRegistry: {
-        id: "0xca5a5a62f01c79a104bf4d31669e29daa387f325c241de4edbe30986a9bc8b0d",
-        upgradeCap: "0x34e76a945d29f195bc53ca704fa70877d1cf3a5d7bbfdda1b13e633fff13c0f6"
-      },
-      math: {
-        id: "0xad013d5fde39e15eabda32b3dbdafd67dac32b798ce63237c27a8f73339b9b6f",
-        upgradeCap: "0x3a329598231de02e6135c62284b66005b41cad1d9ab7ca2dc79c08293aba2ec6"
-      },
-      whitelist: {
-        id: "0x1318fdc90319ec9c24df1456d960a447521b0a658316155895014a6e39b5482f",
-        upgradeCap: "0xf5a22aea23db664f7b69855b6a546747f17c1ec4230319cfc17225e462b05761"
-      },
-      x: {
-        id: "0x779b5c547976899f5474f3a5bc0db36ddf4697ad7e5a901db0415c2281d28162",
-        upgradeCap: "0x3f203f6fff6a69d151e4f1cd931f22b68c489ef2759765662fc7baf673943c9e"
-      },
-      protocol: {
-        id: "0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1",
-        upgradeCap: "0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a"
-      },
-      // protocol: {
-      //   id: '0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e',
-      //   upgradeCap:
-      //     '0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a',
-      // },
-      protocolWhitelist: {
-        id: "0x4c262d9343dac53ecb28f482a2a3f62c73d0ebac5b5f03d57383d56ff219acdf",
-        upgradeCap: "0x4a5e88a75039b00988f633f811f58117f31b8627a46bf822aa114d9010049449"
-      },
-      // query: {
-      //   id: '0xb8d603a39114a5efef3dd0bf84df0bed1be1fbd39b78b7dd6e8a61ccc5e6006f',
-      //   upgradeCap:
-      //     '0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f',
-      // },
-      query: {
-        id: "0xe4f9d62d17746d5b9dbf0d5557747430021a71575780b515161210cdba0a4c1c",
-        upgradeCap: "0x0d535c35f608b9b01b7ccce11acf43b1dd80c1b72bf8b541744a6e28e8d2745f"
-      },
-      supra: { id: "", upgradeCap: "" },
-      pyth: {
-        id: "0x910f30cbc7f601f75a5141a01265cd47c62d468707c5e1aecb32a18f448cb25a",
-        upgradeCap: "0xdf0ffbae1ea5bb25fbca5efba433dcf00c7cced65679af2f04728901275c6157"
-      },
-      switchboard: { id: "", upgradeCap: "" },
-      xOracle: {
-        id: "0x1478a432123e4b3d61878b629f2c692969fdb375644f1251cd278a4b1e7d7cd6",
-        upgradeCap: "0x0f928a6b2e26b73330fecaf9b44acfc9800a4a9794d6415c2a3153bc70e3c1f0"
-      },
-      testCoin: { id: "", upgradeCap: "" }
-    }
-  },
-  spool: {
-    // id: '0x7c4fdabe81c31b19a45d1e572a52a539997a90903fbb5bfab71480abe0fa62c3',
-    id: "0x1742655fe5872dfa6456673f9e38612a4965e6979e6cd7696a7f1225f28bae21",
-    adminCap: "0xdd8a047cbbf802bfcde5288b8ef1910965d789cc614da11d39af05fca0bd020a",
-    // object:
-    //   '0xe87f1b2d498106a2c61421cec75b7b5c5e348512b0dc263949a0e7a3c256571a',
-    object: "0x1742655fe5872dfa6456673f9e38612a4965e6979e6cd7696a7f1225f28bae21",
-    pools: {
-      sweth: {
-        id: "0xeec40beccb07c575bebd842eeaabb835f77cd3dab73add433477e57f583a6787",
-        rewardPoolId: "0x957de68a18d87817de8309b30c1ec269a4d87ae513abbeed86b5619cb9ce1077"
-      },
-      ssui: {
-        // id: '0x4f0ba970d3c11db05c8f40c64a15b6a33322db3702d634ced6536960ab6f3ee4',
-        id: "0xb9617f83c06ebdeac0a8834782b1015e1cc7ea23739e30c132c4bfb95c37a579",
-        rewardPoolId: (
-          // '0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9',
-          "0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a"
-        )
-      },
-      swusdc: {
-        // id: '0x4ace6648ddc64e646ba47a957c562c32c9599b3bba8f5ac1aadb2ae23a2f8ca0',
-        id: "0xf1b383b9cf2e9f515fc69567df1053098f273849d09cd84b0278a773429bd2b2",
-        rewardPoolId: (
-          // '0xf4268cc9b9413b9bfe09e8966b8de650494c9e5784bf0930759cfef4904daff8',
-          "0xc71c53ee6505d928ba15bea4fe4f45d98c9c31eced94b72d00a7827d4b7ba3ff"
-        )
-      },
-      swusdt: {
-        // id: '0xcb328f7ffa7f9342ed85af3fdb2f22919e1a06dfb2f713c04c73543870d7548f',
-        id: "0xb5567dfa5c7fc17a249e959732664c50713dd8c23db1a11376b27df800c17418",
-        rewardPoolId: (
-          // '0x2c9f934d67a5baa586ceec2cc24163a2f049a6af3d5ba36b84d8ac40f25c4080',
-          "0x60768b0687ff0235e376a039709a683e4c436098785e473b67b32dbab47b69ab"
-        )
-      },
-      scetus: {
-        id: "0xac1bb13bf4472a637c18c2415fb0e3c1227ea2bcf35242e50563c98215bd298e",
-        rewardPoolId: "0x6835c1224126a45086fc6406adc249e3f30df18d779ca4f4e570e38716a17f3f"
-      },
-      safsui: {
-        // id: '0xeedf438abcaa6ce4d9625ffca110920592d5867e4c5637d84ad9f466c4feb800',
-        id: "0xc568bb4c991258e839aa54802ecda04fcd9838c826bc3b42b40af81b23c458c8",
-        rewardPoolId: (
-          // '0x89255a2f86ed7fbfef35ab8b7be48cc7667015975be2685dd9a55a9a64baf76e',
-          "0x389a3cbeda742b918941bb24fd00e077bad3367484394d6234f8209b9a6aa03d"
-        )
-      },
-      shasui: {
-        // id: '0xa6148bc1b623e936d39a952ceb5bea79e8b37228a8f595067bf1852efd3c34aa',
-        id: "0x93f3f4499bf89f2d05ddc1f8b15f51701a7c6c4d0ac0b9c3bc99462cbbd8e321",
-        rewardPoolId: (
-          // '0x6f3563644d3e2ef13176dbf9d865bd93479df60ccbe07b7e66db57f6309f5a66',
-          "0x94cee1be7f5ff34193f3aabef0b14142cb28af4d905fe487a9a7d85a15edb6aa"
-        )
-      },
-      svsui: {
-        // id: '0x69ce8e537e750a95381e6040794afa5ab1758353a1a2e1de7760391b01f91670',
-        id: "0xa970e9087f80cb59e9299b8e7af7175d977ad6c9af0322aa4440e138fbd7ae00",
-        rewardPoolId: (
-          // '0xbca914adce058ad0902c7f3cfcd698392a475f00dcfdc3f76001d0370b98777a',
-          "0x38eee9699c4fc132a6623e54b865f047df4fc6eb83af807300f44e8f4b235ff0"
-        )
+    });
+  }
+  async queryGetDynamicFields(input) {
+    return this.queryClient.fetchQuery({
+      queryKey: queryKeys.rpc.getDynamicFields(input),
+      queryFn: async () => {
+        return await callWithRateLimit(
+          this.tokenBucket,
+          () => this.client.getDynamicFields(input)
+        );
       }
-    },
-    config: ""
-  },
-  borrowIncentive: {
-    id: "0x6152f696fc3a658f33c4b891764731a59153125ffedfa8bff7167c42823f58a9",
-    adminCap: "0xc486afa253646f4d381e81d7f1df8aa4723b845a6bb356f69bad635ffefffe2c",
-    object: "0x002875153e09f8145ab63527bc85c00f2bd102e12f9573c47f8cdf1a1cb62934",
-    query: "0x529edc54a3dce2207703ceebbccb0ac14133f7825c1f528775ba0d85a4063489",
-    incentivePools: "0x6547e143d406b5ccd5f46aae482497de279cc1a68c406f701df70a05f9212ab4",
-    incentiveAccounts: "0xc4701fdbc1c92f9a636d334d66012b3027659e9fb8aff27279a82edfb6b77d02",
-    config: "0xdf5d04b4691cc67e82fd4db8394d89ff44823a9de29716c924f74bb4f11cc1f7"
-  },
-  referral: {
-    id: "0xa3654ebb63eb06c0f4ff52f8aa6512df9f164f7772bdf15dac3709bd3798dda9",
-    object: "0x5658d4bf5ddcba27e4337b4262108b3ad1716643cac8c2054ac341538adc72ec",
-    adminCap: "0xc5dc06b9074291259f2cac460c940012c781c4430e42125c541cc43101c3bcbd",
-    referralBindings: "0xf63299d58789d99de94092b9011323466e55ca0c1ea1a7a3786a589af46e1c09",
-    bindingTableId: "0x1c8202b17267ec8d6cf97ca013615354181a04f179570e42601ff2dae19294b1",
-    referralRevenuePool: "0x6abd852caf90769c1b185cdf636d841673fa95528f0550f018b8a138bd283c07",
-    revenueTableId: "0x595baa3654c297bff84ab7786a2d250f019cefc66e8df8e89fd9d41e02bd30dd",
-    referralTiers: "0x962cb903d8d7346190c5204785ccbb91b61086aa764f674c8145df82335cf83e",
-    tiersTableId: "0xeac755a7a8b7798530905ac79e8c114f19d0f130f6eab012954f08faac29c75d",
-    // authorizedWitnessList:
-    //   '0xf21b0ed043c9bb70842c0129159f4943dbcc3c9ef2f2f808af65f8be25cfd20e',
-    authorizedWitnessList: "0x9d6223dc52015b8a3986a573590ef2af8f1b8f3e4685513888c052f001b87e7f",
-    version: "0x1bd4b7285f72e11c316b828c7c47b3f4da18dcec9f9b3dba6d8629cbb6f93e5e"
-  },
-  vesca: {
-    id: "0xb15b6e0cdd85afb5028bea851dd249405e734d800a259147bbc24980629723a4",
-    object: "0xb15b6e0cdd85afb5028bea851dd249405e734d800a259147bbc24980629723a4",
-    adminCap: "0x8ffa76135c5b85c5fbd73a6448a4a733d826cb63a267ab817656acb77c72d4a5",
-    tableId: "0xe3153b2bf124be0b86cb8bd468346a861efd0da52fc42197b54d2f616488a311",
-    table: "0x611cb8d9d4d90867467b5ebdf4cc447a0047ed5b01334a28a29fcfe733e3d609",
-    treasury: "0xe8c112c09b88158dc6c8e23d1fbae5b3c7136cdee54b7dafc08e65db28c4a5bc",
-    config: "0xe0a2ff281e73c1d53cfa85807080f87e833e4f1a7f93dcf8800b3865269a76b9"
-  },
-  loyaltyProgram: {
-    id: "0xd17bcf8b5a59652c36225d478564a8593ae0ed7d650bcacdda1d6fe179127907",
-    object: "0xd17bcf8b5a59652c36225d478564a8593ae0ed7d650bcacdda1d6fe179127907",
-    rewardPool: "0xf9c090492ef476bd542109d0913ffe871cbfa28578b7114eca2a8c0e5671786f",
-    userRewardTableId: "0x748a80395849ed37db1b0e14f2ab5d1d96458d2359ab3a84eb079d0f4ac7cf2e"
-  },
-  scoin: {
-    id: "0xad2ca2aa5089df94bb2d444d5eb3520378c2f2dfb3a0bd2a2c994145ac4b0a53",
-    coins: {
-      ssui: {
-        coinType: "0xfac769100bccc0caebcf4f4e2d00ac2f8883f07f724be28940df90605f5e7e9a::scallop_sui::SCALLOP_SUI",
-        treasury: "0x9cb4551b36c17d37e19d700147fa819ea1c487ff8bcf18374de2cceb2e9d4845"
-      },
-      scetus: {
-        coinType: "0x8b71e6d323ed78515af2bead13bf3d0da1562ba4a99234eb7c4f14fd39ef0427::scallop_cetus::SCALLOP_CETUS",
-        treasury: "0xd786f4b2d26278cc7911a3445b1b085eab60f269ef9dbb6b87e803d52f155003"
-      },
-      ssca: {
-        coinType: "0x0a9d3c6c9af9f6e8def82921541bcbd17f73ed31bed3adcb684f2a4c267e42f0::scallop_sca::SCALLOP_SCA",
-        treasury: "0xe818636d1d6c46d6ea1a2dce9d94696d7cbc18ce27451b603eeaa47aba8d75e0"
-      },
-      swusdc: {
-        coinType: "0xaedc3ab75db8680b81a755015fa90124d217be93457b893c05bac033817defaf::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
-        treasury: "0xfc6971648f867f7fd6928d1b873af71577e2eaf2c7543ef8bc82c431d833ae78"
-      },
-      swusdt: {
-        coinType: "0xbf02fc87ddc104b342ad8414c85ceadf5b0c823c055a06fb0ed776272c01a52a::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT",
-        treasury: "0xb9593e2c3a0ba796ee815012b75ae46468ea78cda0188b9ac6816efe65503521"
-      },
-      sweth: {
-        coinType: "0x27d54f43e3eda701be56b82e5756e41c84467cd202f5cf713d5f9e45a9f1b6bc::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH",
-        treasury: "0x032b4c8fac94c038dbe986f7587e9b1e4ef580b5ee06d2ef249d85459b7ef05d"
-      },
-      safsui: {
-        coinType: "0xb75b46d975d8d80670b53a6bee90baaa8ce2e0b7d397f079447d641eef6b44ad::scallop_af_sui::SCALLOP_AF_SUI",
-        treasury: "0x21450ef0570ef3d224ffa3b873ab802e439ece7b93cc7efad10ae0c1e3b3fcfe"
-      },
-      shasui: {
-        coinType: "0xd973a723874e2c7cde196602a79155a1343a933f8cf87d9b1bb7408bc1acbc58::scallop_ha_sui::SCALLOP_HA_SUI",
-        treasury: "0xf822fc1402207e47d2e3ba8ff6e1e594bf1de777dc5ebd2744619cd2726e3b0d"
-      },
-      svsui: {
-        coinType: "0x97023a317320c4498cc4cd239dd02fd30c28246e5e8f81325d63f2bd8d70f6b3::scallop_v_sui::SCALLOP_V_SUI",
-        treasury: "0x327114f0bf3559d7e2de10282147ed76a236c7c6775029165c4db09a6062ead6\u0192"
+    });
+  }
+  async queryGetDynamicFieldObject(input) {
+    return this.queryClient.fetchQuery({
+      queryKey: queryKeys.rpc.getDynamicFieldObject(input),
+      queryFn: async () => {
+        return await callWithRateLimit(
+          this.tokenBucket,
+          () => this.client.getDynamicFieldObject(input)
+        );
+      }
+    });
+  }
+  async queryGetAllCoinBalances(owner) {
+    return this.queryClient.fetchQuery({
+      queryKey: queryKeys.rpc.getAllCoinBalances(owner),
+      queryFn: async () => {
+        const allBalances = await callWithRateLimit(
+          this.tokenBucket,
+          () => this.client.getAllBalances({ owner })
+        );
+        if (!allBalances)
+          return {};
+        const balances = allBalances.reduce(
+          (acc, coinBalance) => {
+            if (coinBalance.totalBalance !== "0") {
+              acc[normalizeStructTag2(coinBalance.coinType)] = coinBalance.totalBalance;
+            }
+            return acc;
+          },
+          {}
+        );
+        return balances;
       }
-    }
+    });
+  }
+  async queryGetCoinBalance(input) {
+    if (!input.coinType)
+      return "0";
+    return (await this.queryGetAllCoinBalances(input.owner) || {})[normalizeStructTag2(input.coinType)] ?? "0";
   }
 };
 
 // src/models/scallopAddress.ts
+import axios from "axios";
 var EMPTY_ADDRESSES = {
   core: {
     version: "",
@@ -2312,6 +2353,89 @@ var getSupplyLimit = async (utils, poolName) => {
   return parsedData.data.fields.value;
 };
 
+// src/queries/isolatedAsset.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 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();
@@ -2396,8 +2520,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
     };
@@ -2436,6 +2560,7 @@ var queryMarket = async (query, indexer = false) => {
       liquidationDiscount: parsedMarketCollateralData.liquidationDiscount,
       liquidationPanelty: parsedMarketCollateralData.liquidationPanelty,
       liquidationReserveFactor: parsedMarketCollateralData.liquidationReserveFactor,
+      isIsolated: await isIsolatedAsset(query.utils, collateralCoinName),
       ...calculatedMarketCollateralData
     };
   }
@@ -2483,79 +2608,73 @@ 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);
+      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)
-        return void 0;
-      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)
-        return void 0;
-      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)
-        return void 0;
-      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: {
@@ -2567,16 +2686,11 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
           }
         }
       });
-      if (!borrowFeeDynamicFieldObjectResponse)
-        return void 0;
-      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,
@@ -2590,7 +2704,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,
@@ -2606,7 +2720,7 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
     const maxSupplyCoin = BigNumber2(
       await getSupplyLimit(query.utils, poolCoinName) ?? "0"
     ).shiftedBy(-coinDecimal).toNumber();
-    marketPool = {
+    return {
       coinName: poolCoinName,
       symbol: query.utils.parseSymbol(poolCoinName),
       coinType: query.utils.parseCoinType(poolCoinName),
@@ -2625,12 +2739,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,
+      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");
@@ -2679,85 +2794,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
@@ -2986,7 +3092,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");
+    throw new Error(`Failed to fetch marketPool for ${marketCoinName}`);
   }
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
   const rewardPoolId = query.address.get(
@@ -3714,12 +3820,8 @@ var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
 };
 var getObligationAccount = async (query, obligationId, ownerAddress, indexer = false, market, coinPrices, coinAmounts) => {
   market = market || await query.queryMarket(indexer);
-  const collateralAssetCoinNames = [
-    .../* @__PURE__ */ new Set([
-      ...Object.values(market.collaterals).map(
-        (collateral) => collateral.coinName
-      )
-    ])
+  const poolAssetCoinNames = [
+    .../* @__PURE__ */ new Set([...Object.values(market.pools).map((pool) => pool.coinName)])
   ];
   const obligationQuery = await query.queryObligation(obligationId);
   const borrowIncentivePools = await query.getBorrowIncentivePools(
@@ -3727,8 +3829,9 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     indexer
   );
   const borrowIncentiveAccounts = await query.getBorrowIncentiveAccounts(obligationId);
-  coinPrices = coinPrices || await query.utils.getCoinPrices(collateralAssetCoinNames);
-  coinAmounts = coinAmounts || await query.getCoinAmounts(collateralAssetCoinNames, ownerAddress);
+  coinPrices = coinPrices || await query.utils.getCoinPrices(poolAssetCoinNames);
+  coinAmounts = coinAmounts || await query.getCoinAmounts(poolAssetCoinNames, ownerAddress);
+  console.log(coinPrices);
   const collaterals = {};
   const debts = {};
   const borrowIncentives = {};
@@ -3740,7 +3843,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   let totalRewardedPools = 0;
   let totalBorrowedValue = BigNumber4(0);
   let totalBorrowedValueWithWeight = BigNumber4(0);
-  for (const assetCoinName of collateralAssetCoinNames) {
+  for (const assetCoinName of poolAssetCoinNames) {
     const collateral = obligationQuery?.collaterals.find((collateral2) => {
       const collateralCoinName = query.utils.parseCoinNameFromType(
         collateral2.type.name
@@ -4045,7 +4148,7 @@ var getTotalValueLocked = async (query, indexer = false) => {
 import BigNumber5 from "bignumber.js";
 import { SUI_CLOCK_OBJECT_ID, SuiTxBlock as SuiTxBlock2 } from "@scallop-io/sui-kit";
 import { bcs } from "@mysten/sui/bcs";
-import { z as zod2 } from "zod";
+import { z as zod3 } from "zod";
 import assert from "assert";
 var getVescaKeys = async (utils, ownerAddress) => {
   const owner = ownerAddress || utils.suiKit.currentAddress();
@@ -4094,10 +4197,10 @@ var getVeScas = async ({
   }
   return result;
 };
-var SuiObjectRefZod = zod2.object({
-  objectId: zod2.string(),
-  digest: zod2.string(),
-  version: zod2.string()
+var SuiObjectRefZod = zod3.object({
+  objectId: zod3.string(),
+  digest: zod3.string(),
+  version: zod3.string()
 });
 var getVeSca = async (utils, veScaKey, ownerAddress) => {
   const tableId = utils.address.get(`vesca.tableId`);
@@ -4231,16 +4334,16 @@ var queryVeScaKeyIdFromReferralBindings = async (address, refereeAddress) => {
 
 // src/queries/loyaltyProgramQuery.ts
 import BigNumber6 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: BigNumber6(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) => BigNumber6(value.value).shiftedBy(-9).toNumber());
 var getLoyaltyProgramInformations = async (query, veScaKey) => {
   const rewardPool = query.address.get("loyaltyProgram.rewardPool");
@@ -4351,10 +4454,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();
     }
   }
   /**
@@ -4654,30 +4757,38 @@ var ScallopUtils = class {
             const priceId = this.address.get(
               `core.coins.${coinName}.oracle.pyth.feed`
             );
-            acc[coinName] = priceId;
+            if (priceId) {
+              acc[coinName] = priceId;
+            }
             return acc;
           },
           {}
         );
         await Promise.allSettled(
-          Object.entries(priceIds).map(async ([coinName, priceId]) => {
+          Object.entries(priceIds).filter(([_, priceId]) => !!priceId).map(async ([coinName, priceId]) => {
             const pythConnection = new SuiPriceServiceConnection(endpoint);
             try {
               const feed = await this.cache.queryClient.fetchQuery({
-                queryKey: queryKeys.oracle.getPythLatestPriceFeed(priceId),
+                queryKey: queryKeys.oracle.getPythLatestPriceFeed(
+                  priceId,
+                  endpoint
+                ),
                 queryFn: async () => {
                   return await pythConnection.getLatestPriceFeeds([priceId]) ?? [];
                 }
               });
               if (feed[0]) {
-                const data = parseDataFromPythPriceFeed(feed[0], this.address);
+                const data = parseDataFromPythPriceFeed(
+                  feed[0],
+                  this.address
+                );
                 this._priceMap.set(coinName, {
                   price: data.price,
                   publishTime: data.publishTime
                 });
                 coinPrices[coinName] = data.price;
+                failedRequests.delete(coinName);
               }
-              failedRequests.delete(coinName);
             } catch (e) {
               console.warn(
                 `Failed to get price ${coinName} feeds with endpoint ${endpoint}: ${e}`
@@ -6634,88 +6745,6 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
 
 // src/models/scallopQuery.ts
 import { normalizeSuiAddress } from "@mysten/sui/utils";
-
-// src/queries/isolatedAsset.ts
-import { z as zod4 } from "zod";
-var isolatedAssetZod = zod4.object({
-  dataType: zod4.string(),
-  type: zod4.string(),
-  hasPublicTransfer: zod4.boolean(),
-  fields: zod4.object({
-    id: zod4.object({
-      id: zod4.string()
-    }),
-    name: zod4.object({
-      type: zod4.string()
-    }),
-    value: zod4.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;
@@ -6785,11 +6814,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 ==================== */
@@ -7297,10 +7327,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);
@@ -8214,6 +8244,7 @@ export {
   ScallopIndexer,
   ScallopQuery,
   ScallopUtils,
+  TEST_ADDRESSES,
   UNLOCK_ROUND_DURATION,
   USE_TEST_ADDRESS,
   assetCoins,