@scallop-io/sui-scallop-sdk 0.47.6 → 1.3.0-alpha.2

package/src/queries/spoolQuery.ts

@@ -1,4 +1,4 @@
-import { normalizeStructTag } from '@mysten/sui.js/utils';
+import { normalizeStructTag } from '@mysten/sui/utils';
 import { SUPPORT_SPOOLS } from '../constants';
 import {
   parseOriginSpoolData,
@@ -7,7 +7,7 @@ import {
   calculateSpoolRewardPoolData,
   isMarketCoin,
 } from '../utils';
-import type { SuiObjectResponse } from '@mysten/sui.js/client';
+import type { SuiObjectResponse } from '@mysten/sui/client';
 import type { ScallopQuery, ScallopUtils } from '../models';
 import type {
   MarketPool,
@@ -287,9 +287,8 @@ export const getStakeAccounts = async (
           utils.parseCoinName<SupportStakeCoins>(stakeMarketCoinName);
         const marketCoinType = utils.parseMarketCoinType(stakeCoinName);
 
-        types[
-          stakeMarketCoinName as SupportStakeMarketCoins
-        ] = `${spoolObjectId}::spool_account::SpoolAccount<${marketCoinType}>`;
+        types[stakeMarketCoinName as SupportStakeMarketCoins] =
+          `${spoolObjectId}::spool_account::SpoolAccount<${marketCoinType}>`;
         return types;
       },
       {} as Record<SupportStakeMarketCoins, string>

package/src/queries/vescaQuery.ts

@@ -4,12 +4,13 @@ import {
   type SuiObjectResponse,
   type SuiObjectData,
   DevInspectResults,
-} from '@mysten/sui.js/client';
+} from '@mysten/sui/client';
 import type { ScallopUtils } from '../models';
 import { MAX_LOCK_DURATION } from 'src/constants';
 import { SUI_CLOCK_OBJECT_ID, SuiTxBlock } from '@scallop-io/sui-kit';
-import { bcs } from '@mysten/sui.js/bcs';
+import { bcs } from '@mysten/sui/bcs';
 import { z as zod } from 'zod';
+import assert from 'assert';
 /**
  * Query all owned veSca key.
  *
@@ -213,6 +214,7 @@ const getTotalVeScaTreasuryAmount = async (
   );
 
   const txb = new SuiTxBlock();
+
   // refresh first
   txb.moveCall(refreshQueryTarget, resolvedRefreshArgs);
   txb.moveCall(veScaAmountQueryTarget, resolvedVeScaAmountArgs);
@@ -237,7 +239,8 @@ const getTotalVeScaTreasuryAmount = async (
   if (results && results[1].returnValues) {
     const value = Uint8Array.from(results[1].returnValues[0][0]);
     const type = results[1].returnValues[0][1];
-    return bcs.de(type, value);
+    assert(type === 'u64', 'Result type is not u64');
+    return bcs.u64().parse(value);
   }
 
   return '0';

package/src/test.ts

@@ -0,0 +1,26 @@
+import { ScallopQuery } from './models';
+
+const query = new ScallopQuery({
+  walletAddress:
+    '0xe78704e7c188b1902dbb630dc4c3ef7f46740c8cf121e38b3438ac1daea09f2d',
+});
+
+const main = async () => {
+  try {
+    await query.init();
+    const result = await query.suiKit.client().getObject({
+      id: '0xaa72bd551b25715b8f9d72f226fa02526bdf2e085a86faec7184230c5209bb6e',
+      options: {
+        showContent: true,
+        showType: true,
+      },
+    });
+    console.dir(result.data, { depth: null });
+  } catch (e) {
+    console.error(e);
+  } finally {
+    process.exit(0);
+  }
+};
+
+main();

package/src/types/address.ts

@@ -27,13 +27,13 @@ export interface AddressesInterface {
             [K in SupportOracleType]: K extends (typeof SUPPORT_ORACLES)[0]
               ? string
               : K extends (typeof SUPPORT_ORACLES)[1]
-              ? string
-              : K extends (typeof SUPPORT_ORACLES)[2]
-              ? {
-                  feed: string;
-                  feedObject: string;
-                }
-              : never;
+                ? string
+                : K extends (typeof SUPPORT_ORACLES)[2]
+                  ? {
+                      feed: string;
+                      feedObject: string;
+                    }
+                  : never;
           };
         }
       >
@@ -46,19 +46,19 @@ export interface AddressesInterface {
             holder: string;
           }
         : K extends (typeof SUPPORT_ORACLES)[1]
-        ? {
-            registry: string;
-            registryCap: string;
-          }
-        : K extends (typeof SUPPORT_ORACLES)[2]
-        ? {
-            registry: string;
-            registryCap: string;
-            state: string;
-            wormhole: string;
-            wormholeState: string;
-          }
-        : never;
+          ? {
+              registry: string;
+              registryCap: string;
+            }
+          : K extends (typeof SUPPORT_ORACLES)[2]
+            ? {
+                registry: string;
+                registryCap: string;
+                state: string;
+                wormhole: string;
+                wormholeState: string;
+              }
+            : never;
     } & { xOracle: string; xOracleCap: string };
     packages: Partial<
       Record<
@@ -145,12 +145,12 @@ type AddressPathsProps<T> = T extends string
 type Join<T extends string[], D extends string> = T extends []
   ? never
   : T extends [infer F]
-  ? F
-  : T extends [infer F, ...infer R]
-  ? F extends string
-    ? `${F}${D}${Join<Extract<R, string[]>, D>}`
-    : never
-  : string;
+    ? F
+    : T extends [infer F, ...infer R]
+      ? F extends string
+        ? `${F}${D}${Join<Extract<R, string[]>, D>}`
+        : never
+      : string;
 
 export type AddressStringPath = Join<
   AddressPathsProps<AddressesInterface>,

package/src/types/builder/borrowIncentive.ts

@@ -2,7 +2,7 @@ import type {
   SuiTxBlock as SuiKitTxBlock,
   SuiObjectArg,
 } from '@scallop-io/sui-kit';
-import type { TransactionResult } from '@mysten/sui.js/transactions';
+import type { TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type {
   SupportBorrowIncentiveCoins,

package/src/types/builder/core.ts

@@ -1,13 +1,11 @@
 import type {
   SuiTxBlock as SuiKitTxBlock,
-  SuiAddressArg,
   SuiObjectArg,
-  SuiTxArg,
 } from '@scallop-io/sui-kit';
 import type {
   TransactionArgument,
   TransactionResult,
-} from '@mysten/sui.js/transactions';
+} from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type {
   SupportCollateralCoins,
@@ -35,19 +33,19 @@ type ObligationHotPotato = NestedResult;
 export type CoreNormalMethods = {
   openObligation: () => [Obligation, ObligationKey, ObligationHotPotato];
   returnObligation: (
-    obligation: SuiAddressArg,
+    obligation: SuiObjectArg,
     obligationHotPotato: SuiObjectArg
   ) => void;
   openObligationEntry: () => void;
   addCollateral: (
-    obligation: SuiAddressArg,
+    obligation: SuiObjectArg,
     coin: SuiObjectArg,
     collateralCoinName: SupportCollateralCoins
   ) => void;
   takeCollateral: (
-    obligation: SuiAddressArg,
-    obligationKey: SuiAddressArg,
-    amount: SuiTxArg,
+    obligation: SuiObjectArg,
+    obligationKey: SuiObjectArg,
+    amount: number,
     collateralCoinName: SupportCollateralCoins
   ) => TransactionResult;
   deposit: (
@@ -64,36 +62,36 @@ export type CoreNormalMethods = {
     poolCoinName: SupportPoolCoins
   ) => void;
   borrow: (
-    obligation: SuiAddressArg,
-    obligationKey: SuiAddressArg,
-    amount: SuiTxArg,
+    obligation: SuiObjectArg,
+    obligationKey: SuiObjectArg,
+    amount: number,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   borrowWithReferral: (
-    obligation: SuiAddressArg,
-    obligationKey: SuiAddressArg,
+    obligation: SuiObjectArg,
+    obligationKey: SuiObjectArg,
     borrowReferral: SuiObjectArg,
-    amount: SuiTxArg,
+    amount: number,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   borrowEntry: (
-    obligation: SuiAddressArg,
-    obligationKey: SuiAddressArg,
-    amount: SuiTxArg,
+    obligation: SuiObjectArg,
+    obligationKey: SuiObjectArg,
+    amount: number,
     poolCoinName: SupportPoolCoins
   ) => void;
   repay: (
-    obligation: SuiAddressArg,
+    obligation: SuiObjectArg,
     coin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
   ) => void;
   borrowFlashLoan: (
-    amount: SuiTxArg,
+    amount: number,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   repayFlashLoan: (
     coin: SuiObjectArg,
-    loan: SuiAddressArg,
+    loan: SuiObjectArg,
     poolCoinName: SupportPoolCoins
   ) => void;
 };
@@ -102,26 +100,26 @@ export type CoreQuickMethods = {
   addCollateralQuick: (
     amount: number,
     collateralCoinName: SupportCollateralCoins,
-    obligationId?: SuiAddressArg
+    obligationId?: SuiObjectArg
   ) => Promise<void>;
   takeCollateralQuick: (
     amount: number,
     collateralCoinName: SupportCollateralCoins,
-    obligationId?: SuiAddressArg,
-    obligationKey?: SuiAddressArg
+    obligationId?: SuiObjectArg,
+    obligationKey?: SuiObjectArg
   ) => Promise<TransactionResult>;
   borrowQuick: (
     amount: number,
     poolCoinName: SupportPoolCoins,
-    obligationId?: SuiAddressArg,
-    obligationKey?: SuiAddressArg
+    obligationId?: SuiObjectArg,
+    obligationKey?: SuiObjectArg
   ) => Promise<TransactionResult>;
   borrowWithReferralQuick: (
     amount: number,
     poolCoinName: SupportPoolCoins,
     borrowReferral: SuiObjectArg,
-    obligationId?: SuiAddressArg,
-    obligationKey?: SuiAddressArg
+    obligationId?: SuiObjectArg,
+    obligationKey?: SuiObjectArg
   ) => Promise<TransactionResult>;
   depositQuick: (
     amount: number,
@@ -135,7 +133,7 @@ export type CoreQuickMethods = {
   repayQuick: (
     amount: number,
     poolCoinName: SupportPoolCoins,
-    obligationId?: SuiAddressArg
+    obligationId?: SuiObjectArg
   ) => Promise<void>;
   updateAssetPricesQuick: (
     assetCoinNames?: SupportAssetCoins[]

package/src/types/builder/spool.ts

@@ -2,9 +2,8 @@ import type {
   SuiTxBlock as SuiKitTxBlock,
   SuiAddressArg,
   SuiObjectArg,
-  SuiTxArg,
 } from '@scallop-io/sui-kit';
-import type { TransactionResult } from '@mysten/sui.js/transactions';
+import type { TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportStakeMarketCoins } from '../constant';
 import { SuiTxBlockWithSCoin } from '.';
@@ -24,7 +23,7 @@ export type SpoolNormalMethods = {
   ) => void;
   unstake: (
     stakeAccount: SuiAddressArg,
-    amount: SuiTxArg,
+    amount: number,
     stakeMarketCoinName: SupportStakeMarketCoins
   ) => TransactionResult;
   claim: (

package/src/types/builder/vesca.ts

@@ -1,9 +1,5 @@
-import {
-  SuiTxBlock as SuiKitTxBlock,
-  SuiObjectArg,
-  SuiTxArg,
-} from '@scallop-io/sui-kit';
-import type { TransactionResult } from '@mysten/sui.js/transactions';
+import { SuiTxBlock as SuiKitTxBlock, SuiObjectArg } from '@scallop-io/sui-kit';
+import type { TransactionResult } from '@mysten/sui/transactions';
 import { ScallopBuilder } from 'src/models';
 
 export type VescaIds = {
@@ -16,17 +12,17 @@ export type VescaIds = {
 export type VeScaNormalMethods = {
   lockSca: (
     scaCoin: SuiObjectArg,
-    unlockAtInSecondTimestamp: SuiTxArg
+    unlockAtInSecondTimestamp: number
   ) => TransactionResult;
   extendLockPeriod: (
     veScaKey: SuiObjectArg,
-    newUnlockAtInSecondTimestamp: SuiTxArg
+    newUnlockAtInSecondTimestamp: number
   ) => void;
   extendLockAmount: (veScaKey: SuiObjectArg, scaCoin: SuiObjectArg) => void;
   renewExpiredVeSca: (
     veScaKey: SuiObjectArg,
     scaCoin: SuiObjectArg,
-    newUnlockAtInSecondTimestamp: SuiTxArg
+    newUnlockAtInSecondTimestamp: number
   ) => void;
   redeemSca: (veScaKey: SuiObjectArg) => TransactionResult;
   mintEmptyVeSca: () => TransactionResult;

package/src/types/model.ts

@@ -1,8 +1,5 @@
-import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
-import type {
-  TransactionBlock,
-  TransactionResult,
-} from '@mysten/sui.js/transactions';
+import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
+import type { Transaction, TransactionResult } from '@mysten/sui/transactions';
 import type { SuiKit, SuiKitParams, NetworkType } from '@scallop-io/sui-kit';
 import type {
   ScallopAddress,
@@ -16,12 +13,12 @@ import { AddressesInterface } from './address';
 
 export type ScallopClientFnReturnType<T extends boolean> = T extends true
   ? SuiTransactionBlockResponse
-  : TransactionBlock;
+  : Transaction;
 
 export type ScallopClientVeScaReturnType<T extends boolean> = T extends true
   ? SuiTransactionBlockResponse
   : {
-      tx: TransactionBlock;
+      tx: Transaction;
       scaCoin: TransactionResult;
     };
 
@@ -60,12 +57,12 @@ export type ScallopAddressParams = {
   id: string;
   auth?: string;
   network?: NetworkType;
-  forceInterface?: Record<NetworkType, AddressesInterface>;
+  forceInterface?: Partial<Record<NetworkType, AddressesInterface>>;
 };
 
 export type ScallopParams = {
   addressesId?: string;
-  forceAddressesInterface?: Record<NetworkType, AddressesInterface>;
+  forceAddressesInterface?: Partial<Record<NetworkType, AddressesInterface>>;
   walletAddress?: string;
 } & SuiKitParams;
 

package/src/types/query/vesca.ts

@@ -1,4 +1,4 @@
-import type { SuiObjectRef } from '@mysten/sui.js/client';
+import type { SuiObjectRef } from '@mysten/sui/client';
 
 export type Vesca = {
   id: string;

package/src/utils/index.ts

@@ -2,3 +2,4 @@ export * from './builder';
 export * from './query';
 export * from './util';
 export * from './tokenBucket';
+export * from './indexer';

package/src/utils/indexer.ts

@@ -0,0 +1,39 @@
+/**
+ * Generic wrapper for methods with indexer fallback.
+ *
+ * @param method - The method to call with fallback behavior.
+ * @param context - The context (`this`) of the class instance.
+ * @param args - The arguments to pass to the method.
+ * @returns The result of the method call.
+ */
+export async function callMethodWithIndexerFallback(
+  method: Function,
+  context: any,
+  ...args: any[]
+) {
+  const indexer = args[args.length - 1]; // Assume last argument is always `indexer`
+
+  if (indexer) {
+    try {
+      return await method.apply(context, args);
+    } catch (_e) {
+      console.warn('Indexer requests failed. Retrying without indexer..');
+      return await method.apply(context, [...args.slice(0, -1), false]);
+    }
+  }
+  return await method.apply(context, args);
+}
+
+/**
+ * This function creates a wrapper for methods that have an indexer parameter.
+ * It ensures fallback behavior if indexer fails.
+ *
+ * @param method - The method to wrap.
+ * @returns A function that applies indexer fallback.
+ */
+export function withIndexerFallback(method: Function) {
+  return (...args: any[]) => {
+    // @ts-ignore
+    return callMethodWithIndexerFallback(method, this, ...args); // Preserve `this` with arrow function
+  };
+}

package/src/utils/query.ts

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { normalizeStructTag, parseStructTag } from '@mysten/sui.js/utils';
+import { normalizeStructTag, parseStructTag } from '@mysten/sui/utils';
 import type { ScallopUtils } from '../models';
 import type {
   OriginMarketPoolData,