@scallop-io/sui-scallop-sdk 1.3.3 → 1.3.4-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.3.3",
+  "version": "1.3.4-alpha.2",
   "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",
+    "build:tsup": "tsup ./src/index.ts --format esm,cjs --sourcemap --clean",
     "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/coinGecko.ts

@@ -0,0 +1,18 @@
+import { SupportPoolCoins } from 'src/types/constant/common';
+
+export const COIN_GECKGO_IDS: Record<SupportPoolCoins, string> = {
+  usdc: 'usdc-coin',
+  sbeth: 'ethereum',
+  weth: 'ethereum',
+  wbtc: 'bitcoin',
+  wusdc: 'usdc-coin',
+  wusdt: 'tether',
+  sui: 'sui',
+  wapt: 'aptos',
+  wsol: 'solana',
+  cetus: 'cetus-protocol',
+  afsui: 'sui',
+  hasui: 'sui',
+  vsui: 'sui',
+  sca: 'scallop-2',
+};

package/src/constants/common.ts

@@ -1,4 +1,3 @@
-// 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;
 

package/src/constants/enum.ts

@@ -183,6 +183,14 @@ 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,5 +1,11 @@
+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 './testAddress';
+export * from './tokenBucket';
 export * from './vesca';

package/src/constants/poolAddress.ts

@@ -0,0 +1,94 @@
+import { SupportPoolCoins } from 'src/types';
+
+export const POOL_ADDRESSES: Record<
+  SupportPoolCoins,
+  {
+    lendingPoolAddress: string;
+    collateralPoolAddress: string;
+  }
+> = {
+  usdc: {
+    lendingPoolAddress:
+      '0xd3be98bf540f7603eeb550c0c0a19dbfc78822f25158b5fa84ebd9609def415f',
+    collateralPoolAddress:
+      '0x8f0d529ba179c5b3d508213003eab813aaae31f78226099639b9a69d1aec17af',
+  },
+  sbeth: {
+    lendingPoolAddress:
+      '0x5f08c4f71d56dd3342c452cc70ffc47f2f4180146d821941b0b9c04761bb42e7',
+    collateralPoolAddress:
+      '0xce0549a1cbe952e734f56646988e6b02bbae14667889a60e24d0d03540a6119f',
+  },
+  weth: {
+    lendingPoolAddress:
+      '0xc8fcdff48efc265740ae0b74aae3faccae9ec00034039a113f3339798035108c',
+    collateralPoolAddress:
+      '0xad7ced91ed6e7f2b81805561eee27fa6f3e72fdae561077334c7248583db4dbf',
+  },
+  wbtc: {
+    lendingPoolAddress:
+      '0x65cc08a5aca0a0b8d72e1993ded8d145f06dd102fd0d8f285b92934faed564ab',
+    collateralPoolAddress:
+      '0x1aa4e5cf743cd797b4eb8bf1e614f80ae2cf556ced426cddaaf190ffcd0e59c3',
+  },
+  wusdc: {
+    lendingPoolAddress:
+      '0x9c9077abf7a29eebce41e33addbcd6f5246a5221dd733e56ea0f00ae1b25c9e8',
+    collateralPoolAddress:
+      '0x75aacfb7dcbf92ee0111fc1bf975b12569e4ba632e81ed7ae5ac090d40cd3acb',
+  },
+  wusdt: {
+    lendingPoolAddress:
+      '0xfbc056f126dd35adc1f8fe985e2cedc8010e687e8e851e1c5b99fdf63cd1c879',
+    collateralPoolAddress:
+      '0x2260cb5b24929dd20a1742f37a61ff3ce4fde5cdb023e2d3ce2e0ce2d90719e3',
+  },
+  sui: {
+    lendingPoolAddress:
+      '0x9c9077abf7a29eebce41e33addbcd6f5246a5221dd733e56ea0f00ae1b25c9e8',
+    collateralPoolAddress:
+      '0x75aacfb7dcbf92ee0111fc1bf975b12569e4ba632e81ed7ae5ac090d40cd3acb',
+  },
+  wapt: {
+    lendingPoolAddress:
+      '0xca8c14a24e0c32b198eaf479a3317461e3cc339097ce88eaf296a15df8dcfdf5',
+    collateralPoolAddress:
+      '0xde33f9ac5bb0ed34598da4e64b4983832716ced65f172fbf267bcfe859c4ad9c',
+  },
+  wsol: {
+    lendingPoolAddress:
+      '0x985682c42984cdfb03f9ff7d8923344c2fe096b1ae4b82ea17721af19d22a21f',
+    collateralPoolAddress:
+      '0xdc1cc2c371a043ae8e3c3fe2d013c35f1346960b7dbb4c072982c5b794ed144f',
+  },
+  cetus: {
+    lendingPoolAddress:
+      '0xc09858f60e74a1b671635bec4e8a2c84a0ff313eb87f525fba3258e88c6b6282',
+    collateralPoolAddress:
+      '0xe363967e29b7b9c1245d6d46d63e719de8f90b37e3358c545b55d945ea0b676a',
+  },
+  afsui: {
+    lendingPoolAddress:
+      '0x9b942a24ce390b7f5016d34a0217057bf9487b92aa6d7cc9894271dbbe62471a',
+    collateralPoolAddress:
+      '0xe5e56f5c0e3072760b21f9d49a5cc793f37d736c412a9065c16e1265c74e6341',
+  },
+  hasui: {
+    lendingPoolAddress:
+      '0x7ebc607f6bdeb659fb6506cb91c5cc1d47bb365cfd5d2e637ea765346ec84ed4',
+    collateralPoolAddress:
+      '0xad9ed40d6486e4c26cec7370dffce8dc4821eb79178250b5938a34ccafd61e6d',
+  },
+  vsui: {
+    lendingPoolAddress:
+      '0xda9257c0731d8822e8a438ebced13415850d705b779c79958dcf2aeb21fcb43d',
+    collateralPoolAddress:
+      '0x4435e8b8ec2a04094d863aa52deb6ab6f8f47ed8778f4d9f1b27afc4a6e85f1e',
+  },
+  sca: {
+    lendingPoolAddress:
+      '0x6fc7d4211fc7018b6c75e7b908b88f2e0536443239804a3d32af547637bd28d7',
+    collateralPoolAddress:
+      '0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31',
+  },
+};

package/src/constants/pyth.ts

@@ -1,6 +1,25 @@
+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,10 +99,6 @@ export const queryKeys = {
     ],
   },
   oracle: {
-    getPythLatestPriceFeed: (pythPriceId?: string) => [
-      'oracle',
-      'getPythPriceId',
-      { pythPriceId },
-    ],
+    getPythLatestPriceFeeds: () => ['oracle', 'getPythPriceIds'],
   },
 };

package/src/constants/rpc.ts

@@ -0,0 +1,16 @@
+import { getFullnodeUrl } from '@mysten/sui/client';
+
+export const RPC_PROVIDERS = [
+  getFullnodeUrl('mainnet'),
+  'https://sui-mainnet.public.blastapi.io',
+  'https://sui-mainnet-ca-2.cosmostation.io',
+  'https://sui-mainnet-eu-4.cosmostation.io',
+  'https://sui-mainnet-endpoint.blockvision.org',
+  'https://sui-rpc.publicnode.com',
+  'https://sui-mainnet-rpc.allthatnode.com',
+  'https://mainnet.suiet.app',
+  'https://mainnet.sui.rpcpool.com',
+  'https://sui1mainnet-rpc.chainode.tech',
+  'https://fullnode.mainnet.apis.scallop.io',
+  'https://sui-mainnet-us-2.cosmostation.io',
+];

package/src/constants/tokenBucket.ts

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

package/src/models/scallop.ts

@@ -22,6 +22,7 @@ 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.
@@ -54,7 +55,7 @@ export class Scallop {
     queryClient?: QueryClient
   ) {
     this.params = params;
-    this.suiKit = new SuiKit(params);
+    this.suiKit = newSuiKit(params);
     this.cache = new ScallopCache(
       this.suiKit,
       params.walletAddress,
@@ -65,7 +66,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: 30000,
+      timeout: 8000,
     });
     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,6 +19,7 @@ import type {
 } from '../types';
 import { ScallopCache } from './scallopCache';
 import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
+import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -46,11 +47,11 @@ export class ScallopBuilder {
     params: ScallopBuilderParams,
     instance?: ScallopBuilderInstanceParams
   ) {
-    this.suiKit = instance?.suiKit ?? new SuiKit(params);
+    this.suiKit = instance?.suiKit ?? newSuiKit(params);
 
     this.params = params;
     this.walletAddress = normalizeSuiAddress(
-      params?.walletAddress || this.suiKit.currentAddress()
+      params?.walletAddress ?? this.suiKit.currentAddress()
     );
 
     if (instance?.query) {
@@ -66,7 +67,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,6 +34,7 @@ import type {
   ScallopClientVeScaReturnType,
   ScallopClientInstanceParams,
 } from '../types';
+import { newSuiKit } from './suiKit';
 
 /**
  * @description
@@ -64,9 +65,9 @@ export class ScallopClient {
   ) {
     this.params = params;
     this.suiKit =
-      instance?.suiKit ?? instance?.builder?.suiKit ?? new SuiKit(params);
+      instance?.suiKit ?? instance?.builder?.suiKit ?? newSuiKit(params);
     this.walletAddress = normalizeSuiAddress(
-      params?.walletAddress || this.suiKit.currentAddress()
+      params?.walletAddress ?? this.suiKit.currentAddress()
     );
 
     if (instance?.builder) {
@@ -83,7 +84,7 @@ export class ScallopClient {
       );
       this.address = new ScallopAddress(
         {
-          id: params?.addressesId || ADDRESSES_ID,
+          id: params?.addressesId ?? ADDRESSES_ID,
           network: params?.networkType,
           forceInterface: params?.forceAddressesInterface,
         },
@@ -142,7 +143,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);
   }
 
@@ -169,7 +170,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);
   }
 
@@ -187,7 +188,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);
   }
 
@@ -272,11 +273,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,
@@ -319,7 +320,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(
@@ -365,7 +366,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);
@@ -409,14 +410,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) {
@@ -466,7 +467,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);
@@ -501,7 +502,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 = (
@@ -549,7 +550,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 = (
@@ -610,7 +611,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);
@@ -647,7 +648,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);
@@ -691,12 +692,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 {
@@ -743,7 +744,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(
@@ -802,7 +803,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(
@@ -863,7 +864,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(
@@ -899,7 +900,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);
@@ -929,7 +930,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);
@@ -961,7 +962,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 = [];
@@ -1186,7 +1187,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`;