@msafe/sui3-sdk 0.0.11 → 0.0.12-pre-0fb7c20.0

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import * as _mysten_sui_js_src_cryptography from '@mysten/sui.js/src/cryptography';
 import { PublicKey as PublicKey$1 } from '@mysten/sui.js/src/cryptography';
 import * as _mysten_sui_js_client from '@mysten/sui.js/client';
-import { SuiClient, ExecuteTransactionRequestType, SuiTransactionBlockResponseOptions, SuiTransactionBlockResponse, CoinMetadata, SuiObjectDataOptions, SuiObjectResponse, SuiObjectData, CoinStruct } from '@mysten/sui.js/client';
+import { SuiClient, GasCostSummary, DryRunTransactionBlockResponse, ExecuteTransactionRequestType, SuiTransactionBlockResponseOptions, SuiTransactionBlockResponse, CoinMetadata, SuiObjectDataOptions, SuiObjectResponse, SuiObjectData, CoinStruct } from '@mysten/sui.js/client';
 import * as _msafe_sui3_utils from '@msafe/sui3-utils';
 import { AuthLoginRequest, MSafeAccountInfo, UserWithOwnedMSafe, HistoryTransaction, CreateMSafeAccountInfoRequest, MultisigAccountManager } from '@msafe/sui3-utils';
 import { PublicKey, SerializedSignature, SignatureScheme } from '@mysten/sui.js/cryptography';
@@ -72,9 +72,9 @@ interface PendingTx {
     createdAt: Date;
     sequenceNumber: number;
     votes: PendingVote[];
-    rejectDigest?: string;
-    rejectPayload?: string;
-    rejectVotes?: PendingVote[];
+    rejectDigest: string;
+    rejectPayload: string;
+    rejectVotes: PendingVote[];
 }
 interface PendingVote {
     userAddress: string;
@@ -117,6 +117,13 @@ interface FutureIntention {
     statusRemark?: string;
     createdAt: Date;
 }
+interface SimulationResult {
+    success: boolean;
+    errorMsg?: string;
+    gasPrice: bigint;
+    gasUsed: GasCostSummary;
+    dryRunResult: DryRunTransactionBlockResponse;
+}
 
 interface IWallet {
     walletType: string;
@@ -328,6 +335,7 @@ declare class MessageHelper {
     static updateAddressBookMessage(updates: UpdateAddressBookEntry[]): string;
 }
 interface ProposeIntentionData {
+    msafeAddress: string;
     intention: TxIntention;
     sn: number;
 }
@@ -361,9 +369,8 @@ declare class MSafeAccount {
     static new(globals: MSafeGlobals, address: string): Promise<MSafeAccountInfo>;
     ownedCoins(): Promise<OwnedCoin[]>;
     ownedObjects(options?: BatchObjectOptions): Promise<SuiObjectData[]>;
-    pendingTransactions(): Promise<PendingTx[]>;
     pendingTransaction(): Promise<PendingTx | undefined>;
-    historyTransaction(paginationOption?: PaginationOption): Promise<_msafe_sui3_utils.HistoryTransaction[]>;
+    historyTransaction(paginationOption?: PaginationOption): Promise<PagedResult<_msafe_sui3_utils.HistoryTransaction>>;
     futureIntentions(paginationOption?: PaginationOption): Promise<FutureIntention[]>;
     currentSequenceNumber(): Promise<number>;
     nextSequenceNumber(): Promise<number>;
@@ -373,6 +380,7 @@ declare class MSafeAccount {
     rejectCurrentTx(pending?: PendingTx): Promise<void>;
     buildNextIntentionAndAddToPending(): Promise<void>;
     skipNextFailedIntention(): Promise<void>;
+    simulateIntention(intention: TxIntention): Promise<SimulationResult>;
     executePendingTx(pending: PendingTx): Promise<_mysten_sui_js_client.SuiTransactionBlockResponse>;
     get address(): string;
     private get backend();
@@ -477,4 +485,4 @@ declare class Coin {
     static getBalance(data: SuiObjectData): bigint | undefined;
 }
 
-export { AUTH_SIGN_MESSAGE, AddressBookSDK, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeAccountInfo, type CreatePermissionInfo, type DBConfig, DEV_API_URL, DEV_DATABASE_CONFIG, DEV_SYNCING_URL, type DeleteAddressBookEntry, ENV_CONFIGS, Formatter, type FutureIntention, type GetAddressBookResult, type GetAddressBookResultEntry, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, type IntentionCoinTransfer, IntentionHelper, type IntentionObjectTransfer, type JWTToken, LOCAL_API_URL, LOCAL_DATABASE_CONFIG, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnv, MSafeGlobals, MessageHelper, OpAddressBookType, type PagedMeta, type PagedResult, type PaginationMeta, type PaginationOption, type PaginationResponse, type PendingTx, type PendingVote, PublicKeySerde, type ReceiveTransaction, SUI_COIN, SignatureVerifier, TESTNET_RPC_URL, type TxIntention, UNIT_DATABASE_CONFIG, Uint8ArrayToHex, type UpdateAddressBookEntry, type UpsertAddressBookEntry, getAllCoins, getMSafeConfig, getPublicKeyFromChain, stringToBuffer };
+export { AUTH_SIGN_MESSAGE, AddressBookSDK, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeAccountInfo, type CreatePermissionInfo, type DBConfig, DEV_API_URL, DEV_DATABASE_CONFIG, DEV_SYNCING_URL, type DeleteAddressBookEntry, ENV_CONFIGS, Formatter, type FutureIntention, type GetAddressBookResult, type GetAddressBookResultEntry, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, type IntentionCoinTransfer, IntentionHelper, type IntentionObjectTransfer, type JWTToken, LOCAL_API_URL, LOCAL_DATABASE_CONFIG, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnv, MSafeGlobals, MessageHelper, OpAddressBookType, type PagedMeta, type PagedResult, type PaginationMeta, type PaginationOption, type PaginationResponse, type PendingTx, type PendingVote, PublicKeySerde, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulationResult, TESTNET_RPC_URL, type TxIntention, UNIT_DATABASE_CONFIG, Uint8ArrayToHex, type UpdateAddressBookEntry, type UpsertAddressBookEntry, getAllCoins, getMSafeConfig, getPublicKeyFromChain, stringToBuffer };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as _mysten_sui_js_src_cryptography from '@mysten/sui.js/src/cryptography';
 import { PublicKey as PublicKey$1 } from '@mysten/sui.js/src/cryptography';
 import * as _mysten_sui_js_client from '@mysten/sui.js/client';
-import { SuiClient, ExecuteTransactionRequestType, SuiTransactionBlockResponseOptions, SuiTransactionBlockResponse, CoinMetadata, SuiObjectDataOptions, SuiObjectResponse, SuiObjectData, CoinStruct } from '@mysten/sui.js/client';
+import { SuiClient, GasCostSummary, DryRunTransactionBlockResponse, ExecuteTransactionRequestType, SuiTransactionBlockResponseOptions, SuiTransactionBlockResponse, CoinMetadata, SuiObjectDataOptions, SuiObjectResponse, SuiObjectData, CoinStruct } from '@mysten/sui.js/client';
 import * as _msafe_sui3_utils from '@msafe/sui3-utils';
 import { AuthLoginRequest, MSafeAccountInfo, UserWithOwnedMSafe, HistoryTransaction, CreateMSafeAccountInfoRequest, MultisigAccountManager } from '@msafe/sui3-utils';
 import { PublicKey, SerializedSignature, SignatureScheme } from '@mysten/sui.js/cryptography';
@@ -72,9 +72,9 @@ interface PendingTx {
     createdAt: Date;
     sequenceNumber: number;
     votes: PendingVote[];
-    rejectDigest?: string;
-    rejectPayload?: string;
-    rejectVotes?: PendingVote[];
+    rejectDigest: string;
+    rejectPayload: string;
+    rejectVotes: PendingVote[];
 }
 interface PendingVote {
     userAddress: string;
@@ -117,6 +117,13 @@ interface FutureIntention {
     statusRemark?: string;
     createdAt: Date;
 }
+interface SimulationResult {
+    success: boolean;
+    errorMsg?: string;
+    gasPrice: bigint;
+    gasUsed: GasCostSummary;
+    dryRunResult: DryRunTransactionBlockResponse;
+}
 
 interface IWallet {
     walletType: string;
@@ -328,6 +335,7 @@ declare class MessageHelper {
     static updateAddressBookMessage(updates: UpdateAddressBookEntry[]): string;
 }
 interface ProposeIntentionData {
+    msafeAddress: string;
     intention: TxIntention;
     sn: number;
 }
@@ -361,9 +369,8 @@ declare class MSafeAccount {
     static new(globals: MSafeGlobals, address: string): Promise<MSafeAccountInfo>;
     ownedCoins(): Promise<OwnedCoin[]>;
     ownedObjects(options?: BatchObjectOptions): Promise<SuiObjectData[]>;
-    pendingTransactions(): Promise<PendingTx[]>;
     pendingTransaction(): Promise<PendingTx | undefined>;
-    historyTransaction(paginationOption?: PaginationOption): Promise<_msafe_sui3_utils.HistoryTransaction[]>;
+    historyTransaction(paginationOption?: PaginationOption): Promise<PagedResult<_msafe_sui3_utils.HistoryTransaction>>;
     futureIntentions(paginationOption?: PaginationOption): Promise<FutureIntention[]>;
     currentSequenceNumber(): Promise<number>;
     nextSequenceNumber(): Promise<number>;
@@ -373,6 +380,7 @@ declare class MSafeAccount {
     rejectCurrentTx(pending?: PendingTx): Promise<void>;
     buildNextIntentionAndAddToPending(): Promise<void>;
     skipNextFailedIntention(): Promise<void>;
+    simulateIntention(intention: TxIntention): Promise<SimulationResult>;
     executePendingTx(pending: PendingTx): Promise<_mysten_sui_js_client.SuiTransactionBlockResponse>;
     get address(): string;
     private get backend();
@@ -477,4 +485,4 @@ declare class Coin {
     static getBalance(data: SuiObjectData): bigint | undefined;
 }
 
-export { AUTH_SIGN_MESSAGE, AddressBookSDK, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeAccountInfo, type CreatePermissionInfo, type DBConfig, DEV_API_URL, DEV_DATABASE_CONFIG, DEV_SYNCING_URL, type DeleteAddressBookEntry, ENV_CONFIGS, Formatter, type FutureIntention, type GetAddressBookResult, type GetAddressBookResultEntry, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, type IntentionCoinTransfer, IntentionHelper, type IntentionObjectTransfer, type JWTToken, LOCAL_API_URL, LOCAL_DATABASE_CONFIG, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnv, MSafeGlobals, MessageHelper, OpAddressBookType, type PagedMeta, type PagedResult, type PaginationMeta, type PaginationOption, type PaginationResponse, type PendingTx, type PendingVote, PublicKeySerde, type ReceiveTransaction, SUI_COIN, SignatureVerifier, TESTNET_RPC_URL, type TxIntention, UNIT_DATABASE_CONFIG, Uint8ArrayToHex, type UpdateAddressBookEntry, type UpsertAddressBookEntry, getAllCoins, getMSafeConfig, getPublicKeyFromChain, stringToBuffer };
+export { AUTH_SIGN_MESSAGE, AddressBookSDK, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeAccountInfo, type CreatePermissionInfo, type DBConfig, DEV_API_URL, DEV_DATABASE_CONFIG, DEV_SYNCING_URL, type DeleteAddressBookEntry, ENV_CONFIGS, Formatter, type FutureIntention, type GetAddressBookResult, type GetAddressBookResultEntry, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, type IntentionCoinTransfer, IntentionHelper, type IntentionObjectTransfer, type JWTToken, LOCAL_API_URL, LOCAL_DATABASE_CONFIG, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnv, MSafeGlobals, MessageHelper, OpAddressBookType, type PagedMeta, type PagedResult, type PaginationMeta, type PaginationOption, type PaginationResponse, type PendingTx, type PendingVote, PublicKeySerde, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulationResult, TESTNET_RPC_URL, type TxIntention, UNIT_DATABASE_CONFIG, Uint8ArrayToHex, type UpdateAddressBookEntry, type UpsertAddressBookEntry, getAllCoins, getMSafeConfig, getPublicKeyFromChain, stringToBuffer };

package/dist/index.js

@@ -480,11 +480,12 @@ var MessageHelper = class {
     return matches ? matches[1] : void 0;
   }
   static proposeIntentionMessage(data) {
-    const { intention, sn } = data;
+    const { msafeAddress, intention, sn } = data;
     const intentionData = IntentionHelper.ser(intention);
     const msg = {
       intentionData,
-      sequenceNumber: sn
+      sequenceNumber: sn,
+      msafeAddress
     };
     return JSON.stringify(msg);
   }
@@ -493,8 +494,9 @@ var MessageHelper = class {
     if (!("intentionData" in de) || typeof de.intentionData !== "string" || !("sequenceNumber" in de) || typeof de.sequenceNumber !== "number") {
       throw new Error("Invalid intention data");
     }
-    const { sequenceNumber, intentionData } = de;
+    const { msafeAddress, sequenceNumber, intentionData } = de;
     return {
+      msafeAddress,
       sn: sequenceNumber,
       intention: IntentionHelper.de(intentionData)
     };
@@ -534,7 +536,7 @@ var AddressBookSDK = class {
 };
 
 // src/core/MSafeAccount.ts
-import { MultisigAccountManager as MultisigAccountManager2 } from "@msafe/sui3-utils";
+import { buildIntentionTransaction, MultisigAccountManager as MultisigAccountManager2 } from "@msafe/sui3-utils";
 import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
 
 // src/utils/iter/iterator.ts
@@ -696,10 +698,11 @@ var MSafeAccount = class {
     );
   }
   async ownedObjects(options) {
-    return getAllOwnedObjects(this.suiClient, this.address, options);
-  }
-  async pendingTransactions() {
-    return this.backend.getPendingTransactions(this.address);
+    const filterCoinObjectOptions = {
+      filter: (objRes) => !objRes?.data?.type?.startsWith("0x2::coin::Coin"),
+      ...options
+    };
+    return getAllOwnedObjects(this.suiClient, this.address, filterCoinObjectOptions);
   }
   async pendingTransaction() {
     const pendings = await this.backend.getPendingTransactions(this.address);
@@ -709,18 +712,17 @@ var MSafeAccount = class {
     if (pendings.length === 0) {
       return void 0;
     }
-    if (pendings.length === 1) {
-      return pendings[0];
-    }
-    const [rejectPending, pendingTx] = pendings[0].isRejectTx ? [pendings[0], pendings[1]] : [pendings[1], pendings[0]];
-    pendingTx.rejectDigest = rejectPending.digest;
-    pendingTx.rejectPayload = rejectPending.payload;
-    pendingTx.rejectVotes = rejectPending.votes;
-    return pendingTx;
+    const pendingTx = pendings.find((tx) => !tx.isRejectTx);
+    const rejectPending = pendings.find((tx) => tx.isRejectTx);
+    return {
+      ...pendingTx,
+      rejectDigest: rejectPending?.digest ?? "",
+      rejectPayload: rejectPending?.payload ?? "",
+      rejectVotes: rejectPending?.votes ?? []
+    };
   }
   async historyTransaction(paginationOption) {
-    const paginatedHistoryTransactions = await this.backend.getHistoryTransactions(this.address, paginationOption);
-    return paginatedHistoryTransactions.data;
+    return this.backend.getHistoryTransactions(this.address, paginationOption);
   }
   async futureIntentions(paginationOption) {
     const paginatedIntentions = await this.backend.getFutureIntentions(this.address, paginationOption);
@@ -733,7 +735,11 @@ var MSafeAccount = class {
     return this.backend.getNextSequenceNumber(this.address);
   }
   async proposeIntention(intention, sequenceNumber) {
-    const message = MessageHelper.proposeIntentionMessage({ intention, sn: sequenceNumber });
+    const message = MessageHelper.proposeIntentionMessage({
+      intention,
+      sn: sequenceNumber,
+      msafeAddress: this.address
+    });
     const signature = await this.wallet.signPersonalMessage({
       messageStr: message
     });
@@ -783,7 +789,7 @@ var MSafeAccount = class {
       payloadToReject = pending.payload;
     } else {
       const pendingTx = await this.pendingTransaction();
-      if (!pendingTx || pendingTx?.rejectDigest !== void 0) {
+      if (!pendingTx || pendingTx.rejectDigest !== "") {
         throw new Error("Already rejected");
       }
       payloadToReject = pendingTx.payload;
@@ -808,6 +814,26 @@ var MSafeAccount = class {
   async skipNextFailedIntention() {
     return this.backend.skipNextFailedIntention({ msafeAddress: this.address, userAddress: await this.userAddress() });
   }
+  async simulateIntention(intention) {
+    const txb = await buildIntentionTransaction(this.suiClient, intention, this.address);
+    if (!txb.blockData.gasConfig.price) {
+      const refGas = await this.suiClient.getReferenceGasPrice();
+      txb.setGasPrice(refGas);
+    }
+    const payload = await txb.build({ client: this.suiClient });
+    const dryRunResult = await this.suiClient.dryRunTransactionBlock({ transactionBlock: payload });
+    const success = dryRunResult.effects.status.status === "success";
+    const errorMsg = dryRunResult.effects.status.error;
+    const gasPrice = BigInt(txb.blockData.gasConfig.price);
+    const { gasUsed } = dryRunResult.effects;
+    return {
+      success,
+      errorMsg,
+      gasPrice,
+      gasUsed,
+      dryRunResult
+    };
+  }
   async executePendingTx(pending) {
     let gotSigs;
     let payload;