@scallop-io/sui-scallop-sdk 0.47.2 → 0.47.4

package/dist/builders/oracle.d.ts

@@ -7,5 +7,8 @@ import type { SupportAssetCoins } from '../types';
  * @param builder - The scallop builder.
  * @param txBlock - TxBlock created by SuiKit.
  * @param assetCoinNames - Specific an array of support asset coin name.
+ * @param options - The options for update oracles.
  */
-export declare const updateOracles: (builder: ScallopBuilder, txBlock: SuiKitTxBlock, assetCoinNames?: SupportAssetCoins[]) => Promise<void>;
+export declare const updateOracles: (builder: ScallopBuilder, txBlock: SuiKitTxBlock, assetCoinNames?: SupportAssetCoins[], options?: {
+    usePythPullModel: boolean;
+}) => Promise<void>;

package/dist/index.js

@@ -4155,7 +4155,7 @@ var getVescaKeys = async (utils, ownerAddress) => {
 };
 var getVeScas = async ({
   utils
-}, ownerAddress) => {
+}, ownerAddress, excludeEmpty) => {
   const keyObjectDatas = await getVescaKeys(utils, ownerAddress);
   const veScas = Array(keyObjectDatas.length).fill(null);
   const tasks = keyObjectDatas.map(async (veScaKey, idx) => {
@@ -4165,7 +4165,11 @@ var getVeScas = async ({
     }
   });
   await Promise.allSettled(tasks);
-  return veScas.filter(Boolean).sort((a, b) => b.currentVeScaBalance - a.currentVeScaBalance);
+  const result = veScas.filter(Boolean).sort((a, b) => b.currentVeScaBalance - a.currentVeScaBalance);
+  if (excludeEmpty) {
+    return result.filter((v) => v.lockedScaAmount !== "0");
+  }
+  return result;
 };
 var SuiObjectRefZod = import_zod2.z.object({
   objectId: import_zod2.z.string(),
@@ -4805,12 +4809,13 @@ var import_sui_kit5 = require("@scallop-io/sui-kit");
 // src/builders/oracle.ts
 var import_utils12 = require("@mysten/sui.js/utils");
 var import_pyth_sui_js2 = require("@pythnetwork/pyth-sui-js");
-var updateOracles = async (builder, txBlock, assetCoinNames) => {
+var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePythPullModel: true }) => {
+  const usePythPullModel = builder.params.usePythPullModel ?? options.usePythPullModel;
   assetCoinNames = assetCoinNames ?? [
     .../* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
   ];
   const rules = builder.isTestnet ? ["pyth"] : ["pyth"];
-  if (rules.includes("pyth")) {
+  if (usePythPullModel && rules.includes("pyth")) {
     const pythClient = new import_pyth_sui_js2.SuiPythClient(
       builder.suiKit.client(),
       builder.address.get("core.oracles.pyth.state"),
@@ -5717,19 +5722,14 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
       );
       if (!obligationLocked || unstakeObligationBeforeStake) {
         const bindedVeScaKey = await builder.query.getBindedVeScaKey(obligationArg);
-        if (veScaKey && veScaKey !== bindedVeScaKey) {
-          throw new Error(
-            "Binded veScaKey is not equal to the provided veScaKey"
-          );
-        }
-        if (bindedVeScaKey) {
+        if (veScaKey && veScaKey !== bindedVeScaKey || !bindedVeScaKey) {
+          txBlock.stakeObligation(obligationArg, obligationKeyArg);
+        } else {
           txBlock.stakeObligationWithVesca(
             obligationArg,
             obligationKeyArg,
             bindedVeScaKey
           );
-        } else {
-          txBlock.stakeObligation(obligationArg, obligationKeyArg);
         }
       }
     },
@@ -7049,8 +7049,11 @@ var ScallopQuery = class {
    * @param walletAddress
    * @returns array of veSca
    */
-  async getVeScas(walletAddress = this.walletAddress) {
-    return await getVeScas(this, walletAddress);
+  async getVeScas({
+    walletAddress = this.walletAddress,
+    excludeEmpty = false
+  } = {}) {
+    return await getVeScas(this, walletAddress, excludeEmpty);
   }
   /**
    * Get total vesca treasury with movecall
@@ -7898,7 +7901,9 @@ var ScallopClient = class {
     }
   }
   async claimAllUnlockedSca(sign = true) {
-    const veScaKeys = (await this.query.getVeScas(this.walletAddress) ?? []).map(({ keyObject }) => keyObject);
+    const veScaKeys = (await this.query.getVeScas({
+      walletAddress: this.walletAddress
+    }) ?? []).map(({ keyObject }) => keyObject);
     if (veScaKeys.length === 0) {
       throw new Error("No veSCA found in the wallet");
     }
@@ -7995,11 +8000,15 @@ var Scallop = class {
    *
    * @return Scallop Builder.
    */
-  async createScallopBuilder() {
+  async createScallopBuilder(params) {
     if (!this.address.getAddresses())
       await this.address.read();
-    const scallopBuilder = new ScallopBuilder(this.params, {
-      query: await this.createScallopQuery()
+    const builderParams = {
+      ...this.params,
+      ...params
+    };
+    const scallopBuilder = new ScallopBuilder(builderParams, {
+      query: await this.createScallopQuery(builderParams)
     });
     return scallopBuilder;
   }
@@ -8009,13 +8018,16 @@ var Scallop = class {
    * @param walletAddress - When user cannot provide a secret key or mnemonic, the scallop client cannot directly derive the address of the transaction the user wants to sign. This argument specifies the wallet address for signing the transaction.
    * @return Scallop Client.
    */
-  async createScallopClient(walletAddress) {
+  async createScallopClient(params) {
     if (!this.address.getAddresses())
       await this.address.read();
-    const scallopClient = new ScallopClient(
-      { ...this.params, walletAddress },
-      { builder: await this.createScallopBuilder() }
-    );
+    const clientParams = {
+      ...this.params,
+      ...params
+    };
+    const scallopClient = new ScallopClient(clientParams, {
+      builder: await this.createScallopBuilder(clientParams)
+    });
     return scallopClient;
   }
   /**
@@ -8023,11 +8035,15 @@ var Scallop = class {
    *
    * @return Scallop Query.
    */
-  async createScallopQuery() {
+  async createScallopQuery(params) {
     if (!this.address.getAddresses())
       await this.address.read();
-    const scallopQuery = new ScallopQuery(this.params, {
-      utils: await this.createScallopUtils()
+    const queryParams = {
+      ...this.params,
+      ...params
+    };
+    const scallopQuery = new ScallopQuery(queryParams, {
+      utils: await this.createScallopUtils(queryParams)
     });
     return scallopQuery;
   }
@@ -8047,12 +8063,18 @@ var Scallop = class {
    *
    * @return Scallop Utils.
    */
-  async createScallopUtils() {
+  async createScallopUtils(params) {
     if (!this.address.getAddresses())
       await this.address.read();
-    const scallopUtils = new ScallopUtils(this.params, {
-      address: this.address
-    });
+    const scallopUtils = new ScallopUtils(
+      {
+        ...this.params,
+        ...params
+      },
+      {
+        address: this.address
+      }
+    );
     return scallopUtils;
   }
 };