@scallop-io/sui-scallop-sdk 1.4.15-rc.2 → 1.4.15-rc.3

package/dist/models/scallopQuery.d.ts

@@ -388,7 +388,7 @@ export declare class ScallopQuery {
      * @return All obligation accounts information.
      */
     getObligationAccounts(ownerAddress?: string, args?: {
-        indexer: boolean;
+        indexer?: boolean;
     }): Promise<{
         [x: string]: import("../types").ObligationAccount | undefined;
     }>;
@@ -405,7 +405,7 @@ export declare class ScallopQuery {
      */
     getObligationAccount(obligationId: string, ownerAddress?: string, args?: {
         indexer?: boolean;
-    }): Promise<import("../types").ObligationAccount>;
+    }): Promise<import("../types").ObligationAccount | undefined>;
     /**
      * Get total value locked.
      *
@@ -571,5 +571,7 @@ export declare class ScallopQuery {
         supplyLimitKey?: string;
         borrowLimitKey?: string;
         isolatedAssetKey?: string;
+        coinDecimalId?: string;
+        borrowIncentivePoolId?: string;
     }>>>;
 }

package/dist/queries/poolAddressesQuery.d.ts

@@ -13,4 +13,6 @@ export declare const getAllAddresses: (query: ScallopQuery) => Promise<OptionalK
     supplyLimitKey?: string;
     borrowLimitKey?: string;
     isolatedAssetKey?: string;
+    coinDecimalId?: string;
+    borrowIncentivePoolId?: string;
 }>>>;

package/dist/types/builder/core.d.ts

@@ -1,4 +1,4 @@
-import type { SuiTxBlock as SuiKitTxBlock, SuiObjectArg } from '@scallop-io/sui-kit';
+import type { SuiTxBlock as SuiKitTxBlock, SuiObjectArg, SuiTxArg } from '@scallop-io/sui-kit';
 import type { Argument, TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportCollateralCoins, SupportPoolCoins, SupportAssetCoins } from '../constant';
@@ -27,10 +27,10 @@ export type CoreNormalMethods = {
     withdraw: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
     withdrawEntry: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
     borrow: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
-    borrowWithReferral: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, borrowReferral: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
+    borrowWithReferral: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, borrowReferral: SuiObjectArg, amount: number | SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
     borrowEntry: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, amount: number, poolCoinName: SupportPoolCoins) => void;
     repay: (obligation: SuiObjectArg, coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
-    borrowFlashLoan: (amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
+    borrowFlashLoan: (amount: number | SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
     repayFlashLoan: (coin: SuiObjectArg, loan: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
 };
 export type CoreQuickMethods = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.4.15-rc.2",
+  "version": "1.4.15-rc.3",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/coreBuilder.ts

@@ -189,7 +189,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
           coreIds.market,
           coreIds.coinDecimalsRegistry,
           borrowReferral,
-          txBlock.pure.u64(amount),
+          typeof amount === 'number' ? txBlock.pure.u64(amount) : amount,
           coreIds.xOracle,
           SUI_CLOCK_OBJECT_ID,
         ],

package/src/constants/poolAddress.ts

@@ -17,9 +17,36 @@ export const POOL_ADDRESSES: OptionalKeys<
       supplyLimitKey?: string;
       borrowLimitKey?: string;
       isolatedAssetKey?: string;
+      coinDecimalId?: string;
     }
   >
 > = {
+  usdc: {
+    lendingPoolAddress:
+      '0xd3be98bf540f7603eeb550c0c0a19dbfc78822f25158b5fa84ebd9609def415f',
+    collateralPoolAddress:
+      '0x8f0d529ba179c5b3d508213003eab813aaae31f78226099639b9a69d1aec17af',
+    borrowDynamic:
+      '0x77837ecd4f26fac9a410fff594f2c0bd3288904a15492ca77cb8a52684dbb866',
+    interestModel:
+      '0xaae3f179d63009380cbdcb9acb12907afc9c3cb79cc3460be296a9c6d28f3ff3',
+    riskModel:
+      '0x198b24db213bfeb8b3c80ae63dde92e32fd24984d25da8233ff777b851edd574',
+    borrowFeeKey:
+      '0xd37c5316cfe0a5967d14264fa6b423f880518b294a1ee6581ccbb49ccc401fb8',
+    supplyLimitKey:
+      '0x4be9ae54ac4d320f4f9c14cae78cb85c8e0e67791dd9bdba6d2db20614a28a24',
+    borrowLimitKey:
+      '0x6b01093cba95b835181f00e3a2c31ed8dfc8d64fe3db0fb80933a09f66e1ccf1',
+    isolatedAssetKey: undefined,
+    spool: '0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918',
+    spoolReward:
+      '0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166',
+    sCoinTreasury:
+      '0xbe6b63021f3d82e0e7e977cdd718ed7c019cf2eba374b7b546220402452f938e',
+    coinDecimalId:
+      '0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6',
+  },
   sbeth: {
     lendingPoolAddress:
       '0xaa34c938e0394e5186c7dc626ad69be96af2194b23fdc6ac1c63090e399f5ba4',
@@ -40,28 +67,36 @@ export const POOL_ADDRESSES: OptionalKeys<
     isolatedAssetKey: undefined,
     spool: undefined,
     spoolReward: undefined,
+    sCoinTreasury:
+      '0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed',
+    coinDecimalId:
+      '0x89b04ba87f8832d4d76e17a1c9dce72eb3e64d372cf02012b8d2de5384faeef0',
   },
-  usdc: {
+  weth: {
     lendingPoolAddress:
-      '0xd3be98bf540f7603eeb550c0c0a19dbfc78822f25158b5fa84ebd9609def415f',
+      '0xc8fcdff48efc265740ae0b74aae3faccae9ec00034039a113f3339798035108c',
     collateralPoolAddress:
-      '0x8f0d529ba179c5b3d508213003eab813aaae31f78226099639b9a69d1aec17af',
+      '0xad7ced91ed6e7f2b81805561eee27fa6f3e72fdae561077334c7248583db4dbf',
     borrowDynamic:
-      '0x77837ecd4f26fac9a410fff594f2c0bd3288904a15492ca77cb8a52684dbb866',
+      '0xd1578e1d1c9c82eb4c5bf14beece8142a67a683b2647d7276e92984119fc1445',
     interestModel:
-      '0xaae3f179d63009380cbdcb9acb12907afc9c3cb79cc3460be296a9c6d28f3ff3',
+      '0xa1dc08541cd2cb7cfb4e56272292d5c6a4780e80fd210c58abffae98268b5ed9',
     riskModel:
-      '0x198b24db213bfeb8b3c80ae63dde92e32fd24984d25da8233ff777b851edd574',
+      '0x9f05a25fd33a9e8cf33962126b175d038e184f0ee1b87dc41d4cedbe6abebbe5',
     borrowFeeKey:
-      '0xd37c5316cfe0a5967d14264fa6b423f880518b294a1ee6581ccbb49ccc401fb8',
+      '0x29672ba8ab4625b8181d8ed739e5344de22a97d417748c4d1276c7379283d7a3',
     supplyLimitKey:
-      '0x4be9ae54ac4d320f4f9c14cae78cb85c8e0e67791dd9bdba6d2db20614a28a24',
+      '0x2b957941bdc9432bbc83ab74dc194b6ebb7c927bc4c6926a5492b5503499e509',
     borrowLimitKey:
-      '0x6b01093cba95b835181f00e3a2c31ed8dfc8d64fe3db0fb80933a09f66e1ccf1',
+      '0x51f256d87e51a7ca2b1c482923096f4b6dac6beac89d8ecf4c65b7d5764115d6',
     isolatedAssetKey: undefined,
-    spool: '0x0b5f5f413bd3799e4052c37311966c77f3a4545eb125d2e93e67a68478021918',
+    spool: '0xeec40beccb07c575bebd842eeaabb835f77cd3dab73add433477e57f583a6787',
     spoolReward:
-      '0x85ed6ed72ea97c35dbf0cdc7ed6fbc48d8ec15de9b17c74bf4512df8a6d7f166',
+      '0x957de68a18d87817de8309b30c1ec269a4d87ae513abbeed86b5619cb9ce1077',
+    sCoinTreasury:
+      '0x4b7f5da0e306c9d52490a0c1d4091e653d6b89778b9b4f23c877e534e4d9cd21',
+    coinDecimalId:
+      '0x8900e4ceede3363bef086d6b50ca89d816d0e90bf6bc46efefe1f8455e08f50f',
   },
   wbtc: {
     lendingPoolAddress:
@@ -83,6 +118,10 @@ export const POOL_ADDRESSES: OptionalKeys<
     isolatedAssetKey: undefined,
     spool: undefined,
     spoolReward: undefined,
+    sCoinTreasury:
+      '0xe2883934ea42c99bc998bbe0f01dd6d27aa0e27a56455707b1b34e6a41c20baa',
+    coinDecimalId:
+      '0x5d3c6e60eeff8a05b693b481539e7847dfe33013e7070cdcb387f5c0cac05dfd',
   },
   wusdc: {
     lendingPoolAddress:
@@ -105,28 +144,10 @@ export const POOL_ADDRESSES: OptionalKeys<
     spool: '0x4ace6648ddc64e646ba47a957c562c32c9599b3bba8f5ac1aadb2ae23a2f8ca0',
     spoolReward:
       '0xf4268cc9b9413b9bfe09e8966b8de650494c9e5784bf0930759cfef4904daff8',
-  },
-  weth: {
-    lendingPoolAddress:
-      '0xc8fcdff48efc265740ae0b74aae3faccae9ec00034039a113f3339798035108c',
-    collateralPoolAddress:
-      '0xad7ced91ed6e7f2b81805561eee27fa6f3e72fdae561077334c7248583db4dbf',
-    borrowDynamic:
-      '0xd1578e1d1c9c82eb4c5bf14beece8142a67a683b2647d7276e92984119fc1445',
-    interestModel:
-      '0xa1dc08541cd2cb7cfb4e56272292d5c6a4780e80fd210c58abffae98268b5ed9',
-    riskModel:
-      '0x9f05a25fd33a9e8cf33962126b175d038e184f0ee1b87dc41d4cedbe6abebbe5',
-    borrowFeeKey:
-      '0x29672ba8ab4625b8181d8ed739e5344de22a97d417748c4d1276c7379283d7a3',
-    supplyLimitKey:
-      '0x2b957941bdc9432bbc83ab74dc194b6ebb7c927bc4c6926a5492b5503499e509',
-    borrowLimitKey:
-      '0x51f256d87e51a7ca2b1c482923096f4b6dac6beac89d8ecf4c65b7d5764115d6',
-    isolatedAssetKey: undefined,
-    spool: '0xeec40beccb07c575bebd842eeaabb835f77cd3dab73add433477e57f583a6787',
-    spoolReward:
-      '0x957de68a18d87817de8309b30c1ec269a4d87ae513abbeed86b5619cb9ce1077',
+    sCoinTreasury:
+      '0x50c5cfcbcca3aaacab0984e4d7ad9a6ad034265bebb440f0d1cd688ec20b2548',
+    coinDecimalId:
+      '0x4fbf84f3029bd0c0b77164b587963be957f853eccf834a67bb9ecba6ec80f189',
   },
   wusdt: {
     lendingPoolAddress:
@@ -149,6 +170,10 @@ export const POOL_ADDRESSES: OptionalKeys<
     spool: '0xcb328f7ffa7f9342ed85af3fdb2f22919e1a06dfb2f713c04c73543870d7548f',
     spoolReward:
       '0x2c9f934d67a5baa586ceec2cc24163a2f049a6af3d5ba36b84d8ac40f25c4080',
+    sCoinTreasury:
+      '0x1f02e2fed702b477732d4ad6044aaed04f2e8e586a169153694861a901379df0',
+    coinDecimalId:
+      '0xfb0e3eb97dd158a5ae979dddfa24348063843c5b20eb8381dd5fa7c93699e45c',
   },
   sui: {
     lendingPoolAddress:
@@ -171,6 +196,10 @@ export const POOL_ADDRESSES: OptionalKeys<
     spool: '0x4f0ba970d3c11db05c8f40c64a15b6a33322db3702d634ced6536960ab6f3ee4',
     spoolReward:
       '0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9',
+    sCoinTreasury:
+      '0x5c1678c8261ac9eec024d4d630006a9f55c80dc0b1aa38a003fcb1d425818c6b',
+    coinDecimalId:
+      '0x9258181f5ceac8dbffb7030890243caed69a9599d2886d957a9cb7656af3bdb3',
   },
   wapt: {
     lendingPoolAddress:
@@ -190,28 +219,9 @@ export const POOL_ADDRESSES: OptionalKeys<
     isolatedAssetKey: undefined,
     spool: undefined,
     spoolReward: undefined,
-  },
-  afsui: {
-    lendingPoolAddress:
-      '0x9b942a24ce390b7f5016d34a0217057bf9487b92aa6d7cc9894271dbbe62471a',
-    collateralPoolAddress:
-      '0xe5e56f5c0e3072760b21f9d49a5cc793f37d736c412a9065c16e1265c74e6341',
-    borrowDynamic:
-      '0x1c76d4df9506154a117bbac0f5e005d8a9c0d9ca60e3fe0c9d080006f6f54e81',
-    interestModel:
-      '0xb155c536b37c9601baaa734ad1dd0ef335b2b597aceb8d3ecee41a43f94dcd70',
-    riskModel:
-      '0x75371b1d04b5bebc0738af548ba64ea658e74f78228ec8014336d8eebb992312',
-    borrowFeeKey:
-      '0xabc6422db2d4ee01635ddaeaa44ba68370eebd785d2c4632515f841ae9bc47d9',
-    supplyLimitKey:
-      '0x61a2054eb37f543c0d774da57f2c9542aad8d79a197f748ac08ef5df6cc47028',
-    borrowLimitKey:
-      '0x4459498a043872cd107ea917493fee0baf2d37a273c7538e1d6581cc61b92af8',
-    isolatedAssetKey: undefined,
-    spool: '0xeedf438abcaa6ce4d9625ffca110920592d5867e4c5637d84ad9f466c4feb800',
-    spoolReward:
-      '0x89255a2f86ed7fbfef35ab8b7be48cc7667015975be2685dd9a55a9a64baf76e',
+    sCoinTreasury: undefined,
+    coinDecimalId:
+      '0xc969c5251f372c0f34c32759f1d315cf1ea0ee5e4454b52aea08778eacfdd0a8',
   },
   wsol: {
     lendingPoolAddress:
@@ -233,6 +243,10 @@ export const POOL_ADDRESSES: OptionalKeys<
     isolatedAssetKey: undefined,
     spool: undefined,
     spoolReward: undefined,
+    sCoinTreasury:
+      '0x760fd66f5be869af4382fa32b812b3c67f0eca1bb1ed7a5578b21d56e1848819',
+    coinDecimalId:
+      '0x4d2c39082b4477e3e79dc4562d939147ab90c42fc5f3e4acf03b94383cd69b6e',
   },
   cetus: {
     lendingPoolAddress:
@@ -255,6 +269,36 @@ export const POOL_ADDRESSES: OptionalKeys<
     spool: '0xac1bb13bf4472a637c18c2415fb0e3c1227ea2bcf35242e50563c98215bd298e',
     spoolReward:
       '0x6835c1224126a45086fc6406adc249e3f30df18d779ca4f4e570e38716a17f3f',
+    sCoinTreasury:
+      '0xa283c63488773c916cb3d6c64109536160d5eb496caddc721eb39aad2977d735',
+    coinDecimalId:
+      '0x4c0dce55eff2db5419bbd2d239d1aa22b4a400c01bbb648b058a9883989025da',
+  },
+  afsui: {
+    lendingPoolAddress:
+      '0x9b942a24ce390b7f5016d34a0217057bf9487b92aa6d7cc9894271dbbe62471a',
+    collateralPoolAddress:
+      '0xe5e56f5c0e3072760b21f9d49a5cc793f37d736c412a9065c16e1265c74e6341',
+    borrowDynamic:
+      '0x1c76d4df9506154a117bbac0f5e005d8a9c0d9ca60e3fe0c9d080006f6f54e81',
+    interestModel:
+      '0xb155c536b37c9601baaa734ad1dd0ef335b2b597aceb8d3ecee41a43f94dcd70',
+    riskModel:
+      '0x75371b1d04b5bebc0738af548ba64ea658e74f78228ec8014336d8eebb992312',
+    borrowFeeKey:
+      '0xabc6422db2d4ee01635ddaeaa44ba68370eebd785d2c4632515f841ae9bc47d9',
+    supplyLimitKey:
+      '0x61a2054eb37f543c0d774da57f2c9542aad8d79a197f748ac08ef5df6cc47028',
+    borrowLimitKey:
+      '0x4459498a043872cd107ea917493fee0baf2d37a273c7538e1d6581cc61b92af8',
+    isolatedAssetKey: undefined,
+    spool: '0xeedf438abcaa6ce4d9625ffca110920592d5867e4c5637d84ad9f466c4feb800',
+    spoolReward:
+      '0x89255a2f86ed7fbfef35ab8b7be48cc7667015975be2685dd9a55a9a64baf76e',
+    sCoinTreasury:
+      '0x55f4dfe9e40bc4cc11c70fcb1f3daefa2bdc330567c58d4f0792fbd9f9175a62',
+    coinDecimalId:
+      '0x2f9217f533e51334873a39b8026a4aa6919497b47f49d0986a4f1aec66f8a34d',
   },
   hasui: {
     lendingPoolAddress:
@@ -277,6 +321,10 @@ export const POOL_ADDRESSES: OptionalKeys<
     spool: '0xa6148bc1b623e936d39a952ceb5bea79e8b37228a8f595067bf1852efd3c34aa',
     spoolReward:
       '0x6f3563644d3e2ef13176dbf9d865bd93479df60ccbe07b7e66db57f6309f5a66',
+    sCoinTreasury:
+      '0x404ccc1404d74a90eb6f9c9d4b6cda6d417fb03189f80d9070a35e5dab1df0f5',
+    coinDecimalId:
+      '0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24',
   },
   vsui: {
     lendingPoolAddress:
@@ -299,6 +347,10 @@ export const POOL_ADDRESSES: OptionalKeys<
     spool: '0x69ce8e537e750a95381e6040794afa5ab1758353a1a2e1de7760391b01f91670',
     spoolReward:
       '0xbca914adce058ad0902c7f3cfcd698392a475f00dcfdc3f76001d0370b98777a',
+    sCoinTreasury:
+      '0xc06688ee1af25abc286ffb1d18ce273d1d5907cd1064c25f4e8ca61ea989c1d1',
+    coinDecimalId:
+      '0xabd84a23467b33854ab25cf862006fd97479f8f6f53e50fe732c43a274d939bd',
   },
   sca: {
     lendingPoolAddress:
@@ -320,45 +372,57 @@ export const POOL_ADDRESSES: OptionalKeys<
     isolatedAssetKey: undefined,
     spool: undefined,
     spoolReward: undefined,
+    sCoinTreasury:
+      '0xe04bfc95e00252bd654ee13c08edef9ac5e4b6ae4074e8390db39e9a0109c529',
+    coinDecimalId:
+      '0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844',
   },
-  deep: {
+  fud: {
     lendingPoolAddress:
-      '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
+      '0xefed2cbe76b344792ac724523c8b2236740d1cea2100d46a0ed0dc760c7f4231',
     collateralPoolAddress: undefined,
     borrowDynamic:
-      '0x95e00d7466f97a100e70f08bd37788dc49335796f6f49fab996d40dd0681c6d3',
+      '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
     interestModel:
-      '0x4143c298506a332d92ea8a995e6f3991ee3215f58f6fc6441752835d275b9a69',
+      '0x2600ac100ef154eb2329ffd3aad47aca308ff9f9348de3e8e94aaeb906ec2303',
     riskModel: undefined,
     borrowFeeKey:
-      '0xb14ee43f4ad2a2c40bac8c4406a401690e93c982e289cf3802fedf74a159cab2',
+      '0xa87e8b26e07ff35ac9fb57adcc779be2883080fc7d12de2d9e7e16d8d8d5e529',
     supplyLimitKey:
-      '0x599528fdfdc253e90dfd0acf4f4a166b391e2aac1ca6528abbff63225b548fee',
+      '0xf98419aecc37a3c5de716f8ec590f8991a5be34da72ce1a2da09531ff45adf7d',
     borrowLimitKey:
-      '0xf4217e8ef9d9c32e8992092e910a77535a8124c19b8a762a673f227f5f765a4e',
+      '0x3d928a001c453c50004baa54e14b0a0e1b0907d9c613dfd76064fd7ed4e8beb8',
     isolatedAssetKey:
-      '0x208d3a24ba369dcfc8f0387333d1512b98199eb150d2f2a69359ff708cf761e3',
+      '0xfcb533e9e4e31f9c9f32d6cbf7fbb3425f1d60474e229a363a2dc7f835d587e2',
     spool: undefined,
     spoolReward: undefined,
+    sCoinTreasury:
+      '0xf25212f11d182decff7a86165699a73e3d5787aced203ca539f43cfbc10db867',
+    coinDecimalId:
+      '0x01087411ef48aaac1eb6e24803213e3a60a03b147dac930e5e341f17a85e524e',
   },
-  fud: {
+  deep: {
     lendingPoolAddress:
-      '0xefed2cbe76b344792ac724523c8b2236740d1cea2100d46a0ed0dc760c7f4231',
+      '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
     collateralPoolAddress: undefined,
     borrowDynamic:
-      '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
+      '0x95e00d7466f97a100e70f08bd37788dc49335796f6f49fab996d40dd0681c6d3',
     interestModel:
-      '0x2600ac100ef154eb2329ffd3aad47aca308ff9f9348de3e8e94aaeb906ec2303',
+      '0x4143c298506a332d92ea8a995e6f3991ee3215f58f6fc6441752835d275b9a69',
     riskModel: undefined,
     borrowFeeKey:
-      '0xa87e8b26e07ff35ac9fb57adcc779be2883080fc7d12de2d9e7e16d8d8d5e529',
+      '0xb14ee43f4ad2a2c40bac8c4406a401690e93c982e289cf3802fedf74a159cab2',
     supplyLimitKey:
-      '0xf98419aecc37a3c5de716f8ec590f8991a5be34da72ce1a2da09531ff45adf7d',
+      '0x599528fdfdc253e90dfd0acf4f4a166b391e2aac1ca6528abbff63225b548fee',
     borrowLimitKey:
-      '0x3d928a001c453c50004baa54e14b0a0e1b0907d9c613dfd76064fd7ed4e8beb8',
+      '0xf4217e8ef9d9c32e8992092e910a77535a8124c19b8a762a673f227f5f765a4e',
     isolatedAssetKey:
-      '0xfcb533e9e4e31f9c9f32d6cbf7fbb3425f1d60474e229a363a2dc7f835d587e2',
+      '0x208d3a24ba369dcfc8f0387333d1512b98199eb150d2f2a69359ff708cf761e3',
     spool: undefined,
     spoolReward: undefined,
+    sCoinTreasury:
+      '0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88',
+    coinDecimalId:
+      '0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0',
   },
 };

package/src/models/scallopCache.ts

@@ -231,15 +231,44 @@ export class ScallopCache {
    * @returns Promise<PaginatedObjectsResponse>
    */
   public async queryGetOwnedObjects(input: GetOwnedObjectsParams) {
+    // TODO: This query need its own separate rate limiter (as owned objects can theoretically be infinite), need a better way to handle this
     return this.queryClient.fetchQuery({
       retry: this.retryFn,
       retryDelay: 1000,
       queryKey: queryKeys.rpc.getOwnedObjects(input),
       queryFn: async () => {
-        return await callWithRateLimit(
+        const results = await callWithRateLimit(
           this.tokenBucket,
           async () => await this.client.getOwnedObjects(input)
         );
+        if (results && results.data.length > 0) {
+          results.data
+            .filter(
+              (
+                result
+              ): result is typeof result &
+                NonNullable<{ data: SuiObjectData }> => !!result.data
+            )
+            .forEach((result) => {
+              this.queryClient.setQueriesData(
+                {
+                  exact: false,
+                  queryKey: queryKeys.rpc.getObject(
+                    result.data.objectId,
+                    input.options ?? {}
+                  ),
+                },
+                {
+                  data: result.data,
+                  error: null,
+                },
+                {
+                  updatedAt: Date.now(),
+                }
+              );
+            });
+        }
+        return results;
       },
     });
   }
@@ -268,9 +297,28 @@ export class ScallopCache {
       retryDelay: (attemptIndex) => Math.min(1000 * attemptIndex, 8000),
       queryKey: queryKeys.rpc.getDynamicFieldObject(input),
       queryFn: async () => {
-        return await callWithRateLimit(this.tokenBucket, () =>
+        const result = await callWithRateLimit(this.tokenBucket, () =>
           this.client.getDynamicFieldObject(input)
         );
+        if (result?.data) {
+          this.queryClient.setQueriesData(
+            {
+              exact: false,
+              queryKey: queryKeys.rpc.getObject(result?.data.objectId, {
+                showContent: true,
+                showOwner: true,
+              }),
+            },
+            {
+              data: result.data,
+              error: null,
+            },
+            {
+              updatedAt: Date.now(),
+            }
+          );
+        }
+        return result;
       },
     });
   }

package/src/models/scallopClient.ts

@@ -965,6 +965,7 @@ export class ScallopClient {
     const rewardCoinsCollection: Record<string, TransactionResult[]> = {};
     const obligationAccount =
       await this.query.getObligationAccount(obligationId);
+    if (!obligationAccount) throw new Error('Obligation not found');
     const rewardCoinNames = Object.values(obligationAccount.borrowIncentives)
       .flatMap(({ rewards }) =>
         rewards.filter(({ availableClaimAmount }) => availableClaimAmount > 0)

package/src/models/scallopQuery.ts

@@ -25,7 +25,6 @@ import {
   getLendings,
   getLending,
   getObligationAccounts,
-  getObligationAccount,
   getTotalValueLocked,
   queryVeScaKeyIdFromReferralBindings,
   getBindedObligationId,
@@ -615,7 +614,7 @@ export class ScallopQuery {
    */
   public async getObligationAccounts(
     ownerAddress: string = this.walletAddress,
-    args?: { indexer: boolean }
+    args?: { indexer?: boolean }
   ) {
     return await getObligationAccounts(this, ownerAddress, args?.indexer);
   }
@@ -636,12 +635,16 @@ export class ScallopQuery {
     ownerAddress: string = this.walletAddress,
     args?: { indexer?: boolean }
   ) {
-    return await getObligationAccount(
-      this,
-      obligationId,
-      ownerAddress,
-      args?.indexer
+    const results = await this.getObligationAccounts(ownerAddress, args);
+    return Object.values(results).find(
+      (obligation) => obligation?.obligationId === obligationId
     );
+    // return await getObligationAccount(
+    //   this,
+    //   obligationId,
+    //   ownerAddress,
+    //   args?.indexer
+    // );
   }
 
   /**

package/src/queries/coreQuery.ts

@@ -13,7 +13,11 @@ import {
   calculateMarketCollateralData,
   parseObjectAs,
 } from '../utils';
-import type { SuiObjectResponse, SuiObjectData } from '@mysten/sui/client';
+import type {
+  SuiObjectResponse,
+  SuiObjectData,
+  SuiParsedData,
+} from '@mysten/sui/client';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type { ScallopAddress, ScallopCache, ScallopQuery } from '../models';
 import {
@@ -902,14 +906,32 @@ export const getObligations = async (
   const keyObjects = keyObjectsResponse.filter((ref) => !!ref.data);
 
   const obligations: Obligation[] = [];
+  // fetch all obligations with multi get objects
+  const obligationsObjects = await queryMultipleObjects(
+    address.cache,
+    keyObjects
+      .map((ref) => ref.data?.content)
+      .filter(
+        (content): content is SuiParsedData & { dataType: 'moveObject' } =>
+          content?.dataType === 'moveObject'
+      )
+      .map((content) => (content.fields as any).ownership.fields.of),
+    {
+      showContent: true,
+    }
+  );
+
   await Promise.allSettled(
-    keyObjects.map(async ({ data }) => {
+    keyObjects.map(async ({ data }, idx) => {
       const keyId = data?.objectId;
       const content = data?.content;
       if (keyId && content && 'fields' in content) {
         const fields = content.fields as any;
         const obligationId = String(fields.ownership.fields.of);
-        const locked = await getObligationLocked(address.cache, obligationId);
+        const locked = await getObligationLocked(
+          address.cache,
+          obligationsObjects[idx]
+        );
         obligations.push({ id: obligationId, keyId, locked });
       }
     })
@@ -929,7 +951,7 @@ export const getObligationLocked = async (
   cache: ScallopCache,
   obligation: string | SuiObjectData
 ) => {
-  const obligationObjectResponse =
+  const obligationObjectData =
     typeof obligation === 'string'
       ? (
           await cache.queryGetObject(obligation, {
@@ -939,13 +961,11 @@ export const getObligationLocked = async (
       : obligation;
   let obligationLocked = false;
   if (
-    obligationObjectResponse &&
-    obligationObjectResponse?.content?.dataType === 'moveObject' &&
-    'lock_key' in obligationObjectResponse.content.fields
+    obligationObjectData &&
+    obligationObjectData?.content?.dataType === 'moveObject' &&
+    'lock_key' in obligationObjectData.content.fields
   ) {
-    obligationLocked = Boolean(
-      obligationObjectResponse.content.fields.lock_key
-    );
+    obligationLocked = Boolean(obligationObjectData.content.fields.lock_key);
   }
 
   return obligationLocked;

package/src/queries/poolAddressesQuery.ts

@@ -19,6 +19,8 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         supplyLimitKey?: string;
         borrowLimitKey?: string;
         isolatedAssetKey?: string;
+        coinDecimalId?: string;
+        borrowIncentivePoolId?: string;
       }
     >
   > = {};
@@ -117,6 +119,9 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         // @ts-ignore
         `scoin.coins.s${coinName}.treasury`
       );
+      const coinDecimalId = query.address.get(
+        `core.coins.${coinName}.metaData`
+      );
       results[coinName as SupportPoolCoins] = {
         lendingPoolAddress: addresses[0],
         collateralPoolAddress: addresses[1],
@@ -130,6 +135,7 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         spool,
         spoolReward: rewardPool,
         sCoinTreasury,
+        coinDecimalId,
       };
 
       await new Promise((resolve) => setTimeout(resolve, 200));

package/src/queries/portfolioQuery.ts

@@ -366,7 +366,7 @@ export const getObligationAccount = async (
   coinPrices =
     coinPrices ?? (await query.getAllCoinPrices({ marketPools: market.pools }));
   coinAmounts =
-    coinAmounts || (await query.getCoinAmounts(coinNames, ownerAddress));
+    coinAmounts ?? (await query.getCoinAmounts(coinNames, ownerAddress));
 
   const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] =
     await Promise.all([

package/src/types/builder/core.ts

@@ -1,6 +1,7 @@
 import type {
   SuiTxBlock as SuiKitTxBlock,
   SuiObjectArg,
+  SuiTxArg,
 } from '@scallop-io/sui-kit';
 import type { Argument, TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
@@ -65,7 +66,7 @@ export type CoreNormalMethods = {
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg,
     borrowReferral: SuiObjectArg,
-    amount: number,
+    amount: number | SuiTxArg,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   borrowEntry: (
@@ -80,7 +81,7 @@ export type CoreNormalMethods = {
     poolCoinName: SupportPoolCoins
   ) => void;
   borrowFlashLoan: (
-    amount: number,
+    amount: number | SuiTxArg,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   repayFlashLoan: (