@mysten/dapp-kit 0.13.2 → 0.14.0

package/dist/esm/index.js

@@ -69,9 +69,10 @@ var walletMutationKeys = {
   autoconnectWallet: formMutationKeyFn("autoconnect-wallet"),
   disconnectWallet: formMutationKeyFn("disconnect-wallet"),
   signPersonalMessage: formMutationKeyFn("sign-personal-message"),
-  signTransactionBlock: formMutationKeyFn("sign-transaction-block"),
-  signAndExecuteTransactionBlock: formMutationKeyFn("sign-and-execute-transaction-block"),
-  switchAccount: formMutationKeyFn("switch-account")
+  signTransaction: formMutationKeyFn("sign-transaction"),
+  signAndExecuteTransaction: formMutationKeyFn("sign-and-execute-transaction"),
+  switchAccount: formMutationKeyFn("switch-account"),
+  reportTransactionEffects: formMutationKeyFn("report-transaction-effects")
 };
 function formMutationKeyFn(baseEntity) {
   return function mutationKeyFn(additionalKeys = []) {
@@ -115,7 +116,12 @@ function useConnectWallet({
           (account) => account.chains.some((chain) => chain.split(":")[0] === "sui")
         );
         const selectedAccount = getSelectedAccount(connectedSuiAccounts, accountAddress);
-        setWalletConnected(wallet, connectedSuiAccounts, selectedAccount);
+        setWalletConnected(
+          wallet,
+          connectedSuiAccounts,
+          selectedAccount,
+          connectResult.supportedIntents
+        );
         return { accounts: connectedSuiAccounts };
       } catch (error) {
         setConnectionStatus("disconnected");
@@ -138,11 +144,11 @@ function getSelectedAccount(connectedAccounts, accountAddress) {
 
 // src/utils/walletUtils.ts
 import { getWallets, isWalletWithRequiredFeatureSet } from "@mysten/wallet-standard";
-function getRegisteredWallets(preferredWallets, requiredFeatures) {
+function getRegisteredWallets(preferredWallets, walletFilter) {
   const walletsApi = getWallets();
   const wallets = walletsApi.get();
   const suiWallets = wallets.filter(
-    (wallet) => isWalletWithRequiredFeatureSet(wallet, requiredFeatures)
+    (wallet) => isWalletWithRequiredFeatureSet(wallet) && (!walletFilter || walletFilter(wallet))
   );
   return [
     // Preferred wallets, in order:
@@ -593,7 +599,7 @@ function useCurrentAccount() {
 }
 
 // src/components/AccountDropdownMenu.tsx
-import { formatAddress } from "@mysten/sui.js/utils";
+import { formatAddress } from "@mysten/sui/utils";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import clsx7 from "clsx";
 
@@ -604,7 +610,7 @@ import { useQuery } from "@tanstack/react-query";
 import { useContext as useContext2 } from "react";
 
 // src/components/SuiClientProvider.tsx
-import { getFullnodeUrl, isSuiClient, SuiClient } from "@mysten/sui.js/client";
+import { getFullnodeUrl, isSuiClient, SuiClient } from "@mysten/sui/client";
 import { createContext as createContext2, useMemo, useState as useState2 } from "react";
 import { jsx as jsx16 } from "react/jsx-runtime";
 var SuiClientContext = createContext2(null);
@@ -715,6 +721,7 @@ var WalletAccountNotFoundError = class extends Error {
 function useCurrentWallet() {
   const currentWallet = useWalletStore((state) => state.currentWallet);
   const connectionStatus2 = useWalletStore((state) => state.connectionStatus);
+  const supportedIntents = useWalletStore((state) => state.supportedIntents);
   switch (connectionStatus2) {
     case "connecting":
       return {
@@ -722,7 +729,8 @@ function useCurrentWallet() {
         currentWallet: null,
         isDisconnected: false,
         isConnecting: true,
-        isConnected: false
+        isConnected: false,
+        supportedIntents: []
       };
     case "disconnected":
       return {
@@ -730,7 +738,8 @@ function useCurrentWallet() {
         currentWallet: null,
         isDisconnected: true,
         isConnecting: false,
-        isConnected: false
+        isConnected: false,
+        supportedIntents: []
       };
     case "connected": {
       return {
@@ -738,7 +747,8 @@ function useCurrentWallet() {
         currentWallet,
         isDisconnected: false,
         isConnecting: false,
-        isConnected: true
+        isConnected: true,
+        supportedIntents
       };
     }
   }
@@ -925,9 +935,11 @@ function createInMemoryStore() {
 var SUI_WALLET_NAME = "Sui Wallet";
 var DEFAULT_STORAGE = typeof window !== "undefined" && window.localStorage ? localStorage : createInMemoryStore();
 var DEFAULT_STORAGE_KEY = "sui-dapp-kit:wallet-connection-info";
-var DEFAULT_REQUIRED_FEATURES = [
+var SIGN_FEATURES = [
+  "sui:signTransaction",
   "sui:signTransactionBlock"
 ];
+var DEFAULT_WALLET_FILTER = (wallet) => SIGN_FEATURES.some((feature) => wallet.features[feature]);
 var DEFAULT_PREFERRED_WALLETS = [SUI_WALLET_NAME, STASHED_WALLET_NAME];
 
 // src/hooks/wallet/useAutoConnectWallet.ts
@@ -1033,7 +1045,9 @@ function useStashedWallet(config) {
 }
 
 // src/hooks/wallet/useUnsafeBurnerWallet.ts
-import { Ed25519Keypair } from "@mysten/sui.js/keypairs/ed25519";
+import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
+import { Transaction } from "@mysten/sui/transactions";
+import { toB64 } from "@mysten/sui/utils";
 import { getWallets as getWallets2, ReadonlyWalletAccount, SUI_CHAINS } from "@mysten/wallet-standard";
 import { useEffect as useEffect2 } from "react";
 var WALLET_NAME = "Unsafe Burner Wallet";
@@ -1048,7 +1062,7 @@ function useUnsafeBurnerWallet(enabled) {
   }, [enabled, suiClient]);
 }
 function registerUnsafeBurnerWallet(suiClient) {
-  var _on, _connect, _signPersonalMessage, _signTransactionBlock, _signAndExecuteTransactionBlock;
+  var _on, _connect, _signPersonalMessage, _signTransactionBlock, _signTransaction, _signAndExecuteTransactionBlock, _signAndExecuteTransaction;
   const walletsApi = getWallets2();
   const registeredWallets = walletsApi.get();
   if (registeredWallets.find((wallet) => wallet.name === WALLET_NAME)) {
@@ -1065,7 +1079,12 @@ function registerUnsafeBurnerWallet(suiClient) {
     address: keypair.getPublicKey().toSuiAddress(),
     publicKey: keypair.getPublicKey().toSuiBytes(),
     chains: ["sui:unknown"],
-    features: ["sui:signAndExecuteTransactionBlock", "sui:signTransactionBlock"]
+    features: [
+      "sui:signAndExecuteTransactionBlock",
+      "sui:signTransactionBlock",
+      "sui:signTransaction",
+      "sui:signAndExecuteTransaction"
+    ]
   });
   class UnsafeBurnerWallet {
     constructor() {
@@ -1090,14 +1109,52 @@ function registerUnsafeBurnerWallet(suiClient) {
           signature
         };
       });
+      __privateAdd(this, _signTransaction, async (transactionInput) => {
+        const { bytes, signature } = await Transaction.from(
+          await transactionInput.transaction.toJSON()
+        ).sign({
+          client: suiClient,
+          signer: keypair
+        });
+        transactionInput.signal?.throwIfAborted();
+        return {
+          bytes,
+          signature
+        };
+      });
       __privateAdd(this, _signAndExecuteTransactionBlock, async (transactionInput) => {
-        return await suiClient.signAndExecuteTransactionBlock({
-          signer: keypair,
-          transactionBlock: transactionInput.transactionBlock,
-          options: transactionInput.options,
-          requestType: transactionInput.requestType
+        const { bytes, signature } = await transactionInput.transactionBlock.sign({
+          client: suiClient,
+          signer: keypair
+        });
+        return suiClient.executeTransactionBlock({
+          signature,
+          transactionBlock: bytes,
+          options: transactionInput.options
         });
       });
+      __privateAdd(this, _signAndExecuteTransaction, async (transactionInput) => {
+        const { bytes, signature } = await Transaction.from(
+          await transactionInput.transaction.toJSON()
+        ).sign({
+          client: suiClient,
+          signer: keypair
+        });
+        transactionInput.signal?.throwIfAborted();
+        const { rawEffects, digest } = await suiClient.executeTransactionBlock({
+          signature,
+          transactionBlock: bytes,
+          options: {
+            showRawEffects: true
+          }
+        });
+        return {
+          bytes,
+          signature,
+          digest,
+          effects: toB64(new Uint8Array(rawEffects))
+        };
+      });
     }
     get version() {
       return "1.0.0";
@@ -1136,6 +1193,14 @@ function registerUnsafeBurnerWallet(suiClient) {
         "sui:signAndExecuteTransactionBlock": {
           version: "1.0.0",
           signAndExecuteTransactionBlock: __privateGet(this, _signAndExecuteTransactionBlock)
+        },
+        "sui:signTransaction": {
+          version: "2.0.0",
+          signTransaction: __privateGet(this, _signTransaction)
+        },
+        "sui:signAndExecuteTransaction": {
+          version: "2.0.0",
+          signAndExecuteTransaction: __privateGet(this, _signAndExecuteTransaction)
         }
       };
     }
@@ -1144,7 +1209,9 @@ function registerUnsafeBurnerWallet(suiClient) {
   _connect = new WeakMap();
   _signPersonalMessage = new WeakMap();
   _signTransactionBlock = new WeakMap();
+  _signTransaction = new WeakMap();
   _signAndExecuteTransactionBlock = new WeakMap();
+  _signAndExecuteTransaction = new WeakMap();
   return walletsApi.register(new UnsafeBurnerWallet());
 }
 
@@ -1169,18 +1236,18 @@ function useWalletPropertiesChanged() {
 // src/hooks/wallet/useWalletsChanged.ts
 import { getWallets as getWallets3 } from "@mysten/wallet-standard";
 import { useEffect as useEffect4 } from "react";
-function useWalletsChanged(preferredWallets, requiredFeatures) {
+function useWalletsChanged(preferredWallets, walletFilter) {
   const setWalletRegistered = useWalletStore((state) => state.setWalletRegistered);
   const setWalletUnregistered = useWalletStore((state) => state.setWalletUnregistered);
   useEffect4(() => {
     const walletsApi = getWallets3();
-    setWalletRegistered(getRegisteredWallets(preferredWallets, requiredFeatures));
+    setWalletRegistered(getRegisteredWallets(preferredWallets, walletFilter));
     const unsubscribeFromRegister = walletsApi.on("register", () => {
-      setWalletRegistered(getRegisteredWallets(preferredWallets, requiredFeatures));
+      setWalletRegistered(getRegisteredWallets(preferredWallets, walletFilter));
     });
     const unsubscribeFromUnregister = walletsApi.on("unregister", (unregisteredWallet) => {
       setWalletUnregistered(
-        getRegisteredWallets(preferredWallets, requiredFeatures),
+        getRegisteredWallets(preferredWallets, walletFilter),
         unregisteredWallet
       );
     });
@@ -1188,7 +1255,7 @@ function useWalletsChanged(preferredWallets, requiredFeatures) {
       unsubscribeFromRegister();
       unsubscribeFromUnregister();
     };
-  }, [preferredWallets, requiredFeatures, setWalletRegistered, setWalletUnregistered]);
+  }, [preferredWallets, walletFilter, setWalletRegistered, setWalletUnregistered]);
 }
 
 // src/themes/lightTheme.ts
@@ -1270,19 +1337,21 @@ function createWalletStore({
         lastConnectedAccountAddress: null,
         lastConnectedWalletName: null,
         connectionStatus: "disconnected",
+        supportedIntents: [],
         setConnectionStatus(connectionStatus2) {
           set(() => ({
             connectionStatus: connectionStatus2
           }));
         },
-        setWalletConnected(wallet, connectedAccounts, selectedAccount) {
+        setWalletConnected(wallet, connectedAccounts, selectedAccount, supportedIntents = []) {
           set(() => ({
             accounts: connectedAccounts,
             currentWallet: wallet,
             currentAccount: selectedAccount,
             lastConnectedWalletName: getWalletUniqueIdentifier(wallet),
             lastConnectedAccountAddress: selectedAccount?.address,
-            connectionStatus: "connected"
+            connectionStatus: "connected",
+            supportedIntents
           }));
         },
         setWalletDisconnected() {
@@ -1292,7 +1361,8 @@ function createWalletStore({
             currentAccount: null,
             lastConnectedWalletName: null,
             lastConnectedAccountAddress: null,
-            connectionStatus: "disconnected"
+            connectionStatus: "disconnected",
+            supportedIntents: []
           }));
         },
         setAccountSwitched(selectedAccount) {
@@ -1313,7 +1383,8 @@ function createWalletStore({
               currentAccount: null,
               lastConnectedWalletName: null,
               lastConnectedAccountAddress: null,
-              connectionStatus: "disconnected"
+              connectionStatus: "disconnected",
+              supportedIntents: []
             }));
           } else {
             set(() => ({ wallets: updatedWallets }));
@@ -1439,7 +1510,7 @@ function cssStringFromTheme(theme) {
 import { jsx as jsx22, jsxs as jsxs9 } from "react/jsx-runtime";
 function WalletProvider({
   preferredWallets = DEFAULT_PREFERRED_WALLETS,
-  requiredFeatures = DEFAULT_REQUIRED_FEATURES,
+  walletFilter = DEFAULT_WALLET_FILTER,
   storage = DEFAULT_STORAGE,
   storageKey = DEFAULT_STORAGE_KEY,
   enableUnsafeBurner = false,
@@ -1451,7 +1522,7 @@ function WalletProvider({
   const storeRef = useRef(
     createWalletStore({
       autoConnectEnabled: autoConnect,
-      wallets: getRegisteredWallets(preferredWallets, requiredFeatures),
+      wallets: getRegisteredWallets(preferredWallets, walletFilter),
       storage: storage || createInMemoryStore(),
       storageKey
     })
@@ -1460,7 +1531,7 @@ function WalletProvider({
     WalletConnectionManager,
     {
       preferredWallets,
-      requiredFeatures,
+      walletFilter,
       enableUnsafeBurner,
       stashedWallet,
       children: [
@@ -1472,12 +1543,12 @@ function WalletProvider({
 }
 function WalletConnectionManager({
   preferredWallets = DEFAULT_PREFERRED_WALLETS,
-  requiredFeatures = DEFAULT_REQUIRED_FEATURES,
+  walletFilter = DEFAULT_WALLET_FILTER,
   enableUnsafeBurner = false,
   stashedWallet,
   children
 }) {
-  useWalletsChanged(preferredWallets, requiredFeatures);
+  useWalletsChanged(preferredWallets, walletFilter);
   useWalletPropertiesChanged();
   useStashedWallet(stashedWallet);
   useUnsafeBurnerWallet(enableUnsafeBurner);
@@ -1565,74 +1636,126 @@ function useSuiClientQueries({
   });
 }
 
-// src/hooks/wallet/useSignAndExecuteTransactionBlock.ts
+// src/hooks/wallet/useSignAndExecuteTransaction.ts
+import { toB64 as toB643 } from "@mysten/sui/utils";
+import { signTransaction } from "@mysten/wallet-standard";
+import { useMutation as useMutation6 } from "@tanstack/react-query";
+
+// src/hooks/wallet/useReportTransactionEffects.ts
+import { toB64 as toB642 } from "@mysten/sui/utils";
 import { useMutation as useMutation5 } from "@tanstack/react-query";
-function useSignAndExecuteTransactionBlock({
+function useReportTransactionEffects({
   mutationKey,
-  executeFromWallet,
   ...mutationOptions
 } = {}) {
   const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
-  const client = useSuiClient();
   return useMutation5({
-    mutationKey: walletMutationKeys.signAndExecuteTransactionBlock(mutationKey),
-    mutationFn: async ({ requestType, options, ...signTransactionBlockArgs }) => {
+    mutationKey: walletMutationKeys.reportTransactionEffects(mutationKey),
+    mutationFn: async ({ effects, chain = currentWallet?.chains[0], account = currentAccount }) => {
       if (!currentWallet) {
         throw new WalletNotConnectedError("No wallet is connected.");
       }
-      const signerAccount = signTransactionBlockArgs.account ?? currentAccount;
-      if (!signerAccount) {
+      if (!account) {
         throw new WalletNoAccountSelectedError(
-          "No wallet account is selected to sign and execute the transaction block with."
+          "No wallet account is selected to report transaction effects for"
         );
       }
-      if (executeFromWallet) {
-        const walletFeature2 = currentWallet.features["sui:signAndExecuteTransactionBlock"];
-        if (!walletFeature2) {
-          throw new WalletFeatureNotSupportedError(
-            "This wallet doesn't support the `signAndExecuteTransactionBlock` feature."
-          );
-        }
-        return walletFeature2.signAndExecuteTransactionBlock({
-          ...signTransactionBlockArgs,
-          account: signerAccount,
-          chain: signTransactionBlockArgs.chain ?? signerAccount.chains[0],
-          requestType,
-          options
+      const reportTransactionEffectsFeature = currentWallet.features["sui:reportTransactionEffects"];
+      if (reportTransactionEffectsFeature) {
+        return await reportTransactionEffectsFeature.reportTransactionEffects({
+          effects: Array.isArray(effects) ? toB642(new Uint8Array(effects)) : effects,
+          account,
+          chain: chain ?? currentWallet?.chains[0]
         });
       }
-      const walletFeature = currentWallet.features["sui:signTransactionBlock"];
-      if (!walletFeature) {
+    },
+    ...mutationOptions
+  });
+}
+
+// src/hooks/wallet/useSignAndExecuteTransaction.ts
+function useSignAndExecuteTransaction({
+  mutationKey,
+  execute,
+  ...mutationOptions
+} = {}) {
+  const { currentWallet, supportedIntents } = useCurrentWallet();
+  const currentAccount = useCurrentAccount();
+  const client = useSuiClient();
+  const { mutate: reportTransactionEffects } = useReportTransactionEffects();
+  const executeTransaction = execute ?? (async ({ bytes, signature }) => {
+    const { digest, rawEffects } = await client.executeTransactionBlock({
+      transactionBlock: bytes,
+      signature,
+      options: {
+        showRawEffects: true
+      }
+    });
+    return {
+      digest,
+      rawEffects,
+      effects: toB643(new Uint8Array(rawEffects)),
+      bytes,
+      signature
+    };
+  });
+  return useMutation6({
+    mutationKey: walletMutationKeys.signAndExecuteTransaction(mutationKey),
+    mutationFn: async ({ transaction, ...signTransactionArgs }) => {
+      if (!currentWallet) {
+        throw new WalletNotConnectedError("No wallet is connected.");
+      }
+      const signerAccount = signTransactionArgs.account ?? currentAccount;
+      if (!signerAccount) {
+        throw new WalletNoAccountSelectedError(
+          "No wallet account is selected to sign the transaction with."
+        );
+      }
+      const chain = signTransactionArgs.chain ?? signerAccount?.chains[0];
+      if (!currentWallet.features["sui:signTransaction"] && !currentWallet.features["sui:signTransactionBlock"]) {
         throw new WalletFeatureNotSupportedError(
-          "This wallet doesn't support the `signTransactionBlock` feature."
+          "This wallet doesn't support the `signTransaction` feature."
         );
       }
-      const { signature, transactionBlockBytes } = await walletFeature.signTransactionBlock({
-        ...signTransactionBlockArgs,
+      const { signature, bytes } = await signTransaction(currentWallet, {
+        ...signTransactionArgs,
+        transaction: {
+          async toJSON() {
+            return typeof transaction === "string" ? transaction : await transaction.toJSON({
+              supportedIntents,
+              client
+            });
+          }
+        },
         account: signerAccount,
-        chain: signTransactionBlockArgs.chain ?? signerAccount.chains[0]
-      });
-      return client.executeTransactionBlock({
-        transactionBlock: transactionBlockBytes,
-        signature,
-        requestType,
-        options
+        chain: signTransactionArgs.chain ?? signerAccount.chains[0]
       });
+      const result = await executeTransaction({ bytes, signature });
+      let effects;
+      if ("effects" in result && result.effects?.bcs) {
+        effects = result.effects.bcs;
+      } else if ("rawEffects" in result) {
+        effects = toB643(new Uint8Array(result.rawEffects));
+      } else {
+        throw new Error("Could not parse effects from transaction result.");
+      }
+      reportTransactionEffects({ effects, account: signerAccount, chain });
+      return result;
     },
     ...mutationOptions
   });
 }
 
 // src/hooks/wallet/useSignPersonalMessage.ts
-import { useMutation as useMutation6 } from "@tanstack/react-query";
+import { useMutation as useMutation7 } from "@tanstack/react-query";
 function useSignPersonalMessage({
   mutationKey,
   ...mutationOptions
 } = {}) {
   const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
-  return useMutation6({
+  return useMutation7({
     mutationKey: walletMutationKeys.signPersonalMessage(mutationKey),
     mutationFn: async (signPersonalMessageArgs) => {
       if (!currentWallet) {
@@ -1670,37 +1793,58 @@ function useSignPersonalMessage({
   });
 }
 
-// src/hooks/wallet/useSignTransactionBlock.ts
-import { useMutation as useMutation7 } from "@tanstack/react-query";
-function useSignTransactionBlock({
+// src/hooks/wallet/useSignTransaction.ts
+import { signTransaction as signTransaction2 } from "@mysten/wallet-standard";
+import { useMutation as useMutation8 } from "@tanstack/react-query";
+function useSignTransaction({
   mutationKey,
   ...mutationOptions
 } = {}) {
   const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
-  return useMutation7({
-    mutationKey: walletMutationKeys.signTransactionBlock(mutationKey),
-    mutationFn: async (signTransactionBlockArgs) => {
+  const client = useSuiClient();
+  const { mutate: reportTransactionEffects } = useReportTransactionEffects();
+  return useMutation8({
+    mutationKey: walletMutationKeys.signTransaction(mutationKey),
+    mutationFn: async ({ transaction, ...signTransactionArgs }) => {
       if (!currentWallet) {
         throw new WalletNotConnectedError("No wallet is connected.");
       }
-      const signerAccount = signTransactionBlockArgs.account ?? currentAccount;
+      const signerAccount = signTransactionArgs.account ?? currentAccount;
       if (!signerAccount) {
         throw new WalletNoAccountSelectedError(
-          "No wallet account is selected to sign the transaction block with."
+          "No wallet account is selected to sign the transaction with."
         );
       }
-      const walletFeature = currentWallet.features["sui:signTransactionBlock"];
-      if (!walletFeature) {
+      if (!currentWallet.features["sui:signTransaction"] && !currentWallet.features["sui:signTransactionBlock"]) {
         throw new WalletFeatureNotSupportedError(
-          "This wallet doesn't support the `SignTransactionBlock` feature."
+          "This wallet doesn't support the `signTransaction` feature."
         );
       }
-      return await walletFeature.signTransactionBlock({
-        ...signTransactionBlockArgs,
+      const { bytes, signature } = await signTransaction2(currentWallet, {
+        ...signTransactionArgs,
+        transaction: {
+          toJSON: async () => {
+            return typeof transaction === "string" ? transaction : await transaction.toJSON({
+              supportedIntents: [],
+              client
+            });
+          }
+        },
         account: signerAccount,
-        chain: signTransactionBlockArgs.chain ?? signerAccount.chains[0]
+        chain: signTransactionArgs.chain ?? signerAccount.chains[0]
       });
+      return {
+        bytes,
+        signature,
+        reportTransactionEffects: (effects) => {
+          reportTransactionEffects({
+            effects,
+            account: signerAccount,
+            chain: signTransactionArgs.chain ?? signerAccount.chains[0]
+          });
+        }
+      };
     },
     ...mutationOptions
   });
@@ -1719,10 +1863,11 @@ export {
   useCurrentAccount,
   useCurrentWallet,
   useDisconnectWallet,
+  useReportTransactionEffects,
   useResolveSuiNSName,
-  useSignAndExecuteTransactionBlock,
+  useSignAndExecuteTransaction,
   useSignPersonalMessage,
-  useSignTransactionBlock,
+  useSignTransaction,
   useSuiClient,
   useSuiClientContext,
   useSuiClientInfiniteQuery,