@msafe/sui3-sdk 0.0.75 → 0.0.76

package/dist/index.d.cts

@@ -67,7 +67,7 @@ interface IBackend {
     getNextIntention(input: IMSafeAddressRequest): Promise<TransactionIntentionItem>;
     getCurrentSequenceNumber(address: string): Promise<number>;
     getNextSequenceNumber(address: string): Promise<number>;
-    fetchTransaction(input: IMSafeAddressRequest): Promise<void>;
+    fetchTransaction(input: IMSafeAddressRequest): Promise<string[]>;
     createMSafeAccount(input: ICreateMSafeReq): Promise<void>;
     proposeIntention(input: IProposeIntentionRequest): Promise<void>;
     rejectCurrentTx(input: IRejectTransactionRequest): Promise<void>;
@@ -245,14 +245,20 @@ interface ProposeIntention {
     msafeAddress: string;
     signature: SerializedSignature;
 }
-interface SimulationResult {
-    success: boolean;
+type SimulationResult = SimulationSuccessResult | SimulationFailedResult;
+interface SimulationSuccessResult {
+    success: true;
     gasPrice: bigint;
     gasUsed: GasCostSummary;
     gasBudget: bigint;
     gasObject: SuiObjectRef;
-    simulationError?: string;
-    response?: DryRunTransactionBlockResponse;
+    response: DryRunTransactionBlockResponse;
+}
+interface SimulationFailedResult {
+    success: false;
+    gasPrice: bigint;
+    response: DryRunTransactionBlockResponse;
+    simulationError: string;
 }
 interface SimulationOption extends IGasOption {
     simulation: boolean;
@@ -311,7 +317,6 @@ declare class InvitationSDK {
 }
 
 type GasPriceOption = MultiplierOption | FixedValueOption;
-type GasBudgetOption = MultiplierOption | FixedValueOption;
 interface MultiplierOption {
     multiplier: {
         numerator: bigint;
@@ -327,13 +332,12 @@ declare class Simulator {
     simulate(input: {
         txb: TransactionBlock;
         sender: string;
-    }, gasOption?: GasPriceOption, budgetOption?: GasBudgetOption): Promise<SimulationResult>;
+    }, gasOption?: GasPriceOption): Promise<SimulationResult>;
     private getGasPrice;
     private toGasBudget;
     private isFixedValue;
     private isMultiplier;
     private applyGasOption;
-    private applyBudgetOption;
     private copyTransactionBlock;
 }
 
@@ -384,7 +388,7 @@ declare class MSafeAccount {
         forceBuild: boolean;
     }): Promise<void>;
     skipNextFailedIntention(): Promise<void>;
-    fetchTransaction(): Promise<void>;
+    fetchTransaction(): Promise<string[]>;
     executePendingTx(pending: PendingTx, isRejectTx?: boolean): Promise<_mysten_sui_js_client.SuiTransactionBlockResponse>;
     dashboard(): Promise<_msafe_sui3_utils.IGetDashboardResp>;
     private calculateWeightFromVotes;
@@ -492,4 +496,4 @@ declare class Coin {
     static getBalance(data: SuiObjectData): bigint | undefined;
 }
 
-export { AddressBookSDK, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeInfo, DEV_API_URL, DEV_SYNCING_URL, ENV_CONFIGS, Formatter, type FutureIntention, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, InfoTypeEnabledDto, InfoTypeKey, LOCAL_API_URL, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnabledDto, MSafeEnv, MSafeGlobals, type NotificationData, type NotificationInfo, NotificationSubscribeDto, NotificationUpdateDto, PREV_API_URL, PROD_API_URL, type Pagination, type PendingTx, type PendingVote, type ProposeIntention, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulationOption, type SimulationResult, TESTNET_RPC_URL, Uint8ArrayToHex, addPrefix, getAllCoins, getMSafeConfig, getPublicKeyFromChain, stringToBuffer };
+export { AddressBookSDK, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeInfo, DEV_API_URL, DEV_SYNCING_URL, ENV_CONFIGS, Formatter, type FutureIntention, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, InfoTypeEnabledDto, InfoTypeKey, LOCAL_API_URL, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnabledDto, MSafeEnv, MSafeGlobals, type NotificationData, type NotificationInfo, NotificationSubscribeDto, NotificationUpdateDto, PREV_API_URL, PROD_API_URL, type Pagination, type PendingTx, type PendingVote, type ProposeIntention, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulationFailedResult, type SimulationOption, type SimulationResult, type SimulationSuccessResult, TESTNET_RPC_URL, Uint8ArrayToHex, addPrefix, getAllCoins, getMSafeConfig, getPublicKeyFromChain, stringToBuffer };

package/dist/index.d.ts

@@ -67,7 +67,7 @@ interface IBackend {
     getNextIntention(input: IMSafeAddressRequest): Promise<TransactionIntentionItem>;
     getCurrentSequenceNumber(address: string): Promise<number>;
     getNextSequenceNumber(address: string): Promise<number>;
-    fetchTransaction(input: IMSafeAddressRequest): Promise<void>;
+    fetchTransaction(input: IMSafeAddressRequest): Promise<string[]>;
     createMSafeAccount(input: ICreateMSafeReq): Promise<void>;
     proposeIntention(input: IProposeIntentionRequest): Promise<void>;
     rejectCurrentTx(input: IRejectTransactionRequest): Promise<void>;
@@ -245,14 +245,20 @@ interface ProposeIntention {
     msafeAddress: string;
     signature: SerializedSignature;
 }
-interface SimulationResult {
-    success: boolean;
+type SimulationResult = SimulationSuccessResult | SimulationFailedResult;
+interface SimulationSuccessResult {
+    success: true;
     gasPrice: bigint;
     gasUsed: GasCostSummary;
     gasBudget: bigint;
     gasObject: SuiObjectRef;
-    simulationError?: string;
-    response?: DryRunTransactionBlockResponse;
+    response: DryRunTransactionBlockResponse;
+}
+interface SimulationFailedResult {
+    success: false;
+    gasPrice: bigint;
+    response: DryRunTransactionBlockResponse;
+    simulationError: string;
 }
 interface SimulationOption extends IGasOption {
     simulation: boolean;
@@ -311,7 +317,6 @@ declare class InvitationSDK {
 }
 
 type GasPriceOption = MultiplierOption | FixedValueOption;
-type GasBudgetOption = MultiplierOption | FixedValueOption;
 interface MultiplierOption {
     multiplier: {
         numerator: bigint;
@@ -327,13 +332,12 @@ declare class Simulator {
     simulate(input: {
         txb: TransactionBlock;
         sender: string;
-    }, gasOption?: GasPriceOption, budgetOption?: GasBudgetOption): Promise<SimulationResult>;
+    }, gasOption?: GasPriceOption): Promise<SimulationResult>;
     private getGasPrice;
     private toGasBudget;
     private isFixedValue;
     private isMultiplier;
     private applyGasOption;
-    private applyBudgetOption;
     private copyTransactionBlock;
 }
 
@@ -384,7 +388,7 @@ declare class MSafeAccount {
         forceBuild: boolean;
     }): Promise<void>;
     skipNextFailedIntention(): Promise<void>;
-    fetchTransaction(): Promise<void>;
+    fetchTransaction(): Promise<string[]>;
     executePendingTx(pending: PendingTx, isRejectTx?: boolean): Promise<_mysten_sui_js_client.SuiTransactionBlockResponse>;
     dashboard(): Promise<_msafe_sui3_utils.IGetDashboardResp>;
     private calculateWeightFromVotes;
@@ -492,4 +496,4 @@ declare class Coin {
     static getBalance(data: SuiObjectData): bigint | undefined;
 }
 
-export { AddressBookSDK, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeInfo, DEV_API_URL, DEV_SYNCING_URL, ENV_CONFIGS, Formatter, type FutureIntention, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, InfoTypeEnabledDto, InfoTypeKey, LOCAL_API_URL, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnabledDto, MSafeEnv, MSafeGlobals, type NotificationData, type NotificationInfo, NotificationSubscribeDto, NotificationUpdateDto, PREV_API_URL, PROD_API_URL, type Pagination, type PendingTx, type PendingVote, type ProposeIntention, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulationOption, type SimulationResult, TESTNET_RPC_URL, Uint8ArrayToHex, addPrefix, getAllCoins, getMSafeConfig, getPublicKeyFromChain, stringToBuffer };
+export { AddressBookSDK, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeInfo, DEV_API_URL, DEV_SYNCING_URL, ENV_CONFIGS, Formatter, type FutureIntention, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, InfoTypeEnabledDto, InfoTypeKey, LOCAL_API_URL, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnabledDto, MSafeEnv, MSafeGlobals, type NotificationData, type NotificationInfo, NotificationSubscribeDto, NotificationUpdateDto, PREV_API_URL, PROD_API_URL, type Pagination, type PendingTx, type PendingVote, type ProposeIntention, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulationFailedResult, type SimulationOption, type SimulationResult, type SimulationSuccessResult, TESTNET_RPC_URL, Uint8ArrayToHex, addPrefix, getAllCoins, getMSafeConfig, getPublicKeyFromChain, stringToBuffer };

package/dist/index.js

@@ -148,60 +148,36 @@ var DEF_GAS_PRICE_OPTION = {
     denominator: DEF_GAS_PRICE_DEN
   }
 };
-var DEF_GAS_BUDGET_NUM = 120n;
-var DEF_GAS_BUDGET_DEN = 100n;
-var DEF_GAS_BUDGET_OPTION = {
-  multiplier: {
-    numerator: DEF_GAS_BUDGET_NUM,
-    denominator: DEF_GAS_BUDGET_DEN
-  }
-};
 var Simulator = class {
   constructor(globals) {
     this.globals = globals;
   }
-  async simulate(input, gasOption = DEF_GAS_PRICE_OPTION, budgetOption = DEF_GAS_BUDGET_OPTION) {
+  async simulate(input, gasOption = DEF_GAS_PRICE_OPTION) {
     const tx = this.copyTransactionBlock(input.txb);
     const { suiClient } = this.globals;
     const gasPrice = await this.getGasPrice(gasOption);
-    try {
-      const inspectResult = await suiClient.dryRunTransactionBlock({
-        transactionBlock: await tx.build({ client: suiClient })
-      });
-      const { gasUsed } = inspectResult.effects;
-      const gasBudget = this.toGasBudget(gasUsed, gasPrice);
-      const success = inspectResult.effects.status.status === "success";
-      let error;
-      if (!success) {
-        error = inspectResult.effects.status.error;
-      }
+    tx.setGasPrice(gasPrice);
+    const inspectResult = await suiClient.dryRunTransactionBlock({
+      transactionBlock: await tx.build({ client: suiClient })
+    });
+    const success = inspectResult.effects.status.status === "success";
+    if (!success) {
       return {
         success,
         gasPrice,
-        gasObject: inspectResult.effects.gasObject.reference,
-        gasUsed,
-        gasBudget: this.applyBudgetOption(gasBudget, budgetOption),
-        simulationError: error,
-        response: inspectResult
+        response: inspectResult,
+        simulationError: inspectResult.effects.status.error
       };
-    } catch (err) {
-      if (err instanceof Error) {
-        return {
-          success: false,
-          gasObject: { digest: "", objectId: "", version: "" },
-          gasPrice: 0n,
-          gasBudget: 0n,
-          gasUsed: {
-            computationCost: "",
-            nonRefundableStorageFee: "",
-            storageCost: "",
-            storageRebate: ""
-          },
-          simulationError: err.message
-        };
-      }
-      throw err;
     }
+    const gasBudget = this.toGasBudget(inspectResult.effects.gasUsed, gasPrice);
+    return {
+      success,
+      gasPrice,
+      gasObject: inspectResult.effects.gasObject.reference,
+      gasUsed: inspectResult.effects.gasUsed,
+      gasBudget,
+      response: inspectResult
+    };
   }
   async getGasPrice(option) {
     if (this.isFixedValue(option)) {
@@ -211,10 +187,10 @@ var Simulator = class {
     return this.applyGasOption(refGasPrice, option);
   }
   toGasBudget(gasUsed, gasPrice) {
-    const { computationCost, storageCost } = gasUsed;
+    const { computationCost, storageCost, storageRebate } = gasUsed;
     const safeOverhead = GAS_SAFE_OVERHEAD * gasPrice;
     const baseComputationCostWithOverhead = BigInt(computationCost) + safeOverhead;
-    const gasBudget = baseComputationCostWithOverhead + BigInt(storageCost);
+    const gasBudget = baseComputationCostWithOverhead + BigInt(storageCost) - BigInt(storageRebate);
     return gasBudget > baseComputationCostWithOverhead ? gasBudget : baseComputationCostWithOverhead;
   }
   isFixedValue(option) {
@@ -233,16 +209,6 @@ var Simulator = class {
     }
     throw new Error("Sanity: Unknown gas price option");
   }
-  applyBudgetOption(val, option) {
-    if (this.isFixedValue(option)) {
-      return option.fixedVal;
-    }
-    if (this.isMultiplier(option)) {
-      const { multiplier } = option;
-      return val * multiplier.numerator / multiplier.denominator;
-    }
-    throw new Error("Sanity: Unknown gas budget option");
-  }
   copyTransactionBlock(tx) {
     return TransactionBlock.from(tx.serialize());
   }
@@ -1202,7 +1168,8 @@ var BackendImpl = class _BackendImpl {
     await this.post(`/transaction/pending/skip`, input, { headers: this.headers() });
   }
   async fetchTransaction(input) {
-    await this.post(`/transaction/fetch`, input, { headers: this.headers() });
+    const res = await this.post(`/transaction/fetch`, input, { headers: this.headers() });
+    return res.data;
   }
   async getAddressBookEntries(pagination) {
     const res = await this.get(`/address-book`, {