@scallop-io/sui-scallop-sdk 1.4.24-alpha.1 → 1.5.0-alpha.1

package/dist/models/scallopIndexer.d.ts

@@ -86,4 +86,5 @@ export declare class ScallopIndexer {
      * @return price data.
      */
     getCoinPrice(poolCoinName: SupportPoolCoins): Promise<number>;
+    getCoinPrices(): Promise<Record<string, number>>;
 }

package/dist/models/scallopQuery.d.ts

@@ -1,5 +1,5 @@
 import { SuiKit, SuiObjectArg } from '@scallop-io/sui-kit';
-import { ScallopQueryParams, SupportStakeMarketCoins, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, SupportMarketCoins, SupportBorrowIncentiveCoins, SupportSCoin, ScallopQueryInstanceParams, MarketPool, CoinPrices, MarketPools, MarketCollaterals } from '../types';
+import { ScallopQueryParams, SupportStakeMarketCoins, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, SupportMarketCoins, SupportBorrowIncentiveCoins, SupportSCoin, ScallopQueryInstanceParams, MarketPool, CoinPrices, MarketPools, MarketCollaterals, xOracleRules } from '../types';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopIndexer } from './scallopIndexer';
@@ -128,7 +128,10 @@ export declare class ScallopQuery {
      * @param obligationId - The obligation id.
      * @return Obligation data.
      */
-    queryObligation(obligationId: string | SuiObjectArg): Promise<import("../types").ObligationQueryInterface | undefined>;
+    queryObligation(obligationId: SuiObjectArg, args?: {
+        version: SuiObjectArg;
+        market: SuiObjectArg;
+    }): Promise<import("../types").ObligationQueryInterface | undefined>;
     /**
      * Get all asset coin amounts.
      *
@@ -320,7 +323,6 @@ export declare class ScallopQuery {
         deep?: import("../types").BorrowIncentivePool | undefined;
         fdusd?: import("../types").BorrowIncentivePool | undefined;
         blub?: import("../types").BorrowIncentivePool | undefined;
-        musd?: import("../types").BorrowIncentivePool | undefined;
     }>;
     /**
      * Get borrow incentive accounts data.
@@ -350,7 +352,6 @@ export declare class ScallopQuery {
         deep?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         fdusd?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
         blub?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
-        musd?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     }>;
     /**
      * Get user lending and spool infomation for specific pools.
@@ -385,7 +386,6 @@ export declare class ScallopQuery {
         deep?: import("../types").Lending | undefined;
         fdusd?: import("../types").Lending | undefined;
         blub?: import("../types").Lending | undefined;
-        musd?: import("../types").Lending | undefined;
     }>;
     /**
      * Get user lending and spool information for specific pool.
@@ -501,7 +501,7 @@ export declare class ScallopQuery {
      * @param ownerAddress - The owner address.
      * @return All market sCoin amounts.
      */
-    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub" | "smusd", number>>>;
+    getSCoinAmounts(sCoinNames?: SupportSCoin[], ownerAddress?: string): Promise<import("../types").OptionalKeys<Record<"susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub", number>>>;
     /**
      * Get sCoin amount.
      *
@@ -516,7 +516,7 @@ export declare class ScallopQuery {
      * @returns
      */
     getSCoinSwapRate(fromSCoin: SupportSCoin, toSCoin: SupportSCoin): Promise<number>;
-    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd", number>>;
+    getFlashLoanFees(assetCoinNames?: SupportAssetCoins[]): Promise<Record<"usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub", number>>;
     /**
      * Get supply limit of lending pool
      */
@@ -539,6 +539,11 @@ export declare class ScallopQuery {
      * @returns price data
      */
     getCoinPriceByIndexer(poolName: SupportPoolCoins): Promise<number>;
+    /**
+     * Get all supported pool price from indexer
+     * @returns prices data
+     */
+    getCoinPricesByIndexer(): Promise<Record<string, number>>;
     /**
      * Get all coin prices, including sCoin
      * @returns prices data
@@ -546,6 +551,7 @@ export declare class ScallopQuery {
     getAllCoinPrices(args?: {
         marketPools?: MarketPools;
         coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<{
         susdc?: number | undefined;
         ssbeth?: number | undefined;
@@ -566,7 +572,6 @@ export declare class ScallopQuery {
         sdeep?: number | undefined;
         sfdusd?: number | undefined;
         sblub?: number | undefined;
-        smusd?: number | undefined;
         usdc?: number | undefined;
         sbeth?: number | undefined;
         sbusdt?: number | undefined;
@@ -587,14 +592,13 @@ export declare class ScallopQuery {
         deep?: number | undefined;
         fdusd?: number | undefined;
         blub?: number | undefined;
-        musd?: number | undefined;
         swapt?: number | undefined;
     }>;
     /**
      * Query all address (lending pool, collateral pool, borrow dynamics, interest models, etc.) of all pool
      * @returns
      */
-    getPoolAddresses(pools?: SupportPoolCoins[]): Promise<import("../types").OptionalKeys<Record<"usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd", {
+    getPoolAddresses(poolNames?: SupportPoolCoins[]): Promise<import("../types").OptionalKeys<Record<"usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub", {
         coinName: string;
         symbol: string;
         lendingPoolAddress?: string;
@@ -633,7 +637,7 @@ export declare class ScallopQuery {
             suppliedCoin: number;
             suppliedValue: number;
             stakedCoin: number;
-            coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd";
+            coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub";
             symbol: string;
             coinType: string;
             coinPrice: number;
@@ -650,7 +654,7 @@ export declare class ScallopQuery {
             availableCollateralInUsd: number;
             totalUnhealthyCollateralInUsd: number;
             borrowedPools: {
-                coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd";
+                coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub";
                 symbol: string;
                 coinDecimals: number;
                 coinType: string;
@@ -660,7 +664,7 @@ export declare class ScallopQuery {
                 borrowApr: number | undefined;
                 borrowApy: number | undefined;
                 incentiveInfos: {
-                    coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd" | "susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub" | "smusd";
+                    coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub";
                     symbol: string;
                     coinType: string;
                     incentiveApr: number;
@@ -684,4 +688,17 @@ export declare class ScallopQuery {
         totalCollateralValue: number;
         totalSupplyValue: number;
     }>;
+    /**
+     * Get both primary and secondary price update policy objects
+     * @returns price update policies
+     */
+    getPriceUpdatePolicies(): Promise<{
+        primary: import("@mysten/sui/client").SuiObjectResponse | null;
+        secondary: import("@mysten/sui/client").SuiObjectResponse | null;
+    }>;
+    /**
+     * Return the supported primary and secondary oracles for all supported pool assets
+     * @returns
+     */
+    getAssetOracles(): Promise<Record<SupportAssetCoins, xOracleRules>>;
 }

package/dist/models/scallopUtils.d.ts

@@ -65,7 +65,7 @@ export declare class ScallopUtils {
      * if no `scallop_...` is encountered, return coinName
      * @return sCoin name
      */
-    parseSCoinTypeNameToMarketCoinName(coinName: string): "susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub" | "smusd";
+    parseSCoinTypeNameToMarketCoinName(coinName: string): "susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub";
     /**
      * Convert sCoin name into sCoin type
      * @param sCoinName
@@ -77,7 +77,7 @@ export declare class ScallopUtils {
      * @param sCoinType
      * @returns sCoin name
      */
-    parseSCoinNameFromType(sCoinType: string): "susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub" | "smusd";
+    parseSCoinNameFromType(sCoinType: string): "susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub";
     /**
      * Convert sCoin name into its underlying coin type
      * @param sCoinName

package/dist/queries/borrowIncentiveQuery.d.ts

@@ -36,7 +36,6 @@ export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncent
     deep?: BorrowIncentivePool | undefined;
     fdusd?: BorrowIncentivePool | undefined;
     blub?: BorrowIncentivePool | undefined;
-    musd?: BorrowIncentivePool | undefined;
 }>;
 /**
  * Query borrow incentive accounts data.
@@ -68,7 +67,6 @@ export declare const queryBorrowIncentiveAccounts: ({ utils, }: {
     deep?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     fdusd?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
     blub?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
-    musd?: import("../types").ParsedBorrowIncentiveAccountData | undefined;
 }>;
 /**
  * Check veSca bind status

package/dist/queries/coreQuery.d.ts

@@ -125,7 +125,7 @@ export declare const getObligationLocked: (cache: ScallopCache, obligation: stri
  */
 export declare const queryObligation: ({ address, }: {
     address: ScallopAddress;
-}, obligationId: SuiObjectArg) => Promise<ObligationQueryInterface | undefined>;
+}, obligationId: SuiObjectArg, version?: SuiObjectArg, market?: SuiObjectArg) => Promise<ObligationQueryInterface | undefined>;
 /**
  * Query all owned coin amount.
  *

package/dist/queries/index.d.ts

@@ -12,3 +12,4 @@ export * from './vescaQuery';
 export * from './borrowLimitQuery';
 export * from './poolAddressesQuery';
 export * from './objectsQuery';
+export * from './xOracleQuery';

package/dist/queries/poolAddressesQuery.d.ts

@@ -1,6 +1,6 @@
 import { ScallopQuery } from 'src/models';
 import { OptionalKeys, SupportPoolCoins } from 'src/types';
-export declare const getAllAddresses: (query: ScallopQuery, pools: SupportPoolCoins[]) => Promise<OptionalKeys<Record<"usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd", {
+export declare const getAllAddresses: (query: ScallopQuery, pools?: SupportPoolCoins[]) => Promise<OptionalKeys<Record<"usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub", {
     coinName: string;
     symbol: string;
     lendingPoolAddress?: string;

package/dist/queries/portfolioQuery.d.ts

@@ -31,7 +31,6 @@ export declare const getLendings: (query: ScallopQuery, poolCoinNames?: SupportP
     deep?: Lending | undefined;
     fdusd?: Lending | undefined;
     blub?: Lending | undefined;
-    musd?: Lending | undefined;
 }>;
 /**
  * Get user lending infomation for specific pool.
@@ -91,7 +90,7 @@ export declare const getUserPortfolio: (query: ScallopQuery, walletAddress: stri
         suppliedCoin: number;
         suppliedValue: number;
         stakedCoin: number;
-        coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd";
+        coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub";
         symbol: string;
         coinType: string;
         coinPrice: number;
@@ -108,7 +107,7 @@ export declare const getUserPortfolio: (query: ScallopQuery, walletAddress: stri
         availableCollateralInUsd: number;
         totalUnhealthyCollateralInUsd: number;
         borrowedPools: {
-            coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd";
+            coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub";
             symbol: string;
             coinDecimals: number;
             coinType: string;
@@ -118,7 +117,7 @@ export declare const getUserPortfolio: (query: ScallopQuery, walletAddress: stri
             borrowApr: number | undefined;
             borrowApy: number | undefined;
             incentiveInfos: {
-                coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "musd" | "susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub" | "smusd";
+                coinName: "usdc" | "sbeth" | "sbusdt" | "sbwbtc" | "weth" | "wbtc" | "wusdc" | "wusdt" | "sui" | "wapt" | "wsol" | "cetus" | "afsui" | "hasui" | "vsui" | "sca" | "fud" | "deep" | "fdusd" | "blub" | "susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub";
                 symbol: string;
                 coinType: string;
                 incentiveApr: number;

package/dist/queries/priceQuery.d.ts

@@ -14,7 +14,7 @@ export declare const getPythPrice: ({ address, }: {
 export declare const getPythPrices: ({ address, }: {
     address: ScallopAddress;
 }, assetCoinNames: SupportAssetCoins[]) => Promise<Record<SupportAssetCoins, number>>;
-export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: MarketPools, coinPrices?: CoinPrices) => Promise<{
+export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: MarketPools, coinPrices?: CoinPrices, indexer?: boolean) => Promise<{
     susdc?: number | undefined;
     ssbeth?: number | undefined;
     ssbusdt?: number | undefined;
@@ -34,7 +34,6 @@ export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: Marke
     sdeep?: number | undefined;
     sfdusd?: number | undefined;
     sblub?: number | undefined;
-    smusd?: number | undefined;
     usdc?: number | undefined;
     sbeth?: number | undefined;
     sbusdt?: number | undefined;
@@ -55,6 +54,5 @@ export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: Marke
     deep?: number | undefined;
     fdusd?: number | undefined;
     blub?: number | undefined;
-    musd?: number | undefined;
     swapt?: number | undefined;
 }>;

package/dist/queries/sCoinQuery.d.ts

@@ -19,7 +19,7 @@ export declare const getSCoinTotalSupply: ({ utils, }: {
  */
 export declare const getSCoinAmounts: ({ utils, }: {
     utils: ScallopUtils;
-}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub" | "smusd", number>>>;
+}, sCoinNames?: SupportSCoin[], ownerAddress?: string) => Promise<OptionalKeys<Record<"susdc" | "ssbeth" | "ssbusdt" | "ssbwbtc" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep" | "sfdusd" | "sblub", number>>>;
 /**
  * Query owned sCoin amount.
  *

package/dist/queries/xOracleQuery.d.ts

@@ -0,0 +1,13 @@
+import { SuiObjectResponse } from '@mysten/sui/client';
+import { ScallopAddress, ScallopUtils } from 'src/models';
+import { SupportAssetCoins, SupportOracleType, xOracleRuleType } from 'src/types';
+/**
+ * Query the price update policy table ids. Usually the value for these table will be constant.
+ * @param query
+ * @returns
+ */
+export declare const getPriceUpdatePolicies: (address: ScallopAddress) => Promise<{
+    primary: SuiObjectResponse | null;
+    secondary: SuiObjectResponse | null;
+}>;
+export declare const getAssetOracles: (utils: ScallopUtils, ruleType: xOracleRuleType) => Promise<Record<SupportAssetCoins, SupportOracleType[]>>;

package/dist/types/address.d.ts

@@ -41,6 +41,7 @@ export interface AddressesInterface {
         };
         packages: Partial<Record<SupportPackageType, {
             id: string;
+            object?: string;
             upgradeCap: string;
         }>>;
     };

package/dist/types/constant/index.d.ts

@@ -1,2 +1,3 @@
 export type * from './common';
 export type * from './enum';
+export type * from './xOracle';

package/dist/types/constant/xOracle.d.ts

@@ -0,0 +1,9 @@
+import { SupportAssetCoins, SupportOracleType } from './common';
+export type xOracleRules = {
+    primary: SupportOracleType[];
+    secondary: SupportOracleType[];
+};
+export type xOracleRuleType = keyof xOracleRules;
+export type xOracleListType = {
+    [key in SupportAssetCoins]: xOracleRules;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.4.24-alpha.1",
+  "version": "1.5.0-alpha.1",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/borrowIncentiveBuilder.ts

@@ -98,6 +98,12 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
       config: builder.address.get('vesca.config'),
     };
 
+    const clockObjectRef = txBlock.sharedObjectRef({
+      objectId: SUI_CLOCK_OBJECT_ID,
+      mutable: false,
+      initialSharedVersion: '1',
+    });
+
     return {
       stakeObligation: (obligationId, obligationKey) => {
         builder.moveCall(
@@ -110,11 +116,7 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
             obligationKey,
             obligationId,
             borrowIncentiveIds.obligationAccessStore,
-            txBlock.sharedObjectRef({
-              objectId: SUI_CLOCK_OBJECT_ID,
-              mutable: false,
-              initialSharedVersion: '1',
-            }),
+            clockObjectRef,
           ]
         );
       },
@@ -133,11 +135,7 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
             veScaIds.treasury,
             veScaIds.table,
             veScaKey,
-            txBlock.sharedObjectRef({
-              objectId: SUI_CLOCK_OBJECT_ID,
-              mutable: false,
-              initialSharedVersion: '1',
-            }),
+            clockObjectRef,
           ],
           []
         );
@@ -152,11 +150,7 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
             borrowIncentiveIds.incentiveAccounts,
             obligationKey,
             obligationId,
-            txBlock.sharedObjectRef({
-              objectId: SUI_CLOCK_OBJECT_ID,
-              mutable: false,
-              initialSharedVersion: '1',
-            }),
+            clockObjectRef,
           ]
         );
       },
@@ -171,11 +165,7 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
             borrowIncentiveIds.incentiveAccounts,
             obligationKey,
             obligationId,
-            txBlock.sharedObjectRef({
-              objectId: SUI_CLOCK_OBJECT_ID,
-              mutable: false,
-              initialSharedVersion: '1',
-            }),
+            clockObjectRef,
           ],
           [rewardType]
         );
@@ -190,11 +180,7 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
             borrowIncentiveIds.incentiveAccounts,
             obligation,
             veScaKey,
-            txBlock.sharedObjectRef({
-              objectId: SUI_CLOCK_OBJECT_ID,
-              mutable: false,
-              initialSharedVersion: '1',
-            }),
+            clockObjectRef,
           ]
         );
       },

package/src/builders/coreBuilder.ts

@@ -75,6 +75,11 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
 
   const referralPkgId = builder.address.get('referral.id');
   const referralWitnessType = `${referralPkgId}::scallop_referral_program::REFERRAL_WITNESS`;
+  const clockObjectRef = txBlock.sharedObjectRef({
+    objectId: SUI_CLOCK_OBJECT_ID,
+    mutable: false,
+    initialSharedVersion: '1',
+  });
 
   return {
     openObligation: () => {
@@ -126,11 +131,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           txBlock.pure.u64(amount),
           coreIds.xOracle,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
+          clockObjectRef,
         ],
         [coinType]
       );
@@ -141,16 +142,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::mint::mint`,
-        [
-          coreIds.version,
-          coreIds.market,
-          coin,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
-        ],
+        [coreIds.version, coreIds.market, coin, clockObjectRef],
         [coinType]
       );
     },
@@ -160,16 +152,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::mint::mint_entry`,
-        [
-          coreIds.version,
-          coreIds.market,
-          coin,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
-        ],
+        [coreIds.version, coreIds.market, coin, clockObjectRef],
         [coinType]
       );
     },
@@ -179,16 +162,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::redeem::redeem`,
-        [
-          coreIds.version,
-          coreIds.market,
-          marketCoin,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
-        ],
+        [coreIds.version, coreIds.market, marketCoin, clockObjectRef],
         [coinType]
       );
     },
@@ -198,16 +172,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
       return builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::redeem::redeem_entry`,
-        [
-          coreIds.version,
-          coreIds.market,
-          marketCoin,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
-        ],
+        [coreIds.version, coreIds.market, marketCoin, clockObjectRef],
         [coinType]
       );
     },
@@ -225,11 +190,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
+          clockObjectRef,
         ],
         [coinType]
       );
@@ -255,11 +216,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
           borrowReferral,
           typeof amount === 'number' ? txBlock.pure.u64(amount) : amount,
           coreIds.xOracle,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
+          clockObjectRef,
         ],
         [coinType, referralWitnessType]
       );
@@ -278,11 +235,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           txBlock.pure.u64(amount),
           coreIds.xOracle,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
+          clockObjectRef,
         ],
         [coinType]
       );
@@ -292,17 +245,7 @@ const generateCoreNormalMethod: GenerateCoreNormalMethod = ({
       builder.moveCall(
         txBlock,
         `${coreIds.protocolPkg}::repay::repay`,
-        [
-          coreIds.version,
-          obligation,
-          coreIds.market,
-          coin,
-          txBlock.sharedObjectRef({
-            objectId: SUI_CLOCK_OBJECT_ID,
-            mutable: false,
-            initialSharedVersion: '1',
-          }),
-        ],
+        [coreIds.version, obligation, coreIds.market, coin, clockObjectRef],
         [coinType]
       );
     },
@@ -479,7 +422,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         )) ?? [];
       const updateCoinNames = [...obligationCoinNames, poolCoinName];
       await updateOracles(builder, txBlock, updateCoinNames);
-      return await txBlock.borrow(
+      return txBlock.borrow(
         obligationInfo.obligationId,
         obligationInfo.obligationKey as SuiObjectArg,
         amount,