[ts-sdk] tx block rename

apps/explorer/src/components/module/module-functions-interaction/ModuleFunction.tsx

@@ -5,7 +5,7 @@ import {
     getPureSerializationType,
     getExecutionStatusType,
     getExecutionStatusError,
-    Transaction,
+    TransactionBlock,
 } from '@mysten/sui.js';
 import { useWalletKit, ConnectButton } from '@mysten/wallet-kit';
 import { useMutation } from '@tanstack/react-query';
@@ -71,7 +71,7 @@ export function ModuleFunction({
 
     const execute = useMutation({
         mutationFn: async ({ params, types }: TypeOf<typeof argsSchema>) => {
-            const tx = new Transaction();
+            const tx = new TransactionBlock();
             tx.moveCall({
                 target: `${packageId}::${moduleName}::${functionName}`,
                 typeArguments: types ?? [],
@@ -86,7 +86,7 @@ export function ModuleFunction({
                     ) ?? [],
             });
             const result = await signAndExecuteTransaction({
-                transaction: tx,
+                transactionBlock: tx,
                 options: {
                     showEffects: true,
                     showEvents: true,

apps/explorer/tests/utils/localnet.ts

@@ -10,7 +10,7 @@ import {
     RawSigner,
     type Keypair,
     localnetConnection,
-    Transaction,
+    TransactionBlock,
 } from '@mysten/sui.js';
 
 const addressToKeypair = new Map<string, Keypair>();
@@ -28,15 +28,15 @@ export async function split_coin(address: string) {
     const coins = await provider.getCoins({ owner: address });
     const coin_id = coins.data[0].coinObjectId;
 
-    const tx = new Transaction();
+    const tx = new TransactionBlock();
     tx.moveCall({
         target: '0x2::pay::split',
         typeArguments: ['0x2::sui::SUI'],
         arguments: [tx.object(coin_id), tx.pure(10)],
     });
 
     const result = await signer.signAndExecuteTransaction({
-        transaction: tx,
+        transactionBlock: tx,
         options: {
             showInput: true,
             showEffects: true,

apps/wallet/src/dapp-interface/WalletStandardInterface.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { type SuiAddress, toB64, Transaction } from '@mysten/sui.js';
+import { type SuiAddress, toB64, TransactionBlock } from '@mysten/sui.js';
 import {
     SUI_CHAINS,
     ReadonlyWalletAccount,
@@ -225,7 +225,7 @@ export class SuiWallet implements Wallet {
     };
 
     #signTransaction: SuiSignTransactionMethod = async (input) => {
-        if (!Transaction.is(input.transaction)) {
+        if (!TransactionBlock.is(input.transactionBlock)) {
             throw new Error(
                 'Unexpect transaction format found. Ensure that you are using the `Transaction` class.'
             );
@@ -242,7 +242,7 @@ export class SuiWallet implements Wallet {
                         input.account?.address ||
                         this.#accounts[0]?.address ||
                         '',
-                    transaction: input.transaction.serialize(),
+                    transaction: input.transactionBlock.serialize(),
                 },
             }),
             (response) => response.result
@@ -252,7 +252,7 @@ export class SuiWallet implements Wallet {
     #signAndExecuteTransaction: SuiSignAndExecuteTransactionMethod = async (
         input
     ) => {
-        if (!Transaction.is(input.transaction)) {
+        if (!TransactionBlock.is(input.transactionBlock)) {
             throw new Error(
                 'Unexpect transaction format found. Ensure that you are using the `Transaction` class.'
             );
@@ -263,7 +263,7 @@ export class SuiWallet implements Wallet {
                 type: 'execute-transaction-request',
                 transaction: {
                     type: 'transaction',
-                    data: input.transaction.serialize(),
+                    data: input.transactionBlock.serialize(),
                     options: input.options,
                     // account might be undefined if previous version of adapters is used
                     // in that case use the first account address

apps/wallet/src/ui/app/hooks/useTransactionData.ts

@@ -2,19 +2,23 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { useFormatCoin, useRpcClient } from '@mysten/core';
-import { type SuiAddress, SUI_TYPE_ARG, Transaction } from '@mysten/sui.js';
+import {
+    type SuiAddress,
+    SUI_TYPE_ARG,
+    TransactionBlock,
+} from '@mysten/sui.js';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
 
 export function useTransactionData(
     sender?: SuiAddress | null,
-    transaction?: Transaction | null
+    transaction?: TransactionBlock | null
 ) {
     const rpc = useRpcClient();
     const clonedTransaction = useMemo(() => {
         if (!transaction) return;
 
-        const tx = new Transaction(transaction);
+        const tx = new TransactionBlock(transaction);
         if (sender) {
             tx.setSenderIfNotSet(sender);
         }
@@ -26,7 +30,7 @@ export function useTransactionData(
         async () => {
             // Build the transaction to bytes, which will ensure that the transaction data is fully populated:
             await clonedTransaction!.build({ provider: rpc });
-            return clonedTransaction!.transactionData;
+            return clonedTransaction!.blockData;
         },
         {
             enabled: !!clonedTransaction,
@@ -36,7 +40,7 @@ export function useTransactionData(
 
 export function useTransactionGasBudget(
     sender?: SuiAddress | null,
-    transaction?: Transaction | null
+    transaction?: TransactionBlock | null
 ) {
     const { data, ...rest } = useTransactionData(sender, transaction);
 

apps/wallet/src/ui/app/hooks/useTransactionDryRun.ts

@@ -1,20 +1,20 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { type SuiAddress, type Transaction } from '@mysten/sui.js';
+import { type SuiAddress, type TransactionBlock } from '@mysten/sui.js';
 import { useQuery } from '@tanstack/react-query';
 
 import { useSigner } from '_hooks';
 
 export function useTransactionDryRun(
     sender: SuiAddress | undefined,
-    transaction: Transaction
+    transactionBlock: TransactionBlock
 ) {
     const signer = useSigner(sender);
     const response = useQuery({
-        queryKey: ['dryRunTransaction', transaction.serialize()],
+        queryKey: ['dryRunTransaction', transactionBlock.serialize()],
         queryFn: () => {
-            return signer.dryRunTransaction({ transaction });
+            return signer.dryRunTransaction({ transactionBlock });
         },
     });
     return response;

apps/wallet/src/ui/app/pages/approval-request/transaction-request/GasFees.tsx

@@ -4,7 +4,7 @@
 import {
     formatAddress,
     type SuiAddress,
-    type Transaction,
+    type TransactionBlock,
 } from '@mysten/sui.js';
 
 import { DescriptionItem, DescriptionList } from './DescriptionList';
@@ -14,7 +14,7 @@ import { GAS_SYMBOL } from '_src/ui/app/redux/slices/sui-objects/Coin';
 
 interface Props {
     sender?: SuiAddress;
-    transaction: Transaction;
+    transaction: TransactionBlock;
 }
 
 export function GasFees({ sender, transaction }: Props) {

apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/Command.tsx

@@ -3,17 +3,17 @@
 
 import { ChevronDown12, ChevronRight12 } from '@mysten/icons';
 import {
-    type CommandArgument,
+    type TransactionArgument,
     formatAddress,
-    type TransactionCommand,
+    type TransactionType,
     normalizeSuiAddress,
 } from '@mysten/sui.js';
 import { useState } from 'react';
 
 import { Text } from '_src/ui/app/shared/text';
 
 function convertCommandArgumentToString(
-    arg: string | string[] | CommandArgument | CommandArgument[]
+    arg: string | string[] | TransactionArgument | TransactionArgument[]
 ): string {
     if (typeof arg === 'string') return arg;
 
@@ -37,7 +37,7 @@ function convertCommandArgumentToString(
     }
 }
 
-function convertCommandToString({ kind, ...command }: TransactionCommand) {
+function convertCommandToString({ kind, ...command }: TransactionType) {
     const commandArguments = Object.entries(command);
 
     return commandArguments
@@ -57,7 +57,7 @@ function convertCommandToString({ kind, ...command }: TransactionCommand) {
 }
 
 interface CommandProps {
-    command: TransactionCommand;
+    command: TransactionType;
 }
 
 export function Command({ command }: CommandProps) {

apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/Input.tsx

@@ -6,15 +6,15 @@ import {
     formatAddress,
     is,
     toB64,
-    type TransactionInput,
+    type TransactionBlockInput,
 } from '@mysten/sui.js';
 
 import ExplorerLink from '_src/ui/app/components/explorer-link';
 import { ExplorerLinkType } from '_src/ui/app/components/explorer-link/ExplorerLinkType';
 import { Text } from '_src/ui/app/shared/text';
 
 interface InputProps {
-    input: TransactionInput;
+    input: TransactionBlockInput;
 }
 
 export function Input({ input }: InputProps) {

apps/wallet/src/ui/app/pages/approval-request/transaction-request/TransactionDetails/index.tsx

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Tab as HeadlessTab, type TabProps } from '@headlessui/react';
-import { type SuiAddress, type Transaction } from '@mysten/sui.js';
+import { type SuiAddress, type TransactionBlock } from '@mysten/sui.js';
 
 import { SummaryCard } from '../SummaryCard';
 import { Command } from './Command';
@@ -12,7 +12,7 @@ import { useTransactionData } from '_src/ui/app/hooks';
 
 interface Props {
     sender?: SuiAddress;
-    transaction: Transaction;
+    transaction: TransactionBlock;
 }
 
 const Tab = (props: TabProps<'div'>) => (
@@ -26,7 +26,7 @@ export function TransactionDetails({ sender, transaction }: Props) {
     const { data: transactionData } = useTransactionData(sender, transaction);
 
     if (
-        transactionData?.commands.length === 0 &&
+        transactionData?.transactions.length === 0 &&
         transactionData.inputs.length === 0
     ) {
         return null;
@@ -38,17 +38,18 @@ export function TransactionDetails({ sender, transaction }: Props) {
                 <div>
                     <HeadlessTab.Group>
                         <HeadlessTab.List className="flex gap-6 border-0 border-b border-solid border-gray-45 mb-6">
-                            {!!transactionData.commands.length && (
-                                <Tab>Commands</Tab>
+                            {!!transactionData.transactions.length && (
+                                <Tab>Transactions</Tab>
                             )}
                             {!!transactionData.inputs.length && (
                                 <Tab>Inputs</Tab>
                             )}
                         </HeadlessTab.List>
                         <HeadlessTab.Panels>
-                            {!!transactionData.commands.length && (
+                            {!!transactionData.transactions.length && (
                                 <HeadlessTab.Panel className="flex flex-col gap-6">
-                                    {transactionData.commands.map(
+                                    {/* TODO: Rename components: */}
+                                    {transactionData.transactions.map(
                                         (command, index) => (
                                             <Command
                                                 key={index}

apps/wallet/src/ui/app/pages/approval-request/transaction-request/index.tsx

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // import { Transaction } from '@mysten/sui.js';
-import { Transaction } from '@mysten/sui.js';
+import { TransactionBlock } from '@mysten/sui.js';
 import { useCallback, useMemo } from 'react';
 
 import { GasFees } from './GasFees';
@@ -24,7 +24,7 @@ export function TransactionRequest({ txRequest }: TransactionRequestProps) {
     const signer = useSigner(addressForTransaction);
     const dispatch = useAppDispatch();
     const transaction = useMemo(() => {
-        const tx = Transaction.from(txRequest.tx.data);
+        const tx = TransactionBlock.from(txRequest.tx.data);
         if (addressForTransaction) {
             tx.setSenderIfNotSet(addressForTransaction);
         }

apps/wallet/src/ui/app/pages/home/nft-transfer/TransferNFTForm.tsx

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ArrowRight16 } from '@mysten/icons';
-import { getTransactionDigest, Transaction } from '@mysten/sui.js';
+import { getTransactionDigest, TransactionBlock } from '@mysten/sui.js';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { Form, Field, Formik } from 'formik';
 import { toast } from 'react-hot-toast';
@@ -34,11 +34,11 @@ export function TransferNFTForm({ objectId }: { objectId: string }) {
             if (!to || !signer) {
                 throw new Error('Missing data');
             }
-            const tx = new Transaction();
+            const tx = new TransactionBlock();
             tx.transferObjects([tx.object(objectId)], tx.pure(to));
 
             return signer.signAndExecuteTransaction({
-                transaction: tx,
+                transactionBlock: tx,
                 options: {
                     showInput: true,
                     showEffects: true,

apps/wallet/src/ui/app/pages/home/transfer-coin/PreviewTransfer.tsx

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { useCoinDecimals } from '@mysten/core';
-import { type Transaction } from '@mysten/sui.js';
+import { type TransactionBlock } from '@mysten/sui.js';
 
 import { Text } from '_app/shared/text';
 import { TxnAddress } from '_components/receipt-card/TxnAddress';
@@ -17,7 +17,7 @@ export type PreviewTransferProps = {
     to: string;
     amount: string;
     approximation?: boolean;
-    transaction: Transaction | null;
+    transaction: TransactionBlock | null;
 };
 
 export function PreviewTransfer({

apps/wallet/src/ui/app/pages/home/transfer-coin/index.tsx

@@ -64,7 +64,7 @@ function TransferCoinPage() {
                 });
 
                 return signer.signAndExecuteTransaction({
-                    transaction,
+                    transactionBlock: transaction,
                     options: {
                         showInput: true,
                         showEffects: true,

apps/wallet/src/ui/app/pages/home/transfer-coin/utils/transaction.ts

@@ -1,7 +1,11 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { type CoinStruct, SUI_TYPE_ARG, Transaction } from '@mysten/sui.js';
+import {
+    type CoinStruct,
+    SUI_TYPE_ARG,
+    TransactionBlock,
+} from '@mysten/sui.js';
 
 import { parseAmount } from '_src/ui/app/helpers';
 
@@ -22,7 +26,7 @@ export function createTokenTransferTransaction({
     coinDecimals,
     isPayAllSui,
 }: Options) {
-    const tx = new Transaction();
+    const tx = new TransactionBlock();
 
     if (isPayAllSui && coinType === SUI_TYPE_ARG) {
         tx.transferObjects([tx.gas], tx.pure(to));