@scallop-io/sui-scallop-sdk 0.44.15 → 0.44.17

package/dist/constants/common.d.ts

@@ -5,7 +5,7 @@ export declare const PROTOCOL_OBJECT_ID = "0xefe8b36d5b2e43728cc323298626b831778
 export declare const BORROW_FEE_PROTOCOL_ID = "0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da";
 export declare const SUPPORT_POOLS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus", "afsui", "hasui", "vsui"];
 export declare const SUPPORT_COLLATERALS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus", "afsui", "hasui", "vsui"];
-export declare const SUPPORT_SPOOLS: readonly ["ssui", "susdc", "susdt", "safsui", "shasui", "svsui"];
+export declare const SUPPORT_SPOOLS: readonly ["seth", "ssui", "susdc", "susdt", "scetus", "safsui", "shasui", "svsui"];
 export declare const SUPPORT_SPOOLS_REWARDS: readonly ["sui"];
 export declare const SUPPORT_BORROW_INCENTIVE_POOLS: readonly ["sui", "usdc", "usdt"];
 export declare const SUPPORT_BORROW_INCENTIVE_REWARDS: readonly ["sui"];

package/dist/constants/pyth.d.ts

@@ -0,0 +1,3 @@
+export declare const PYTH_ENDPOINTS: {
+    [k in 'mainnet' | 'testnet']: Readonly<string[]>;
+};

package/dist/index.js

@@ -95,9 +95,11 @@ var SUPPORT_COLLATERALS = [
   "vsui"
 ];
 var SUPPORT_SPOOLS = [
+  "seth",
   "ssui",
   "susdc",
   "susdt",
+  "scetus",
   "safsui",
   "shasui",
   "svsui"
@@ -173,17 +175,21 @@ var marketCoins = {
   svsui: "svsui"
 };
 var stakeMarketCoins = {
+  seth: "seth",
   ssui: "ssui",
   susdc: "susdc",
   susdt: "susdt",
+  scetus: "scetus",
   safsui: "safsui",
   shasui: "shasui",
   svsui: "svsui"
 };
 var spoolRewardCoins = {
+  seth: "sui",
   ssui: "sui",
   susdc: "sui",
   susdt: "sui",
+  scetus: "sui",
   safsui: "sui",
   shasui: "sui",
   svsui: "sui"
@@ -407,6 +413,10 @@ var EMPTY_ADDRESSES = {
     adminCap: "",
     object: "",
     pools: {
+      seth: {
+        id: "",
+        rewardPoolId: ""
+      },
       ssui: {
         id: "",
         rewardPoolId: ""
@@ -419,6 +429,10 @@ var EMPTY_ADDRESSES = {
         id: "",
         rewardPoolId: ""
       },
+      scetus: {
+        id: "",
+        rewardPoolId: ""
+      },
       safsui: {
         id: "",
         rewardPoolId: ""
@@ -963,8 +977,6 @@ var parseOriginSpoolRewardPoolData = (originSpoolRewardPoolData) => {
     exchangeRateNumerator: Number(
       originSpoolRewardPoolData.exchange_rate_numerator
     ),
-    feeRateDenominator: Number(originSpoolRewardPoolData.fee_rate_denominator),
-    feeRateNumerator: Number(originSpoolRewardPoolData.fee_rate_numerator),
     rewards: Number(originSpoolRewardPoolData.rewards),
     spoolId: String(originSpoolRewardPoolData.spool_id)
   };
@@ -989,7 +1001,6 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
   const rewardValueForYear = (0, import_bignumber.default)(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
   const rewardRate = rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).toNumber() : Infinity;
-  const rewardFeeRate = (0, import_bignumber.default)(parsedSpoolRewardPoolData.feeRateNumerator).dividedBy(parsedSpoolRewardPoolData.feeRateDenominator).toNumber();
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
@@ -1001,8 +1012,7 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
     claimedRewardAmount: claimedRewardAmount.toNumber(),
     claimedRewardCoin: claimedRewardCoin.toNumber(),
     claimedRewardValue: claimedRewardValue.toNumber(),
-    rewardPerSec: rewardPerSec.toNumber(),
-    rewardFee: rewardFeeRate
+    rewardPerSec: rewardPerSec.toNumber()
   };
 };
 var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
@@ -1077,12 +1087,6 @@ var parseOriginBorrowIncentiveRewardPoolData = (originBorrowIncentiveRewardPoolD
     exchangeRateDenominator: Number(
       originBorrowIncentiveRewardPoolData.exchange_rate_denominator
     ),
-    rewardsFeeRateNumerator: Number(
-      originBorrowIncentiveRewardPoolData.rewards_fee_rate_numerator
-    ),
-    rewardsFeeRateDenominator: Number(
-      originBorrowIncentiveRewardPoolData.rewards_fee_rate_denominator
-    ),
     remainingRewards: Number(
       originBorrowIncentiveRewardPoolData.remaining_reward
     )
@@ -1112,9 +1116,6 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
   const rewardValueForYear = (0, import_bignumber.default)(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
   const rewardRate = rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).toNumber() : Infinity;
-  const rewardFeeRate = (0, import_bignumber.default)(
-    parsedBorrowIncentiveRewardPoolData.rewardsFeeRateNumerator
-  ).dividedBy(parsedBorrowIncentiveRewardPoolData.rewardsFeeRateDenominator).toNumber();
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
@@ -1126,8 +1127,7 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
     claimedRewardAmount: claimedRewardAmount.toNumber(),
     claimedRewardCoin: claimedRewardCoin.toNumber(),
     claimedRewardValue: claimedRewardValue.toNumber(),
-    rewardPerSec: rewardPerSec.toNumber(),
-    rewardFee: rewardFeeRate
+    rewardPerSec: rewardPerSec.toNumber()
   };
 };
 var parseOriginBorrowIncentiveAccountData = (originBorrowIncentiveAccountData) => {
@@ -1908,7 +1908,6 @@ var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
 var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPrices) => {
   const coinName = query.utils.parseCoinName(marketCoinName);
   marketPool = marketPool || await query.getMarketPool(coinName, indexer);
-  const spoolPkgId = query.address.get(`spool.id`);
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
   const rewardPoolId = query.address.get(
     `spool.pools.${marketCoinName}.rewardPoolId`
@@ -1929,19 +1928,11 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
       showContent: true
     }
   });
-  const spoolRewardFeeDynamicFieldsResponse = await query.suiKit.client().getDynamicFieldObject({
-    parentId: rewardPoolId,
-    name: {
-      type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
-      value: { dummy_field: false }
-    }
-  });
   if (marketPool && spoolObjectResponse[0].data && spoolObjectResponse[1].data) {
     const rewardCoinName = query.utils.getSpoolRewardCoinName(marketCoinName);
     coinPrices = coinPrices || await query.utils.getCoinPrices([coinName, rewardCoinName]);
     const spoolObject = spoolObjectResponse[0].data;
     const rewardPoolObject = spoolObjectResponse[1].data;
-    const rewardFeeObject = spoolRewardFeeDynamicFieldsResponse.data;
     if (spoolObject.content && "fields" in spoolObject.content) {
       const spoolFields = spoolObject.content.fields;
       const parsedSpoolData = parseOriginSpoolData({
@@ -1963,15 +1954,12 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
         marketCoinPrice,
         marketCoinDecimal
       );
-      if (rewardPoolObject.content && rewardFeeObject?.content && "fields" in rewardPoolObject.content && "fields" in rewardFeeObject.content) {
+      if (rewardPoolObject.content && "fields" in rewardPoolObject.content) {
         const rewardPoolFields = rewardPoolObject.content.fields;
-        const rewardFeeFields = rewardFeeObject.content.fields.value.fields;
         const parsedSpoolRewardPoolData = parseOriginSpoolRewardPoolData({
           claimed_rewards: rewardPoolFields.claimed_rewards,
           exchange_rate_numerator: rewardPoolFields.exchange_rate_numerator,
           exchange_rate_denominator: rewardPoolFields.exchange_rate_denominator,
-          fee_rate_numerator: rewardFeeFields.fee_rate_numerator,
-          fee_rate_denominator: rewardFeeFields.fee_rate_denominator,
           rewards: rewardPoolFields.rewards,
           spool_id: rewardPoolFields.spool_id
         });
@@ -2034,9 +2022,11 @@ var getStakeAccounts = async (query, ownerAddress) => {
     }
   } while (hasNextPage);
   const stakeAccounts = {
+    seth: [],
     ssui: [],
     susdc: [],
     susdt: [],
+    scetus: [],
     safsui: [],
     shasui: [],
     svsui: []
@@ -2063,7 +2053,18 @@ var getStakeAccounts = async (query, ownerAddress) => {
       const index = Number(fields.index);
       const points = Number(fields.points);
       const totalPoints = Number(fields.total_points);
-      if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.ssui) {
+      if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.seth) {
+        stakeAccounts.seth.push({
+          id,
+          type: (0, import_utils4.normalizeStructTag)(type),
+          stakePoolId,
+          stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints
+        });
+      } else if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.ssui) {
         stakeAccounts.ssui.push({
           id,
           type: (0, import_utils4.normalizeStructTag)(type),
@@ -2096,6 +2097,17 @@ var getStakeAccounts = async (query, ownerAddress) => {
           points,
           totalPoints
         });
+      } else if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.scetus) {
+        stakeAccounts.scetus.push({
+          id,
+          type: (0, import_utils4.normalizeStructTag)(type),
+          stakePoolId,
+          stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints
+        });
       } else if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.safsui) {
         stakeAccounts.safsui.push({
           id,
@@ -2179,7 +2191,6 @@ var getStakePool = async (query, marketCoinName) => {
   return stakePool;
 };
 var getStakeRewardPool = async (query, marketCoinName) => {
-  const spoolPkgId = query.address.get("spool.id");
   const poolId = query.address.get(
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
@@ -2191,21 +2202,12 @@ var getStakeRewardPool = async (query, marketCoinName) => {
       showType: true
     }
   });
-  const stakeRewardFeeDynamicFieldsResponse = await query.suiKit.client().getDynamicFieldObject({
-    parentId: poolId,
-    name: {
-      type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
-      value: { dummy_field: false }
-    }
-  });
-  if (stakeRewardPoolObjectResponse.data && stakeRewardFeeDynamicFieldsResponse.data) {
+  if (stakeRewardPoolObjectResponse.data) {
     const stakeRewardPoolObject = stakeRewardPoolObjectResponse.data;
-    const stakeRewardFeeDynamicFieldObject = stakeRewardFeeDynamicFieldsResponse.data;
     const id = stakeRewardPoolObject.objectId;
     const type = stakeRewardPoolObject.type;
-    if (stakeRewardPoolObject.content && stakeRewardFeeDynamicFieldObject.content && "fields" in stakeRewardPoolObject.content && "fields" in stakeRewardFeeDynamicFieldObject.content) {
+    if (stakeRewardPoolObject.content && "fields" in stakeRewardPoolObject.content) {
       const rewardPoolFields = stakeRewardPoolObject.content.fields;
-      const rewardFeeFields = stakeRewardFeeDynamicFieldObject.content.fields.value.fields;
       const stakePoolId = String(rewardPoolFields.spool_id);
       const ratioNumerator = Number(rewardPoolFields.exchange_rate_numerator);
       const ratioDenominator = Number(
@@ -2213,16 +2215,12 @@ var getStakeRewardPool = async (query, marketCoinName) => {
       );
       const rewards = Number(rewardPoolFields.rewards);
       const claimedRewards = Number(rewardPoolFields.claimed_rewards);
-      const feeRateNumerator = Number(rewardFeeFields.fee_rate_numerator);
-      const feeRateDenominator = Number(rewardFeeFields.fee_rate_denominator);
       stakeRewardPool = {
         id,
         type: (0, import_utils4.normalizeStructTag)(type),
         stakePoolId,
         ratioNumerator,
         ratioDenominator,
-        feeRateNumerator,
-        feeRateDenominator,
         rewards,
         claimedRewards
       };
@@ -3050,13 +3048,16 @@ var ScallopQuery = class {
   /**
    * Request the scallop API to initialize data.
    *
-   * @param forece - Whether to force initialization.
+   * @param force - Whether to force initialization.
+   * @param address - ScallopAddress instance.
    */
-  async init(forece = false) {
-    if (forece || !this.address.getAddresses()) {
+  async init(force = false, address) {
+    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
       await this.address.read();
+    } else {
+      this.address = address;
     }
-    await this.utils.init(forece);
+    await this.utils.init(force, this.address);
   }
   /* ==================== Core Query Methods ==================== */
   /**
@@ -3382,6 +3383,12 @@ var ScallopQuery = class {
   }
 };
 
+// src/constants/pyth.ts
+var PYTH_ENDPOINTS = {
+  testnet: ["https://hermes-beta.pyth.network"],
+  mainnet: ["https://hermes.pyth.network", "https://scallop.rpc.p2p.world"]
+};
+
 // src/models/scallopUtils.ts
 var ScallopUtils = class {
   constructor(params, instance) {
@@ -3419,13 +3426,18 @@ var ScallopUtils = class {
   /**
    * Request the scallop API to initialize data.
    *
-   * @param forece - Whether to force initialization.
+   * @param force - Whether to force initialization.
+   * @param address - ScallopAddress instance.
    */
-  async init(forece = false) {
-    if (forece || !this._address.getAddresses()) {
+  async init(force = false, address) {
+    if (force || !this._address.getAddresses() || !address?.getAddresses()) {
       await this._address.read();
+    } else {
+      this._address = address;
+    }
+    if (!this._query.address.getAddresses()) {
+      await this._query.init(force, this._address);
     }
-    await this._query.init(forece);
   }
   /**
    * Convert coin name to symbol.
@@ -3623,22 +3635,31 @@ var ScallopUtils = class {
       }
     }
     if (lackPricesCoinNames.length > 0) {
-      const pythConnection = new import_pyth_sui_js.SuiPriceServiceConnection(
-        this.isTestnet ? "https://hermes-beta.pyth.network" : "https://hermes.pyth.network"
-      );
-      const priceIds = lackPricesCoinNames.map(
-        (coinName) => this._address.get(`core.coins.${coinName}.oracle.pyth.feed`)
-      );
+      const endpoints = this.params.pythEndpoints ?? PYTH_ENDPOINTS[this.isTestnet ? "testnet" : "mainnet"];
       try {
-        const priceFeeds = await pythConnection.getLatestPriceFeeds(priceIds) || [];
-        for (const [index, feed] of priceFeeds.entries()) {
-          const data = parseDataFromPythPriceFeed(feed, this._address);
-          const coinName = lackPricesCoinNames[index];
-          this._priceMap.set(coinName, {
-            price: data.price,
-            publishTime: data.publishTime
-          });
-          coinPrices[coinName] = data.price;
+        for (const endpoint of endpoints) {
+          try {
+            const pythConnection = new import_pyth_sui_js.SuiPriceServiceConnection(endpoint);
+            const priceIds = lackPricesCoinNames.map(
+              (coinName) => this._address.get(`core.coins.${coinName}.oracle.pyth.feed`)
+            );
+            const priceFeeds = await pythConnection.getLatestPriceFeeds(priceIds) || [];
+            for (const [index, feed] of priceFeeds.entries()) {
+              const data = parseDataFromPythPriceFeed(feed, this._address);
+              const coinName = lackPricesCoinNames[index];
+              this._priceMap.set(coinName, {
+                price: data.price,
+                publishTime: data.publishTime
+              });
+              coinPrices[coinName] = data.price;
+            }
+            break;
+          } catch (e) {
+            console.warn(
+              `Failed to update price feeds with endpoint ${endpoint}: ${e}`
+            );
+          }
+          throw new Error("Failed to update price feeds with all endpoins");
         }
       } catch (_e) {
         for (const coinName of lackPricesCoinNames) {
@@ -3701,15 +3722,23 @@ var updateOracles = async (builder, txBlock, assetCoinNames) => {
     const priceIds = assetCoinNames.map(
       (assetCoinName) => builder.address.get(`core.coins.${assetCoinName}.oracle.pyth.feed`)
     );
-    const pythConnection = new import_pyth_sui_js2.SuiPriceServiceConnection(
-      builder.isTestnet ? "https://hermes-beta.pyth.network" : "https://hermes.pyth.network"
-    );
-    const priceUpdateData = await pythConnection.getPriceFeedsUpdateData(priceIds);
-    await pythClient.updatePriceFeeds(
-      txBlock.txBlock,
-      priceUpdateData,
-      priceIds
-    );
+    const endpoints = builder.params.pythEndpoints ?? PYTH_ENDPOINTS[builder.isTestnet ? "testnet" : "mainnet"];
+    for (const endpoint of endpoints) {
+      try {
+        const pythConnection = new import_pyth_sui_js2.SuiPriceServiceConnection(endpoint);
+        const priceUpdateData = await pythConnection.getPriceFeedsUpdateData(priceIds);
+        await pythClient.updatePriceFeeds(
+          txBlock.txBlock,
+          priceUpdateData,
+          priceIds
+        );
+        break;
+      } catch (e) {
+        console.warn(
+          `Failed to update price feeds with endpoint ${endpoint}: ${e}`
+        );
+      }
+    }
   }
   const updateAssetCoinNames = [...new Set(assetCoinNames)];
   for (const assetCoinName of updateAssetCoinNames) {
@@ -4532,13 +4561,16 @@ var ScallopBuilder = class {
    * Request the scallop API to initialize data.
    *
    * @param force - Whether to force initialization.
+   * @param address - ScallopAddress instance.
    */
-  async init(force = false) {
-    if (force || !this.address.getAddresses()) {
+  async init(force = false, address) {
+    if (force || !this.address.getAddresses() || !address?.getAddresses()) {
       await this.address.read();
+    } else {
+      this.address = address;
     }
-    await this.query.init(force);
-    await this.utils.init(force);
+    await this.query.init(force, this.address);
+    await this.utils.init(force, this.address);
   }
   /**
    * Create a scallop txBlock instance that enhances transaction block.
@@ -4626,15 +4658,15 @@ var ScallopClient = class {
   /**
    * Request the scallop API to initialize data.
    *
-   * @param forece - Whether to force initialization.
+   * @param force - Whether to force initialization.
    */
-  async init(forece = false) {
-    if (forece || !this.address.getAddresses()) {
+  async init(force = false) {
+    if (force || !this.address.getAddresses()) {
       await this.address.read();
     }
-    await this.query.init(forece);
-    await this.utils.init(forece);
-    await this.builder.init(forece);
+    await this.builder.init(force, this.address);
+    await this.query.init(force, this.address);
+    await this.utils.init(force, this.address);
   }
   /* ==================== Query Method ==================== */
   /**