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

package/dist/index.mjs

@@ -258,7 +258,9 @@ var sCoinIds = {
   ssui: "0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI",
   // 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",
   // '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
@@ -770,8 +772,8 @@ var TEST_ADDRESSES = {
         treasury: "0xd786f4b2d26278cc7911a3445b1b085eab60f269ef9dbb6b87e803d52f155003"
       },
       ssca: {
-        coinType: "0x0a9d3c6c9af9f6e8def82921541bcbd17f73ed31bed3adcb684f2a4c267e42f0::scallop_sca::SCALLOP_SCA",
-        treasury: "0xe818636d1d6c46d6ea1a2dce9d94696d7cbc18ce27451b603eeaa47aba8d75e0"
+        coinType: "0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA",
+        treasury: "0x5f1c5de1df7341075d119570269b7b452af50afe8363080638f1ae29a554c038"
       },
       swusdc: {
         coinType: "0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC",
@@ -2813,7 +2815,7 @@ var getMarketCollateral = async (query, collateralCoinName, indexer = false, mar
   const riskModelDynamicFieldObject = riskModelDynamicFieldObjectResponse?.data;
   if (!(riskModelDynamicFieldObject && riskModelDynamicFieldObject.content && "fields" in riskModelDynamicFieldObject.content))
     throw new Error(
-      `Failed to ftech riskModelDynamicFieldObject for ${riskModelDynamicFieldObjectResponse?.error?.code.toString()}: `
+      `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;
@@ -3090,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("Failed 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(
@@ -3818,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(
@@ -3831,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 = {};
@@ -3844,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