@scallop-io/sui-scallop-sdk 2.3.10 → 2.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.3.10",
+  "version": "2.3.12",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/oracles/index.ts

@@ -34,17 +34,21 @@ export const updateOracles = async (
   const useOnChainXOracleList =
     options?.useOnChainXOracleList ?? builder.useOnChainXOracleList;
   const sponsoredFeeds = new Set(
-    options?.sponsoredFeeds ?? builder.sponsoredFeeds
+    (options?.sponsoredFeeds ?? builder.sponsoredFeeds).filter((t) =>
+      // Ensure only valid feeds are included.
+      {
+        if (!builder.constants.whitelist.lending.has(t)) {
+          console.error(
+            `Sponsored feed ${t} is not in the whitelist lending assets.`
+          );
+          return false;
+        }
+        return true;
+      }
+    )
   );
   const isSponsoredTx = options?.isSponsoredTx ?? false;
 
-  // Validate the sponsoredFeeds content.
-  sponsoredFeeds.forEach((feed) => {
-    if (!builder.constants.whitelist.lending.has(feed)) {
-      throw new Error(`${feed} is not valid feed`);
-    }
-  });
-
   const xOracleList = useOnChainXOracleList
     ? await builder.query.getAssetOracles()
     : X_ORACLE_LIST;

package/src/constants/testAddress.ts

@@ -3,19 +3,19 @@ import { AddressesInterface } from 'src/types';
 export const TEST_ADDRESSES: AddressesInterface = {
   core: {
     version:
-      '0xee15d07800e2ad4852505c57cd86afea774af02c17388f8bd907de75f915b4f4',
+      '0x72bc09c4ce413d76d07f6e712413aebbe3ce3747eadfbc2331fbdb1dbde2d43a',
     versionCap:
       '0x590a4011cb649b3878f3ea14b3a78674642a9548d79b7e091ef679574b158a07',
     object:
-      '0xb03fa00e2d9f17d78a9d48bd94d8852abec68c19d55e819096b1e062e69bfad1',
+      '0xd971609b7feb6230585831e7aeb3c121fb21b9431337a30fc99185eb459a05ee',
     market:
-      '0xa7f41efe3b551c20ad6d6cea6ccd0fd68d2e2eaaacdca5e62d956209f6a51312',
+      '0xed80ed898df1e0b7a14b78c92527b47ef88591d5722ded16050d7e101687bb20',
     adminCap:
       '0x09689d018e71c337d9db6d67cbca06b74ed92196103624028ccc3ecea411777c',
     coinDecimalsRegistry:
       '0x200abe9bf19751cc566ae35aa58e2b7e4ff688fc1130f8d8909ea09bc137d668',
     obligationAccessStore:
-      '0xb7d7e1464936fbdcdd4913308b40335e662401029635289bdb317c7dde9d6c68',
+      '0x861bfea382072bdd060fa3a33f65387a71d5a75dbb0fedd92aa62f8a048b0ff9',
     coins: {
       usdc: {
         id: '0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7',
@@ -114,10 +114,29 @@ export const TEST_ADDRESSES: AddressesInterface = {
           },
         },
       },
+      hasui: {
+        id: '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d',
+        metaData:
+          '0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24',
+        treasury: '',
+        coinType:
+          '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI',
+        symbol: 'haSUI',
+        decimals: 9,
+        oracle: {
+          supra: '',
+          switchboard: '',
+          pyth: {
+            feed: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+            feedObject:
+              '0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37',
+          },
+        },
+      },
     },
     oracles: {
       xOracle:
-        '0x0c09daac413e834f2fe69601c41e836022fa9a185df6b56a80f6bcd8a3ecb8a2',
+        '0xb112727f380857fd711f89b450a3b22dc4cc55f82b2212b001f2461d6257b0b9',
       xOracleCap:
         '0x1edeae568fde99e090dbdec4bcdbd33a15f53a1ce1f87aeef1a560dedf4b4a90',
       primaryPriceUpdatePolicyObject:
@@ -147,7 +166,7 @@ export const TEST_ADDRESSES: AddressesInterface = {
       },
       pyth: {
         registry:
-          '0xdcf813893649521abd27816ba8d946b0cb7fc98d776cc9adcecba54688ccc109',
+          '0xbc477946f0c8c9a09d7a9bab57eb01f0320c1d1f7f9aeee2503d0a71f50379c6',
         registryCap:
           '0xe4995aaca4e70d4203790fbd22332107131e88b92b81bc976e6fc3a7d5005efd',
         state:
@@ -180,7 +199,7 @@ export const TEST_ADDRESSES: AddressesInterface = {
           '0x3f203f6fff6a69d151e4f1cd931f22b68c489ef2759765662fc7baf673943c9e',
       },
       protocol: {
-        id: '0xb03fa00e2d9f17d78a9d48bd94d8852abec68c19d55e819096b1e062e69bfad1',
+        id: '0xd971609b7feb6230585831e7aeb3c121fb21b9431337a30fc99185eb459a05ee',
         upgradeCap:
           '0x38527d154618d1fd5a644b90717fe07cf0e9f26b46b63e9568e611a3f86d5c1a',
       },
@@ -190,15 +209,15 @@ export const TEST_ADDRESSES: AddressesInterface = {
           '0x4a5e88a75039b00988f633f811f58117f31b8627a46bf822aa114d9010049449',
       },
       query: {
-        id: '0x3a0dbce719fc56a96bf8e8dd53cd57eb9c313642a88d99b86f51208762eba258',
+        id: '0x15f353b593733a6eeb37f67a8a0f6e6b863ef5e813df39cb263f5f40c29a2195',
         upgradeCap:
           '0x14220f035f4cfc2ce442c30703fb44d24f00846eb7077907a231a56051a1d9b2',
       },
       supra: { id: '', object: '', upgradeCap: '' },
       pyth: {
-        id: '0xe622909f9252d4ef1737c41ea430ef44203d8f5dc8e01e1b3950a31405bc54eb',
+        id: '0xde99692957a424f4701e55b77b014cf24612ded4608225090867d1d2990eaea9',
         object:
-          '0xe622909f9252d4ef1737c41ea430ef44203d8f5dc8e01e1b3950a31405bc54eb',
+          '0xde99692957a424f4701e55b77b014cf24612ded4608225090867d1d2990eaea9',
         upgradeCap:
           '0xb1f167889643ff766df31745b6e93b92462d8165b0a4f1b095499e15180370f7',
       },
@@ -209,9 +228,9 @@ export const TEST_ADDRESSES: AddressesInterface = {
         upgradeCap: '',
       },
       xOracle: {
-        id: '0xe7511600c924f1d0ac4b3fa5de3ae26b8845545902b015dc5fc7894307365d7b',
+        id: '0xe2785270b2e6179e68204dd5901a43f9a0e1c566baf656cad705d45a419c4d3a',
         object:
-          '0xe7511600c924f1d0ac4b3fa5de3ae26b8845545902b015dc5fc7894307365d7b',
+          '0xe2785270b2e6179e68204dd5901a43f9a0e1c566baf656cad705d45a419c4d3a',
         upgradeCap:
           '0x0f928a6b2e26b73330fecaf9b44acfc9800a4a9794d6415c2a3153bc70e3c1f0',
       },
@@ -319,15 +338,16 @@ export const TEST_ADDRESSES: AddressesInterface = {
       '0x85d3e557d9bbed617b9cbc09982a0c9a6f6f4fc9ecce49b59124206c409c4774',
   },
   scoin: {
-    id: '0x826a4934bee9487e558eed603cf42f30cdc4321d6f31083930791b95f903b9f9',
+    id: '0xde8fe7f73fcaff729de640b1a67afff5028019aefa67c151250a8d47db37aa1c',
     coins: {
       ssui: {
         coinType:
-          '0x88618204de2dfdc2597681a8441ee726b0dc13494c41e319c3264eb7b35fea90::scallop_sui::SCALLOP_SUI',
-        metaData: '',
+          '0x9d81d8a20e9ffc462839c23346edb69604f7b4deffc9253262e1caca473fd3e3::scallop_sui::SCALLOP_SUI',
+        metaData:
+          '0x13d07ec4114e36b6d9b69cab9e4722c4dc76d9f623db9fcb5b26a01cb0a861a4',
         symbol: 'sSUI',
         treasury:
-          '0x03f1d94a40bd9f5d556bacb5c5245732b185572f6a29b36ad8b555d9a8a24f09',
+          '0x8d2cd566acf9f38629bab1e5aba888c85b177432e91cf7f9a204c3f730281059',
       },
       ssca: {
         coinType:
@@ -339,12 +359,12 @@ export const TEST_ADDRESSES: AddressesInterface = {
       },
       susdc: {
         coinType:
-          '0x55ed015f9f006c0c96ad36ebe3b3570d088e8498f52defea48e5634c110e485c::scallop_usdc::SCALLOP_USDC',
+          '0x55588ffc90718301696fd5497a7b6e82c0f86c15d58e41fc9750a24329ee2523::scallop_usdc::SCALLOP_USDC',
         treasury:
-          '0x6ef82ef94472dcb8c2cdeac8df38874024c08570ca165986ba56d1e38fe0c0a3',
+          '0xe028cf6c656e410502c931ed265524d48ff16e000db1f50305b54d8a6c421150',
         symbol: 'sUSDC',
         metaData:
-          '0x763a21eba338e00bc684aaad80491c89eea5f247b59c47df45b17610c9ad58f2',
+          '0x752b2f407601cbbc335c3d1623e0f5a2b8cb254bc35847c4586bd7cd8bcac7f8',
       },
       sdeep: {
         coinType:
@@ -362,48 +382,17 @@ export const TEST_ADDRESSES: AddressesInterface = {
         treasury:
           '0x858c492d51425b922c040c1a389e185b3b00d565e7d72ead1a81dc733104660d',
       },
+      shasui: {
+        coinType:
+          '0xf2f52fede69abafa2439665bb5bebc8e60fe0f8c5d9d240dd143b5f74f73c867::scallop_ha_sui::SCALLOP_HA_SUI',
+        metaData:
+          '0xb174a5642133c5a7409187c80e2ef090cc0169147a1dcedce8a0f208397578d3',
+        symbol: 'shaSUI',
+        treasury:
+          '0x33b0013a52205955a0af9ceaa4d3f4b7cf4bd8179fe14ac2de29d8f4d656eb0a',
+      },
     },
   },
-  // scoin: {
-  //   id: '0x826a4934bee9487e558eed603cf42f30cdc4321d6f31083930791b95f903b9f9',
-  //   coins: {
-  //     ssui: {
-  //       coinType:
-  //         '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
-  //       metaData: '0xac724644f481f4870ecdc29b9549aa8ea5180f10827c0d97b493f9f65a91455d',
-  //       symbol: 'sSUI',
-  //       treasury: '0x5c1678c8261ac9eec024d4d630006a9f55c80dc0b1aa38a003fcb1d425818c6b',
-  //     },
-  //     ssca: {
-  //       coinType:
-  //         '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
-  //       treasury: '0xe04bfc95e00252bd654ee13c08edef9ac5e4b6ae4074e8390db39e9a0109c529',
-  //       metaData: '0x27e3877491b308dfac46fb3d9f7dfa6a1e8b7dc3c374e92ecda7976055746964',
-  //       symbol: 'sSCA',
-  //     },
-  //     susdc: {
-  //       coinType:
-  //         '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
-  //       treasury: '0xbe6b63021f3d82e0e7e977cdd718ed7c019cf2eba374b7b546220402452f938e',
-  //       metaData: '0x763a21eba338e00bc684aaad80491c89eea5f247b59c47df45b17610c9ad58f2',
-  //       symbol: 'sUSDC',
-  //     },
-  //     sdeep: {
-  //       coinType:
-  //         '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
-  //       treasury: '0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88',
-  //       metaData: '0x2443014594a500a9119e11c6c6a86e865834f496c4614280ce8cace33c0b072e',
-  //       symbol: 'sDEEP',
-  //     },
-  //     sfud: {
-  //       coinType:
-  //         '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
-  //       treasury: '0xf25212f11d182decff7a86165699a73e3d5787aced203ca539f43cfbc10db867',
-  //       metaData: '0x4e03390de36b8c84e0a8297d3d0d08a8a34bed93787e37fcb26bfc26df33226c',
-  //       symbol: 'sFUD',
-  //     },
-  //   },
-  // },
 };
 
 export const WHITELIST = {
@@ -421,11 +410,11 @@ export const WHITELIST = {
     // 'wsol',
     // 'cetus',
     // 'afsui',
-    // 'hasui',
+    'hasui',
     // 'vsui',
-    'sca',
-    'fud',
-    'deep',
+    // 'sca',
+    // 'fud',
+    // 'deep',
     // 'fdusd',
     // 'blub',
     // 'musd',
@@ -447,13 +436,13 @@ export const WHITELIST = {
     // 'wsol',
     // 'cetus',
     // 'afsui',
-    // 'hasui',
+    'hasui',
     // 'vsui',
-    'sca',
+    // 'sca',
     // 'fdusd',
     // 'usdy',
     // 'wal',
-    'deep',
+    // 'deep',
   ]),
   borrowing: new Set([
     'usdc',
@@ -469,11 +458,11 @@ export const WHITELIST = {
     // 'wsol',
     // 'cetus',
     // 'afsui',
-    // 'hasui',
+    'hasui',
     // 'vsui',
-    'sca',
-    'fud',
-    'deep',
+    // 'sca',
+    // 'fud',
+    // 'deep',
     // 'fdusd',
     // 'blub',
     // 'musd',
@@ -515,15 +504,15 @@ export const WHITELIST = {
     // 'swusdc',
     // 'swusdt',
     // 'safsui',
-    // 'shasui',
+    'shasui',
     // 'svsui',
     // 'sweth',
-    'ssca',
+    // 'ssca',
     // 'scetus',
     // 'swsol',
     // 'swbtc',
-    'sdeep',
-    'sfud',
+    // 'sdeep',
+    // 'sfud',
     // 'sfdusd',
     // 'sblub',
     // 'smusd',
@@ -546,15 +535,15 @@ export const POOL_ADDRESSES = {
     coinName: 'usdc',
     symbol: 'USDC',
     lendingPoolAddress:
-      '0x13319d295914b390b22484373f20f822bca10314c34c227ae6e28df3d9aa8e01',
+      '0x9a5bc993b18fb2a27414ae7adc43f343509fd5162f796b025d08ebeca4e02317',
     collateralPoolAddress:
-      '0x2fdcf63682577f6bfdd4296500067543ba9877d5d5e41ebd9e51b97ab071ce69',
+      '0x35275c590b5f754b67ae0da7fbf530d40e90d66076dd7f687e13f7586effba8c',
     borrowDynamic:
-      '0x7fd0660f0102789ad039542165c6cbc2d90ba3c1d9dbd4ac4ae8804d80817542',
+      '0xe7ea2c5a01a7a286d76d135896edbb1ffb199ba100a618beb9c2180c8d547d91',
     interestModel:
-      '0xd4e7b06a79f63706523167f055296db641b0f8ddd6734c05e205f2de0fcefdd0',
+      '0xcde221c16ddbf7d9ea41d6d3dcbff230fc2da9d957a563194c3d9025152ed93b',
     riskModel:
-      '0x19e5993350186f192ffeb2cba0650b04c291390e149c8ac9b324ecf394daaa1a',
+      '0xa15d4c5c56f4afcd604f6db8b1b5c104d91d3ad95a743212ae270375877baa6d',
     borrowFeeKey: '',
     supplyLimitKey:
       '0x4be9ae54ac4d320f4f9c14cae78cb85c8e0e67791dd9bdba6d2db20614a28a24',
@@ -566,15 +555,15 @@ export const POOL_ADDRESSES = {
     spoolReward:
       '0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166',
     sCoinType:
-      '0x55ed015f9f006c0c96ad36ebe3b3570d088e8498f52defea48e5634c110e485c::scallop_usdc::SCALLOP_USDC',
+      '0x55588ffc90718301696fd5497a7b6e82c0f86c15d58e41fc9750a24329ee2523::scallop_usdc::SCALLOP_USDC',
     sCoinTreasury:
-      '0x6ef82ef94472dcb8c2cdeac8df38874024c08570ca165986ba56d1e38fe0c0a3',
+      '0xe028cf6c656e410502c931ed265524d48ff16e000db1f50305b54d8a6c421150',
     sCoinMetadataId:
       '0x763a21eba338e00bc684aaad80491c89eea5f247b59c47df45b17610c9ad58f2',
     sCoinSymbol: 'sUSDC',
     sCoinName: 'susdc',
     coinMetadataId:
-      '0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6',
+      '0x752b2f407601cbbc335c3d1623e0f5a2b8cb254bc35847c4586bd7cd8bcac7f8',
     coinType:
       '0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC',
     spoolName: 'susdc',
@@ -590,15 +579,15 @@ export const POOL_ADDRESSES = {
     coinName: 'sui',
     symbol: 'SUI',
     lendingPoolAddress:
-      '0xeb86ad67543c1ac2c4cbaf178d38a45ab27c2e69d60f0f8badd83f563f012c3c',
+      '0x885330fd03acdcf7d0ba10b6722f91140bc77f6fb62a593d5d025ccd6d160c04',
     collateralPoolAddress:
-      '0xcba7bb07d4d3ce01d81e71d9def680aa8b417347bfd7834aee8fc3b85b61c9a1',
+      '0x1a75bdcb07a64f3a87cff0156c9d470fc9ce0be14ec8093195a27921186afbb8',
     borrowDynamic:
-      '0xd47c2fd3dbb95ed06e5da92f6b99611ba94a36efa6a13d9b33b02519761cc84e',
+      '0xec6749d4fb51841a728e6f0dda1b43047ca76a89690f67c7e496f2c0b6ea67b5',
     interestModel:
-      '0x4742bb49aa49ab4e5d9dfa119cddc027d1b7811ac42ca1ce794818d4a4da68e7',
+      '0x769b1653eb11e85903b0834e0f83d65405e5467a60389b2d86960dc2582c6595',
     riskModel:
-      '0x6dc356e829cfca2d79f0d68a79b5ddd5296ad0c955a38e2fc397485e2b629367',
+      '0xbaf399f7cd7c13e15cf8e5979e4b8baa13513e9068f13c0a0ccdc9e4d3739314',
     borrowFeeKey: '',
     supplyLimitKey:
       '0x0602418e66fb7a73fa997077bd66f248ad5b090d43344a14b9f1db598ecc1d47',
@@ -610,10 +599,11 @@ export const POOL_ADDRESSES = {
     spoolReward:
       '0xc3206071a8d43212efb6e3b5504f2321f8df97ab122b466c0bc7cfdf398dc13a',
     sCoinType:
-      '0x88618204de2dfdc2597681a8441ee726b0dc13494c41e319c3264eb7b35fea90::scallop_sui::SCALLOP_SUI',
+      '0x9d81d8a20e9ffc462839c23346edb69604f7b4deffc9253262e1caca473fd3e3::scallop_sui::SCALLOP_SUI',
     sCoinTreasury:
-      '0x03f1d94a40bd9f5d556bacb5c5245732b185572f6a29b36ad8b555d9a8a24f09',
-    sCoinMetadataId: '',
+      '0x8d2cd566acf9f38629bab1e5aba888c85b177432e91cf7f9a204c3f730281059',
+    sCoinMetadataId:
+      '0x13d07ec4114e36b6d9b69cab9e4722c4dc76d9f623db9fcb5b26a01cb0a861a4',
     sCoinSymbol: 'sSUI',
     sCoinName: 'ssui',
     coinMetadataId:
@@ -749,4 +739,45 @@ export const POOL_ADDRESSES = {
     flashloanFeeObject:
       '0xd54dfb677e9e011e2451375a7a2e318b4f2225c2a0b369bde0afcef8cbb1a863',
   },
+  hasui: {
+    coinName: 'hasui',
+    symbol: 'haSUI',
+    lendingPoolAddress:
+      '0x7e9c2b3105e0999410305dfd2c649ca473a9c04be87c53ce5e4566559f6818ea',
+    collateralPoolAddress:
+      '0x0446c27ce7e6fac2d0b359caad042bd436727b6f498a2efc4ceaa071d9fce4b5',
+    borrowDynamic:
+      '0xa1ba968ebc70685fc5fbdeb5edbd346cbc13223abef556109dc08f26962d3765',
+    interestModel:
+      '0x8440be8ab46d572fefaf0c21a225ebb9e6fe9239112de8de0a2654e6827fd5c7',
+    riskModel:
+      '0xa246e59a3686b63ce4b914c2d1c784cff0ae3288e7b3db5b146925684a6380c0',
+    borrowFeeKey: '',
+    supplyLimitKey: '',
+    borrowLimitKey: '',
+    isolatedAssetKey: '',
+    isIsolated: false,
+    spool: '',
+    spoolReward: '',
+    sCoinType:
+      '0xf2f52fede69abafa2439665bb5bebc8e60fe0f8c5d9d240dd143b5f74f73c867::scallop_ha_sui::SCALLOP_HA_SUI',
+    sCoinTreasury:
+      '0x33b0013a52205955a0af9ceaa4d3f4b7cf4bd8179fe14ac2de29d8f4d656eb0a',
+    sCoinMetadataId:
+      '0xb174a5642133c5a7409187c80e2ef090cc0169147a1dcedce8a0f208397578d3',
+    sCoinSymbol: 'sHASUI',
+    sCoinName: 'shasui',
+    coinMetadataId:
+      '0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24',
+    coinType:
+      '0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI',
+    spoolName: 'shasui',
+    decimals: 9,
+    pythFeed:
+      '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
+    pythFeedObjectId:
+      '0x801dbc2f0053d34734814b2d6df491ce7807a725fe9a01ad74a07e9c51396c37',
+    flashloanFeeObject:
+      '0xb9f505d532de1d6c9f3a8522a2d16f2958b75c0ed939d4f80b96f584a2a8ed5e',
+  },
 };

package/src/models/scallopAddress.ts

@@ -442,7 +442,7 @@ class ScallopAddress {
   public readonly scallopAxios: ScallopAxios;
   private readonly addressMap = new Map<NetworkType, AddressesInterface>();
   private readonly defaultParamValues = {
-    addressId: '67c44a103fe1b8c454eb9699',
+    addressId: '695fcdc084f790c04eb068dc',
     network: 'mainnet' as NetworkType,
   } as const;
 

package/src/models/scallopQuery.ts

@@ -37,8 +37,6 @@ import {
   getOnDemandAggObjectIds,
   getPoolAddresses,
   getPriceUpdatePolicies,
-  getPythPrice,
-  getPythPrices,
   getSCoinAmount,
   getSCoinAmounts,
   getSCoinSwapRate,
@@ -321,7 +319,7 @@ class ScallopQuery implements ScallopQueryInterface {
    * @return Asset coin price.
    */
   async getPriceFromPyth(assetCoinName: string) {
-    return await getPythPrice(this, assetCoinName);
+    return await this.utils.getPythPrice(assetCoinName);
   }
 
   /**
@@ -331,7 +329,7 @@ class ScallopQuery implements ScallopQueryInterface {
    * @return Array of asset coin prices.
    */
   async getPricesFromPyth(assetCoinNames: string[]) {
-    return await getPythPrices(this, assetCoinNames);
+    return await this.utils.getPythPrices(assetCoinNames);
   }
 
   /* ==================== Spool Query Methods ==================== */
@@ -855,8 +853,11 @@ class ScallopQuery implements ScallopQueryInterface {
   /**
    * Check if asset is an isolated asset
    */
-  async isIsolatedAsset(assetCoinName: string) {
-    return isIsolatedAsset(this.utils, assetCoinName);
+  async isIsolatedAsset(
+    assetCoinName: string,
+    useOnChainQuery: boolean = false
+  ) {
+    return isIsolatedAsset(this.utils, assetCoinName, useOnChainQuery);
   }
 
   /**

package/src/models/scallopUtils.ts

@@ -483,13 +483,15 @@ class ScallopUtils implements ScallopUtilsInterface {
     return (
       await Promise.all(
         Object.entries(assetToPriceFeedMapping).map(
-          async ([assetCoinName, priceFeedObject]) => ({
-            coinName: assetCoinName,
-            price: await this.getPythPrice(
-              assetCoinName as string,
-              priceFeedObject
-            ),
-          })
+          async ([coinName, feed]) => {
+            try {
+              const price = await this.getPythPrice(coinName, feed);
+              return { coinName, price };
+            } catch (e) {
+              console.error(e);
+              return { coinName, price: 0 };
+            }
+          }
         )
       )
     ).reduce(

package/src/queries/borrowIncentiveQuery.ts

@@ -31,7 +31,7 @@ import { queryKeys } from 'src/constants';
  * @param address
  * @returns
  */
-export const queryBorrowIncentivePools = async ({
+const queryBorrowIncentivePools = async ({
   address,
   scallopSuiKit,
 }: {
@@ -135,17 +135,19 @@ export const getBorrowIncentivePools = async (
         poolCoinDecimal
       );
 
-      borrowIncentivePoolPoints[coinName as string] = {
-        symbol,
-        coinName: rewardCoinName,
-        coinType: rewardCoinType,
-        coinDecimal,
-        coinPrice: rewardCoinPrice,
-        points: poolPoint.points,
-        distributedPoint: poolPoint.distributedPoint,
-        weightedAmount: poolPoint.weightedAmount,
-        ...calculatedPoolPoint,
-      };
+      if (poolPoint.points > calculatedPoolPoint.accumulatedPoints) {
+        borrowIncentivePoolPoints[coinName as string] = {
+          symbol,
+          coinName: rewardCoinName,
+          coinType: rewardCoinType,
+          coinDecimal,
+          coinPrice: rewardCoinPrice,
+          points: poolPoint.points,
+          distributedPoint: poolPoint.distributedPoint,
+          weightedAmount: poolPoint.weightedAmount,
+          ...calculatedPoolPoint,
+        };
+      }
     }
 
     const stakedAmount = BigNumber(parsedBorrowIncentivePoolData.staked);
@@ -186,13 +188,18 @@ export const queryBorrowIncentiveAccounts = async (
     'borrowIncentive.incentiveAccounts'
   );
   const queryTarget = `${queryPkgId}::incentive_account_query::incentive_account_data`;
+  const [incentiveAccountVersion, obligationDataVersion] = await Promise.all([
+    getSharedObjectData(incentiveAccountsId, utils.scallopSuiKit),
+    getSharedObjectData(obligationId, utils.scallopSuiKit),
+  ]);
+
   const args = [
     txBlock.sharedObjectRef({
-      ...(await getSharedObjectData(incentiveAccountsId, utils.scallopSuiKit)),
+      ...incentiveAccountVersion,
       mutable: true,
     }),
     txBlock.sharedObjectRef({
-      ...(await getSharedObjectData(obligationId, utils.scallopSuiKit)),
+      ...obligationDataVersion,
       mutable: true,
     }),
   ];

package/src/queries/coreQuery.ts

@@ -956,17 +956,23 @@ export const queryObligation = async (
   const market = address.get('core.market');
   const queryTarget = `${packageId}::obligation_query::obligation_data`;
 
+  const [versionData, marketData, obligationData] = await Promise.all([
+    getSharedObjectData(version, scallopSuiKit),
+    getSharedObjectData(market, scallopSuiKit),
+    getSharedObjectData(obligationId, scallopSuiKit),
+  ]);
+
   const args = [
     txBlock.sharedObjectRef({
-      ...(await getSharedObjectData(version, scallopSuiKit)),
+      ...versionData,
       mutable: false,
     }),
     txBlock.sharedObjectRef({
-      ...(await getSharedObjectData(market, scallopSuiKit)),
+      ...marketData,
       mutable: true,
     }),
     txBlock.sharedObjectRef({
-      ...(await getSharedObjectData(obligationId, scallopSuiKit)),
+      ...obligationData,
       mutable: true,
     }),
     {

package/src/queries/isolatedAssetQuery.ts

@@ -81,15 +81,18 @@ export const getIsolatedAssets = async (
 
 /**
  * Check if the coin type is an isolated asset
+ * @param utils ScallopUtils
  * @param coinName coin name
+ * @param useOnChainQuery whether to use on-chain query
  * @returns true if the coin type is an isolated asset
  */
 export const isIsolatedAsset = async (
   utils: ScallopUtils,
-  coinName: string
+  coinName: string,
+  useOnChainQuery?: boolean
 ): Promise<boolean> => {
   const assetInPoolAddresses = utils.constants.poolAddresses[coinName];
-  if (assetInPoolAddresses) {
+  if (assetInPoolAddresses && !useOnChainQuery) {
     return assetInPoolAddresses.isIsolated;
   }