@scallop-io/sui-scallop-sdk 0.44.16 → 0.44.18

package/dist/models/scallopBuilder.d.ts

@@ -30,8 +30,9 @@ export declare class ScallopBuilder {
      * Request the scallop API to initialize data.
      *
      * @param force - Whether to force initialization.
+     * @param address - ScallopAddress instance.
      */
-    init(force?: boolean): Promise<void>;
+    init(force?: boolean, address?: ScallopAddress): Promise<void>;
     /**
      * Create a scallop txBlock instance that enhances transaction block.
      *

package/dist/models/scallopClient.d.ts

@@ -31,9 +31,9 @@ export declare class ScallopClient {
     /**
      * Request the scallop API to initialize data.
      *
-     * @param forece - Whether to force initialization.
+     * @param force - Whether to force initialization.
      */
-    init(forece?: boolean): Promise<void>;
+    init(force?: boolean): Promise<void>;
     /**
      * Query market data.
      *

package/dist/models/scallopQuery.d.ts

@@ -25,9 +25,10 @@ export declare class ScallopQuery {
     /**
      * Request the scallop API to initialize data.
      *
-     * @param forece - Whether to force initialization.
+     * @param force - Whether to force initialization.
+     * @param address - ScallopAddress instance.
      */
-    init(forece?: boolean): Promise<void>;
+    init(force?: boolean, address?: ScallopAddress): Promise<void>;
     /**
      * Query market data.
      * @param indexer - Whether to use indexer.
@@ -148,17 +149,17 @@ export declare class ScallopQuery {
      * @return All market market coin amounts.
      */
     getMarketCoinAmounts(marketCoinNames?: SupportMarketCoins[], ownerAddress?: string): Promise<{
+        seth?: number | undefined;
         ssui?: number | undefined;
         susdc?: number | undefined;
         susdt?: number | undefined;
+        scetus?: number | undefined;
         safsui?: number | undefined;
         shasui?: number | undefined;
         svsui?: number | undefined;
-        seth?: number | undefined;
         sbtc?: number | undefined;
         sapt?: number | undefined;
         ssol?: number | undefined;
-        scetus?: number | undefined;
     }>;
     /**
      * Get market coin amount.
@@ -183,9 +184,11 @@ export declare class ScallopQuery {
      * @return Spools data.
      */
     getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean): Promise<{
+        seth?: import("../types").Spool | undefined;
         ssui?: import("../types").Spool | undefined;
         susdc?: import("../types").Spool | undefined;
         susdt?: import("../types").Spool | undefined;
+        scetus?: import("../types").Spool | undefined;
         safsui?: import("../types").Spool | undefined;
         shasui?: import("../types").Spool | undefined;
         svsui?: import("../types").Spool | undefined;
@@ -224,9 +227,11 @@ export declare class ScallopQuery {
      * @return Stake pools data.
      */
     getStakePools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
+        seth?: import("../types").StakePool | undefined;
         ssui?: import("../types").StakePool | undefined;
         susdc?: import("../types").StakePool | undefined;
         susdt?: import("../types").StakePool | undefined;
+        scetus?: import("../types").StakePool | undefined;
         safsui?: import("../types").StakePool | undefined;
         shasui?: import("../types").StakePool | undefined;
         svsui?: import("../types").StakePool | undefined;
@@ -253,9 +258,11 @@ export declare class ScallopQuery {
      * @return Stake reward pools data.
      */
     getStakeRewardPools(stakeMarketCoinNames?: SupportStakeMarketCoins[]): Promise<{
+        seth?: import("../types").StakeRewardPool | undefined;
         ssui?: import("../types").StakeRewardPool | undefined;
         susdc?: import("../types").StakeRewardPool | undefined;
         susdt?: import("../types").StakeRewardPool | undefined;
+        scetus?: import("../types").StakeRewardPool | undefined;
         safsui?: import("../types").StakeRewardPool | undefined;
         shasui?: import("../types").StakeRewardPool | undefined;
         svsui?: import("../types").StakeRewardPool | undefined;

package/dist/models/scallopUtils.d.ts

@@ -1,4 +1,5 @@
 import { SuiAddressArg } from '@scallop-io/sui-kit';
+import { ScallopAddress } from './scallopAddress';
 import type { ScallopUtilsParams, ScallopInstanceParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, SupportBorrowIncentiveCoins, CoinWrappedType } from '../types';
 /**
  * @description
@@ -23,9 +24,10 @@ export declare class ScallopUtils {
     /**
      * Request the scallop API to initialize data.
      *
-     * @param forece - Whether to force initialization.
+     * @param force - Whether to force initialization.
+     * @param address - ScallopAddress instance.
      */
-    init(forece?: boolean): Promise<void>;
+    init(force?: boolean, address?: ScallopAddress): Promise<void>;
     /**
      * Convert coin name to symbol.
      *

package/dist/queries/coreQuery.d.ts

@@ -151,17 +151,17 @@ export declare const getCoinAmount: (query: ScallopQuery, assetCoinName: Support
  * @return All owned market coins amount.
  */
 export declare const getMarketCoinAmounts: (query: ScallopQuery, marketCoinNames?: SupportMarketCoins[], ownerAddress?: string) => Promise<{
+    seth?: number | undefined;
     ssui?: number | undefined;
     susdc?: number | undefined;
     susdt?: number | undefined;
+    scetus?: number | undefined;
     safsui?: number | undefined;
     shasui?: number | undefined;
     svsui?: number | undefined;
-    seth?: number | undefined;
     sbtc?: number | undefined;
     sapt?: number | undefined;
     ssol?: number | undefined;
-    scetus?: number | undefined;
 }>;
 /**
  * Query owned market coin (sCoin) amount.

package/dist/queries/spoolQuery.d.ts

@@ -9,9 +9,11 @@ import type { MarketPool, Spool, StakePool, StakeRewardPool, StakeAccounts, Supp
  * @return Spools data.
  */
 export declare const getSpools: (query: ScallopQuery, stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean) => Promise<{
+    seth?: Spool | undefined;
     ssui?: Spool | undefined;
     susdc?: Spool | undefined;
     susdt?: Spool | undefined;
+    scetus?: Spool | undefined;
     safsui?: Spool | undefined;
     shasui?: Spool | undefined;
     svsui?: Spool | undefined;

package/dist/types/model.d.ts

@@ -23,6 +23,9 @@ export type ScallopClientParams = ScallopParams & {
 };
 export type ScallopBuilderParams = ScallopParams & {
     walletAddress?: string;
+    pythEndpoints?: string[];
 };
 export type ScallopQueryParams = ScallopParams;
-export type ScallopUtilsParams = ScallopParams;
+export type ScallopUtilsParams = ScallopParams & {
+    pythEndpoints?: string[];
+};

package/package.json

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

package/src/builders/oracle.ts

@@ -8,6 +8,7 @@ import type { TransactionArgument } from '@mysten/sui.js/transactions';
 import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type { SupportAssetCoins, SupportOracleType } from '../types';
+import { PYTH_ENDPOINTS } from 'src/constants/pyth';
 
 /**
  * Update the price of the oracle for multiple coin.
@@ -34,18 +35,29 @@ export const updateOracles = async (
     const priceIds = assetCoinNames.map((assetCoinName) =>
       builder.address.get(`core.coins.${assetCoinName}.oracle.pyth.feed`)
     );
-    const pythConnection = new 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
-    );
+
+    // iterate through the endpoints
+    const endpoints =
+      builder.params.pythEndpoints ??
+      PYTH_ENDPOINTS[builder.isTestnet ? 'testnet' : 'mainnet'];
+    for (const endpoint of endpoints) {
+      try {
+        const pythConnection = new 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}`
+        );
+      }
+    }
   }
 
   // Remove duplicate coin names.

package/src/constants/common.ts

@@ -38,9 +38,11 @@ export const SUPPORT_COLLATERALS = [
 ] as const;
 
 export const SUPPORT_SPOOLS = [
+  'seth',
   'ssui',
   'susdc',
   'susdt',
+  'scetus',
   'safsui',
   'shasui',
   'svsui',

package/src/constants/enum.ts

@@ -64,18 +64,22 @@ export const marketCoins: MarketCoins = {
 };
 
 export const stakeMarketCoins: StakeMarketCoins = {
+  seth: 'seth',
   ssui: 'ssui',
   susdc: 'susdc',
   susdt: 'susdt',
+  scetus: 'scetus',
   safsui: 'safsui',
   shasui: 'shasui',
   svsui: 'svsui',
 };
 
 export const spoolRewardCoins: StakeRewardCoins = {
+  seth: 'sui',
   ssui: 'sui',
   susdc: 'sui',
   susdt: 'sui',
+  scetus: 'sui',
   safsui: 'sui',
   shasui: 'sui',
   svsui: 'sui',

package/src/constants/pyth.ts

@@ -0,0 +1,6 @@
+export const PYTH_ENDPOINTS: {
+  [k in 'mainnet' | 'testnet']: Readonly<string[]>;
+} = {
+  testnet: ['https://hermes-beta.pyth.network'],
+  mainnet: ['https://hermes.pyth.network', 'https://scallop.rpc.p2p.world'],
+} as const;

package/src/models/scallopAddress.ts

@@ -191,6 +191,10 @@ const EMPTY_ADDRESSES: AddressesInterface = {
     adminCap: '',
     object: '',
     pools: {
+      seth: {
+        id: '',
+        rewardPoolId: '',
+      },
       ssui: {
         id: '',
         rewardPoolId: '',
@@ -203,6 +207,10 @@ const EMPTY_ADDRESSES: AddressesInterface = {
         id: '',
         rewardPoolId: '',
       },
+      scetus: {
+        id: '',
+        rewardPoolId: '',
+      },
       safsui: {
         id: '',
         rewardPoolId: '',

package/src/models/scallopBuilder.ts

@@ -74,13 +74,16 @@ export class ScallopBuilder {
    * Request the scallop API to initialize data.
    *
    * @param force - Whether to force initialization.
+   * @param address - ScallopAddress instance.
    */
-  public async init(force: boolean = false) {
-    if (force || !this.address.getAddresses()) {
+  public async init(force: boolean = false, address?: ScallopAddress) {
+    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);
   }
 
   /**

package/src/models/scallopClient.ts

@@ -84,15 +84,16 @@ export class ScallopClient {
   /**
    * Request the scallop API to initialize data.
    *
-   * @param forece - Whether to force initialization.
+   * @param force - Whether to force initialization.
    */
-  public async init(forece: boolean = false) {
-    if (forece || !this.address.getAddresses()) {
+  public async init(force: boolean = 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 ==================== */

package/src/models/scallopQuery.ts

@@ -87,13 +87,17 @@ export class ScallopQuery {
   /**
    * Request the scallop API to initialize data.
    *
-   * @param forece - Whether to force initialization.
+   * @param force - Whether to force initialization.
+   * @param address - ScallopAddress instance.
    */
-  public async init(forece: boolean = false) {
-    if (forece || !this.address.getAddresses()) {
+  public async init(force: boolean = false, address?: ScallopAddress) {
+    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 ==================== */

package/src/models/scallopUtils.ts

@@ -33,6 +33,7 @@ import type {
   PriceMap,
   CoinWrappedType,
 } from '../types';
+import { PYTH_ENDPOINTS } from 'src/constants/pyth';
 
 /**
  * @description
@@ -81,13 +82,19 @@ export class ScallopUtils {
   /**
    * Request the scallop API to initialize data.
    *
-   * @param forece - Whether to force initialization.
+   * @param force - Whether to force initialization.
+   * @param address - ScallopAddress instance.
    */
-  public async init(forece: boolean = false) {
-    if (forece || !this._address.getAddresses()) {
+  public async init(force: boolean = false, address?: ScallopAddress) {
+    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);
   }
 
   /**
@@ -391,25 +398,36 @@ export class ScallopUtils {
     }
 
     if (lackPricesCoinNames.length > 0) {
-      const pythConnection = new 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 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) {

package/src/queries/spoolQuery.ts

@@ -269,9 +269,11 @@ export const getStakeAccounts = async (
   } while (hasNextPage);
 
   const stakeAccounts: StakeAccounts = {
+    seth: [],
     ssui: [],
     susdc: [],
     susdt: [],
+    scetus: [],
     safsui: [],
     shasui: [],
     svsui: [],
@@ -307,7 +309,18 @@ export const getStakeAccounts = async (
       const index = Number(fields.index);
       const points = Number(fields.points);
       const totalPoints = Number(fields.total_points);
-      if (normalizeStructTag(type) === stakeMarketCoinTypes.ssui) {
+      if (normalizeStructTag(type) === stakeMarketCoinTypes.seth) {
+        stakeAccounts.seth.push({
+          id,
+          type: normalizeStructTag(type),
+          stakePoolId,
+          stakeType: normalizeStructTag(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints,
+        });
+      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.ssui) {
         stakeAccounts.ssui.push({
           id,
           type: normalizeStructTag(type),
@@ -340,6 +353,17 @@ export const getStakeAccounts = async (
           points,
           totalPoints,
         });
+      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.scetus) {
+        stakeAccounts.scetus.push({
+          id,
+          type: normalizeStructTag(type),
+          stakePoolId,
+          stakeType: normalizeStructTag(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints,
+        });
       } else if (normalizeStructTag(type) === stakeMarketCoinTypes.safsui) {
         stakeAccounts.safsui.push({
           id,

package/src/types/model.ts

@@ -36,8 +36,11 @@ export type ScallopClientParams = ScallopParams & {
 
 export type ScallopBuilderParams = ScallopParams & {
   walletAddress?: string;
+  pythEndpoints?: string[];
 };
 
 export type ScallopQueryParams = ScallopParams;
 
-export type ScallopUtilsParams = ScallopParams;
+export type ScallopUtilsParams = ScallopParams & {
+  pythEndpoints?: string[];
+};

package/src/utils/query.ts

@@ -359,12 +359,17 @@ export const calculateSpoolRewardPoolData = (
     .shiftedBy(-1 * rewardCoinDecimal)
     .multipliedBy(rateYearFactor)
     .multipliedBy(rewardCoinPrice);
-  const rewardRate = rewardValueForYear
+
+  let rewardRate = rewardValueForYear
     .dividedBy(calculatedSpoolData.stakedValue)
     .isFinite()
     ? rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).toNumber()
     : Infinity;
 
+  if (parsedSpoolData.maxPoint === parsedSpoolData.distributedPoint) {
+    rewardRate = Infinity;
+  }
+
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),