@scallop-io/sui-scallop-sdk 1.4.1-alpha.1 → 1.4.2-rc.1

package/src/builders/referralBuilder.ts

@@ -34,8 +34,9 @@ const generateReferralNormalMethod: GenerateReferralNormalMethod = ({
   const veScaTable = builder.address.get('vesca.table');
 
   return {
-    bindToReferral: (veScaKeyId: string) => {
-      return txBlock.moveCall(
+    bindToReferral: async (veScaKeyId: string) => {
+      await builder.moveCall(
+        txBlock,
         `${referralIds.referralPgkId}::referral_bindings::bind_ve_sca_referrer`,
         [
           referralIds.referralBindings,
@@ -46,9 +47,10 @@ const generateReferralNormalMethod: GenerateReferralNormalMethod = ({
         []
       );
     },
-    claimReferralTicket: (poolCoinName: SupportCoins) => {
+    claimReferralTicket: async (poolCoinName: SupportCoins) => {
       const coinType = builder.utils.parseCoinType(poolCoinName);
-      return txBlock.moveCall(
+      return await builder.moveCall(
+        txBlock,
         `${referralIds.referralPgkId}::scallop_referral_program::claim_ve_sca_referral_ticket`,
         [
           referralIds.version,
@@ -61,9 +63,13 @@ const generateReferralNormalMethod: GenerateReferralNormalMethod = ({
         [coinType]
       );
     },
-    burnReferralTicket: (ticket: SuiObjectArg, poolCoinName: SupportCoins) => {
+    burnReferralTicket: async (
+      ticket: SuiObjectArg,
+      poolCoinName: SupportCoins
+    ) => {
       const coinType = builder.utils.parseCoinType(poolCoinName);
-      return txBlock.moveCall(
+      await builder.moveCall(
+        txBlock,
         `${referralIds.referralPgkId}::scallop_referral_program::burn_ve_sca_referral_ticket`,
         [
           referralIds.version,
@@ -74,12 +80,13 @@ const generateReferralNormalMethod: GenerateReferralNormalMethod = ({
         [coinType]
       );
     },
-    claimReferralRevenue: (
+    claimReferralRevenue: async (
       veScaKey: SuiObjectArg,
       poolCoinName: SupportCoins
     ) => {
       const coinType = builder.utils.parseCoinType(poolCoinName);
-      return txBlock.moveCall(
+      return await builder.moveCall(
+        txBlock,
         `${referralIds.referralPgkId}::referral_revenue_pool::claim_revenue_with_ve_sca_key`,
         [
           referralIds.version,
@@ -106,10 +113,16 @@ const generateReferralQuickMethod: GenerateReferralQuickMethod = ({
       const objToTransfer: SuiObjectArg[] = [];
       for (const coinName of coinNames) {
         if (coinName === 'sui') {
-          const rewardCoin = txBlock.claimReferralRevenue(veScaKey, coinName);
+          const rewardCoin = await txBlock.claimReferralRevenue(
+            veScaKey,
+            coinName
+          );
           objToTransfer.push(rewardCoin);
         } else {
-          const rewardCoin = txBlock.claimReferralRevenue(veScaKey, coinName);
+          const rewardCoin = await txBlock.claimReferralRevenue(
+            veScaKey,
+            coinName
+          );
           try {
             // get the matching user coin if exists
             const coins = await builder.suiKit.suiInteractor.selectCoins(

package/src/builders/sCoinBuilder.ts

@@ -20,8 +20,9 @@ const generateSCoinNormalMethod: GenerateSCoinNormalMethod = ({
   };
 
   return {
-    mintSCoin: (marketCoinName, marketCoin) => {
-      return txBlock.moveCall(
+    mintSCoin: async (marketCoinName, marketCoin) => {
+      return await builder.moveCall(
+        txBlock,
         `${sCoinPkgIds.pkgId}::s_coin_converter::mint_s_coin`,
         [builder.utils.getSCoinTreasury(marketCoinName), marketCoin],
         [
@@ -30,8 +31,9 @@ const generateSCoinNormalMethod: GenerateSCoinNormalMethod = ({
         ]
       );
     },
-    burnSCoin: (sCoinName, sCoin) => {
-      return txBlock.moveCall(
+    burnSCoin: async (sCoinName, sCoin) => {
+      return await builder.moveCall(
+        txBlock,
         `${sCoinPkgIds.pkgId}::s_coin_converter::burn_s_coin`,
         [builder.utils.getSCoinTreasury(sCoinName), sCoin],
         [
@@ -58,7 +60,7 @@ const generateSCoinQuickMethod: GenerateSCoinQuickMethod = ({
       );
 
       txBlock.transferObjects([leftCoin], sender);
-      return txBlock.mintSCoin(marketCoinName, takeCoin);
+      return await txBlock.mintSCoin(marketCoinName, takeCoin);
     },
     burnSCoinQuick: async (sCoinName, amount) => {
       const sender = requireSender(txBlock);
@@ -70,7 +72,7 @@ const generateSCoinQuickMethod: GenerateSCoinQuickMethod = ({
       );
 
       txBlock.transferObjects([leftCoin], sender);
-      return txBlock.burnSCoin(sCoinName, takeCoin);
+      return await txBlock.burnSCoin(sCoinName, takeCoin);
     },
   };
 };

package/src/builders/spoolBuilder.ts

@@ -100,10 +100,10 @@ const stakeHelper = async (
       ? await builder.selectSCoin(txBlock, coinName, amount, sender)
       : await builder.selectMarketCoin(txBlock, coinName, amount, sender);
     if (isSCoin) {
-      const marketCoin = txBlock.burnSCoin(coinName, takeCoin);
-      txBlock.stake(stakeAccount, marketCoin, coinName);
+      const marketCoin = await txBlock.burnSCoin(coinName, takeCoin);
+      await txBlock.stake(stakeAccount, marketCoin, coinName);
     } else {
-      txBlock.stake(stakeAccount, takeCoin, coinName);
+      await txBlock.stake(stakeAccount, takeCoin, coinName);
     }
     txBlock.transferObjects([leftCoin], sender);
     return totalAmount;
@@ -127,43 +127,46 @@ const generateSpoolNormalMethod: GenerateSpoolNormalMethod = ({
     spoolPkg: builder.address.get('spool.id'),
   };
   return {
-    createStakeAccount: (stakeMarketCoinName) => {
+    createStakeAccount: async (stakeMarketCoinName) => {
       const marketCoinType =
         builder.utils.parseMarketCoinType(stakeMarketCoinName);
       const stakePoolId = builder.address.get(
         `spool.pools.${stakeMarketCoinName}.id`
       );
-      return txBlock.moveCall(
+      return await builder.moveCall(
+        txBlock,
         `${spoolIds.spoolPkg}::user::new_spool_account`,
         [stakePoolId, SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
-    stake: (stakeAccount, coin, stakeMarketCoinName) => {
+    stake: async (stakeAccount, coin, stakeMarketCoinName) => {
       const marketCoinType =
         builder.utils.parseMarketCoinType(stakeMarketCoinName);
       const stakePoolId = builder.address.get(
         `spool.pools.${stakeMarketCoinName}.id`
       );
-      txBlock.moveCall(
+      await builder.moveCall(
+        txBlock,
         `${spoolIds.spoolPkg}::user::stake`,
         [stakePoolId, stakeAccount, coin, SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
-    unstake: (stakeAccount, amount, stakeMarketCoinName) => {
+    unstake: async (stakeAccount, amount, stakeMarketCoinName) => {
       const marketCoinType =
         builder.utils.parseMarketCoinType(stakeMarketCoinName);
       const stakePoolId = builder.address.get(
         `spool.pools.${stakeMarketCoinName}.id`
       );
-      return txBlock.moveCall(
+      return await builder.moveCall(
+        txBlock,
         `${spoolIds.spoolPkg}::user::unstake`,
         [stakePoolId, stakeAccount, amount, SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
-    claim: (stakeAccount, stakeMarketCoinName) => {
+    claim: async (stakeAccount, stakeMarketCoinName) => {
       const stakePoolId = builder.address.get(
         `spool.pools.${stakeMarketCoinName}.id`
       ) as string;
@@ -174,7 +177,8 @@ const generateSpoolNormalMethod: GenerateSpoolNormalMethod = ({
         builder.utils.parseMarketCoinType(stakeMarketCoinName);
       const rewardCoinName = spoolRewardCoins[stakeMarketCoinName];
       const rewardCoinType = builder.utils.parseCoinType(rewardCoinName);
-      return txBlock.moveCall(
+      return await builder.moveCall(
+        txBlock,
         `${spoolIds.spoolPkg}::user::redeem_rewards`,
         [stakePoolId, rewardPoolId, stakeAccount, SUI_CLOCK_OBJECT_ID],
         [marketCoinType, rewardCoinType]
@@ -265,7 +269,7 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
       for (const account of stakeAccounts) {
         if (account.staked === 0) continue;
         const amountToUnstake = Math.min(amount, account.staked);
-        const marketCoin = txBlock.unstake(
+        const marketCoin = await txBlock.unstake(
           account.id,
           amountToUnstake,
           stakeMarketCoinName
@@ -273,7 +277,10 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
 
         // convert to new sCoin
         if (returnSCoin) {
-          const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
+          const sCoin = await txBlock.mintSCoin(
+            stakeMarketCoinName,
+            marketCoin
+          );
           toTransfer.push(sCoin);
         } else {
           toTransfer.push(marketCoin);
@@ -301,7 +308,7 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
       );
       const rewardCoins: TransactionResult[] = [];
       for (const accountId of stakeAccountIds) {
-        const rewardCoin = txBlock.claim(accountId, stakeMarketCoinName);
+        const rewardCoin = await txBlock.claim(accountId, stakeMarketCoinName);
         rewardCoins.push(rewardCoin);
       }
       return rewardCoins;

package/src/builders/vescaBuilder.ts

@@ -89,8 +89,9 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
   };
 
   return {
-    lockSca: (scaCoin, unlockAtInSecondTimestamp) => {
-      return txBlock.moveCall(
+    lockSca: async (scaCoin, unlockAtInSecondTimestamp) => {
+      return await builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::mint_ve_sca_key`,
         [
           veScaIds.config,
@@ -103,8 +104,9 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    extendLockPeriod: (veScaKey, newUnlockAtInSecondTimestamp) => {
-      txBlock.moveCall(
+    extendLockPeriod: async (veScaKey, newUnlockAtInSecondTimestamp) => {
+      await builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::extend_lock_period`,
         [
           veScaIds.config,
@@ -117,8 +119,9 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    extendLockAmount: (veScaKey, scaCoin) => {
-      txBlock.moveCall(
+    extendLockAmount: async (veScaKey, scaCoin) => {
+      await builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::lock_more_sca`,
         [
           veScaIds.config,
@@ -131,8 +134,13 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    renewExpiredVeSca: (veScaKey, scaCoin, newUnlockAtInSecondTimestamp) => {
-      txBlock.moveCall(
+    renewExpiredVeSca: async (
+      veScaKey,
+      scaCoin,
+      newUnlockAtInSecondTimestamp
+    ) => {
+      await builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::renew_expired_ve_sca`,
         [
           veScaIds.config,
@@ -146,8 +154,9 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    redeemSca: (veScaKey) => {
-      return txBlock.moveCall(
+    redeemSca: async (veScaKey) => {
+      return await builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::redeem`,
         [
           veScaIds.config,
@@ -159,8 +168,9 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    mintEmptyVeSca: () => {
-      return txBlock.moveCall(
+    mintEmptyVeSca: async () => {
+      return await builder.moveCall(
+        txBlock,
         `${veScaIds.pkgId}::ve_sca::mint_ve_sca_placeholder_key`,
         [veScaIds.config, veScaIds.table],
         []
@@ -346,7 +356,7 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
       checkVesca(veSca?.unlockAt);
 
       if (veSca) {
-        const sca = txBlock.redeemSca(veSca.keyId);
+        const sca = await txBlock.redeemSca(veSca.keyId);
         if (transferSca) {
           txBlock.transferObjects([sca], sender);
           return;

package/src/constants/coinGecko.ts

@@ -15,7 +15,6 @@ export const COIN_GECKGO_IDS: Record<SupportPoolCoins, string> = {
   hasui: 'sui',
   vsui: 'sui',
   sca: 'scallop-2',
-  // TODO: enable for production
-  // deep: 'deepbook',
-  // fud: 'fud-the-pug',
+  deep: 'deepbook',
+  fud: 'fud-the-pug',
 };

package/src/constants/common.ts

@@ -9,7 +9,6 @@ export const ADDRESSES_ID =
     ? ('65fb07c39c845425d71d7b18' as const)
     : ('675c65cd301dd817ea262e76' as const);
 // : ('66f8e7ed9bb9e07fdfb86bbb' as const);
-// : ('664dfe22898c36c159e28bc8' as const);
 
 export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
   ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
@@ -45,9 +44,8 @@ export const SUPPORT_POOLS = [
   'hasui',
   'vsui',
   'sca',
-  // TODO: enable for production
-  // 'fud',
-  // 'deep',
+  'fud',
+  'deep',
 ] as const;
 
 export const SUPPORT_COLLATERALS = [
@@ -93,9 +91,8 @@ export const SUPPORT_SCOIN = [
   'scetus',
   'swsol',
   'swbtc',
-  // TODO: enable for production
-  // 'sdeep',
-  // 'sfud',
+  'sdeep',
+  'sfud',
 ] as const;
 
 export const SUPPORT_SUI_BRIDGE = ['sbeth'] as const;
@@ -110,18 +107,7 @@ export const SUPPORT_WORMHOLE = [
 
 export const SUPPORT_SPOOLS_REWARDS = ['sui'] as const;
 
-export const SUPPORT_BORROW_INCENTIVE_POOLS = [
-  'sui',
-  'wusdc',
-  'wusdt',
-  'afsui',
-  'hasui',
-  'vsui',
-  'weth',
-  'sbeth',
-  'sca',
-  'usdc',
-] as const;
+export const SUPPORT_BORROW_INCENTIVE_POOLS = [...SUPPORT_POOLS] as const;
 
 export const SUPPORT_BORROW_INCENTIVE_REWARDS = [
   ...SUPPORT_POOLS,

package/src/constants/enum.ts

@@ -16,9 +16,8 @@ export const coinDecimals: types.SupportCoinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
-  // TODO: enable for production
-  // deep: 6,
-  // fud: 5,
+  deep: 6,
+  fud: 5,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
@@ -33,9 +32,8 @@ export const coinDecimals: types.SupportCoinDecimals = {
   shasui: 9,
   svsui: 9,
   ssca: 9,
-  // TODO: enable for production
-  // sdeep: 6,
-  // sfud: 5,
+  sdeep: 6,
+  sfud: 5,
 };
 
 export const assetCoins: types.AssetCoins = {
@@ -53,9 +51,8 @@ export const assetCoins: types.AssetCoins = {
   hasui: 'hasui',
   vsui: 'vsui',
   sca: 'sca',
-  // TODO: enable for production
-  // deep: 'deep',
-  // fud: 'fud',
+  deep: 'deep',
+  fud: 'fud',
 };
 
 export const marketCoins: types.MarketCoins = {
@@ -73,9 +70,8 @@ export const marketCoins: types.MarketCoins = {
   shasui: 'shasui',
   svsui: 'svsui',
   ssca: 'ssca',
-  // TODO: enable for production
-  // sdeep: 'sdeep',
-  // sfud: 'sfud',
+  sdeep: 'sdeep',
+  sfud: 'sfud',
 };
 
 export const sCoins: types.SCoins = {
@@ -92,9 +88,8 @@ export const sCoins: types.SCoins = {
   ssca: 'ssca',
   swsol: 'swsol',
   swbtc: 'swbtc',
-  // TODO: enable for production
-  // sfud: 'sfud',
-  // sdeep: 'sdeep',
+  sfud: 'sfud',
+  sdeep: 'sdeep',
 };
 
 export const stakeMarketCoins: types.StakeMarketCoins = {
@@ -143,8 +138,8 @@ export const coinIds: types.AssetCoinIds = {
     ? '0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524'
     : '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
   // isolated assets
-  // deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
-  // fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
+  deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
+  fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
 };
 
 export const wormholeCoinIds: types.WormholeCoinIds = {
@@ -166,22 +161,12 @@ export const sCoinIds: types.SCoinIds = {
     '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
   ssbeth:
     '0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH',
-  // prod values
-  // ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
-  // swusdc:
-  //   '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-  // swusdt:
-  //   '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
-  // ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
-
-  // test values
-  ssui: '0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI',
-  swusdt:
-    '0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
   swusdc:
-    '0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-  ssca: '0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA',
-
+    '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  swusdt:
+    '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
   scetus:
     '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
   sweth:
@@ -196,9 +181,9 @@ export const sCoinIds: types.SCoinIds = {
     '0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL',
   swbtc:
     '0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC',
-  // sdeep:
-  //   '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
-  // sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
+  sdeep:
+    '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
+  sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
 } as const;
 
 export const sCoinTypeToName = Object.entries(sCoinIds).reduce(