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

package/package.json

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

package/src/constants/enum.ts

@@ -166,7 +166,9 @@ export const sCoinIds: types.SCoinIds = {
   // ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
   scetus:
     '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
-  ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
+  // 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',

package/src/constants/testAddress.ts

@@ -467,9 +467,9 @@ export const TEST_ADDRESSES: AddressesInterface = {
       },
       ssca: {
         coinType:
-          '0x0a9d3c6c9af9f6e8def82921541bcbd17f73ed31bed3adcb684f2a4c267e42f0::scallop_sca::SCALLOP_SCA',
+          '0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA',
         treasury:
-          '0xe818636d1d6c46d6ea1a2dce9d94696d7cbc18ce27451b603eeaa47aba8d75e0',
+          '0x5f1c5de1df7341075d119570269b7b452af50afe8363080638f1ae29a554c038',
       },
       swusdc: {
         coinType:

package/src/queries/coreQuery.ts

@@ -640,7 +640,7 @@ export const getMarketCollateral = async (
     )
   )
     throw new Error(
-      `Failed to ftech riskModelDynamicFieldObject for ${riskModelDynamicFieldObjectResponse?.error?.code.toString()}: `
+      `Failed to fetch riskModelDynamicFieldObject for ${riskModelDynamicFieldObjectResponse?.error?.code.toString()}: `
     );
 
   const riskModel: RiskModel = (

package/src/queries/portfolioQuery.ts

@@ -329,12 +329,8 @@ export const getObligationAccount = async (
   coinAmounts?: CoinAmounts
 ) => {
   market = market || (await query.queryMarket(indexer));
-  const collateralAssetCoinNames: SupportCollateralCoins[] = [
-    ...new Set([
-      ...Object.values(market.collaterals).map(
-        (collateral) => collateral.coinName
-      ),
-    ]),
+  const poolAssetCoinNames: SupportCollateralCoins[] = [
+    ...new Set([...Object.values(market.pools).map((pool) => pool.coinName)]),
   ];
   const obligationQuery = await query.queryObligation(obligationId);
   const borrowIncentivePools = await query.getBorrowIncentivePools(
@@ -344,11 +340,12 @@ export const getObligationAccount = async (
   const borrowIncentiveAccounts =
     await query.getBorrowIncentiveAccounts(obligationId);
   coinPrices =
-    coinPrices || (await query.utils.getCoinPrices(collateralAssetCoinNames));
+    coinPrices || (await query.utils.getCoinPrices(poolAssetCoinNames));
   coinAmounts =
     coinAmounts ||
-    (await query.getCoinAmounts(collateralAssetCoinNames, ownerAddress));
+    (await query.getCoinAmounts(poolAssetCoinNames, ownerAddress));
 
+  console.log(coinPrices);
   const collaterals: ObligationAccount['collaterals'] = {};
   const debts: ObligationAccount['debts'] = {};
   const borrowIncentives: ObligationAccount['borrowIncentives'] = {};
@@ -361,7 +358,7 @@ export const getObligationAccount = async (
   let totalBorrowedValue = BigNumber(0);
   let totalBorrowedValueWithWeight = BigNumber(0);
 
-  for (const assetCoinName of collateralAssetCoinNames) {
+  for (const assetCoinName of poolAssetCoinNames) {
     const collateral = obligationQuery?.collaterals.find((collateral) => {
       const collateralCoinName =
         query.utils.parseCoinNameFromType<SupportCollateralCoins>(

package/src/queries/spoolQuery.ts

@@ -114,7 +114,7 @@ export const getSpool = async (
   const coinName = query.utils.parseCoinName<SupportStakeCoins>(marketCoinName);
   marketPool = marketPool || (await query.getMarketPool(coinName, indexer));
   if (!marketPool) {
-    throw new Error('Failed to fetch marketPool');
+    throw new Error(`Failed to fetch marketPool for ${marketCoinName}`);
   }
 
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);