@scallop-io/sui-scallop-sdk 1.4.19 → 1.4.20

package/dist/index.mjs

@@ -4646,7 +4646,8 @@ var getObligationAccount = async (query, obligation, ownerAddress, indexer = fal
 };
 var getTotalValueLocked = async (query, indexer = false) => {
   const market = await query.getMarketPools(void 0, { indexer });
-  let supplyValue = BigNumber5(0);
+  let supplyLendingValue = BigNumber5(0);
+  let supplyCollateralValue = BigNumber5(0);
   let borrowValue = BigNumber5(0);
   if (indexer) {
     const tvlIndexer = await query.indexer.getTotalValueLocked();
@@ -4656,12 +4657,16 @@ var getTotalValueLocked = async (query, indexer = false) => {
       borrowValue: tvlIndexer.borrowValue,
       borrowValueChangeRatio: tvlIndexer.borrowValueChangeRatio,
       totalValue: tvlIndexer.totalValue,
-      totalValueChangeRatio: tvlIndexer.totalValueChangeRatio
+      totalValueChangeRatio: tvlIndexer.totalValueChangeRatio,
+      supplyLendingValue: tvlIndexer.supplyLendingValue,
+      supplyLendingValueChangeRatio: tvlIndexer.supplyLendingValueChangeRatio,
+      supplyCollateralValue: tvlIndexer.supplyCollateralValue,
+      supplyCollateralValueChangeRatio: tvlIndexer.supplyCollateralValueChangeRatio
     };
     return tvl2;
   }
   for (const pool of Object.values(market.pools)) {
-    supplyValue = supplyValue.plus(
+    supplyLendingValue = supplyLendingValue.plus(
       BigNumber5(pool.supplyCoin).multipliedBy(pool.coinPrice)
     );
     borrowValue = borrowValue.plus(
@@ -4669,14 +4674,16 @@ var getTotalValueLocked = async (query, indexer = false) => {
     );
   }
   for (const collateral of Object.values(market.collaterals)) {
-    supplyValue = supplyValue.plus(
+    supplyCollateralValue = supplyCollateralValue.plus(
       BigNumber5(collateral.depositCoin).multipliedBy(collateral.coinPrice)
     );
   }
   const tvl = {
-    supplyValue: supplyValue.toNumber(),
+    supplyValue: supplyLendingValue.plus(supplyCollateralValue).toNumber(),
+    supplyLendingValue: supplyLendingValue.toNumber(),
+    supplyCollateralValue: supplyCollateralValue.toNumber(),
     borrowValue: borrowValue.toNumber(),
-    totalValue: supplyValue.minus(borrowValue).toNumber()
+    totalValue: supplyLendingValue.plus(supplyCollateralValue).minus(borrowValue).toNumber()
   };
   return tvl;
 };
@@ -5508,10 +5515,26 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
   const veScaPkgId = utils.address.get("vesca.id");
   const veScaConfig = utils.address.get("vesca.config");
   veScaTreasury = veScaTreasury ?? utils.address.get("vesca.treasury");
+  const txb = new SuiTxBlock2();
   const refreshQueryTarget = `${veScaPkgId}::treasury::refresh`;
-  const refreshArgs = [veScaConfig, veScaTreasury, SUI_CLOCK_OBJECT_ID];
+  const refreshArgs = [
+    veScaConfig,
+    veScaTreasury,
+    txb.sharedObjectRef({
+      objectId: SUI_CLOCK_OBJECT_ID,
+      mutable: false,
+      initialSharedVersion: "1"
+    })
+  ];
   const veScaAmountQueryTarget = `${veScaPkgId}::treasury::total_ve_sca_amount`;
-  const veScaAmountArgs = [veScaTreasury, SUI_CLOCK_OBJECT_ID];
+  const veScaAmountArgs = [
+    veScaTreasury,
+    txb.sharedObjectRef({
+      objectId: SUI_CLOCK_OBJECT_ID,
+      mutable: false,
+      initialSharedVersion: "1"
+    })
+  ];
   const resolvedRefreshArgs = await Promise.all(
     refreshArgs.map(async (arg) => {
       if (typeof arg === "string") {
@@ -5528,7 +5551,6 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
       return arg;
     })
   );
-  const txb = new SuiTxBlock2();
   txb.moveCall(refreshQueryTarget, resolvedRefreshArgs);
   txb.moveCall(veScaAmountQueryTarget, resolvedVeScaAmountArgs);
   const txBytes = await txb.txBlock.build({
@@ -6292,27 +6314,67 @@ var priceUpdateRequest = (txBlock, packageId, xOracleId, coinType) => {
 var confirmPriceUpdateRequest = (txBlock, packageId, xOracleId, request, coinType) => {
   const target = `${packageId}::x_oracle::confirm_price_update_request`;
   const typeArgs = [coinType];
-  txBlock.moveCall(target, [xOracleId, request, SUI_CLOCK_OBJECT_ID2], typeArgs);
+  txBlock.moveCall(
+    target,
+    [
+      xOracleId,
+      request,
+      txBlock.sharedObjectRef({
+        objectId: SUI_CLOCK_OBJECT_ID2,
+        mutable: false,
+        initialSharedVersion: "1"
+      })
+    ],
+    typeArgs
+  );
   return txBlock;
 };
 var updateSupraPrice = (txBlock, packageId, request, holderId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, holderId, registryId, SUI_CLOCK_OBJECT_ID2],
+    [
+      request,
+      holderId,
+      registryId,
+      txBlock.sharedObjectRef({
+        objectId: SUI_CLOCK_OBJECT_ID2,
+        mutable: false,
+        initialSharedVersion: "1"
+      })
+    ],
     [coinType]
   );
 };
 var updateSwitchboardPrice = (txBlock, packageId, request, aggregatorId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, aggregatorId, registryId, SUI_CLOCK_OBJECT_ID2],
+    [
+      request,
+      aggregatorId,
+      registryId,
+      txBlock.sharedObjectRef({
+        objectId: SUI_CLOCK_OBJECT_ID2,
+        mutable: false,
+        initialSharedVersion: "1"
+      })
+    ],
     [coinType]
   );
 };
 var updatePythPrice = (txBlock, packageId, request, stateId, feedObjectId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, stateId, feedObjectId, registryId, SUI_CLOCK_OBJECT_ID2],
+    [
+      request,
+      stateId,
+      feedObjectId,
+      registryId,
+      txBlock.sharedObjectRef({
+        objectId: SUI_CLOCK_OBJECT_ID2,
+        mutable: false,
+        initialSharedVersion: "1"
+      })
+    ],
     [coinType]
   );
 };
@@ -6392,7 +6454,11 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           txBlock.pure.u64(amount),
           coreIds.xOracle,
-          SUI_CLOCK_OBJECT_ID3
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [coinType]
       );
@@ -6402,7 +6468,16 @@ var generateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::mint::mint`,
-        [coreIds.version, coreIds.market, coin, SUI_CLOCK_OBJECT_ID3],
+        [
+          coreIds.version,
+          coreIds.market,
+          coin,
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
+        ],
         [coinType]
       );
     },
@@ -6411,7 +6486,16 @@ var generateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::mint::mint_entry`,
-        [coreIds.version, coreIds.market, coin, SUI_CLOCK_OBJECT_ID3],
+        [
+          coreIds.version,
+          coreIds.market,
+          coin,
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
+        ],
         [coinType]
       );
     },
@@ -6420,7 +6504,16 @@ var generateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::redeem::redeem`,
-        [coreIds.version, coreIds.market, marketCoin, SUI_CLOCK_OBJECT_ID3],
+        [
+          coreIds.version,
+          coreIds.market,
+          marketCoin,
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
+        ],
         [coinType]
       );
     },
@@ -6429,7 +6522,16 @@ var generateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::redeem::redeem_entry`,
-        [coreIds.version, coreIds.market, marketCoin, SUI_CLOCK_OBJECT_ID3],
+        [
+          coreIds.version,
+          coreIds.market,
+          marketCoin,
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
+        ],
         [coinType]
       );
     },
@@ -6446,7 +6548,11 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          SUI_CLOCK_OBJECT_ID3
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [coinType]
       );
@@ -6465,7 +6571,11 @@ var generateCoreNormalMethod = ({
           borrowReferral,
           typeof amount === "number" ? txBlock.pure.u64(amount) : amount,
           coreIds.xOracle,
-          SUI_CLOCK_OBJECT_ID3
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [coinType, referralWitnessType]
       );
@@ -6483,7 +6593,11 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           txBlock.pure.u64(amount),
           coreIds.xOracle,
-          SUI_CLOCK_OBJECT_ID3
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [coinType]
       );
@@ -6498,7 +6612,11 @@ var generateCoreNormalMethod = ({
           obligation,
           coreIds.market,
           coin,
-          SUI_CLOCK_OBJECT_ID3
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID3,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [coinType]
       );
@@ -6663,7 +6781,7 @@ var generateCoreQuickMethod = ({
       ) ?? [];
       const updateCoinNames = [...obligationCoinNames, poolCoinName];
       await updateOracles(builder, txBlock, updateCoinNames);
-      return await txBlock.borrowWithReferral(
+      return txBlock.borrowWithReferral(
         obligationInfo.obligationId,
         obligationInfo.obligationKey,
         borrowReferral,
@@ -6791,7 +6909,14 @@ var generateSpoolNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${spoolIds.spoolPkg}::user::new_spool_account`,
-        [stakePoolId, SUI_CLOCK_OBJECT_ID4],
+        [
+          stakePoolId,
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID4,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
+        ],
         [marketCoinType]
       );
     },
@@ -6803,7 +6928,16 @@ var generateSpoolNormalMethod = ({
       builder.moveCall(
         txBlock,
         `${spoolIds.spoolPkg}::user::stake`,
-        [stakePoolId, stakeAccount, coin, SUI_CLOCK_OBJECT_ID4],
+        [
+          stakePoolId,
+          stakeAccount,
+          coin,
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID4,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
+        ],
         [marketCoinType]
       );
     },
@@ -6815,7 +6949,16 @@ var generateSpoolNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${spoolIds.spoolPkg}::user::unstake`,
-        [stakePoolId, stakeAccount, amount, SUI_CLOCK_OBJECT_ID4],
+        [
+          stakePoolId,
+          stakeAccount,
+          amount,
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID4,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
+        ],
         [marketCoinType]
       );
     },
@@ -6832,7 +6975,16 @@ var generateSpoolNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${spoolIds.spoolPkg}::user::redeem_rewards`,
-        [stakePoolId, rewardPoolId, stakeAccount, SUI_CLOCK_OBJECT_ID4],
+        [
+          stakePoolId,
+          rewardPoolId,
+          stakeAccount,
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID4,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
+        ],
         [marketCoinType, rewardCoinType]
       );
     }
@@ -6967,8 +7119,10 @@ var newSpoolTxBlock = (builder, initTxBlock) => {
 
 // src/builders/borrowIncentiveBuilder.ts
 import { Transaction as Transaction3 } from "@mysten/sui/transactions";
-import { SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID5 } from "@mysten/sui/utils";
-import { SuiTxBlock as SuiKitTxBlock3 } from "@scallop-io/sui-kit";
+import {
+  SuiTxBlock as SuiKitTxBlock3,
+  SUI_CLOCK_OBJECT_ID as SUI_CLOCK_OBJECT_ID5
+} from "@scallop-io/sui-kit";
 var requireObligationInfo2 = async (...params) => {
   const [builder, txBlock, obligationId, obligationKey] = params;
   if (params.length === 4 && obligationId && obligationKey && typeof obligationId === "string") {
@@ -7020,7 +7174,11 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           obligationKey,
           obligationId,
           borrowIncentiveIds.obligationAccessStore,
-          SUI_CLOCK_OBJECT_ID5
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID5,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ]
       );
     },
@@ -7039,7 +7197,11 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           veScaIds.treasury,
           veScaIds.table,
           veScaKey,
-          SUI_CLOCK_OBJECT_ID5
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID5,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         []
       );
@@ -7054,7 +7216,11 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligationKey,
           obligationId,
-          SUI_CLOCK_OBJECT_ID5
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID5,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ]
       );
     },
@@ -7069,7 +7235,11 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligationKey,
           obligationId,
-          SUI_CLOCK_OBJECT_ID5
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID5,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [rewardType]
       );
@@ -7084,7 +7254,11 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligation,
           veScaKey,
-          SUI_CLOCK_OBJECT_ID5
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID5,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ]
       );
     }
@@ -7239,7 +7413,11 @@ var generateNormalVeScaMethod = ({
           veScaIds.treasury,
           scaCoin,
           unlockAtInSecondTimestamp,
-          SUI_CLOCK_OBJECT_ID6
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID6,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         []
       );
@@ -7254,7 +7432,11 @@ var generateNormalVeScaMethod = ({
           veScaIds.table,
           veScaIds.treasury,
           newUnlockAtInSecondTimestamp,
-          SUI_CLOCK_OBJECT_ID6
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID6,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         []
       );
@@ -7269,7 +7451,11 @@ var generateNormalVeScaMethod = ({
           veScaIds.table,
           veScaIds.treasury,
           scaCoin,
-          SUI_CLOCK_OBJECT_ID6
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID6,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         []
       );
@@ -7285,7 +7471,11 @@ var generateNormalVeScaMethod = ({
           veScaIds.treasury,
           scaCoin,
           newUnlockAtInSecondTimestamp,
-          SUI_CLOCK_OBJECT_ID6
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID6,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         []
       );
@@ -7299,7 +7489,11 @@ var generateNormalVeScaMethod = ({
           veScaKey,
           veScaIds.table,
           veScaIds.treasury,
-          SUI_CLOCK_OBJECT_ID6
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID6,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         []
       );
@@ -7512,7 +7706,11 @@ var generateReferralNormalMethod = ({
           referralIds.referralBindings,
           txBlock.pure.id(veScaKeyId),
           veScaTable,
-          SUI_CLOCK_OBJECT_ID7
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID7,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         []
       );
@@ -7528,7 +7726,11 @@ var generateReferralNormalMethod = ({
           referralIds.referralBindings,
           referralIds.authorizedWitnessList,
           referralIds.referralTiers,
-          SUI_CLOCK_OBJECT_ID7
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID7,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [coinType]
       );
@@ -7542,7 +7744,11 @@ var generateReferralNormalMethod = ({
           referralIds.version,
           ticket,
           referralIds.referralRevenuePool,
-          SUI_CLOCK_OBJECT_ID7
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID7,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [coinType]
       );
@@ -7556,7 +7762,11 @@ var generateReferralNormalMethod = ({
           referralIds.version,
           referralIds.referralRevenuePool,
           veScaKey,
-          SUI_CLOCK_OBJECT_ID7
+          txBlock.sharedObjectRef({
+            objectId: SUI_CLOCK_OBJECT_ID7,
+            mutable: false,
+            initialSharedVersion: "1"
+          })
         ],
         [coinType]
       );