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

package/dist/constants/coinGecko.d.ts

@@ -0,0 +1,2 @@
+import { SupportPoolCoins } from 'src/types/constant/common';
+export declare const COIN_GECKGO_IDS: Record<SupportPoolCoins, string>;

package/dist/constants/index.d.ts

@@ -1,6 +1,12 @@
+export * from './cache';
+export * from './coinGecko';
 export * from './common';
 export * from './enum';
 export * from './flashloan';
+export * from './poolAddress';
+export * from './pyth';
 export * from './queryKeys';
+export * from './testAddress';
+export * from './tokenBucket';
 export * from './vesca';
 export * from './testAddress';

package/dist/constants/poolAddress.d.ts

@@ -0,0 +1,5 @@
+import { SupportPoolCoins } from 'src/types';
+export declare const POOL_ADDRESSES: Record<SupportPoolCoins, {
+    lendingPoolAddress: string;
+    collateralPoolAddress: string;
+}>;

package/dist/constants/pyth.d.ts

@@ -1,3 +1,5 @@
+import { SupportPoolCoins } from 'src/types';
 export declare const PYTH_ENDPOINTS: {
     [k in 'mainnet' | 'testnet']: string[];
 };
+export declare const PYTH_FEED_IDS: Record<SupportPoolCoins, string>;

package/dist/index.js

@@ -33,6 +33,10 @@ __export(src_exports, {
   ADDRESSES_ID: () => ADDRESSES_ID,
   API_BASE_URL: () => API_BASE_URL,
   BORROW_FEE_PROTOCOL_ID: () => BORROW_FEE_PROTOCOL_ID,
+  COIN_GECKGO_IDS: () => COIN_GECKGO_IDS,
+  DEFAULT_CACHE_OPTIONS: () => DEFAULT_CACHE_OPTIONS,
+  DEFAULT_INTERVAL_IN_MS: () => DEFAULT_INTERVAL_IN_MS,
+  DEFAULT_TOKENS_PER_INTERVAL: () => DEFAULT_TOKENS_PER_INTERVAL,
   FlashLoanFeeObjectMap: () => FlashLoanFeeObjectMap,
   IS_VE_SCA_TEST: () => IS_VE_SCA_TEST,
   MAX_LOCK_DURATION: () => MAX_LOCK_DURATION,
@@ -40,7 +44,10 @@ __export(src_exports, {
   MIN_INITIAL_LOCK_AMOUNT: () => MIN_INITIAL_LOCK_AMOUNT,
   MIN_TOP_UP_AMOUNT: () => MIN_TOP_UP_AMOUNT,
   OLD_BORROW_INCENTIVE_PROTOCOL_ID: () => OLD_BORROW_INCENTIVE_PROTOCOL_ID,
+  POOL_ADDRESSES: () => POOL_ADDRESSES,
   PROTOCOL_OBJECT_ID: () => PROTOCOL_OBJECT_ID,
+  PYTH_ENDPOINTS: () => PYTH_ENDPOINTS,
+  PYTH_FEED_IDS: () => PYTH_FEED_IDS,
   SCA_COIN_TYPE: () => SCA_COIN_TYPE,
   SDK_API_BASE_URL: () => SDK_API_BASE_URL,
   SUPPORT_BORROW_INCENTIVE_POOLS: () => SUPPORT_BORROW_INCENTIVE_POOLS,
@@ -81,6 +88,34 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/constants/cache.ts
+var DEFAULT_CACHE_OPTIONS = {
+  defaultOptions: {
+    queries: {
+      staleTime: 5e3,
+      gcTime: 5e3
+    }
+  }
+};
+
+// src/constants/coinGecko.ts
+var COIN_GECKGO_IDS = {
+  usdc: "usdc-coin",
+  sbeth: "ethereum",
+  weth: "ethereum",
+  wbtc: "bitcoin",
+  wusdc: "usdc-coin",
+  wusdt: "tether",
+  sui: "sui",
+  wapt: "aptos",
+  wsol: "solana",
+  cetus: "cetus-protocol",
+  afsui: "sui",
+  hasui: "sui",
+  vsui: "sui",
+  sca: "scallop-2"
+};
+
 // src/constants/common.ts
 var API_BASE_URL = "https://sui.apis.scallop.io";
 var SDK_API_BASE_URL = "https://sdk.api.scallop.io";
@@ -375,6 +410,88 @@ var FlashLoanFeeObjectMap = {
   wsol: "0xe84bdb35b790fc7bdd1645122ac6ac0fc904531d6772c9e25904fece322c5f34"
 };
 
+// src/constants/poolAddress.ts
+var POOL_ADDRESSES = {
+  usdc: {
+    lendingPoolAddress: "0xd3be98bf540f7603eeb550c0c0a19dbfc78822f25158b5fa84ebd9609def415f",
+    collateralPoolAddress: "0x8f0d529ba179c5b3d508213003eab813aaae31f78226099639b9a69d1aec17af"
+  },
+  sbeth: {
+    lendingPoolAddress: "0x5f08c4f71d56dd3342c452cc70ffc47f2f4180146d821941b0b9c04761bb42e7",
+    collateralPoolAddress: "0xce0549a1cbe952e734f56646988e6b02bbae14667889a60e24d0d03540a6119f"
+  },
+  weth: {
+    lendingPoolAddress: "0xc8fcdff48efc265740ae0b74aae3faccae9ec00034039a113f3339798035108c",
+    collateralPoolAddress: "0xad7ced91ed6e7f2b81805561eee27fa6f3e72fdae561077334c7248583db4dbf"
+  },
+  wbtc: {
+    lendingPoolAddress: "0x65cc08a5aca0a0b8d72e1993ded8d145f06dd102fd0d8f285b92934faed564ab",
+    collateralPoolAddress: "0x1aa4e5cf743cd797b4eb8bf1e614f80ae2cf556ced426cddaaf190ffcd0e59c3"
+  },
+  wusdc: {
+    lendingPoolAddress: "0x9c9077abf7a29eebce41e33addbcd6f5246a5221dd733e56ea0f00ae1b25c9e8",
+    collateralPoolAddress: "0x75aacfb7dcbf92ee0111fc1bf975b12569e4ba632e81ed7ae5ac090d40cd3acb"
+  },
+  wusdt: {
+    lendingPoolAddress: "0xfbc056f126dd35adc1f8fe985e2cedc8010e687e8e851e1c5b99fdf63cd1c879",
+    collateralPoolAddress: "0x2260cb5b24929dd20a1742f37a61ff3ce4fde5cdb023e2d3ce2e0ce2d90719e3"
+  },
+  sui: {
+    lendingPoolAddress: "0x9c9077abf7a29eebce41e33addbcd6f5246a5221dd733e56ea0f00ae1b25c9e8",
+    collateralPoolAddress: "0x75aacfb7dcbf92ee0111fc1bf975b12569e4ba632e81ed7ae5ac090d40cd3acb"
+  },
+  wapt: {
+    lendingPoolAddress: "0xca8c14a24e0c32b198eaf479a3317461e3cc339097ce88eaf296a15df8dcfdf5",
+    collateralPoolAddress: "0xde33f9ac5bb0ed34598da4e64b4983832716ced65f172fbf267bcfe859c4ad9c"
+  },
+  wsol: {
+    lendingPoolAddress: "0x985682c42984cdfb03f9ff7d8923344c2fe096b1ae4b82ea17721af19d22a21f",
+    collateralPoolAddress: "0xdc1cc2c371a043ae8e3c3fe2d013c35f1346960b7dbb4c072982c5b794ed144f"
+  },
+  cetus: {
+    lendingPoolAddress: "0xc09858f60e74a1b671635bec4e8a2c84a0ff313eb87f525fba3258e88c6b6282",
+    collateralPoolAddress: "0xe363967e29b7b9c1245d6d46d63e719de8f90b37e3358c545b55d945ea0b676a"
+  },
+  afsui: {
+    lendingPoolAddress: "0x9b942a24ce390b7f5016d34a0217057bf9487b92aa6d7cc9894271dbbe62471a",
+    collateralPoolAddress: "0xe5e56f5c0e3072760b21f9d49a5cc793f37d736c412a9065c16e1265c74e6341"
+  },
+  hasui: {
+    lendingPoolAddress: "0x7ebc607f6bdeb659fb6506cb91c5cc1d47bb365cfd5d2e637ea765346ec84ed4",
+    collateralPoolAddress: "0xad9ed40d6486e4c26cec7370dffce8dc4821eb79178250b5938a34ccafd61e6d"
+  },
+  vsui: {
+    lendingPoolAddress: "0xda9257c0731d8822e8a438ebced13415850d705b779c79958dcf2aeb21fcb43d",
+    collateralPoolAddress: "0x4435e8b8ec2a04094d863aa52deb6ab6f8f47ed8778f4d9f1b27afc4a6e85f1e"
+  },
+  sca: {
+    lendingPoolAddress: "0x6fc7d4211fc7018b6c75e7b908b88f2e0536443239804a3d32af547637bd28d7",
+    collateralPoolAddress: "0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31"
+  }
+};
+
+// src/constants/pyth.ts
+var PYTH_ENDPOINTS = {
+  testnet: ["https://hermes-beta.pyth.network"],
+  mainnet: ["https://hermes.pyth.network", "https://scallop.rpc.p2p.world"]
+};
+var PYTH_FEED_IDS = {
+  usdc: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+  sbeth: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
+  weth: "ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace",
+  wbtc: "e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43",
+  wusdc: "eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
+  wusdt: "2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b",
+  sui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+  wapt: "03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5",
+  wsol: "ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d",
+  cetus: "e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef",
+  afsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+  hasui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+  vsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
+  sca: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc"
+};
+
 // src/constants/queryKeys.ts
 var queryKeys = {
   api: {
@@ -459,13 +576,6 @@ var queryKeys = {
   }
 };
 
-// src/constants/vesca.ts
-var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
-var MAX_LOCK_ROUNDS = 1460;
-var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
-var MIN_INITIAL_LOCK_AMOUNT = 1e10;
-var MIN_TOP_UP_AMOUNT = 1e9;
-
 // src/constants/testAddress.ts
 var TEST_ADDRESSES = {
   core: {
@@ -890,6 +1000,17 @@ var TEST_ADDRESSES = {
   }
 };
 
+// src/constants/tokenBucket.ts
+var DEFAULT_TOKENS_PER_INTERVAL = 50;
+var DEFAULT_INTERVAL_IN_MS = 300;
+
+// src/constants/vesca.ts
+var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
+var MAX_LOCK_ROUNDS = 1460;
+var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
+var MIN_INITIAL_LOCK_AMOUNT = 1e10;
+var MIN_TOP_UP_AMOUNT = 1e9;
+
 // src/models/scallop.ts
 var import_sui_kit16 = require("@scallop-io/sui-kit");
 
@@ -900,16 +1021,6 @@ var import_sui_kit2 = require("@scallop-io/sui-kit");
 var import_query_core = require("@tanstack/query-core");
 var import_sui_kit = require("@scallop-io/sui-kit");
 
-// src/constants/cache.ts
-var DEFAULT_CACHE_OPTIONS = {
-  defaultOptions: {
-    queries: {
-      staleTime: 5e3,
-      gcTime: 5e3
-    }
-  }
-};
-
 // src/utils/builder.ts
 var requireSender = (txBlock) => {
   const sender = txBlock.blockData.sender;
@@ -1469,10 +1580,6 @@ var findClosestUnlockRound = (unlockAtInSecondTimestamp) => {
   return Math.floor(closestTwelveAM.getTime() / 1e3);
 };
 
-// src/constants/tokenBucket.ts
-var DEFAULT_TOKENS_PER_INTERVAL = 50;
-var DEFAULT_INTERVAL_IN_MS = 300;
-
 // src/utils/tokenBucket.ts
 var TokenBucket = class {
   constructor(tokensPerInterval, intervalInMs) {
@@ -2959,6 +3066,9 @@ var getObligations = async ({
       filter: {
         StructType: `${protocolObjectId}::obligation::ObligationKey`
       },
+      options: {
+        showContent: true
+      },
       cursor: nextCursor,
       limit: 10
     });
@@ -2972,14 +3082,14 @@ var getObligations = async ({
       hasNextPage = false;
     }
   } while (hasNextPage);
-  const keyObjectIds = keyObjectsResponse.map((ref) => ref?.data?.objectId).filter((id) => id !== void 0);
-  const keyObjects = await address.cache.queryGetObjects(keyObjectIds);
+  const keyObjects = keyObjectsResponse.filter((ref) => !!ref.data);
   const obligations = [];
   await Promise.allSettled(
-    keyObjects.map(async (keyObject) => {
-      const keyId = keyObject.objectId;
-      if (keyObject.content && "fields" in keyObject.content) {
-        const fields = keyObject.content.fields;
+    keyObjects.map(async ({ data }) => {
+      const keyId = data?.objectId;
+      const content = data?.content;
+      if (keyId && content && "fields" in content) {
+        const fields = content.fields;
         const obligationId = String(fields.ownership.fields.of);
         const locked = await getObligationLocked(address.cache, obligationId);
         obligations.push({ id: obligationId, keyId, locked });
@@ -3247,6 +3357,7 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
         coinType: query.utils.parseCoinType(coinName),
         marketCoinType: query.utils.parseMarketCoinType(coinName),
         rewardCoinType: isMarketCoin(rewardCoinName) ? query.utils.parseMarketCoinType(rewardCoinName) : query.utils.parseCoinType(rewardCoinName),
+        sCoinType: marketPool.sCoinType,
         coinDecimal: query.utils.getCoinDecimal(coinName),
         rewardCoinDecimal: query.utils.getCoinDecimal(rewardCoinName),
         coinPrice: coinPrices?.[coinName] ?? 0,
@@ -3843,6 +3954,7 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
     symbol: query.utils.parseSymbol(poolCoinName),
     coinType: query.utils.parseCoinType(poolCoinName),
     marketCoinType: query.utils.parseMarketCoinType(poolCoinName),
+    sCoinType: marketPool?.sCoinType ?? "",
     coinDecimal,
     coinPrice: coinPrice ?? 0,
     conversionRate: marketPool?.conversionRate ?? 1,
@@ -4282,9 +4394,8 @@ var SuiObjectRefZod = import_zod3.z.object({
   digest: import_zod3.z.string(),
   version: import_zod3.z.string()
 });
-var getVeSca = async (utils, veScaKey, ownerAddress) => {
+var getVeSca = async (utils, veScaKey) => {
   const tableId = utils.address.get(`vesca.tableId`);
-  veScaKey = veScaKey || (await getVescaKeys(utils, ownerAddress))[0];
   if (!veScaKey)
     return void 0;
   if (typeof veScaKey === "object") {
@@ -4463,12 +4574,6 @@ var getLoyaltyProgramInformations = async (query, veScaKey) => {
   return result;
 };
 
-// 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) {
@@ -4946,6 +5051,26 @@ var ScallopUtils = class {
     }
     return findClosestUnlockRound(newUnlockAtInSecondTimestamp);
   }
+  /**
+   * Get detailed contract address and price id information for supported pool in Scallop
+   * @returns Supported pool informations
+   */
+  getSupportedPoolAddresses() {
+    return SUPPORT_POOLS.map((poolName) => {
+      const sCoinName = this.parseSCoinName(poolName);
+      return {
+        name: this.parseSymbol(poolName),
+        coingeckoId: COIN_GECKGO_IDS[poolName],
+        decimal: coinDecimals[poolName],
+        pythFeedId: PYTH_FEED_IDS[poolName],
+        ...POOL_ADDRESSES[poolName],
+        sCoinAddress: sCoinIds[sCoinName],
+        marketCoinAddress: this.parseMarketCoinType(poolName),
+        coinAddress: this.parseCoinType(poolName),
+        sCoinName: sCoinName ? this.parseSymbol(sCoinName) : void 0
+      };
+    });
+  }
 };
 
 // src/models/scallopBuilder.ts
@@ -5877,13 +6002,14 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
       );
       if (!obligationLocked || unstakeObligationBeforeStake) {
         const bindedVeScaKey = await builder.query.getBindedVeScaKey(obligationArg);
-        if (veScaKey && veScaKey !== bindedVeScaKey || !bindedVeScaKey) {
+        const _veScaKey = bindedVeScaKey ?? veScaKey;
+        if (!_veScaKey) {
           txBlock.stakeObligation(obligationArg, obligationKeyArg);
         } else {
           txBlock.stakeObligationWithVesca(
             obligationArg,
             obligationKeyArg,
-            bindedVeScaKey
+            _veScaKey
           );
         }
       }
@@ -6717,6 +6843,14 @@ var ScallopIndexer = class {
       throw Error("Failed to getTotalValueLocked.");
     }
   }
+  /**
+   * Get coin price index data.
+   *
+   * @return price data.
+   */
+  async getCoinPrice(poolCoinName) {
+    return (await this.getMarketPool(poolCoinName))?.coinPrice ?? 0;
+  }
 };
 
 // src/queries/sCoinQuery.ts
@@ -7344,6 +7478,14 @@ var ScallopQuery = class {
   async isIsolatedAsset(assetCoinName) {
     return isIsolatedAsset(this.utils, assetCoinName);
   }
+  /**
+   * Get pool coin price from indexer
+   * @param coinName
+   * @returns price data
+   */
+  async getCoinPriceByIndexer(poolName) {
+    return this.indexer.getCoinPrice(poolName);
+  }
 };
 
 // src/models/scallopBuilder.ts
@@ -7784,7 +7926,7 @@ var ScallopClient = class {
     );
     txBlock.transferObjects([coin], sender);
     if (sign && availableStake) {
-      await txBlock.stakeObligationQuick(obligationId, obligationKey);
+      await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKey);
     }
     if (sign) {
       return await this.suiKit.signAndSendTxn(
@@ -7814,7 +7956,7 @@ var ScallopClient = class {
     }
     await txBlock.repayQuick(amount, poolCoinName, obligationId);
     if (sign && availableStake) {
-      await txBlock.stakeObligationQuick(obligationId, obligationKey);
+      await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKey);
     }
     if (sign) {
       return await this.suiKit.signAndSendTxn(
@@ -7961,7 +8103,7 @@ var ScallopClient = class {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
-    await txBlock.stakeObligationQuick(obligationId, obligationKeyId);
+    await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKeyId);
     if (sign) {
       return await this.suiKit.signAndSendTxn(
         txBlock
@@ -8285,6 +8427,10 @@ var Scallop = class {
   ADDRESSES_ID,
   API_BASE_URL,
   BORROW_FEE_PROTOCOL_ID,
+  COIN_GECKGO_IDS,
+  DEFAULT_CACHE_OPTIONS,
+  DEFAULT_INTERVAL_IN_MS,
+  DEFAULT_TOKENS_PER_INTERVAL,
   FlashLoanFeeObjectMap,
   IS_VE_SCA_TEST,
   MAX_LOCK_DURATION,
@@ -8292,7 +8438,10 @@ var Scallop = class {
   MIN_INITIAL_LOCK_AMOUNT,
   MIN_TOP_UP_AMOUNT,
   OLD_BORROW_INCENTIVE_PROTOCOL_ID,
+  POOL_ADDRESSES,
   PROTOCOL_OBJECT_ID,
+  PYTH_ENDPOINTS,
+  PYTH_FEED_IDS,
   SCA_COIN_TYPE,
   SDK_API_BASE_URL,
   SUPPORT_BORROW_INCENTIVE_POOLS,