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

package/dist/index.js

@@ -3495,7 +3495,7 @@ var getBindedObligationId = async ({
 };
 var getBindedVeScaKey = async ({
   address
-}, obliationId) => {
+}, obligationId) => {
   const borrowIncentiveObjectId = address.get("borrowIncentive.object");
   const incentiveAccountsId = address.get("borrowIncentive.incentiveAccounts");
   const corePkg = address.get("core.object");
@@ -3512,7 +3512,7 @@ var getBindedVeScaKey = async ({
     parentId: incentiveAccountsTableId,
     name: {
       type: `${borrowIncentiveObjectId}::typed_id::TypedID<${corePkg}::obligation::Obligation>`,
-      value: obliationId
+      value: obligationId
     }
   });
   if (bindedIncentiveAcc?.data?.content?.dataType !== "moveObject")
@@ -5559,11 +5559,241 @@ var newSpoolTxBlock = (builder, initTxBlock) => {
 
 // src/builders/borrowIncentiveBuilder.ts
 var import_transactions3 = require("@mysten/sui.js/transactions");
-var import_utils18 = require("@mysten/sui.js/utils");
-var import_sui_kit8 = require("@scallop-io/sui-kit");
+var import_utils17 = require("@mysten/sui.js/utils");
+var import_sui_kit7 = require("@scallop-io/sui-kit");
+var requireObligationInfo2 = async (...params) => {
+  const [builder, txBlock, obligationId, obligationKey] = params;
+  if (params.length === 4 && obligationId && obligationKey && typeof obligationId === "string") {
+    const obligationLocked = await getObligationLocked(
+      builder.cache,
+      obligationId
+    );
+    return { obligationId, obligationKey, obligationLocked };
+  }
+  const sender = requireSender(txBlock);
+  const obligations = await getObligations(builder, sender);
+  if (obligations.length === 0) {
+    throw new Error(`No obligation found for sender ${sender}`);
+  }
+  const selectedObligation = obligations.find(
+    (obligation) => obligation.id === obligationId || obligation.keyId === obligationKey
+  ) ?? obligations[0];
+  return {
+    obligationId: selectedObligation.id,
+    obligationKey: selectedObligation.keyId,
+    obligationLocked: selectedObligation.locked
+  };
+};
+var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
+  const borrowIncentiveIds = {
+    borrowIncentivePkg: builder.address.get("borrowIncentive.id"),
+    query: builder.address.get("borrowIncentive.query"),
+    config: builder.address.get("borrowIncentive.config"),
+    incentivePools: builder.address.get("borrowIncentive.incentivePools"),
+    incentiveAccounts: builder.address.get(
+      "borrowIncentive.incentiveAccounts"
+    ),
+    obligationAccessStore: builder.address.get("core.obligationAccessStore")
+  };
+  const veScaIds = {
+    table: builder.address.get("vesca.table"),
+    treasury: builder.address.get("vesca.treasury"),
+    config: builder.address.get("vesca.config")
+  };
+  return {
+    stakeObligation: (obligationId, obligationKey) => {
+      txBlock.moveCall(
+        `${borrowIncentiveIds.borrowIncentivePkg}::user::stake`,
+        [
+          borrowIncentiveIds.config,
+          borrowIncentiveIds.incentivePools,
+          borrowIncentiveIds.incentiveAccounts,
+          obligationKey,
+          obligationId,
+          borrowIncentiveIds.obligationAccessStore,
+          import_utils17.SUI_CLOCK_OBJECT_ID
+        ]
+      );
+    },
+    stakeObligationWithVesca: (obligationId, obligationKey, veScaKey) => {
+      txBlock.moveCall(
+        `${borrowIncentiveIds.borrowIncentivePkg}::user::stake_with_ve_sca`,
+        [
+          borrowIncentiveIds.config,
+          borrowIncentiveIds.incentivePools,
+          borrowIncentiveIds.incentiveAccounts,
+          obligationKey,
+          obligationId,
+          borrowIncentiveIds.obligationAccessStore,
+          veScaIds.config,
+          veScaIds.treasury,
+          veScaIds.table,
+          veScaKey,
+          import_utils17.SUI_CLOCK_OBJECT_ID
+        ],
+        []
+      );
+    },
+    unstakeObligation: (obligationId, obligationKey) => {
+      txBlock.moveCall(
+        `${borrowIncentiveIds.borrowIncentivePkg}::user::unstake`,
+        [
+          borrowIncentiveIds.config,
+          borrowIncentiveIds.incentivePools,
+          borrowIncentiveIds.incentiveAccounts,
+          obligationKey,
+          obligationId,
+          import_utils17.SUI_CLOCK_OBJECT_ID
+        ]
+      );
+    },
+    claimBorrowIncentive: (obligationId, obligationKey, coinName, rewardCoinName) => {
+      const rewardCoinNames = builder.utils.getBorrowIncentiveRewardCoinName(coinName);
+      if (rewardCoinNames.includes(rewardCoinName) === false) {
+        throw new Error(`Invalid reward coin name ${rewardCoinName}`);
+      }
+      const rewardType = builder.utils.parseCoinType(rewardCoinName);
+      return txBlock.moveCall(
+        `${borrowIncentiveIds.borrowIncentivePkg}::user::redeem_rewards`,
+        [
+          borrowIncentiveIds.config,
+          borrowIncentiveIds.incentivePools,
+          borrowIncentiveIds.incentiveAccounts,
+          obligationKey,
+          obligationId,
+          import_utils17.SUI_CLOCK_OBJECT_ID
+        ],
+        [rewardType]
+      );
+    },
+    deactivateBoost: (obligation, veScaKey) => {
+      return txBlock.moveCall(
+        `${borrowIncentiveIds.borrowIncentivePkg}::user::deactivate_boost`,
+        [
+          borrowIncentiveIds.config,
+          borrowIncentiveIds.incentivePools,
+          borrowIncentiveIds.incentiveAccounts,
+          obligation,
+          veScaKey,
+          import_utils17.SUI_CLOCK_OBJECT_ID
+        ]
+      );
+    }
+  };
+};
+var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
+  return {
+    stakeObligationQuick: async (obligation, obligationKey) => {
+      const {
+        obligationId: obligationArg,
+        obligationKey: obligationKeyArg,
+        obligationLocked
+      } = await requireObligationInfo2(
+        builder,
+        txBlock,
+        obligation,
+        obligationKey
+      );
+      const unstakeObligationBeforeStake = !!txBlock.txBlock.blockData.transactions.find(
+        (txn) => txn.kind === "MoveCall" && (txn.target === `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` || txn.target === `${builder.address.get("borrowIncentive.id")}::user::unstake`)
+      );
+      if (!obligationLocked || unstakeObligationBeforeStake) {
+        txBlock.stakeObligation(obligationArg, obligationKeyArg);
+      }
+    },
+    stakeObligationWithVeScaQuick: async (obligation, obligationKey, veScaKey) => {
+      const {
+        obligationId: obligationArg,
+        obligationKey: obligationKeyArg,
+        obligationLocked
+      } = await requireObligationInfo2(
+        builder,
+        txBlock,
+        obligation,
+        obligationKey
+      );
+      const unstakeObligationBeforeStake = !!txBlock.txBlock.blockData.transactions.find(
+        (txn) => txn.kind === "MoveCall" && (txn.target === `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` || txn.target === `${builder.address.get("borrowIncentive.id")}::user::unstake`)
+      );
+      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) {
+          txBlock.stakeObligationWithVesca(
+            obligationArg,
+            obligationKeyArg,
+            bindedVeScaKey
+          );
+        } else {
+          txBlock.stakeObligation(obligationArg, obligationKeyArg);
+        }
+      }
+    },
+    unstakeObligationQuick: async (obligation, obligationKey) => {
+      const {
+        obligationId: obligationArg,
+        obligationKey: obligationKeyArg,
+        obligationLocked
+      } = await requireObligationInfo2(
+        builder,
+        txBlock,
+        obligation,
+        obligationKey
+      );
+      if (obligationLocked) {
+        txBlock.unstakeObligation(obligationArg, obligationKeyArg);
+      }
+    },
+    claimBorrowIncentiveQuick: async (coinName, rewardCoinName, obligation, obligationKey) => {
+      const { obligationId: obligationArg, obligationKey: obligationKeyArg } = await requireObligationInfo2(
+        builder,
+        txBlock,
+        obligation,
+        obligationKey
+      );
+      return txBlock.claimBorrowIncentive(
+        obligationArg,
+        obligationKeyArg,
+        coinName,
+        rewardCoinName
+      );
+    }
+  };
+};
+var newBorrowIncentiveTxBlock = (builder, initTxBlock) => {
+  const txBlock = initTxBlock instanceof import_transactions3.TransactionBlock ? new import_sui_kit7.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit7.SuiTxBlock();
+  const normalMethod = generateBorrowIncentiveNormalMethod({
+    builder,
+    txBlock
+  });
+  const normalTxBlock = new Proxy(txBlock, {
+    get: (target, prop) => {
+      if (prop in normalMethod) {
+        return Reflect.get(normalMethod, prop);
+      }
+      return Reflect.get(target, prop);
+    }
+  });
+  const quickMethod = generateBorrowIncentiveQuickMethod({
+    builder,
+    txBlock: normalTxBlock
+  });
+  return new Proxy(normalTxBlock, {
+    get: (target, prop) => {
+      if (prop in quickMethod) {
+        return Reflect.get(quickMethod, prop);
+      }
+      return Reflect.get(target, prop);
+    }
+  });
+};
 
 // src/builders/vescaBuilder.ts
-var import_sui_kit7 = require("@scallop-io/sui-kit");
+var import_sui_kit8 = require("@scallop-io/sui-kit");
 var requireVeSca = async (...params) => {
   const [builder, txBlock, veScaKey] = params;
   if (params.length === 3 && veScaKey && typeof veScaKey === "string") {
@@ -5578,7 +5808,7 @@ var requireVeSca = async (...params) => {
   if (veScas.length === 0) {
     return void 0;
   }
-  return veScas[0];
+  return veScaKey ? veScas.find(({ keyId }) => veScaKey === keyId) : veScas[0];
 };
 var generateNormalVeScaMethod = ({
   builder,
@@ -5600,7 +5830,7 @@ var generateNormalVeScaMethod = ({
           veScaIds.treasury,
           scaCoin,
           unlockAtInSecondTimestamp,
-          import_sui_kit7.SUI_CLOCK_OBJECT_ID
+          import_sui_kit8.SUI_CLOCK_OBJECT_ID
         ],
         []
       );
@@ -5614,7 +5844,7 @@ var generateNormalVeScaMethod = ({
           veScaIds.table,
           veScaIds.treasury,
           newUnlockAtInSecondTimestamp,
-          import_sui_kit7.SUI_CLOCK_OBJECT_ID
+          import_sui_kit8.SUI_CLOCK_OBJECT_ID
         ],
         []
       );
@@ -5628,7 +5858,7 @@ var generateNormalVeScaMethod = ({
           veScaIds.table,
           veScaIds.treasury,
           scaCoin,
-          import_sui_kit7.SUI_CLOCK_OBJECT_ID
+          import_sui_kit8.SUI_CLOCK_OBJECT_ID
         ],
         []
       );
@@ -5643,7 +5873,7 @@ var generateNormalVeScaMethod = ({
           veScaIds.treasury,
           scaCoin,
           newUnlockAtInSecondTimestamp,
-          import_sui_kit7.SUI_CLOCK_OBJECT_ID
+          import_sui_kit8.SUI_CLOCK_OBJECT_ID
         ],
         []
       );
@@ -5656,7 +5886,7 @@ var generateNormalVeScaMethod = ({
           veScaKey,
           veScaIds.table,
           veScaIds.treasury,
-          import_sui_kit7.SUI_CLOCK_OBJECT_ID
+          import_sui_kit8.SUI_CLOCK_OBJECT_ID
         ],
         []
       );
@@ -5811,7 +6041,7 @@ var generateQuickVeScaMethod = ({
   };
 };
 var newVeScaTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_sui_kit7.TransactionBlock ? new import_sui_kit7.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit7.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_sui_kit8.TransactionBlock ? new import_sui_kit8.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit8.SuiTxBlock();
   const normalMethod = generateNormalVeScaMethod({
     builder,
     txBlock
@@ -5838,241 +6068,6 @@ var newVeScaTxBlock = (builder, initTxBlock) => {
   });
 };
 
-// src/builders/borrowIncentiveBuilder.ts
-var requireObligationInfo2 = async (...params) => {
-  const [builder, txBlock, obligationId, obligationKey] = params;
-  if (params.length === 4 && obligationId && obligationKey && typeof obligationId === "string") {
-    const obligationLocked = await getObligationLocked(
-      builder.cache,
-      obligationId
-    );
-    return { obligationId, obligationKey, obligationLocked };
-  }
-  const sender = requireSender(txBlock);
-  const obligations = await getObligations(builder, sender);
-  if (obligations.length === 0) {
-    throw new Error(`No obligation found for sender ${sender}`);
-  }
-  const selectedObligation = obligations.find(
-    (obligation) => obligation.id === obligationId || obligation.keyId === obligationKey
-  ) ?? obligations[0];
-  return {
-    obligationId: selectedObligation.id,
-    obligationKey: selectedObligation.keyId,
-    obligationLocked: selectedObligation.locked
-  };
-};
-var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
-  const borrowIncentiveIds = {
-    borrowIncentivePkg: builder.address.get("borrowIncentive.id"),
-    query: builder.address.get("borrowIncentive.query"),
-    config: builder.address.get("borrowIncentive.config"),
-    incentivePools: builder.address.get("borrowIncentive.incentivePools"),
-    incentiveAccounts: builder.address.get(
-      "borrowIncentive.incentiveAccounts"
-    ),
-    obligationAccessStore: builder.address.get("core.obligationAccessStore")
-  };
-  const veScaIds = {
-    table: builder.address.get("vesca.table"),
-    treasury: builder.address.get("vesca.treasury"),
-    config: builder.address.get("vesca.config")
-  };
-  return {
-    stakeObligation: (obligationId, obligationKey) => {
-      txBlock.moveCall(
-        `${borrowIncentiveIds.borrowIncentivePkg}::user::stake`,
-        [
-          borrowIncentiveIds.config,
-          borrowIncentiveIds.incentivePools,
-          borrowIncentiveIds.incentiveAccounts,
-          obligationKey,
-          obligationId,
-          borrowIncentiveIds.obligationAccessStore,
-          import_utils18.SUI_CLOCK_OBJECT_ID
-        ]
-      );
-    },
-    stakeObligationWithVesca: (obligationId, obligationKey, veScaKey) => {
-      txBlock.moveCall(
-        `${borrowIncentiveIds.borrowIncentivePkg}::user::stake_with_ve_sca`,
-        [
-          borrowIncentiveIds.config,
-          borrowIncentiveIds.incentivePools,
-          borrowIncentiveIds.incentiveAccounts,
-          obligationKey,
-          obligationId,
-          borrowIncentiveIds.obligationAccessStore,
-          veScaIds.config,
-          veScaIds.treasury,
-          veScaIds.table,
-          veScaKey,
-          import_utils18.SUI_CLOCK_OBJECT_ID
-        ],
-        []
-      );
-    },
-    unstakeObligation: (obligationId, obligationKey) => {
-      txBlock.moveCall(
-        `${borrowIncentiveIds.borrowIncentivePkg}::user::unstake`,
-        [
-          borrowIncentiveIds.config,
-          borrowIncentiveIds.incentivePools,
-          borrowIncentiveIds.incentiveAccounts,
-          obligationKey,
-          obligationId,
-          import_utils18.SUI_CLOCK_OBJECT_ID
-        ]
-      );
-    },
-    claimBorrowIncentive: (obligationId, obligationKey, coinName, rewardCoinName) => {
-      const rewardCoinNames = builder.utils.getBorrowIncentiveRewardCoinName(coinName);
-      if (rewardCoinNames.includes(rewardCoinName) === false) {
-        throw new Error(`Invalid reward coin name ${rewardCoinName}`);
-      }
-      const rewardType = builder.utils.parseCoinType(rewardCoinName);
-      return txBlock.moveCall(
-        `${borrowIncentiveIds.borrowIncentivePkg}::user::redeem_rewards`,
-        [
-          borrowIncentiveIds.config,
-          borrowIncentiveIds.incentivePools,
-          borrowIncentiveIds.incentiveAccounts,
-          obligationKey,
-          obligationId,
-          import_utils18.SUI_CLOCK_OBJECT_ID
-        ],
-        [rewardType]
-      );
-    },
-    deactivateBoost: (obligation, veScaKey) => {
-      return txBlock.moveCall(
-        `${borrowIncentiveIds.borrowIncentivePkg}::user::deactivate_boost`,
-        [
-          borrowIncentiveIds.config,
-          borrowIncentiveIds.incentivePools,
-          borrowIncentiveIds.incentiveAccounts,
-          obligation,
-          veScaKey,
-          import_utils18.SUI_CLOCK_OBJECT_ID
-        ]
-      );
-    }
-  };
-};
-var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
-  return {
-    stakeObligationQuick: async (obligation, obligationKey) => {
-      const {
-        obligationId: obligationArg,
-        obligationKey: obligationKeyArg,
-        obligationLocked
-      } = await requireObligationInfo2(
-        builder,
-        txBlock,
-        obligation,
-        obligationKey
-      );
-      const unstakeObligationBeforeStake = !!txBlock.txBlock.blockData.transactions.find(
-        (txn) => txn.kind === "MoveCall" && (txn.target === `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` || txn.target === `${builder.address.get("borrowIncentive.id")}::user::unstake`)
-      );
-      if (!obligationLocked || unstakeObligationBeforeStake) {
-        txBlock.stakeObligation(obligationArg, obligationKeyArg);
-      }
-    },
-    stakeObligationWithVeScaQuick: async (obligation, obligationKey, veScaKey) => {
-      const {
-        obligationId: obligationArg,
-        obligationKey: obligationKeyArg,
-        obligationLocked
-      } = await requireObligationInfo2(
-        builder,
-        txBlock,
-        obligation,
-        obligationKey
-      );
-      const unstakeObligationBeforeStake = !!txBlock.txBlock.blockData.transactions.find(
-        (txn) => txn.kind === "MoveCall" && (txn.target === `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` || txn.target === `${builder.address.get("borrowIncentive.id")}::user::unstake`)
-      );
-      if (!obligationLocked || unstakeObligationBeforeStake) {
-        const veSca = await requireVeSca(builder, txBlock, veScaKey);
-        if (veSca) {
-          const bindedObligationId = await getBindedObligationId(
-            builder,
-            veSca.keyId
-          );
-          if ((!bindedObligationId || bindedObligationId === obligationArg) && veSca.currentVeScaBalance > 0) {
-            txBlock.stakeObligationWithVesca(
-              obligationArg,
-              obligationKeyArg,
-              veSca.keyId
-            );
-          } else {
-            txBlock.stakeObligation(obligationArg, obligationKeyArg);
-          }
-        } else {
-          txBlock.stakeObligation(obligationArg, obligationKeyArg);
-        }
-      }
-    },
-    unstakeObligationQuick: async (obligation, obligationKey) => {
-      const {
-        obligationId: obligationArg,
-        obligationKey: obligationKeyArg,
-        obligationLocked
-      } = await requireObligationInfo2(
-        builder,
-        txBlock,
-        obligation,
-        obligationKey
-      );
-      if (obligationLocked) {
-        txBlock.unstakeObligation(obligationArg, obligationKeyArg);
-      }
-    },
-    claimBorrowIncentiveQuick: async (coinName, rewardCoinName, obligation, obligationKey) => {
-      const { obligationId: obligationArg, obligationKey: obligationKeyArg } = await requireObligationInfo2(
-        builder,
-        txBlock,
-        obligation,
-        obligationKey
-      );
-      return txBlock.claimBorrowIncentive(
-        obligationArg,
-        obligationKeyArg,
-        coinName,
-        rewardCoinName
-      );
-    }
-  };
-};
-var newBorrowIncentiveTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions3.TransactionBlock ? new import_sui_kit8.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit8.SuiTxBlock();
-  const normalMethod = generateBorrowIncentiveNormalMethod({
-    builder,
-    txBlock
-  });
-  const normalTxBlock = new Proxy(txBlock, {
-    get: (target, prop) => {
-      if (prop in normalMethod) {
-        return Reflect.get(normalMethod, prop);
-      }
-      return Reflect.get(target, prop);
-    }
-  });
-  const quickMethod = generateBorrowIncentiveQuickMethod({
-    builder,
-    txBlock: normalTxBlock
-  });
-  return new Proxy(normalTxBlock, {
-    get: (target, prop) => {
-      if (prop in quickMethod) {
-        return Reflect.get(quickMethod, prop);
-      }
-      return Reflect.get(target, prop);
-    }
-  });
-};
-
 // src/builders/referralBuilder.ts
 var import_sui_kit9 = require("@scallop-io/sui-kit");
 var generateReferralNormalMethod = ({