@scallop-io/sui-scallop-sdk 1.3.0-alpha.4 → 1.3.0-alpha.5

package/dist/index.mjs

@@ -283,6 +283,93 @@ var FlashLoanFeeObjectMap = {
   wsol: "0xe84bdb35b790fc7bdd1645122ac6ac0fc904531d6772c9e25904fece322c5f34"
 };
 
+// src/constants/queryKeys.ts
+var queryKeys = {
+  api: {
+    getAddresses: (addressesId) => [
+      "api",
+      "getAddresses",
+      { addressesId }
+    ],
+    getMarket: () => ["api", "getMarket"],
+    getSpools: () => ["api", "getSpools"],
+    getBorrowIncentivePool: () => ["api", "getBorrowIncentivePools"],
+    getTotalValueLocked: () => ["api", "getTotalValueLocked"]
+  },
+  rpc: {
+    getInspectTxn: (queryTarget, args, typeArgs) => [
+      "rpc",
+      "getInspectTxn",
+      {
+        queryTarget,
+        args: JSON.stringify(args),
+        typeArgs: !typeArgs ? void 0 : JSON.stringify(typeArgs)
+      }
+    ],
+    getObject: (objectId, walletAddress, options) => ["rpc", "getObject", { walletAddress, options, objectId }],
+    getObjects: (objectIds, walletAddress, options) => [
+      "rpc",
+      "getObjects",
+      {
+        walletAddress,
+        options,
+        objectIds: JSON.stringify(objectIds ?? [])
+      }
+    ],
+    getOwnedObjects: (input) => [
+      "rpc",
+      "getOwnedObjects",
+      {
+        walletAddress: input.owner,
+        cursor: input.cursor ?? void 0,
+        options: input.options ?? void 0,
+        filter: JSON.stringify(input.filter ?? void 0),
+        limit: input.limit ?? void 0
+      }
+    ],
+    getDynamicFields: (input) => [
+      "rpc",
+      "getDynamicFields",
+      {
+        parentId: input.parentId,
+        cursor: input.cursor ?? void 0,
+        limit: input.limit ?? void 0
+      }
+    ],
+    getDynamicFieldObject: (input) => [
+      "rpc",
+      "getDynamicFieldObject",
+      {
+        parentId: input.parentId,
+        name: {
+          type: input?.name?.type,
+          value: input?.name?.value
+        }
+      }
+    ],
+    getTotalVeScaTreasuryAmount: (refreshArgs, vescaAmountArgs) => [
+      "rpc",
+      "getTotalVeScaTreasuryAmount",
+      {
+        refreshArgs: JSON.stringify(refreshArgs),
+        vescaAmountArgs: JSON.stringify(vescaAmountArgs)
+      }
+    ],
+    getAllCoinBalances: (owner) => [
+      "rpc",
+      "getAllCoinBalances",
+      { owner }
+    ]
+  },
+  pyth: {
+    getPythLatestPriceFeed: (pythPriceId) => [
+      "pyth",
+      "getPythPriceId",
+      { pythPriceId }
+    ]
+  }
+};
+
 // src/constants/vesca.ts
 var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
 var MAX_LOCK_ROUNDS = 1460;
@@ -300,8 +387,7 @@ import { SuiKit } from "@scallop-io/sui-kit";
 import { QueryClient } from "@tanstack/query-core";
 import {
   SuiTxBlock,
-  normalizeStructTag as normalizeStructTag2,
-  normalizeSuiAddress
+  normalizeStructTag as normalizeStructTag2
 } from "@scallop-io/sui-kit";
 
 // src/constants/cache.ts
@@ -942,8 +1028,8 @@ async function callMethodWithIndexerFallback(method, context, ...args) {
   if (indexer) {
     try {
       return await method.apply(context, args);
-    } catch (_e) {
-      console.warn("Indexer requests failed. Retrying without indexer..");
+    } catch (e) {
+      console.warn(`Indexer requests failed: ${e}. Retrying without indexer..`);
       return await method.apply(context, [...args.slice(0, -1), false]);
     }
   }
@@ -957,8 +1043,8 @@ function withIndexerFallback(method) {
 
 // src/models/scallopCache.ts
 var ScallopCache = class {
-  constructor(suiKit, walletAddress, cacheOptions, tokenBucket) {
-    this.queryClient = new QueryClient(cacheOptions ?? DEFAULT_CACHE_OPTIONS);
+  constructor(suiKit, walletAddress, cacheOptions, tokenBucket, queryClient) {
+    this.queryClient = queryClient ?? new QueryClient(cacheOptions ?? DEFAULT_CACHE_OPTIONS);
     this._suiKit = suiKit;
     this.tokenBucket = tokenBucket ?? new TokenBucket(DEFAULT_TOKENS_PER_INTERVAL, DEFAULT_INTERVAL_IN_MS);
     this.walletAddress = walletAddress ?? suiKit.currentAddress();
@@ -986,41 +1072,6 @@ var ScallopCache = class {
       refetchType
     });
   }
-  async resolveArgs(txb, args) {
-    return await Promise.all(
-      args.map(async (arg) => {
-        if (typeof arg === "string") {
-          const objData = (await this.queryGetObject(arg, { showOwner: true }))?.data;
-          if (!objData)
-            return arg;
-          const owner = objData?.owner;
-          if (!owner)
-            return arg;
-          if ("Shared" in owner) {
-            return txb.sharedObjectRef({
-              objectId: objData.objectId,
-              initialSharedVersion: owner.Shared.initial_shared_version,
-              mutable: true
-            });
-          } else {
-            return txb.objectRef({
-              objectId: objData.objectId,
-              version: objData.version,
-              digest: objData.digest
-            });
-          }
-        } else if ("objectId" in arg && "version" in arg && "digest" in arg) {
-          return txb.objectRef({
-            objectId: arg.objectId,
-            version: arg.version,
-            digest: arg.digest
-          });
-        } else {
-          return arg;
-        }
-      })
-    );
-  }
   /**
    * @description Provides cache for inspectTxn of the SuiKit.
    * @param QueryInspectTxnParams
@@ -1033,15 +1084,9 @@ var ScallopCache = class {
     typeArgs
   }) {
     const txBlock = new SuiTxBlock();
-    const resolvedArgs = await this.resolveArgs(txBlock, args);
-    txBlock.moveCall(queryTarget, resolvedArgs, typeArgs);
+    txBlock.moveCall(queryTarget, args, typeArgs);
     const query = await this.queryClient.fetchQuery({
-      queryKey: typeArgs ? ["inspectTxn", queryTarget, JSON.stringify(args)] : [
-        "inspectTxn",
-        queryTarget,
-        JSON.stringify(args),
-        JSON.stringify(typeArgs)
-      ],
+      queryKey: queryKeys.rpc.getInspectTxn(queryTarget, args, typeArgs),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
@@ -1058,12 +1103,8 @@ var ScallopCache = class {
    * @returns Promise<SuiObjectResponse>
    */
   async queryGetObject(objectId, options) {
-    const queryKey = ["getObject", objectId, this.walletAddress];
-    if (options) {
-      queryKey.push(JSON.stringify(options));
-    }
     return this.queryClient.fetchQuery({
-      queryKey,
+      queryKey: queryKeys.rpc.getObject(objectId, this.walletAddress, options),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
@@ -1085,16 +1126,12 @@ var ScallopCache = class {
   }) {
     if (objectIds.length === 0)
       return [];
-    const queryKey = [
-      "getObjects",
-      JSON.stringify(objectIds),
-      this.walletAddress
-    ];
-    if (options) {
-      queryKey.push(JSON.stringify(options));
-    }
     return this.queryClient.fetchQuery({
-      queryKey,
+      queryKey: queryKeys.rpc.getObjects(
+        objectIds,
+        this.walletAddress,
+        options
+      ),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
@@ -1109,21 +1146,8 @@ var ScallopCache = class {
    * @returns Promise<PaginatedObjectsResponse>
    */
   async queryGetOwnedObjects(input) {
-    const queryKey = ["getOwnedObjects", input.owner];
-    if (input.cursor) {
-      queryKey.push(JSON.stringify(input.cursor));
-    }
-    if (input.options) {
-      queryKey.push(JSON.stringify(input.options));
-    }
-    if (input.filter) {
-      queryKey.push(JSON.stringify(input.filter));
-    }
-    if (input.limit) {
-      queryKey.push(JSON.stringify(input.limit));
-    }
     return this.queryClient.fetchQuery({
-      queryKey,
+      queryKey: queryKeys.rpc.getOwnedObjects(input),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
@@ -1133,15 +1157,8 @@ var ScallopCache = class {
     });
   }
   async queryGetDynamicFields(input) {
-    const queryKey = ["getDynamicFields", input.parentId];
-    if (input.cursor) {
-      queryKey.push(JSON.stringify(input.cursor));
-    }
-    if (input.limit) {
-      queryKey.push(JSON.stringify(input.limit));
-    }
     return this.queryClient.fetchQuery({
-      queryKey,
+      queryKey: queryKeys.rpc.getDynamicFields(input),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
@@ -1151,14 +1168,8 @@ var ScallopCache = class {
     });
   }
   async queryGetDynamicFieldObject(input) {
-    const queryKey = [
-      "getDynamicFieldObject",
-      input.parentId,
-      input.name.type,
-      input.name.value
-    ];
     return this.queryClient.fetchQuery({
-      queryKey,
+      queryKey: queryKeys.rpc.getDynamicFieldObject(input),
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
@@ -1168,9 +1179,8 @@ var ScallopCache = class {
     });
   }
   async queryGetAllCoinBalances(owner) {
-    const queryKey = ["getAllCoinBalances", owner];
     return this.queryClient.fetchQuery({
-      queryKey,
+      queryKey: queryKeys.rpc.getAllCoinBalances(owner),
       queryFn: async () => {
         const allBalances = await callWithRateLimit(
           this.tokenBucket,
@@ -1187,17 +1197,6 @@ var ScallopCache = class {
           },
           {}
         );
-        for (const coinType in balances) {
-          const coinBalanceQueryKey = [
-            "getCoinBalance",
-            normalizeSuiAddress(owner),
-            normalizeStructTag2(coinType)
-          ];
-          this.queryClient.setQueryData(
-            coinBalanceQueryKey,
-            balances[coinType]
-          );
-        }
         return balances;
       }
     });
@@ -1205,19 +1204,7 @@ var ScallopCache = class {
   async queryGetCoinBalance(input) {
     if (!input.coinType)
       return "0";
-    const queryKey = [
-      "getCoinBalance",
-      normalizeSuiAddress(input.owner),
-      normalizeStructTag2(input.coinType)
-    ];
-    return this.queryClient.fetchQuery({
-      queryKey,
-      queryFn: async () => {
-        if (!input.coinType)
-          return "0";
-        return (await this.queryGetAllCoinBalances(input.owner))[normalizeStructTag2(input.coinType)] ?? "0";
-      }
-    });
+    return (await this.queryGetAllCoinBalances(input.owner) || {})[normalizeStructTag2(input.coinType)] ?? "0";
   }
 };
 
@@ -2151,7 +2138,7 @@ var ScallopAddress = class {
     const addressesId = id || this._id || void 0;
     if (addressesId !== void 0) {
       const response = await this.cache.queryClient.fetchQuery({
-        queryKey: ["api-getAddresses", addressesId],
+        queryKey: queryKeys.api.getAddresses(addressesId),
         queryFn: async () => {
           return await this._requestClient.get(`/addresses/${addressesId}`, {
             headers: {
@@ -2277,7 +2264,7 @@ var ScallopAddress = class {
 };
 
 // src/models/scallopClient.ts
-import { normalizeSuiAddress as normalizeSuiAddress4 } from "@mysten/sui/utils";
+import { normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui/utils";
 import { SuiKit as SuiKit6 } from "@scallop-io/sui-kit";
 
 // src/models/scallopUtils.ts
@@ -4252,10 +4239,10 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
     onlyTransactionKind: true
   });
   const res = await utils.cache.queryClient.fetchQuery({
-    queryKey: [
-      "getTotalVeScaTreasuryAmount",
-      JSON.stringify([...refreshArgs, ...veScaAmountArgs])
-    ],
+    queryKey: queryKeys.rpc.getTotalVeScaTreasuryAmount(
+      refreshArgs,
+      veScaAmountArgs
+    ),
     queryFn: async () => {
       return await utils.suiKit.inspectTxn(txBytes);
     }
@@ -4739,7 +4726,7 @@ var ScallopUtils = class {
             const pythConnection = new SuiPriceServiceConnection(endpoint);
             try {
               const feed = await this.address.cache.queryClient.fetchQuery({
-                queryKey: [priceId],
+                queryKey: queryKeys.pyth.getPythLatestPriceFeed(priceId),
                 queryFn: async () => {
                   return await pythConnection.getLatestPriceFeeds([priceId]);
                 }
@@ -4833,7 +4820,7 @@ var ScallopUtils = class {
 };
 
 // src/models/scallopBuilder.ts
-import { normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui/utils";
+import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui/utils";
 import { SuiKit as SuiKit5 } from "@scallop-io/sui-kit";
 
 // src/builders/coreBuilder.ts
@@ -6466,7 +6453,7 @@ var ScallopIndexer = class {
    */
   async getMarket() {
     const response = await this.cache.queryClient.fetchQuery({
-      queryKey: ["market"],
+      queryKey: queryKeys.api.getMarket(),
       queryFn: async () => {
         return await this._requestClient.get(`/api/market/migrate`);
       }
@@ -6529,7 +6516,7 @@ var ScallopIndexer = class {
    */
   async getSpools() {
     const response = await this.cache.queryClient.fetchQuery({
-      queryKey: ["spools"],
+      queryKey: queryKeys.api.getSpools(),
       queryFn: async () => {
         return await this._requestClient.get(`/api/spools/migrate`);
       }
@@ -6558,7 +6545,7 @@ var ScallopIndexer = class {
    */
   async getBorrowIncentivePools() {
     const response = await this.cache.queryClient.fetchQuery({
-      queryKey: ["borrowIncentivePools"],
+      queryKey: queryKeys.api.getBorrowIncentivePool(),
       queryFn: async () => {
         return await this._requestClient.get(`/api/borrowIncentivePools/migrate`);
       }
@@ -6599,7 +6586,7 @@ var ScallopIndexer = class {
    */
   async getTotalValueLocked() {
     const response = await this.cache.queryClient.fetchQuery({
-      queryKey: ["totalValueLocked"],
+      queryKey: queryKeys.api.getTotalValueLocked(),
       queryFn: async () => {
         return await this._requestClient.get(`/api/market/tvl`);
       }
@@ -6706,12 +6693,12 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
 };
 
 // src/models/scallopQuery.ts
-import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui/utils";
+import { normalizeSuiAddress } from "@mysten/sui/utils";
 var ScallopQuery = class {
   constructor(params, instance) {
     this.params = params;
     this.suiKit = instance?.suiKit ?? instance?.utils?.suiKit ?? new SuiKit4(params);
-    this.walletAddress = normalizeSuiAddress2(
+    this.walletAddress = normalizeSuiAddress(
       params.walletAddress || this.suiKit.currentAddress()
     );
     if (instance?.utils) {
@@ -7244,7 +7231,7 @@ var ScallopBuilder = class {
   constructor(params, instance) {
     this.suiKit = instance?.suiKit ?? new SuiKit5(params);
     this.params = params;
-    this.walletAddress = normalizeSuiAddress3(
+    this.walletAddress = normalizeSuiAddress2(
       params?.walletAddress || this.suiKit.currentAddress()
     );
     if (instance?.query) {
@@ -7394,7 +7381,7 @@ var ScallopClient = class {
   constructor(params, instance) {
     this.params = params;
     this.suiKit = instance?.suiKit ?? instance?.builder?.suiKit ?? new SuiKit6(params);
-    this.walletAddress = normalizeSuiAddress4(
+    this.walletAddress = normalizeSuiAddress3(
       params?.walletAddress || this.suiKit.currentAddress()
     );
     if (instance?.builder) {
@@ -8064,14 +8051,15 @@ var ScallopClient = class {
 
 // src/models/scallop.ts
 var Scallop = class {
-  constructor(params, cacheOptions, tokenBucket) {
+  constructor(params, cacheOptions, tokenBucket, queryClient) {
     this.params = params;
     this.suiKit = new SuiKit7(params);
     this.cache = new ScallopCache(
       this.suiKit,
       params.walletAddress,
       cacheOptions ?? DEFAULT_CACHE_OPTIONS,
-      tokenBucket ?? new TokenBucket(DEFAULT_TOKENS_PER_INTERVAL, DEFAULT_INTERVAL_IN_MS)
+      tokenBucket ?? new TokenBucket(DEFAULT_TOKENS_PER_INTERVAL, DEFAULT_INTERVAL_IN_MS),
+      queryClient
     );
     this.address = new ScallopAddress(
       {
@@ -8215,6 +8203,7 @@ export {
   coinDecimals,
   coinIds,
   marketCoins,
+  queryKeys,
   sCoinIds,
   sCoins,
   spoolRewardCoins,