@scallop-io/sui-scallop-sdk 0.37.9 → 0.37.10

package/dist/constants/common.d.ts

@@ -1,5 +1,6 @@
 export declare const API_BASE_URL = "https://sui.api.scallop.io";
 export declare const ADDRESSES_ID = "6462a088a7ace142bb6d7e9b";
+export declare const PROTOCOL_OBJECT_ID = "0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf";
 export declare const SUPPORT_ASSET_COINS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus"];
 export declare const SUPPORT_COLLATERAL_COINS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus"];
 export declare const SUPPORT_ORACLES: readonly ["supra", "switchboard", "pyth"];

package/dist/index.js

@@ -32,6 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   ADDRESSES_ID: () => ADDRESSES_ID,
   API_BASE_URL: () => API_BASE_URL,
+  PROTOCOL_OBJECT_ID: () => PROTOCOL_OBJECT_ID,
   SUI_COIN_TYPE_ARG_REGEX: () => SUI_COIN_TYPE_ARG_REGEX,
   SUPPORT_ASSET_COINS: () => SUPPORT_ASSET_COINS,
   SUPPORT_COLLATERAL_COINS: () => SUPPORT_COLLATERAL_COINS,
@@ -47,6 +48,7 @@ module.exports = __toCommonJS(src_exports);
 // src/constants/common.ts
 var API_BASE_URL = "https://sui.api.scallop.io";
 var ADDRESSES_ID = "6462a088a7ace142bb6d7e9b";
+var PROTOCOL_OBJECT_ID = "0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf";
 var SUPPORT_ASSET_COINS = [
   "eth",
   "btc",
@@ -619,17 +621,16 @@ var ScallopUtils = class {
    * @description Handle market coin types.
    *
    * @param coinPackageId Package id of coin.
-   * @param protocolPkgId Package id of protocol.
    * @param coinName specific support coin name.
    *
    * @return marketCoinType.
    */
-  parseMarketCoinType(coinPackageId, protocolPkgId, coinName) {
+  parseMarketCoinType(coinPackageId, coinName) {
     const coinType = this.parseCoinType(
       coinName === "sui" ? import_sui.SUI_FRAMEWORK_ADDRESS : coinPackageId,
       coinName
     );
-    return `${protocolPkgId}::reserve::MarketCoin<${coinType}>`;
+    return `${PROTOCOL_OBJECT_ID}::reserve::MarketCoin<${coinType}>`;
   }
 };
 
@@ -693,7 +694,6 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils, rateType) => {
     const symbol = coin.toUpperCase();
     const marketCoinType = scallopUtils.parseMarketCoinType(
       scallopAddress.get(`core.coins.${coin}.id`),
-      scallopAddress.get("core.packages.protocol.id"),
       coin
     );
     const wrappedType = coin === "usdc" || coin === "usdt" || coin === "eth" || coin === "btc" || coin === "apt" || coin === "sol" ? {
@@ -790,14 +790,12 @@ var queryObligation = async (obligationId, scallopAddress, suiKit) => {
   const queryResult = await suiKit.inspectTxn(txBlock);
   return queryResult.events[0].parsedJson;
 };
-var getObligations = async (ownerAddress, scallopAddress, suiKit) => {
+var getObligations = async (ownerAddress, suiKit) => {
   const owner = ownerAddress || suiKit.currentAddress();
   const keyObjectRefs = await suiKit.provider().getOwnedObjects({
     owner,
     filter: {
-      StructType: `${scallopAddress.get(
-        "core.packages.protocol.id"
-      )}::obligation::ObligationKey`
+      StructType: `${PROTOCOL_OBJECT_ID}::obligation::ObligationKey`
     }
   });
   const keyIds = keyObjectRefs.data.map((ref) => ref?.data?.objectId).filter((id) => id !== void 0);
@@ -1173,12 +1171,7 @@ var selectCoin = async (txBlock, scallopAddress, scallopUtils, coinName, amount,
 };
 var selectMarketCoin = async (txBlock, scallopAddress, scallopUtils, coinName, amount, sender) => {
   const coinPackageId = scallopAddress.get(`core.coins.${coinName}.id`);
-  const protocolPackageId = scallopAddress.get("core.packages.protocol.id");
-  const coinType = scallopUtils.parseMarketCoinType(
-    coinPackageId,
-    protocolPackageId,
-    coinName
-  );
+  const coinType = scallopUtils.parseMarketCoinType(coinPackageId, coinName);
   const coins = await scallopUtils.selectCoins(sender, amount, coinType);
   const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(coins, amount);
   return { takeCoin, leftCoin };
@@ -1193,13 +1186,13 @@ var requireSender = (txBlock) => {
   return sender;
 };
 var requireObligationInfo = async (...args) => {
-  const [txBlock, scallopAddress, suiKit, obligationId, obligationKey] = args;
-  if (args.length === 4 && obligationId)
+  const [txBlock, suiKit, obligationId, obligationKey] = args;
+  if (args.length === 3 && obligationId)
     return { obligationId };
-  if (args.length === 5 && obligationId && obligationKey)
+  if (args.length === 4 && obligationId && obligationKey)
     return { obligationId, obligationKey };
   const sender = requireSender(txBlock);
-  const obligations = await getObligations(sender, scallopAddress, suiKit);
+  const obligations = await getObligations(sender, suiKit);
   if (obligations.length === 0) {
     throw new Error(`No obligation found for sender ${sender}`);
   }
@@ -1213,7 +1206,6 @@ var scallopQuickMethodsHandler = {
     const sender = requireSender(txBlock);
     const { obligationId: obligationArg } = await requireObligationInfo(
       txBlock,
-      scallopAddress,
       suiKit,
       obligationId
     );
@@ -1236,7 +1228,6 @@ var scallopQuickMethodsHandler = {
   takeCollateralQuick: ({ txBlock, suiKit, scallopUtils, scallopAddress, isTestnet }) => async (amount, coinName, obligationId, obligationKey) => {
     const { obligationId: obligationArg, obligationKey: obligationKeyArg } = await requireObligationInfo(
       txBlock,
-      scallopAddress,
       suiKit,
       obligationId,
       obligationKey
@@ -1290,7 +1281,6 @@ var scallopQuickMethodsHandler = {
   borrowQuick: ({ txBlock, suiKit, scallopUtils, scallopAddress, isTestnet }) => async (amount, coinName, obligationId, obligationKey) => {
     const { obligationId: obligationArg, obligationKey: obligationKeyArg } = await requireObligationInfo(
       txBlock,
-      scallopAddress,
       suiKit,
       obligationId,
       obligationKey
@@ -1315,7 +1305,6 @@ var scallopQuickMethodsHandler = {
     const sender = requireSender(txBlock);
     const { obligationId: obligationArg } = await requireObligationInfo(
       txBlock,
-      scallopAddress,
       suiKit,
       obligationId
     );
@@ -1400,7 +1389,7 @@ var ScallopClient = class {
    */
   async getObligations(ownerAddress) {
     const owner = ownerAddress || this.walletAddress;
-    return getObligations(owner, this.address, this.suiKit);
+    return getObligations(owner, this.suiKit);
   }
   /**
    * Query obligation data.
@@ -1640,6 +1629,7 @@ var Scallop = class {
 0 && (module.exports = {
   ADDRESSES_ID,
   API_BASE_URL,
+  PROTOCOL_OBJECT_ID,
   SUI_COIN_TYPE_ARG_REGEX,
   SUPPORT_ASSET_COINS,
   SUPPORT_COLLATERAL_COINS,