@scallop-io/sui-scallop-sdk 2.2.3-pyth-sponsored-transaction-alpha.1 → 2.2.3-pyth-sponsored-transaction-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.2.3-pyth-sponsored-transaction-alpha.1",
+  "version": "2.2.3-pyth-sponsored-transaction-alpha.3",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "@mysten/sui": "1.28.2",
-    "@pythnetwork/pyth-sui-js": "2.1.0",
+    "@pythnetwork/pyth-sui-js": "2.2.0",
     "@scallop-io/sui-kit": "1.4.1",
     "@tanstack/query-core": "5.59.16",
     "axios": "^1.9.0",
@@ -146,6 +146,7 @@
   "scripts": {
     "clean": "rm -rf tsconfig.tsbuildinfo ./dist",
     "build": "pnpm run build:tsup",
+    "build:sourcemap": "tsup ./src/index.ts --format esm,cjs --sourcemap --dts",
     "build:tsup": "tsup ./src/index.ts --format esm,cjs --splitting --minify --treeshake --dts",
     "watch:tsup": "tsup ./src/index.ts --format esm,cjs --clean --splitting --watch",
     "watch:types": "tsc --watch",

package/src/builders/coreBuilder.ts

@@ -313,7 +313,8 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       amount,
       collateralCoinName,
       obligationId,
-      obligationKey
+      obligationKey,
+      isSponsoredTx = false
     ) => {
       const obligationInfo = await requireObligationInfo(
         builder,
@@ -324,7 +325,7 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       const updateCoinNames = await builder.utils.getObligationCoinNames(
         obligationInfo.obligationId
       );
-      await updateOracles(builder, txBlock, updateCoinNames);
+      await updateOracles(builder, txBlock, updateCoinNames, { isSponsoredTx });
       return txBlock.takeCollateral(
         obligationInfo.obligationId,
         obligationInfo.obligationKey as SuiObjectArg,
@@ -438,7 +439,12 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         poolCoinName
       );
     },
-    repayQuick: async (amount, poolCoinName, obligationId) => {
+    repayQuick: async (
+      amount,
+      poolCoinName,
+      obligationId,
+      isSponsoredTx = false
+    ) => {
       const sender = requireSender(txBlock);
       const obligationInfo = await requireObligationInfo(
         builder,
@@ -446,27 +452,15 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         obligationId
       );
 
-      if (poolCoinName === 'sui') {
-        const [suiCoin] = txBlock.splitSUIFromGas([amount]);
-        return txBlock.repay(
-          obligationInfo.obligationId,
-          suiCoin,
-          poolCoinName
-        );
-      } else {
-        const { leftCoin, takeCoin } = await builder.selectCoin(
-          txBlock,
-          poolCoinName,
-          amount,
-          sender
-        );
-        txBlock.transferObjects([leftCoin], sender);
-        return txBlock.repay(
-          obligationInfo.obligationId,
-          takeCoin,
-          poolCoinName
-        );
-      }
+      const { leftCoin, takeCoin } = await builder.selectCoin(
+        txBlock,
+        poolCoinName,
+        amount,
+        sender,
+        isSponsoredTx
+      );
+      if (leftCoin) txBlock.transferObjects([leftCoin], sender);
+      return txBlock.repay(obligationInfo.obligationId, takeCoin, poolCoinName);
     },
     updateAssetPricesQuick: async (assetCoinNames) => {
       return await updateOracles(builder, txBlock, assetCoinNames);

package/src/builders/oracles/pyth.ts

@@ -1,9 +1,82 @@
 import {
+  HexString,
   SuiPriceServiceConnection,
   SuiPythClient,
 } from '@pythnetwork/pyth-sui-js';
 import { ScallopBuilder } from 'src/models';
-import type { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
+import {
+  SUI_CLOCK_OBJECT_ID,
+  type SuiTxBlock as SuiKitTxBlock,
+  type Transaction,
+} from '@scallop-io/sui-kit';
+import { SuiClient } from '@mysten/sui/client';
+
+type ObjectId = string;
+class ScallopPythClient extends SuiPythClient {
+  constructor(
+    provider: SuiClient,
+    pythStateId: ObjectId,
+    wormholeStateId: ObjectId,
+    private params: {
+      // addressId?: string;
+      defaultPackageId: ObjectId;
+      gasStationId: ObjectId;
+    }
+  ) {
+    super(provider, pythStateId, wormholeStateId);
+  }
+
+  async updatePriceFeedsWithSponsoredBaseUpdateFee(
+    tx: Transaction,
+    updates: Buffer[],
+    feedIds: HexString[]
+  ) {
+    if (!this.params) throw new Error('Please provide params');
+    const { defaultPackageId: scallopSponsorPackage, gasStationId } =
+      this.params;
+    const packageId = await this.getPythPackageId();
+    let priceUpdatesHotPotato = await this.verifyVaasAndGetHotPotato(
+      tx,
+      updates,
+      packageId
+    );
+
+    const priceInfoObjects = [];
+    for (const feedId of feedIds) {
+      const priceInfoObjectId = await this.getPriceFeedObjectId(feedId);
+      if (!priceInfoObjectId) {
+        throw new Error(`Price feed object not found for ID: ${feedId}`);
+      }
+      priceInfoObjects.push(priceInfoObjectId);
+    }
+
+    const clockObjectRef = tx.sharedObjectRef({
+      objectId: SUI_CLOCK_OBJECT_ID,
+      mutable: false,
+      initialSharedVersion: '1',
+    });
+
+    for (let i = 0; i < priceInfoObjects.length; i++) {
+      const priceInfoObjectId = priceInfoObjects[i];
+      [priceUpdatesHotPotato] = tx.moveCall({
+        target: `${scallopSponsorPackage}::pyth_sponsor::update_single_price_feed_with_sponsor`,
+        arguments: [
+          tx.object(this.pythStateId),
+          priceUpdatesHotPotato,
+          tx.object(priceInfoObjectId),
+          tx.object(gasStationId),
+          clockObjectRef,
+        ],
+      });
+    }
+
+    tx.moveCall({
+      target: `${packageId}::hot_potato_vector::destroy`,
+      arguments: [priceUpdatesHotPotato],
+      typeArguments: [`${packageId}::price_info::PriceInfo`],
+    });
+  }
+}
 
 export const updatePythPriceFeeds = async (
   builder: ScallopBuilder,
@@ -11,7 +84,7 @@ export const updatePythPriceFeeds = async (
   txBlock: SuiKitTxBlock,
   isSponsoredTx: boolean = false
 ) => {
-  const pythClient = new SuiPythClient(
+  const pythClient = new ScallopPythClient(
     builder.suiKit.client,
     builder.address.get('core.oracles.pyth.state'),
     builder.address.get('core.oracles.pyth.wormholeState'),
@@ -30,19 +103,30 @@ export const updatePythPriceFeeds = async (
   const endpoints = builder.utils.pythEndpoints ?? [
     ...builder.constants.whitelist.pythEndpoints,
   ];
+
+  // get feed object ids
   for (const endpoint of endpoints) {
     try {
       const pythConnection = new SuiPriceServiceConnection(endpoint);
       const priceUpdateData =
         await pythConnection.getPriceFeedsUpdateData(priceIds);
-      await pythClient.updatePriceFeeds(
-        txBlock.txBlock,
-        priceUpdateData,
-        priceIds,
-        isSponsoredTx
-      );
 
-      break;
+      if (isSponsoredTx) {
+        // Use gas station to sponsor the baseFeeUpdate
+        await pythClient.updatePriceFeedsWithSponsoredBaseUpdateFee(
+          txBlock.txBlock,
+          priceUpdateData,
+          priceIds
+        );
+      } else {
+        await pythClient.updatePriceFeeds(
+          txBlock.txBlock,
+          priceUpdateData,
+          priceIds
+        );
+      }
+
+      return;
     } catch (e) {
       console.warn(
         `Failed to update price feeds with endpoint ${endpoint}: ${e}`

package/src/constants/testAddress.ts

@@ -534,10 +534,7 @@ export const WHITELIST = {
   suiBridge: new Set(['sbeth', 'sbusdt', 'sbwbtc']),
   wormhole: new Set(['wusdc', 'wusdt', 'weth', 'wbtc', 'wapt', 'wsol']),
   oracles: new Set(['pyth', 'supra', 'switchboard']),
-  pythEndpoints: new Set([
-    'https://hermes.pyth.network',
-    'https://scallop.rpc.p2p.world',
-  ]),
+  pythEndpoints: new Set(['https://hermes.pyth.network']),
   deprecated: new Set(['wapt', 'wusdc', 'wusdt', 'weth', 'wbtc']),
   borrowIncentiveRewards: new Set(['mpoints']),
   rewardsAsPoint: new Set(['mpoints']),

package/src/models/scallopBuilder.ts

@@ -12,7 +12,7 @@ import type {
   SuiTxArg,
   SuiVecTxArg,
 } from '@scallop-io/sui-kit';
-import type { ScallopTxBlock, SelectCoinReturnType } from '../types';
+import type { ScallopTxBlock } from '../types';
 import { ScallopBuilderInterface } from './interface';
 
 export type ScallopBuilderParams = {
@@ -98,20 +98,22 @@ class ScallopBuilder implements ScallopBuilderInterface {
    * @param sender - Sender address.
    * @return Take coin and left coin.
    */
-  async selectCoin<T extends string>(
+  async selectCoin(
     txBlock: ScallopTxBlock | SuiKitTxBlock,
-    assetCoinName: T,
+    assetCoinName: string,
     amount: number,
-    sender: string = this.walletAddress
-  ): Promise<SelectCoinReturnType<T>> {
-    if (assetCoinName === 'sui') {
+    sender: string = this.walletAddress,
+    isSponsored: boolean = false
+  ) {
+    if (assetCoinName === 'sui' && !isSponsored) {
       const [takeCoin] = txBlock.splitSUIFromGas([amount]);
-      return { takeCoin } as SelectCoinReturnType<T>;
+      return { takeCoin };
     } else {
       const coinType = this.utils.parseCoinType(assetCoinName);
       const coins = await this.utils.selectCoins(amount, coinType, sender);
       const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(coins, amount);
-      return { takeCoin, leftCoin } as SelectCoinReturnType<T>;
+
+      return { takeCoin, leftCoin };
     }
   }
 

package/src/models/scallopUtils.ts

@@ -31,6 +31,7 @@ class ScallopUtils implements ScallopUtilsInterface {
   public pythEndpoints: string[];
   public readonly scallopSuiKit: ScallopSuiKit;
   public readonly constants: ScallopConstants;
+  public readonly timeout: number;
 
   constructor(params: ScallopUtilsParams = {}) {
     this.constants = params.scallopConstants ?? new ScallopConstants(params);
@@ -43,8 +44,9 @@ class ScallopUtils implements ScallopUtilsInterface {
 
     this.pythEndpoints = params.pythEndpoints ?? [
       'https://hermes.pyth.network',
-      'https://scallop.rpc.p2p.world',
     ];
+
+    this.timeout = params.axiosTimeout ?? 4000;
   }
 
   get walletAddress() {
@@ -539,7 +541,7 @@ class ScallopUtils implements ScallopUtilsInterface {
 
       const priceIds = priceIdPairs.map(([_, priceId]) => priceId);
       const pythConnection = new SuiPriceServiceConnection(endpoint, {
-        timeout: 4000,
+        timeout: this.timeout,
       });
 
       try {

package/src/types/builder/core.ts

@@ -93,7 +93,8 @@ export type CoreQuickMethods = {
     amount: number,
     collateralCoinName: string,
     obligationId?: SuiObjectArg,
-    obligationKey?: SuiObjectArg
+    obligationKey?: SuiObjectArg,
+    isSponsoredTx?: boolean
   ) => Promise<TransactionResult>;
   borrowQuick: (
     amount: number,
@@ -122,7 +123,8 @@ export type CoreQuickMethods = {
   repayQuick: (
     amount: number,
     poolCoinName: string,
-    obligationId?: SuiObjectArg
+    obligationId?: SuiObjectArg,
+    isSponsoredTx?: boolean
   ) => Promise<void>;
   updateAssetPricesQuick: (assetCoinNames?: string[]) => Promise<void>;
 };

package/src/types/builder/index.ts

@@ -1,4 +1,4 @@
-import type { CoreTxBlock, NestedResult } from './core';
+import type { CoreTxBlock } from './core';
 import type { SpoolTxBlock } from './spool';
 import type { BorrowIncentiveTxBlock } from './borrowIncentive';
 import type { VeScaTxBlock } from './vesca';
@@ -21,12 +21,3 @@ export type BaseScallopTxBlock = ReferralTxBlock &
 export type SuiTxBlockWithSCoin = BaseScallopTxBlock & SCoinTxBlock;
 export type SuiTxBlockWithSpool = SuiTxBlockWithSCoin & SpoolTxBlock;
 export type ScallopTxBlock = SuiTxBlockWithSpool & CoreTxBlock;
-
-export type SelectCoinReturnType<T extends string> = T extends 'sui'
-  ? {
-      takeCoin: NestedResult;
-    }
-  : {
-      takeCoin: NestedResult;
-      leftCoin: NestedResult;
-    };