@scallop-io/sui-scallop-sdk 1.4.2-rc.5 → 1.4.3-rc.1

package/src/builders/vescaBuilder.ts

@@ -89,8 +89,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
   };
 
   return {
-    lockSca: async (scaCoin, unlockAtInSecondTimestamp) => {
-      return await builder.moveCall(
+    lockSca: (scaCoin, unlockAtInSecondTimestamp) => {
+      return builder.moveCall(
         txBlock,
         `${veScaIds.pkgId}::ve_sca::mint_ve_sca_key`,
         [
@@ -104,8 +104,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    extendLockPeriod: async (veScaKey, newUnlockAtInSecondTimestamp) => {
-      await builder.moveCall(
+    extendLockPeriod: (veScaKey, newUnlockAtInSecondTimestamp) => {
+      builder.moveCall(
         txBlock,
         `${veScaIds.pkgId}::ve_sca::extend_lock_period`,
         [
@@ -119,8 +119,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    extendLockAmount: async (veScaKey, scaCoin) => {
-      await builder.moveCall(
+    extendLockAmount: (veScaKey, scaCoin) => {
+      builder.moveCall(
         txBlock,
         `${veScaIds.pkgId}::ve_sca::lock_more_sca`,
         [
@@ -134,12 +134,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    renewExpiredVeSca: async (
-      veScaKey,
-      scaCoin,
-      newUnlockAtInSecondTimestamp
-    ) => {
-      await builder.moveCall(
+    renewExpiredVeSca: (veScaKey, scaCoin, newUnlockAtInSecondTimestamp) => {
+      builder.moveCall(
         txBlock,
         `${veScaIds.pkgId}::ve_sca::renew_expired_ve_sca`,
         [
@@ -154,8 +150,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    redeemSca: async (veScaKey) => {
-      return await builder.moveCall(
+    redeemSca: (veScaKey) => {
+      return builder.moveCall(
         txBlock,
         `${veScaIds.pkgId}::ve_sca::redeem`,
         [
@@ -168,8 +164,8 @@ const generateNormalVeScaMethod: GenerateVeScaNormalMethod = ({
         []
       );
     },
-    mintEmptyVeSca: async () => {
-      return await builder.moveCall(
+    mintEmptyVeSca: () => {
+      return builder.moveCall(
         txBlock,
         `${veScaIds.pkgId}::ve_sca::mint_ve_sca_placeholder_key`,
         [veScaIds.config, veScaIds.table],

package/src/models/scallopClient.ts

@@ -232,7 +232,7 @@ export class ScallopClient {
     sign: S = true as S
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
-    await txBlock.openObligationEntry();
+    txBlock.openObligationEntry();
     if (sign) {
       return (await this.suiKit.signAndSendTxn(
         txBlock
@@ -283,10 +283,9 @@ export class ScallopClient {
         specificObligationId
       );
     } else {
-      const [obligation, obligationKey, hotPotato] =
-        await txBlock.openObligation();
+      const [obligation, obligationKey, hotPotato] = txBlock.openObligation();
       await txBlock.addCollateralQuick(amount, collateralCoinName, obligation);
-      await txBlock.returnObligation(obligation, hotPotato);
+      txBlock.returnObligation(obligation, hotPotato);
       txBlock.transferObjects([obligationKey], sender);
     }
 
@@ -426,7 +425,7 @@ export class ScallopClient {
         targetStakeAccount
       );
     } else {
-      const account = await txBlock.createStakeAccount(stakeMarketCoinName);
+      const account = txBlock.createStakeAccount(stakeMarketCoinName);
       await txBlock.stakeQuick(marketCoin, stakeMarketCoinName, account);
       txBlock.transferObjects([account], sender);
     }
@@ -612,12 +611,8 @@ export class ScallopClient {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
-    const [coin, loan] = await txBlock.borrowFlashLoan(amount, poolCoinName);
-    await txBlock.repayFlashLoan(
-      await callback(txBlock, coin),
-      loan,
-      poolCoinName
-    );
+    const [coin, loan] = txBlock.borrowFlashLoan(amount, poolCoinName);
+    txBlock.repayFlashLoan(await callback(txBlock, coin), loan, poolCoinName);
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(
@@ -654,7 +649,7 @@ export class ScallopClient {
     const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
 
-    const stakeAccount = await txBlock.createStakeAccount(marketCoinName);
+    const stakeAccount = txBlock.createStakeAccount(marketCoinName);
     txBlock.transferObjects([stakeAccount], sender);
 
     if (sign) {
@@ -704,7 +699,7 @@ export class ScallopClient {
     if (targetStakeAccount) {
       await txBlock.stakeQuick(amount, stakeMarketCoinName, targetStakeAccount);
     } else {
-      const account = await txBlock.createStakeAccount(stakeMarketCoinName);
+      const account = txBlock.createStakeAccount(stakeMarketCoinName);
       await txBlock.stakeQuick(amount, stakeMarketCoinName, account);
       txBlock.transferObjects([account], sender);
     }
@@ -819,7 +814,7 @@ export class ScallopClient {
       this.utils.parseCoinName<SupportStakeCoins>(stakeMarketCoinName);
 
     if (stakeMarketCoin) {
-      const coin = await txBlock.withdraw(stakeMarketCoin, stakeCoinName);
+      const coin = txBlock.withdraw(stakeMarketCoin, stakeCoinName);
       await this.utils.mergeSimilarCoins(
         txBlock,
         coin,
@@ -1053,7 +1048,7 @@ export class ScallopClient {
         // if market coin found, mint sCoin
         if (toDestroyMarketCoin) {
           // mint new sCoin
-          const sCoin = await txBlock.mintSCoin(
+          const sCoin = txBlock.mintSCoin(
             sCoinName as SupportSCoin,
             toDestroyMarketCoin
           );

package/src/types/builder/borrowIncentive.ts

@@ -19,25 +19,22 @@ export type BorrowIncentiveNormalMethods = {
   stakeObligation: (
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg
-  ) => Promise<void>;
+  ) => void;
   stakeObligationWithVesca: (
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg,
     veScaKey: SuiObjectArg
-  ) => Promise<void>;
+  ) => void;
   unstakeObligation: (
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg
-  ) => Promise<void>;
+  ) => void;
   claimBorrowIncentive: (
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg,
     rewardType: SupportBorrowIncentiveRewardCoins
-  ) => Promise<TransactionResult>;
-  deactivateBoost: (
-    obligation: SuiObjectArg,
-    veScaKey: SuiObjectArg
-  ) => Promise<void>;
+  ) => TransactionResult;
+  deactivateBoost: (obligation: SuiObjectArg, veScaKey: SuiObjectArg) => void;
 };
 
 export type BorrowIncentiveQuickMethods = {

package/src/types/builder/core.ts

@@ -26,74 +26,87 @@ type ObligationKey = NestedResult;
 type ObligationHotPotato = NestedResult;
 
 export type CoreNormalMethods = {
-  openObligation: () => Promise<
-    [Obligation, ObligationKey, ObligationHotPotato]
-  >;
+  // openObligation: () => Promise<
+  openObligation: () => [Obligation, ObligationKey, ObligationHotPotato];
   returnObligation: (
     obligation: SuiObjectArg,
     obligationHotPotato: SuiObjectArg
-  ) => Promise<void>;
-  openObligationEntry: () => Promise<void>;
+    // ) => Promise<void>;
+  ) => void;
+  // openObligationEntry: () => Promise<void>;
+  openObligationEntry: () => void;
   addCollateral: (
     obligation: SuiObjectArg,
     coin: SuiObjectArg,
     collateralCoinName: SupportCollateralCoins
-  ) => Promise<void>;
+    // ) => Promise<void>;
+  ) => void;
   takeCollateral: (
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg,
     amount: number,
     collateralCoinName: SupportCollateralCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   deposit: (
     coin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   depositEntry: (
     coin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   withdraw: (
     marketCoin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   withdrawEntry: (
     marketCoin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   borrow: (
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg,
     amount: number,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   borrowWithReferral: (
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg,
     borrowReferral: SuiObjectArg,
     amount: number | SuiTxArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   borrowEntry: (
     obligation: SuiObjectArg,
     obligationKey: SuiObjectArg,
     amount: number,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   repay: (
     obligation: SuiObjectArg,
     coin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<void>;
+    // ) => Promise<void>;
+  ) => void;
   borrowFlashLoan: (
     amount: number | SuiTxArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+    // ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   repayFlashLoan: (
     coin: SuiObjectArg,
     loan: SuiObjectArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<void>;
+    // ) => Promise<void>;
+  ) => void;
 };
 
 export type CoreQuickMethods = {

package/src/types/builder/loyaltyProgram.ts

@@ -12,7 +12,7 @@ export type LoyaltyProgramIds = {
 };
 
 export type LoyaltyProgramNormalMethods = {
-  claimLoyaltyRevenue: (veScaKey: SuiObjectArg) => Promise<TransactionResult>;
+  claimLoyaltyRevenue: (veScaKey: SuiObjectArg) => TransactionResult;
 };
 
 export type LoyaltyProgramQuickMethods = {

package/src/types/builder/referral.ts

@@ -16,18 +16,16 @@ export type ReferralIds = {
 };
 
 export type ReferralNormalMethods = {
-  bindToReferral: (veScaKeyId: string) => Promise<void>;
-  claimReferralTicket: (
-    poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+  bindToReferral: (veScaKeyId: string) => void;
+  claimReferralTicket: (poolCoinName: SupportPoolCoins) => TransactionResult;
   burnReferralTicket: (
     ticket: SuiObjectArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<void>;
+  ) => void;
   claimReferralRevenue: (
     veScaKey: SuiObjectArg,
     poolCoinName: SupportPoolCoins
-  ) => Promise<TransactionResult>;
+  ) => TransactionResult;
 };
 
 export type ReferralQuickMethods = {

package/src/types/builder/sCoin.ts

@@ -21,7 +21,7 @@ export type sCoinNormalMethods = {
   mintSCoin: (
     marketCoinName: SupportSCoin,
     marketCoin: SuiObjectArg
-  ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   /**
    * Burn sCoin and return marketCoin
    * @param sCoinName
@@ -31,7 +31,7 @@ export type sCoinNormalMethods = {
   burnSCoin: (
     sCoinName: SupportSCoin,
     sCoin: SuiObjectArg
-  ) => Promise<TransactionResult>; // returns marketCoin
+  ) => TransactionResult; // returns marketCoin
 };
 
 export type sCoinQuickMethods = {

package/src/types/builder/spool.ts

@@ -15,21 +15,21 @@ export type SpoolIds = {
 export type SpoolNormalMethods = {
   createStakeAccount: (
     stakeMarketCoinName: SupportStakeMarketCoins
-  ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   stake: (
     stakeAccount: SuiAddressArg,
     coin: SuiObjectArg,
     stakeMarketCoinName: SupportStakeMarketCoins
-  ) => Promise<void>;
+  ) => void;
   unstake: (
     stakeAccount: SuiAddressArg,
     amount: number,
     stakeMarketCoinName: SupportStakeMarketCoins
-  ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   claim: (
     stakeAccount: SuiAddressArg,
     stakeMarketCoinName: SupportStakeMarketCoins
-  ) => Promise<TransactionResult>;
+  ) => TransactionResult;
 };
 
 export type SpoolQuickMethods = {

package/src/types/builder/vesca.ts

@@ -13,22 +13,19 @@ export type VeScaNormalMethods = {
   lockSca: (
     scaCoin: SuiObjectArg,
     unlockAtInSecondTimestamp: number
-  ) => Promise<TransactionResult>;
+  ) => TransactionResult;
   extendLockPeriod: (
     veScaKey: SuiObjectArg,
     newUnlockAtInSecondTimestamp: number
-  ) => Promise<void>;
-  extendLockAmount: (
-    veScaKey: SuiObjectArg,
-    scaCoin: SuiObjectArg
-  ) => Promise<void>;
+  ) => void;
+  extendLockAmount: (veScaKey: SuiObjectArg, scaCoin: SuiObjectArg) => void;
   renewExpiredVeSca: (
     veScaKey: SuiObjectArg,
     scaCoin: SuiObjectArg,
     newUnlockAtInSecondTimestamp: number
-  ) => Promise<void>;
-  redeemSca: (veScaKey: SuiObjectArg) => Promise<TransactionResult>;
-  mintEmptyVeSca: () => Promise<TransactionResult>;
+  ) => void;
+  redeemSca: (veScaKey: SuiObjectArg) => TransactionResult;
+  mintEmptyVeSca: () => TransactionResult;
 };
 
 export type RedeemScaQuickReturnType<T extends boolean> = T extends true