@scallop-io/sui-scallop-sdk 1.4.15-rc.3 → 1.4.17

package/src/constants/queryKeys.ts

@@ -37,19 +37,13 @@ export const queryKeys = {
     getObject: (objectId?: string, options?: SuiObjectDataOptions) => [
       'rpc',
       'getObject',
-      { options, objectId },
+      { objectId, options },
     ],
-    getObjects: (
-      objectIds?: string[],
-      walletAddress?: string,
-      options?: SuiObjectDataOptions
-    ) => [
+    getObjects: (objectIds?: string[]) => [
       'rpc',
       'getObjects',
       {
-        walletAddress,
-        options,
-        objectIds: JSON.stringify(objectIds ?? []),
+        objectIds: JSON.stringify(objectIds ?? undefined),
       },
     ],
     getOwnedObjects: (input?: Partial<GetOwnedObjectsParams>) => [
@@ -97,6 +91,10 @@ export const queryKeys = {
       'getAllCoinBalances',
       { owner },
     ],
+
+    getNormalizedMoveFunction: (target?: string) => {
+      return ['rpc', 'getNormalizedMoveCall', target];
+    },
   },
   oracle: {
     getPythLatestPriceFeeds: () => ['oracle', 'getPythPriceIds'],

package/src/constants/testAddress.ts

@@ -236,6 +236,24 @@ export const TEST_ADDRESSES: AddressesInterface = {
           },
         },
       },
+      // @TODO: add test address
+      // @ts-ignore
+      sbusdt: {},
+      fdusd: {
+        id: '0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a',
+        metaData:
+          '0xdebee5265a67c186ed87fe93303d33dfe1de53e3b4fd7d9329c2852860acd3e7',
+        treasury: '',
+        oracle: {
+          supra: '',
+          switchboard: '',
+          pyth: {
+            feed: '0xccdc1a08923e2e4f4b1e6ea89de6acbc5fe1948e9706f5604b8cb50bc1ed3979',
+            feedObject:
+              '0x5f6583b2b0fe1ecf94aaffeaab8a838794693960cea48c0da282d5f4a24be027',
+          },
+        },
+      },
       deep: {
         id: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
         metaData:
@@ -543,6 +561,12 @@ export const TEST_ADDRESSES: AddressesInterface = {
         treasury:
           '0xfd0f02def6358a1f266acfa1493d4707ee8387460d434fb667d63d755ff907ed',
       },
+      sfdusd: {
+        coinType:
+          '0x6711551c1e7652a270d9fbf0eee25d99594c157cde3cb5fbb49035eb59b1b001::scallop_fdusd::SCALLOP_FDUSD',
+        treasury:
+          '0xdad9bc6293e694f67a5274ea51b596e0bdabfafc585ae6d7e82888e65f1a03e0',
+      },
       sdeep: {
         coinType:
           '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',

package/src/index.ts

@@ -1,4 +1,3 @@
 export * from './constants';
 export * from './models';
 export type * from './types';
-export * from './utils/tokenBucket';

package/src/models/scallop.ts

@@ -15,12 +15,6 @@ import type {
 import { ScallopIndexer } from './scallopIndexer';
 import { ScallopCache } from './scallopCache';
 import { QueryClientConfig } from '@tanstack/query-core';
-import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
-import { TokenBucket } from 'src/utils';
-import {
-  DEFAULT_INTERVAL_IN_MS,
-  DEFAULT_TOKENS_PER_INTERVAL,
-} from 'src/constants/tokenBucket';
 import type { QueryClient } from '@tanstack/query-core';
 import { newSuiKit } from './suiKit';
 
@@ -51,18 +45,19 @@ export class Scallop {
   public constructor(
     params: ScallopParams,
     cacheOptions?: QueryClientConfig,
-    tokenBucket?: TokenBucket,
     queryClient?: QueryClient
   ) {
     this.params = params;
     this.suiKit = newSuiKit(params);
     this.cache = new ScallopCache(
-      this.suiKit,
-      params.walletAddress,
-      cacheOptions ?? DEFAULT_CACHE_OPTIONS,
-      tokenBucket ??
-        new TokenBucket(DEFAULT_TOKENS_PER_INTERVAL, DEFAULT_INTERVAL_IN_MS),
-      queryClient
+      {
+        ...this.params,
+        cacheOptions,
+      },
+      {
+        suiKit: this.suiKit,
+        queryClient,
+      }
     );
     this.address = new ScallopAddress(
       {
@@ -168,6 +163,7 @@ export class Scallop {
       },
       {
         address: this.address,
+        suiKit: this.suiKit,
       }
     );
 

package/src/models/scallopAddress.ts

@@ -1,5 +1,5 @@
 import { API_BASE_URL, USE_TEST_ADDRESS } from '../constants';
-import { SuiKit, type NetworkType } from '@scallop-io/sui-kit';
+import { type NetworkType } from '@scallop-io/sui-kit';
 import type {
   ScallopAddressParams,
   AddressesInterface,
@@ -7,7 +7,6 @@ import type {
   ScallopAddressInstanceParams,
 } from '../types';
 import { ScallopCache } from './scallopCache';
-import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import axios, { AxiosInstance } from 'axios';
 import { TEST_ADDRESSES } from 'src/constants/testAddress';
 import { queryKeys } from 'src/constants';
@@ -379,13 +378,7 @@ export class ScallopAddress {
     instance?: ScallopAddressInstanceParams
   ) {
     const { id, auth, network, forceInterface } = params;
-    this.cache =
-      instance?.cache ??
-      new ScallopCache(
-        instance?.suiKit ?? new SuiKit({}),
-        undefined,
-        DEFAULT_CACHE_OPTIONS
-      );
+    this.cache = instance?.cache ?? new ScallopCache({});
 
     this._requestClient = axios.create({
       baseURL: API_BASE_URL,

package/src/models/scallopBuilder.ts

@@ -7,7 +7,13 @@ import { ScallopQuery } from './scallopQuery';
 import { ScallopUtils } from './scallopUtils';
 import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
 import type { Transaction } from '@mysten/sui/transactions';
-import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
+import type {
+  SuiAmountsArg,
+  SuiTxBlock as SuiKitTxBlock,
+  SuiObjectArg,
+  SuiTxArg,
+  SuiVecTxArg,
+} from '@scallop-io/sui-kit';
 import type {
   ScallopBuilderParams,
   ScallopTxBlock,
@@ -18,7 +24,6 @@ import type {
   SelectCoinReturnType,
 } from '../types';
 import { ScallopCache } from './scallopCache';
-import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import { newSuiKit } from './suiKit';
 
 /**
@@ -44,7 +49,7 @@ export class ScallopBuilder {
   public cache: ScallopCache;
 
   public constructor(
-    params: ScallopBuilderParams,
+    params: ScallopBuilderParams = {},
     instance?: ScallopBuilderInstanceParams
   ) {
     this.suiKit = instance?.suiKit ?? newSuiKit(params);
@@ -60,11 +65,9 @@ export class ScallopBuilder {
       this.address = this.utils.address;
       this.cache = this.address.cache;
     } else {
-      this.cache = new ScallopCache(
-        this.suiKit,
-        this.walletAddress,
-        DEFAULT_CACHE_OPTIONS
-      );
+      this.cache = new ScallopCache(this.params, {
+        suiKit: this.suiKit,
+      });
       this.address = new ScallopAddress(
         {
           id: params?.addressesId ?? ADDRESSES_ID,
@@ -104,7 +107,7 @@ export class ScallopBuilder {
       await this.address.read();
     }
     await this.query.init(force, this.address);
-    await this.utils.init(force, this.address);
+    // await this.utils.init(force, this.address);
   }
 
   /**
@@ -215,4 +218,55 @@ export class ScallopBuilder {
       txBlock
     )) as SuiTransactionBlockResponse;
   }
+
+  public moveCall(
+    txb: ScallopTxBlock | SuiKitTxBlock,
+    target: string,
+    args?: (SuiTxArg | SuiVecTxArg | SuiObjectArg | SuiAmountsArg)[],
+    typeArgs?: string[]
+  ) {
+    // Disable for now
+    // const resolvedQueryTarget =
+    //   await this.cache.queryGetNormalizedMoveFunction(target);
+    // if (!resolvedQueryTarget) throw new Error('Invalid query target');
+
+    // const { parameters } = resolvedQueryTarget;
+    // try {
+    //   // we can try resolve the args first
+    //   const resolvedArgs = await Promise.all(
+    //     (args ?? []).map(async (arg, idx) => {
+    //       if (typeof arg !== 'string') return arg;
+
+    //       const cachedData = (await this.cache.queryGetObject(arg))?.data;
+    //       if (!cachedData) return arg;
+
+    //       const owner = cachedData.owner;
+    //       if (!owner || typeof owner !== 'object' || !('Shared' in owner))
+    //         return {
+    //           objectId: cachedData.objectId,
+    //           version: cachedData.version,
+    //           digest: cachedData.digest,
+    //         };
+
+    //       const parameter = parameters[idx];
+    //       if (
+    //         typeof parameter !== 'object' ||
+    //         !('MutableReference' in parameter || 'Reference' in parameter)
+    //       )
+    //         return arg;
+
+    //       return {
+    //         objectId: cachedData.objectId,
+    //         initialSharedVersion: owner.Shared.initial_shared_version,
+    //         mutable: 'MutableReference' in parameter,
+    //       };
+    //     })
+    //   );
+    //   return txb.moveCall(target, resolvedArgs, typeArgs);
+    // } catch (e: any) {
+    //   console.error(e.message);
+    //   return txb.moveCall(target, args, typeArgs);
+    // }
+    return txb.moveCall(target, args, typeArgs);
+  }
 }