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

package/dist/models/scallopBuilder.d.ts

@@ -7,7 +7,6 @@ import type { Transaction } from '@mysten/sui/transactions';
 import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilderParams, ScallopTxBlock, SupportMarketCoins, SupportAssetCoins, SupportSCoin, ScallopBuilderInstanceParams, SelectCoinReturnType } from '../types';
 import { ScallopCache } from './scallopCache';
-import { SuiClient as SuiClientV0 } from '@mysten/sui.js/client';
 /**
  * @description
  * It provides methods for operating the transaction block, making it more convenient to organize transaction combinations.
@@ -28,7 +27,6 @@ export declare class ScallopBuilder {
     utils: ScallopUtils;
     walletAddress: string;
     cache: ScallopCache;
-    oldSuiClient: SuiClientV0;
     constructor(params: ScallopBuilderParams, instance?: ScallopBuilderInstanceParams);
     /**
      * Request the scallop API to initialize data.

package/dist/models/scallopQuery.d.ts

@@ -4,7 +4,7 @@ import { ScallopAddress } from './scallopAddress';
 import { ScallopUtils } from './scallopUtils';
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
-import { SuiObjectData } from '@mysten/sui/src/client';
+import { SuiObjectData } from '@mysten/sui/client';
 /**
  * @description
  * It provides methods for getting on-chain data from the Scallop contract.

package/dist/queries/loyaltyProgramQuery.d.ts

@@ -1,4 +1,4 @@
-import { SuiObjectData } from '@mysten/sui/src/client';
+import { SuiObjectData } from '@mysten/sui/client';
 import { ScallopQuery } from 'src/models';
 import { LoyaltyProgramInfo } from 'src/types';
 /**

package/dist/types/builder/core.d.ts

@@ -1,5 +1,5 @@
 import type { SuiTxBlock as SuiKitTxBlock, SuiObjectArg } from '@scallop-io/sui-kit';
-import type { TransactionArgument, TransactionResult } from '@mysten/sui/transactions';
+import type { Argument, TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportCollateralCoins, SupportPoolCoins, SupportAssetCoins } from '../constant';
 import { SuiTxBlockWithSpool } from '.';
@@ -10,8 +10,8 @@ export type CoreIds = {
     coinDecimalsRegistry: string;
     xOracle: string;
 };
-export type NestedResult = Extract<TransactionArgument, {
-    kind: 'NestedResult';
+export type NestedResult = Extract<Argument, {
+    $kind: 'NestedResult';
 }>;
 type Obligation = NestedResult;
 type ObligationKey = NestedResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.3.0-alpha.5",
+  "version": "1.3.0",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -41,11 +41,10 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "@mysten/bcs": "^1.0.3",
     "@mysten/sui": "^1.3.0",
-    "@mysten/sui.js": "0.54.1",
     "@noble/curves": "^1.2.0",
     "@noble/hashes": "^1.3.2",
     "@pythnetwork/price-service-client": "^1.8.2",
-    "@pythnetwork/pyth-sui-js": "2.0.0",
+    "@pythnetwork/pyth-sui-js": "2.1.0",
     "@scallop-io/sui-kit": "1.3.1-alpha.1",
     "@scure/bip39": "^1.2.1",
     "@tanstack/query-core": "5.51.15",

package/src/builders/oracle.ts

@@ -9,7 +9,6 @@ import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type { SupportAssetCoins, SupportOracleType } from '../types';
 import { PYTH_ENDPOINTS } from 'src/constants/pyth';
-import { TransactionBlock } from '@mysten/sui.js/transactions';
 
 /**
  * Update the price of the oracle for multiple coin.
@@ -35,7 +34,7 @@ export const updateOracles = async (
   const rules: SupportOracleType[] = builder.isTestnet ? ['pyth'] : ['pyth'];
   if (usePythPullModel && rules.includes('pyth')) {
     const pythClient = new SuiPythClient(
-      builder.oldSuiClient,
+      builder.suiKit.client(),
       builder.address.get('core.oracles.pyth.state'),
       builder.address.get('core.oracles.pyth.wormholeState')
     );
@@ -53,7 +52,7 @@ export const updateOracles = async (
         const priceUpdateData =
           await pythConnection.getPriceFeedsUpdateData(priceIds);
         await pythClient.updatePriceFeeds(
-          TransactionBlock.from(txBlock.serialize()), // convert txBlock to TransactionBlock because pyth sdk not support new @mysten/sui yet
+          txBlock.txBlock, // convert txBlock to TransactionBlock because pyth sdk not support new @mysten/sui yet
           priceUpdateData,
           priceIds
         );

package/src/constants/queryKeys.ts

@@ -101,9 +101,9 @@ export const queryKeys = {
       { owner },
     ],
   },
-  pyth: {
+  oracle: {
     getPythLatestPriceFeed: (pythPriceId?: string) => [
-      'pyth',
+      'oracle',
       'getPythPriceId',
       { pythPriceId },
     ],

package/src/models/scallopBuilder.ts

@@ -19,7 +19,6 @@ import type {
 } from '../types';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
-import { SuiClient as SuiClientV0 } from '@mysten/sui.js/client';
 
 /**
  * @description
@@ -43,9 +42,6 @@ export class ScallopBuilder {
   public walletAddress: string;
   public cache: ScallopCache;
 
-  // For compatibility with pyth sdk
-  public oldSuiClient: SuiClientV0;
-
   public constructor(
     params: ScallopBuilderParams,
     instance?: ScallopBuilderInstanceParams
@@ -93,11 +89,6 @@ export class ScallopBuilder {
     this.isTestnet = params.networkType
       ? params.networkType === 'testnet'
       : false;
-
-    // intitialize old Sui Client version
-    this.oldSuiClient = new SuiClientV0({
-      url: this.suiKit.suiInteractor.currentFullNode,
-    });
   }
 
   /**

package/src/models/scallopQuery.ts

@@ -53,7 +53,7 @@ import { ScallopUtils } from './scallopUtils';
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
-import { SuiObjectData } from '@mysten/sui/src/client';
+import { SuiObjectData } from '@mysten/sui/client';
 import {
   getSCoinAmount,
   getSCoinAmounts,

package/src/models/scallopUtils.ts

@@ -559,7 +559,7 @@ export class ScallopUtils {
             const pythConnection = new SuiPriceServiceConnection(endpoint);
             try {
               const feed = await this.address.cache.queryClient.fetchQuery({
-                queryKey: queryKeys.pyth.getPythLatestPriceFeed(priceId),
+                queryKey: queryKeys.oracle.getPythLatestPriceFeed(priceId),
                 queryFn: async () => {
                   return await pythConnection.getLatestPriceFeeds([priceId]);
                 },

package/src/queries/loyaltyProgramQuery.ts

@@ -1,4 +1,4 @@
-import { SuiObjectData } from '@mysten/sui/src/client';
+import { SuiObjectData } from '@mysten/sui/client';
 import BigNumber from 'bignumber.js';
 import { ScallopQuery } from 'src/models';
 import { LoyaltyProgramInfo } from 'src/types';

package/src/types/builder/core.ts

@@ -2,10 +2,7 @@ import type {
   SuiTxBlock as SuiKitTxBlock,
   SuiObjectArg,
 } from '@scallop-io/sui-kit';
-import type {
-  TransactionArgument,
-  TransactionResult,
-} from '@mysten/sui/transactions';
+import type { Argument, TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
 import type {
   SupportCollateralCoins,
@@ -22,10 +19,7 @@ export type CoreIds = {
   xOracle: string;
 };
 
-export type NestedResult = Extract<
-  TransactionArgument,
-  { kind: 'NestedResult' }
->;
+export type NestedResult = Extract<Argument, { $kind: 'NestedResult' }>;
 type Obligation = NestedResult;
 type ObligationKey = NestedResult;
 type ObligationHotPotato = NestedResult;