@scallop-io/sui-scallop-sdk 1.3.4-alpha.6 → 1.3.4-hotfix

package/dist/utils/query.d.ts

@@ -0,0 +1,62 @@
+import BigNumber from 'bignumber.js';
+import type { ScallopUtils } from '../models';
+import type { OriginMarketPoolData, ParsedMarketPoolData, CalculatedMarketPoolData, OriginMarketCollateralData, ParsedMarketCollateralData, CalculatedMarketCollateralData, OriginSpoolData, ParsedSpoolData, CalculatedSpoolData, OriginSpoolRewardPoolData, ParsedSpoolRewardPoolData, CalculatedSpoolRewardPoolData, OriginBorrowIncentivePoolData, ParsedBorrowIncentivePoolData, OriginBorrowIncentiveAccountData, ParsedBorrowIncentiveAccountData, OriginBorrowIncentivePoolPointData, ParsedBorrowIncentivePoolPointData, CalculatedBorrowIncentivePoolPointData, OriginBorrowIncentiveAccountPoolData, ParsedBorrowIncentiveAccountPoolData } from '../types';
+/**
+ *  Parse origin market pool data to a more readable format.
+ *
+ * @param originMarketPoolData - Origin market pool data
+ * @return Parsed market pool data
+ */
+export declare const parseOriginMarketPoolData: (originMarketPoolData: OriginMarketPoolData) => ParsedMarketPoolData;
+export declare const calculateMarketPoolData: (utils: ScallopUtils, parsedMarketPoolData: ParsedMarketPoolData) => CalculatedMarketPoolData;
+/**
+ *  Parse origin market collateral data to a more readable format.
+ *
+ * @param originMarketCollateralData - Origin market collateral data
+ * @return Parsed market collateral data
+ */
+export declare const parseOriginMarketCollateralData: (originMarketCollateralData: OriginMarketCollateralData) => ParsedMarketCollateralData;
+export declare const calculateMarketCollateralData: (utils: ScallopUtils, parsedMarketCollateralData: ParsedMarketCollateralData) => CalculatedMarketCollateralData;
+/**
+ *  Parse origin spool data to a more readable format.
+ *
+ * @param originSpoolData - Origin spool data
+ * @return Parsed spool data
+ */
+export declare const parseOriginSpoolData: (originSpoolData: OriginSpoolData) => ParsedSpoolData;
+export declare const calculateSpoolData: (parsedSpoolData: ParsedSpoolData, stakeMarketCoinPrice: number, stakeMarketCoinDecimal: number) => CalculatedSpoolData;
+/**
+ *  Parse origin spool reward pool data to a more readable format.
+ *
+ * @param originRewardPoolData - Origin reward pool data
+ * @return Parsed spool reward pool data
+ */
+export declare const parseOriginSpoolRewardPoolData: (originSpoolRewardPoolData: OriginSpoolRewardPoolData) => ParsedSpoolRewardPoolData;
+export declare const calculateSpoolRewardPoolData: (parsedSpoolData: ParsedSpoolData, parsedSpoolRewardPoolData: ParsedSpoolRewardPoolData, calculatedSpoolData: CalculatedSpoolData, rewardCoinPrice: number, rewardCoinDecimal: number) => CalculatedSpoolRewardPoolData;
+export declare const parseOriginBorrowIncentivesPoolPointData: (originBorrowIncentivePoolPointData: OriginBorrowIncentivePoolPointData) => ParsedBorrowIncentivePoolPointData;
+/**
+ *  Parse origin borrow incentive pool data to a more readable format.
+ *
+ * @param originBorrowIncentivePoolData - Origin borrow incentive pool data
+ * @return Parsed borrow incentive pool data
+ */
+export declare const parseOriginBorrowIncentivePoolData: (originBorrowIncentivePoolData: OriginBorrowIncentivePoolData) => ParsedBorrowIncentivePoolData;
+export declare const calculateBorrowIncentivePoolPointData: (parsedBorrowIncentivePoolPointData: ParsedBorrowIncentivePoolPointData, rewardCoinPrice: number, rewardCoinDecimal: number, poolCoinPrice: number, poolCoinDecimal: number) => CalculatedBorrowIncentivePoolPointData;
+export declare const parseOriginBorrowIncentiveAccountPoolPointData: (originBorrowIncentiveAccountPoolPointData: OriginBorrowIncentiveAccountPoolData) => ParsedBorrowIncentiveAccountPoolData;
+/**
+ *  Parse origin borrow incentive account data to a more readable format.
+ *
+ * @param originBorrowIncentiveAccountData - Origin borrow incentive account data
+ * @return Parsed borrow incentive account data
+ */
+export declare const parseOriginBorrowIncentiveAccountData: (originBorrowIncentiveAccountData: OriginBorrowIncentiveAccountData) => ParsedBorrowIncentiveAccountData;
+export declare const minBigNumber: (...args: BigNumber.Value[]) => BigNumber;
+export declare const maxBigNumber: (...args: BigNumber.Value[]) => BigNumber;
+/**
+ * Dynamically adjust the decrease or increase ratio according to the amount
+ * @param amount - The amount required to calculate factor.
+ * @param scaleStep - The scale step required to determine the factor..
+ * @param type - The type of the calculation.
+ * @return The estimated factor
+ * */
+export declare const estimatedFactor: (amount: number, scaleStep: number, type: "increase" | "decrease") => number;

package/dist/utils/tokenBucket.d.ts

@@ -0,0 +1,11 @@
+declare class TokenBucket {
+    private tokensPerInterval;
+    private interval;
+    private tokens;
+    private lastRefill;
+    constructor(tokensPerInterval: number, intervalInMs: number);
+    refill(): void;
+    removeTokens(count: number): boolean;
+}
+declare const callWithRateLimit: <T>(tokenBucket: TokenBucket, fn: () => Promise<T>, retryDelayInMs?: number, maxRetries?: number, backoffFactor?: number) => Promise<T | null>;
+export { TokenBucket, callWithRateLimit };

package/dist/utils/util.d.ts

@@ -0,0 +1,26 @@
+import type { PriceFeed } from '@pythnetwork/pyth-sui-js';
+import type { ScallopAddress } from '../models';
+import type { SupportAssetCoins, SupportCoins, SupportMarketCoins, SupportSuiBridgeCoins, SupportWormholeCoins } from '../types';
+export declare const isMarketCoin: (coinName: SupportCoins) => coinName is SupportMarketCoins;
+export declare const isSuiBridgeAsset: (coinName: any) => coinName is SupportSuiBridgeCoins;
+export declare const isWormholeAsset: (coinName: any) => coinName is SupportWormholeCoins;
+export declare const parseAssetSymbol: (coinName: SupportCoins) => string;
+/**
+ * Parse price from pyth price feed.
+ *
+ * @param feed  - Price feed object from pyth.
+ * @param address - Scallop address instance.
+ * @return Price Data inclue coin name, price, and publish time.
+ */
+export declare const parseDataFromPythPriceFeed: (feed: PriceFeed, address: ScallopAddress) => {
+    coinName: SupportAssetCoins;
+    price: number;
+    publishTime: number;
+};
+/**
+ * Find the closest unlock round timestamp (12AM) to the given unlock at timestamp in seconds.
+ *
+ * @param unlockAtInSecondTimestamp - Unlock at in seconds timestamp to find the closest round.
+ * @returns Closest round (12AM) in seconds timestamp.
+ */
+export declare const findClosestUnlockRound: (unlockAtInSecondTimestamp: number) => number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.3.4-alpha.6",
+  "version": "1.3.4-hotfix",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -149,7 +149,7 @@
   "scripts": {
     "clean": "rm -rf tsconfig.tsbuildinfo ./dist",
     "build": "pnpm run build:types && pnpm run build:tsup",
-    "build:tsup": "tsup ./src/index.ts --format esm,cjs --sourcemap --clean",
+    "build:tsup": "tsup ./src/index.ts --format esm,cjs --sourcemap",
     "build:types": "tsc --build",
     "watch:tsup": "tsup ./src/index.ts --format esm,cjs --clean --splitting --watch",
     "watch:types": "tsc --watch",

package/src/builders/loyaltyProgramBuilder.ts

@@ -38,7 +38,7 @@ const generateLoyaltyProgramQuickMethod: GenerateLoyaltyProgramQuickMethod = ({
 }) => {
   return {
     claimLoyaltyRevenueQuick: async (veScaKey) => {
-      veScaKey = veScaKey ?? (await builder.query.getVeScas())[0]?.keyObject;
+      veScaKey = veScaKey || (await builder.query.getVeScas())[0]?.keyObject;
       const sender = requireSender(txBlock);
       if (!veScaKey) throw new Error(`No veScaKey found for user ${sender}`);
 

package/src/constants/common.ts

@@ -1,3 +1,4 @@
+// export const API_BASE_URL = 'https://sui.api.scallop.io';
 export const API_BASE_URL = 'https://sui.apis.scallop.io' as const;
 export const SDK_API_BASE_URL = 'https://sdk.api.scallop.io' as const;
 
@@ -7,7 +8,7 @@ export const USE_TEST_ADDRESS: boolean = false;
 export const ADDRESSES_ID =
   IS_VE_SCA_TEST || USE_TEST_ADDRESS
     ? ('65fb07c39c845425d71d7b18' as const)
-    : ('66f8e7ed9bb9e07fdfb86bbb' as const);
+    : ('675c65cd301dd817ea262e76' as const);
 // : ('664dfe22898c36c159e28bc8' as const);
 
 export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST

package/src/constants/enum.ts

@@ -183,14 +183,6 @@ export const sCoinIds: types.SCoinIds = {
     '0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC',
 } as const;
 
-export const sCoinTypeToName = Object.entries(sCoinIds).reduce(
-  (acc, [coinName, coinType]) => {
-    acc[coinType] = coinName as types.SupportSCoin;
-    return acc;
-  },
-  {} as Record<string, types.SupportSCoin>
-);
-
 // TEST VERSION
 // export const sCoinIds: types.SCoinIds = {
 //   ssui: '0xfac769100bccc0caebcf4f4e2d00ac2f8883f07f724be28940df90605f5e7e9a::scallop_sui::SCALLOP_SUI',

package/src/constants/index.ts

@@ -1,12 +1,5 @@
-export * from './cache';
-export * from './coinGecko';
 export * from './common';
 export * from './enum';
 export * from './flashloan';
-export * from './poolAddress';
-export * from './pyth';
 export * from './queryKeys';
-export * from './rpc';
-export * from './testAddress';
-export * from './tokenBucket';
 export * from './vesca';

package/src/constants/pyth.ts

@@ -1,25 +1,6 @@
-import { SupportPoolCoins } from 'src/types';
-
 export const PYTH_ENDPOINTS: {
   [k in 'mainnet' | 'testnet']: string[];
 } = {
   testnet: ['https://hermes-beta.pyth.network'],
   mainnet: ['https://hermes.pyth.network', 'https://scallop.rpc.p2p.world'],
 };
-
-export const PYTH_FEED_IDS: Record<SupportPoolCoins, string> = {
-  usdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-  sbeth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
-  weth: 'ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
-  wbtc: 'e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
-  wusdc: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-  wusdt: '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
-  sui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  wapt: '03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5',
-  wsol: 'ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
-  cetus: 'e5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef',
-  afsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  hasui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  vsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
-  sca: '7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc',
-};

package/src/constants/queryKeys.ts

@@ -99,6 +99,10 @@ export const queryKeys = {
     ],
   },
   oracle: {
-    getPythLatestPriceFeeds: () => ['oracle', 'getPythPriceIds'],
+    getPythLatestPriceFeed: (pythPriceId?: string) => [
+      'oracle',
+      'getPythPriceId',
+      { pythPriceId },
+    ],
   },
 };

package/src/constants/tokenBucket.ts

@@ -1,2 +1,2 @@
-export const DEFAULT_TOKENS_PER_INTERVAL = 10;
+export const DEFAULT_TOKENS_PER_INTERVAL = 50;
 export const DEFAULT_INTERVAL_IN_MS = 300;

package/src/models/scallop.ts

@@ -22,7 +22,6 @@ import {
   DEFAULT_TOKENS_PER_INTERVAL,
 } from 'src/constants/tokenBucket';
 import type { QueryClient } from '@tanstack/query-core';
-import { newSuiKit } from './suiKit';
 
 /**
  * @argument params - The parameters for the Scallop instance.
@@ -55,7 +54,7 @@ export class Scallop {
     queryClient?: QueryClient
   ) {
     this.params = params;
-    this.suiKit = newSuiKit(params);
+    this.suiKit = new SuiKit(params);
     this.cache = new ScallopCache(
       this.suiKit,
       params.walletAddress,
@@ -66,7 +65,7 @@ export class Scallop {
     );
     this.address = new ScallopAddress(
       {
-        id: params?.addressesId ?? ADDRESSES_ID,
+        id: params?.addressesId || ADDRESSES_ID,
         network: params?.networkType,
         forceInterface: params?.forceAddressesInterface,
       },

package/src/models/scallopAddress.ts

@@ -393,11 +393,11 @@ export class ScallopAddress {
         'Content-Type': 'application/json',
         Accept: 'application/json',
       },
-      timeout: 8000,
+      timeout: 30000,
     });
     if (auth) this._auth = auth;
     this._id = id;
-    this._network = network ?? 'mainnet';
+    this._network = network || 'mainnet';
     this._addressesMap = USE_TEST_ADDRESS
       ? new Map([['mainnet', TEST_ADDRESSES]])
       : new Map();

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 { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -47,11 +46,11 @@ export class ScallopBuilder {
     params: ScallopBuilderParams,
     instance?: ScallopBuilderInstanceParams
   ) {
-    this.suiKit = instance?.suiKit ?? newSuiKit(params);
+    this.suiKit = instance?.suiKit ?? new SuiKit(params);
 
     this.params = params;
     this.walletAddress = normalizeSuiAddress(
-      params?.walletAddress ?? this.suiKit.currentAddress()
+      params?.walletAddress || this.suiKit.currentAddress()
     );
 
     if (instance?.query) {
@@ -67,7 +66,7 @@ export class ScallopBuilder {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId ?? ADDRESSES_ID,
+          id: params?.addressesId || ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface,
         },

package/src/models/scallopCache.ts

@@ -255,7 +255,7 @@ export class ScallopCache {
     if (!input.coinType) return '0';
 
     return (
-      ((await this.queryGetAllCoinBalances(input.owner)) ?? {})[
+      ((await this.queryGetAllCoinBalances(input.owner)) || {})[
         normalizeStructTag(input.coinType)
       ] ?? '0'
     );

package/src/models/scallopClient.ts

@@ -34,7 +34,6 @@ import type {
   ScallopClientVeScaReturnType,
   ScallopClientInstanceParams,
 } from '../types';
-import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -65,9 +64,9 @@ export class ScallopClient {
   ) {
     this.params = params;
     this.suiKit =
-      instance?.suiKit ?? instance?.builder?.suiKit ?? newSuiKit(params);
+      instance?.suiKit ?? instance?.builder?.suiKit ?? new SuiKit(params);
     this.walletAddress = normalizeSuiAddress(
-      params?.walletAddress ?? this.suiKit.currentAddress()
+      params?.walletAddress || this.suiKit.currentAddress()
     );
 
     if (instance?.builder) {
@@ -84,7 +83,7 @@ export class ScallopClient {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId ?? ADDRESSES_ID,
+          id: params?.addressesId || ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface,
         },
@@ -143,7 +142,7 @@ export class ScallopClient {
    * @return Obligations data.
    */
   public async getObligations(ownerAddress?: string) {
-    const owner = ownerAddress ?? this.walletAddress;
+    const owner = ownerAddress || this.walletAddress;
     return await this.query.getObligations(owner);
   }
 
@@ -170,7 +169,7 @@ export class ScallopClient {
    * @return All stake accounts data.
    */
   async getAllStakeAccounts(ownerAddress?: string) {
-    const owner = ownerAddress ?? this.walletAddress;
+    const owner = ownerAddress || this.walletAddress;
     return await this.query.getAllStakeAccounts(owner);
   }
 
@@ -188,7 +187,7 @@ export class ScallopClient {
     stakeMarketCoinName: SupportStakeMarketCoins,
     ownerAddress?: string
   ) {
-    const owner = ownerAddress ?? this.walletAddress;
+    const owner = ownerAddress || this.walletAddress;
     return await this.query.getStakeAccounts(stakeMarketCoinName, owner);
   }
 
@@ -273,11 +272,11 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const obligations = await this.query.getObligations(sender);
-    const specificObligationId = obligationId ?? obligations[0]?.id;
+    const specificObligationId = obligationId || obligations[0]?.id;
     if (specificObligationId) {
       await txBlock.addCollateralQuick(
         amount,
@@ -320,7 +319,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const collateralCoin = await txBlock.takeCollateralQuick(
@@ -366,7 +365,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const sCoin = await txBlock.depositQuick(amount, poolCoinName);
@@ -410,14 +409,14 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const stakeMarketCoinName =
       this.utils.parseMarketCoinName<SupportStakeMarketCoins>(stakeCoinName);
     const stakeAccounts =
       await this.query.getStakeAccounts(stakeMarketCoinName);
-    const targetStakeAccount = stakeAccountId ?? stakeAccounts[0]?.id;
+    const targetStakeAccount = stakeAccountId || stakeAccounts[0]?.id;
 
     const marketCoin = await txBlock.depositQuick(amount, stakeCoinName, false);
     if (targetStakeAccount) {
@@ -467,7 +466,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const coin = await txBlock.withdrawQuick(amount, poolCoinName);
@@ -502,7 +501,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const availableStake = (
@@ -550,7 +549,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const availableStake = (
@@ -611,7 +610,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
     const [coin, loan] = txBlock.borrowFlashLoan(amount, poolCoinName);
     txBlock.repayFlashLoan(await callback(txBlock, coin), loan, poolCoinName);
@@ -648,7 +647,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const stakeAccount = txBlock.createStakeAccount(marketCoinName);
@@ -692,12 +691,12 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const stakeAccounts =
       await this.query.getStakeAccounts(stakeMarketCoinName);
-    const targetStakeAccount = stakeAccountId ?? stakeAccounts[0]?.id;
+    const targetStakeAccount = stakeAccountId || stakeAccounts[0]?.id;
     if (targetStakeAccount) {
       await txBlock.stakeQuick(amount, stakeMarketCoinName, targetStakeAccount);
     } else {
@@ -744,7 +743,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const sCoin = await txBlock.unstakeQuick(
@@ -803,7 +802,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const stakeMarketCoin = await txBlock.unstakeQuick(
@@ -864,7 +863,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const rewardCoins = await txBlock.claimQuick(
@@ -900,7 +899,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     await txBlock.stakeObligationWithVeScaQuick(obligationId, obligationKeyId);
@@ -930,7 +929,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     await txBlock.unstakeObligationQuick(obligationId, obligationKeyId);
@@ -962,7 +961,7 @@ export class ScallopClient {
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    const sender = walletAddress ?? this.walletAddress;
+    const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
 
     const rewardCoins = [];
@@ -1187,7 +1186,7 @@ export class ScallopClient {
     }
 
     const txBlock = this.builder.createTxBlock();
-    const recipient = receiveAddress ?? this.walletAddress;
+    const recipient = receiveAddress || this.walletAddress;
     const packageId = this.address.get('core.packages.testCoin.id');
     const treasuryId = this.address.get(`core.coins.${assetCoinName}.treasury`);
     const target = `${packageId}::${assetCoinName}::mint`;