@mysten/dapp-kit 0.2.4 → 0.3.0

package/src/hooks/wallet/useSignAndExecuteTransactionBlock.ts

@@ -15,12 +15,13 @@ import {
 	WalletNotConnectedError,
 } from '../../errors/walletErrors.js';
 import type { PartialBy } from '../../types/utilityTypes.js';
+import { useSuiClient } from '../useSuiClient.js';
 import { useCurrentAccount } from './useCurrentAccount.js';
 import { useCurrentWallet } from './useCurrentWallet.js';
 
 type UseSignAndExecuteTransactionBlockArgs = PartialBy<
 	SuiSignAndExecuteTransactionBlockInput,
-	'account'
+	'account' | 'chain'
 >;
 
 type UseSignAndExecuteTransactionBlockResult = SuiSignAndExecuteTransactionBlockOutput;
@@ -39,42 +40,71 @@ type UseSignAndExecuteTransactionBlockMutationOptions = Omit<
 		unknown
 	>,
 	'mutationFn'
->;
+> & {
+	executeFromWallet?: boolean;
+};
 
 /**
  * Mutation hook for prompting the user to sign and execute a transaction block.
  */
 export function useSignAndExecuteTransactionBlock({
 	mutationKey,
+	executeFromWallet,
 	...mutationOptions
 }: UseSignAndExecuteTransactionBlockMutationOptions = {}) {
 	const currentWallet = useCurrentWallet();
 	const currentAccount = useCurrentAccount();
+	const client = useSuiClient();
 
 	return useMutation({
 		mutationKey: walletMutationKeys.signAndExecuteTransactionBlock(mutationKey),
-		mutationFn: async (signAndExecuteTransactionBlockArgs) => {
+		mutationFn: async ({ requestType, options, ...signTransactionBlockArgs }) => {
 			if (!currentWallet) {
 				throw new WalletNotConnectedError('No wallet is connected.');
 			}
 
-			const signerAccount = signAndExecuteTransactionBlockArgs.account ?? currentAccount;
+			const signerAccount = signTransactionBlockArgs.account ?? currentAccount;
 			if (!signerAccount) {
 				throw new WalletNoAccountSelectedError(
-					'No wallet account is selected to sign the personal message with.',
+					'No wallet account is selected to sign and execute the transaction block with.',
 				);
 			}
 
-			const walletFeature = currentWallet.features['sui:signAndExecuteTransactionBlock'];
+			if (executeFromWallet) {
+				const walletFeature = currentWallet.features['sui:signAndExecuteTransactionBlock'];
+				if (!walletFeature) {
+					throw new WalletFeatureNotSupportedError(
+						"This wallet doesn't support the `signAndExecuteTransactionBlock` feature.",
+					);
+				}
+
+				return walletFeature.signAndExecuteTransactionBlock({
+					...signTransactionBlockArgs,
+					account: signerAccount,
+					chain: signTransactionBlockArgs.chain ?? signerAccount.chains[0],
+					requestType,
+					options,
+				});
+			}
+
+			const walletFeature = currentWallet.features['sui:signTransactionBlock'];
 			if (!walletFeature) {
 				throw new WalletFeatureNotSupportedError(
-					"This wallet doesn't support the `signAndExecuteTransactionBlock` feature.",
+					"This wallet doesn't support the `signTransactionBlock` feature.",
 				);
 			}
 
-			return await walletFeature.signAndExecuteTransactionBlock({
-				...signAndExecuteTransactionBlockArgs,
+			const { signature, transactionBlockBytes } = await walletFeature.signTransactionBlock({
+				...signTransactionBlockArgs,
 				account: signerAccount,
+				chain: signTransactionBlockArgs.chain ?? signerAccount.chains[0],
+			});
+
+			return client.executeTransactionBlock({
+				transactionBlock: transactionBlockBytes,
+				signature,
+				requestType,
+				options,
 			});
 		},
 		...mutationOptions,

package/src/hooks/wallet/useSignTransactionBlock.ts

@@ -18,7 +18,7 @@ import type { PartialBy } from '../../types/utilityTypes.js';
 import { useCurrentAccount } from './useCurrentAccount.js';
 import { useCurrentWallet } from './useCurrentWallet.js';
 
-type UseSignTransactionBlockArgs = PartialBy<SuiSignTransactionBlockInput, 'account'>;
+type UseSignTransactionBlockArgs = PartialBy<SuiSignTransactionBlockInput, 'account' | 'chain'>;
 
 type UseSignTransactionBlockResult = SuiSignTransactionBlockOutput;
 
@@ -58,7 +58,7 @@ export function useSignTransactionBlock({
 			const signerAccount = signTransactionBlockArgs.account ?? currentAccount;
 			if (!signerAccount) {
 				throw new WalletNoAccountSelectedError(
-					'No wallet account is selected to sign the personal message with.',
+					'No wallet account is selected to sign the transaction block with.',
 				);
 			}
 
@@ -72,6 +72,7 @@ export function useSignTransactionBlock({
 			return await walletFeature.signTransactionBlock({
 				...signTransactionBlockArgs,
 				account: signerAccount,
+				chain: signTransactionBlockArgs.chain ?? signerAccount.chains[0],
 			});
 		},
 		...mutationOptions,

package/src/hooks/wallet/useSwitchAccount.ts

@@ -16,13 +16,10 @@ type SwitchAccountArgs = {
 
 type SwitchAccountResult = void;
 
+type UseSwitchAccountError = WalletNotConnectedError | WalletAccountNotFoundError | Error;
+
 type UseSwitchAccountMutationOptions = Omit<
-	UseMutationOptions<
-		SwitchAccountResult,
-		WalletNotConnectedError | WalletAccountNotFoundError | Error,
-		SwitchAccountArgs,
-		unknown
-	>,
+	UseMutationOptions<SwitchAccountResult, UseSwitchAccountError, SwitchAccountArgs, unknown>,
 	'mutationFn'
 >;
 

package/src/index.ts

@@ -21,3 +21,5 @@ export * from './hooks/useSuiClientQuery.js';
 export * from './hooks/useSuiClientInfiniteQuery.js';
 export * from './themes/lightTheme.js';
 export * from './types.js';
+
+export type { Theme, ThemeVars, DynamicTheme } from './themes/themeContract.js';

package/src/types.ts

@@ -2,3 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export type { SignedPersonalMessage, SignedTransactionBlock } from '@mysten/wallet-standard';
+export type { ThemeVars } from './themes/themeContract.js';