@scallop-io/sui-scallop-sdk 1.4.7 → 1.4.9

package/src/constants/poolAddress.ts

@@ -17,7 +17,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       supplyLimitKey?: string;
       borrowLimitKey?: string;
       isolatedAssetKey?: string;
-      coinDecimalId?: string;
+      coinMetadataId?: string;
       sCoinType?: string;
     }
   >
@@ -47,11 +47,40 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xbe6b63021f3d82e0e7e977cdd718ed7c019cf2eba374b7b546220402452f938e',
     sCoinType:
       '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
-    coinDecimalId:
+    coinMetadataId:
       '0x69b7a7c3c200439c1b5f3b19d7d495d5966d5f08de66c69276152f8db3992ec6',
     coinType:
       'dba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC',
   },
+  sbusdt: {
+    lendingPoolAddress:
+      '0x958ca02058a7dd8b00e26ed6988f45d7c2834ae2a47ee4c4a8fdedea155f18ca',
+    collateralPoolAddress:
+      '0x63c861f97192ceab2dabb1e74649ae87a9e36c33aaedcc43e40a811d3a39e653',
+    borrowDynamic:
+      '0xf1ef9a19881ed6ddeb88f361c83f37c592ec5b9c64fe715383f63ccc094be205',
+    interestModel:
+      '0x62c46e4667c4fa69a29030ecbc0f661c61365d02adc3810b08b11cfd8f42ca1c',
+    riskModel:
+      '0x59d5f3dbcd14a0aab6ee6e2879803e10b0a752119d19c4ac0bd389d71dc8c2bf',
+    borrowFeeKey:
+      '0xa418990ad042e97cca61830476483933b9e026970fc33451072b2627ccb31da2',
+    supplyLimitKey:
+      '0x93641bfb62ea40760f0c15911b4ec0eb866f8725e36b0ca9a786775d93629139',
+    borrowLimitKey:
+      '0x953a9b8d5353abb38db21a2cbbc5c54f8f23348895acb26cbe2c0ab61b54635d',
+    isolatedAssetKey: undefined,
+    spool: undefined,
+    spoolReward: undefined,
+    sCoinTreasury:
+      '0x58bdf6a9752e3a60144d0b70e8608d630dfd971513e2b2bfa7282f5eaa7d04d8',
+    sCoinType:
+      '0xb1d7df34829d1513b73ba17cb7ad90c88d1e104bb65ab8f62f13e0cc103783d3::scallop_sb_usdt::SCALLOP_SB_USDT',
+    coinMetadataId:
+      '0xda61b33ac61ed4c084bbda65a2229459ed4eb2185729e70498538f0688bec3cc',
+    coinType:
+      '0x375f70cf2ae4c00bf37117d0c85a2c71545e6ee05c4a5c7d282cd66a4504b068::usdt::USDT',
+  },
   sbeth: {
     lendingPoolAddress:
       '0xaa34c938e0394e5186c7dc626ad69be96af2194b23fdc6ac1c63090e399f5ba4',
@@ -76,7 +105,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed',
     sCoinType:
       '0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH',
-    coinDecimalId:
+    coinMetadataId:
       '0x89b04ba87f8832d4d76e17a1c9dce72eb3e64d372cf02012b8d2de5384faeef0',
     coinType:
       'd0e89b2af5e4910726fbcd8b8dd37bb79b29e5f83f7491bca830e94f7f226d29::eth::ETH',
@@ -106,7 +135,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0x4b7f5da0e306c9d52490a0c1d4091e653d6b89778b9b4f23c877e534e4d9cd21',
     sCoinType:
       '0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH',
-    coinDecimalId:
+    coinMetadataId:
       '0x8900e4ceede3363bef086d6b50ca89d816d0e90bf6bc46efefe1f8455e08f50f',
     coinType:
       'af8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5::coin::COIN',
@@ -135,7 +164,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xe2883934ea42c99bc998bbe0f01dd6d27aa0e27a56455707b1b34e6a41c20baa',
     sCoinType:
       '0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC',
-    coinDecimalId:
+    coinMetadataId:
       '0x5d3c6e60eeff8a05b693b481539e7847dfe33013e7070cdcb387f5c0cac05dfd',
     coinType:
       '027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881::coin::COIN',
@@ -165,7 +194,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0x50c5cfcbcca3aaacab0984e4d7ad9a6ad034265bebb440f0d1cd688ec20b2548',
     sCoinType:
       '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-    coinDecimalId:
+    coinMetadataId:
       '0x4fbf84f3029bd0c0b77164b587963be957f853eccf834a67bb9ecba6ec80f189',
     coinType:
       '5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN',
@@ -195,7 +224,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0x1f02e2fed702b477732d4ad6044aaed04f2e8e586a169153694861a901379df0',
     sCoinType:
       '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
-    coinDecimalId:
+    coinMetadataId:
       '0xfb0e3eb97dd158a5ae979dddfa24348063843c5b20eb8381dd5fa7c93699e45c',
     coinType:
       'c060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN',
@@ -225,7 +254,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0x5c1678c8261ac9eec024d4d630006a9f55c80dc0b1aa38a003fcb1d425818c6b',
     sCoinType:
       '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
-    coinDecimalId:
+    coinMetadataId:
       '0x9258181f5ceac8dbffb7030890243caed69a9599d2886d957a9cb7656af3bdb3',
     coinType:
       '0000000000000000000000000000000000000000000000000000000000000002::sui::SUI',
@@ -250,7 +279,7 @@ export const POOL_ADDRESSES: OptionalKeys<
     spoolReward: undefined,
     sCoinTreasury: undefined,
     sCoinType: undefined,
-    coinDecimalId:
+    coinMetadataId:
       '0xc969c5251f372c0f34c32759f1d315cf1ea0ee5e4454b52aea08778eacfdd0a8',
     coinType:
       '3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37::coin::COIN',
@@ -280,7 +309,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xa283c63488773c916cb3d6c64109536160d5eb496caddc721eb39aad2977d735',
     sCoinType:
       '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
-    coinDecimalId:
+    coinMetadataId:
       '0x4c0dce55eff2db5419bbd2d239d1aa22b4a400c01bbb648b058a9883989025da',
     coinType:
       '06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b::cetus::CETUS',
@@ -309,7 +338,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0x760fd66f5be869af4382fa32b812b3c67f0eca1bb1ed7a5578b21d56e1848819',
     sCoinType:
       '0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL',
-    coinDecimalId:
+    coinMetadataId:
       '0x4d2c39082b4477e3e79dc4562d939147ab90c42fc5f3e4acf03b94383cd69b6e',
     coinType:
       'b7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8::coin::COIN',
@@ -339,7 +368,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0x55f4dfe9e40bc4cc11c70fcb1f3daefa2bdc330567c58d4f0792fbd9f9175a62',
     sCoinType:
       '0x00671b1fa2a124f5be8bdae8b91ee711462c5d9e31bda232e70fd9607b523c88::scallop_af_sui::SCALLOP_AF_SUI',
-    coinDecimalId:
+    coinMetadataId:
       '0x2f9217f533e51334873a39b8026a4aa6919497b47f49d0986a4f1aec66f8a34d',
     coinType:
       'f325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI',
@@ -369,7 +398,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0x404ccc1404d74a90eb6f9c9d4b6cda6d417fb03189f80d9070a35e5dab1df0f5',
     sCoinType:
       '0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI',
-    coinDecimalId:
+    coinMetadataId:
       '0x2c5f33af93f6511df699aaaa5822d823aac6ed99d4a0de2a4a50b3afa0172e24',
     coinType:
       'bde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI',
@@ -399,7 +428,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xc06688ee1af25abc286ffb1d18ce273d1d5907cd1064c25f4e8ca61ea989c1d1',
     sCoinType:
       '0xe1a1cc6bcf0001a015eab84bcc6713393ce20535f55b8b6f35c142e057a25fbe::scallop_v_sui::SCALLOP_V_SUI',
-    coinDecimalId:
+    coinMetadataId:
       '0xabd84a23467b33854ab25cf862006fd97479f8f6f53e50fe732c43a274d939bd',
     coinType:
       '549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55::cert::CERT',
@@ -428,7 +457,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xe04bfc95e00252bd654ee13c08edef9ac5e4b6ae4074e8390db39e9a0109c529',
     sCoinType:
       '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
-    coinDecimalId:
+    coinMetadataId:
       '0x5d26a1e9a55c88147ac870bfa31b729d7f49f8804b8b3adfdf3582d301cca844',
     coinType:
       '7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA',
@@ -456,7 +485,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xf25212f11d182decff7a86165699a73e3d5787aced203ca539f43cfbc10db867',
     sCoinType:
       '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
-    coinDecimalId:
+    coinMetadataId:
       '0x01087411ef48aaac1eb6e24803213e3a60a03b147dac930e5e341f17a85e524e',
     coinType:
       '76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1::fud::FUD',
@@ -484,7 +513,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xc63838fabe37b25ad897392d89876d920f5e0c6a406bf3abcb84753d2829bc88',
     sCoinType:
       '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
-    coinDecimalId:
+    coinMetadataId:
       '0x6e60b051a08fa836f5a7acd7c464c8d9825bc29c44657fe170fe9b8e1e4770c0',
     coinType:
       'deeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP',
@@ -513,7 +542,7 @@ export const POOL_ADDRESSES: OptionalKeys<
       '0xdad9bc6293e694f67a5274ea51b596e0bdabfafc585ae6d7e82888e65f1a03e0',
     sCoinType:
       '0x6711551c1e7652a270d9fbf0eee25d99594c157cde3cb5fbb49035eb59b1b001::scallop_fdusd::SCALLOP_FDUSD',
-    coinDecimalId:
+    coinMetadataId:
       '0xdebee5265a67c186ed87fe93303d33dfe1de53e3b4fd7d9329c2852860acd3e7',
     coinType:
       'f16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a::fdusd::FDUSD',

package/src/constants/pyth.ts

@@ -10,6 +10,7 @@ export const PYTH_ENDPOINTS: {
 export const PYTH_FEED_IDS: Record<SupportPoolCoins, string> = {
   usdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
   sbeth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
+  sbusdt: '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
   weth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
   wbtc: 'e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
   wusdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',

package/src/constants/testAddress.ts

@@ -236,6 +236,9 @@ export const TEST_ADDRESSES: AddressesInterface = {
           },
         },
       },
+      // @TODO: add test address
+      // @ts-ignore
+      sbusdt: {},
       fdusd: {
         id: '0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a',
         metaData:

package/src/models/scallop.ts

@@ -163,6 +163,7 @@ export class Scallop {
       },
       {
         address: this.address,
+        suiKit: this.suiKit,
       }
     );
 

package/src/models/scallopCache.ts

@@ -325,7 +325,7 @@ 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
+    // @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,

package/src/models/scallopQuery.ts

@@ -577,13 +577,18 @@ export class ScallopQuery {
   public async getLendings(
     poolCoinNames?: SupportPoolCoins[],
     ownerAddress: string = this.walletAddress,
-    args?: { indexer?: boolean; marketPools?: MarketPools }
+    args?: {
+      indexer?: boolean;
+      marketPools?: MarketPools;
+      coinPrices?: CoinPrices;
+    }
   ) {
     return await getLendings(
       this,
       poolCoinNames,
       ownerAddress,
       args?.marketPools,
+      args?.coinPrices,
       args?.indexer
     );
   }
@@ -622,12 +627,14 @@ export class ScallopQuery {
         collaterals: MarketCollaterals;
         pools: MarketPools;
       };
+      coinPrices?: CoinPrices;
     }
   ) {
     return await getObligationAccounts(
       this,
       ownerAddress,
       args?.market,
+      args?.coinPrices,
       args?.indexer
     );
   }

package/src/queries/poolAddressesQuery.ts

@@ -20,7 +20,7 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         supplyLimitKey?: string;
         borrowLimitKey?: string;
         isolatedAssetKey?: string;
-        coinDecimalId?: string;
+        coinMetadataId?: string;
         borrowIncentivePoolId?: string;
         coinType?: string;
       }
@@ -80,7 +80,8 @@ export const getAllAddresses = async (query: ScallopQuery) => {
           },
         })
       )?.data?.objectId;
-    } catch (_e) {
+    } catch (e: any) {
+      console.error(e.message);
       return undefined;
     }
   };
@@ -123,7 +124,7 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         // @ts-ignore
         `scoin.coins.s${coinName}.treasury`
       );
-      const coinDecimalId = query.address.get(
+      const coinMetadataId = query.address.get(
         `core.coins.${coinName}.metaData`
       );
       results[coinName as SupportPoolCoins] = {
@@ -140,11 +141,11 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         spoolReward: rewardPool,
         sCoinTreasury,
         sCoinType,
-        coinDecimalId,
-        coinType,
+        coinMetadataId,
+        coinType: `0x${coinType}`,
       };
 
-      await new Promise((resolve) => setTimeout(resolve, 200));
+      await new Promise((resolve) => setTimeout(resolve, 500));
     })
   );
 

package/src/queries/portfolioQuery.ts

@@ -47,6 +47,7 @@ export const getLendings = async (
   poolCoinNames: SupportPoolCoins[] = [...SUPPORT_POOLS],
   ownerAddress?: string,
   marketPools?: MarketPools,
+  coinPrices?: CoinPrices,
   indexer: boolean = false
 ) => {
   const marketCoinNames = poolCoinNames.map((poolCoinName) =>
@@ -56,7 +57,7 @@ export const getLendings = async (
     (SUPPORT_SPOOLS as readonly SupportMarketCoins[]).includes(marketCoinName)
   ) as SupportStakeMarketCoins[];
 
-  const coinPrices = await query.utils.getCoinPrices();
+  coinPrices = coinPrices ?? (await query.utils.getCoinPrices());
   marketPools =
     marketPools ??
     (
@@ -321,12 +322,15 @@ export const getObligationAccounts = async (
     pools: MarketPools;
     collaterals: MarketCollaterals;
   },
+  coinPrices?: CoinPrices,
   indexer: boolean = false
 ) => {
   market = market ?? (await query.getMarketPools(undefined, { indexer }));
-  const coinPrices = await query.getAllCoinPrices({
-    marketPools: market.pools,
-  });
+  coinPrices =
+    coinPrices ??
+    (await query.getAllCoinPrices({
+      marketPools: market.pools,
+    }));
   const [coinAmounts, obligations] = await Promise.all([
     query.getCoinAmounts(undefined, ownerAddress),
     query.getObligations(ownerAddress),
@@ -856,20 +860,26 @@ export const getUserPortfolio = async (
   walletAddress: string,
   indexer: boolean = false
 ) => {
-  const market = await query.getMarketPools();
-  const [lendings, obligationAccounts, borrowIncentivePools] =
+  const coinPrices = await query.utils.getCoinPrices();
+  const market = await query.getMarketPools(undefined, { indexer, coinPrices });
+
+  const [lendings, obligationAccounts, borrowIncentivePools, veScas] =
     await Promise.all([
       query.getLendings(undefined, walletAddress, {
         indexer,
         marketPools: market.pools,
+        coinPrices,
       }),
       query.getObligationAccounts(walletAddress, {
         indexer,
         market: market,
+        coinPrices,
       }),
       query.getBorrowIncentivePools(undefined, {
         marketPools: market.pools,
+        coinPrices,
       }),
+      query.getVeScas({ walletAddress, excludeEmpty: true }),
     ]);
 
   // get pending rewards (spool and borrow incentive)
@@ -988,31 +998,45 @@ export const getUserPortfolio = async (
         }
       >
     );
+
+  const parsedVeScas = veScas.map(
+    ({ keyId, lockedScaCoin, currentVeScaBalance, unlockAt }) => ({
+      veScaKey: keyId,
+      coinPrice: coinPrices.sca ?? 0,
+      lockedScaInCoin: lockedScaCoin,
+      lockedScaInUsd: lockedScaCoin * (coinPrices.sca ?? 0),
+      currentVeScaBalance,
+      remainingLockPeriodInDays:
+        unlockAt - Date.now() > 0 ? (unlockAt - Date.now()) / 86400000 : 0,
+      unlockAt,
+    })
+  );
+
   return {
-    lendings: {
-      totalSupplyValue: parsedLendings.reduce((acc, curr) => {
-        acc += curr.suppliedValue;
+    totalSupplyValue: parsedLendings.reduce((acc, curr) => {
+      acc += curr.suppliedValue;
+      return acc;
+    }, 0),
+    ...parsedObligationAccounts.reduce(
+      (acc, curr) => {
+        acc.totalDebtValue += curr.totalDebtsInUsd;
+        acc.totalCollateralValue += curr.totalCollateralInUsd;
         return acc;
-      }, 0),
-      suppliedPools: parsedLendings,
-    },
-    borrowings: {
-      ...parsedObligationAccounts.reduce(
-        (acc, curr) => {
-          acc.totalDebtValue += curr.totalDebtsInUsd;
-          acc.totalCollateralValue += curr.totalCollateralInUsd;
-          return acc;
-        },
-        {
-          totalDebtValue: 0,
-          totalCollateralValue: 0,
-        } as {
-          totalDebtValue: number;
-          totalCollateralValue: number;
-        }
-      ),
-      obligations: parsedObligationAccounts,
-    },
+      },
+      {
+        totalDebtValue: 0,
+        totalCollateralValue: 0,
+      } as {
+        totalDebtValue: number;
+        totalCollateralValue: number;
+      }
+    ),
+    totalLockedScaValue: parsedVeScas.reduce((acc, curr) => {
+      acc += curr.lockedScaInUsd;
+      return acc;
+    }, 0),
+    lendings: parsedLendings,
+    borrowings: parsedObligationAccounts,
     pendingRewards: {
       lendings: Object.entries(pendingLendingRewards).reduce(
         (acc, [key, value]) => {
@@ -1037,5 +1061,6 @@ export const getUserPortfolio = async (
         [] as any
       ),
     },
+    veScas: parsedVeScas,
   };
 };