Rename NewTransaction to Transaction

packages/compat/src/__typetests__/transaction-typetests.ts

@@ -1,7 +1,7 @@
-import { NewTransaction } from '@solana/transactions';
+import { Transaction } from '@solana/transactions';
 import { VersionedTransaction } from '@solana/web3.js';
 
 import { fromVersionedTransaction } from '../transaction';
 
 const transaction = null as unknown as VersionedTransaction;
-fromVersionedTransaction(transaction) satisfies NewTransaction;
+fromVersionedTransaction(transaction) satisfies Transaction;

packages/compat/src/transaction.ts

@@ -1,6 +1,6 @@
 import { SOLANA_ERROR__TRANSACTION__MESSAGE_SIGNATURES_MISMATCH, SolanaError } from '@solana/errors';
 import type { SignatureBytes } from '@solana/keys';
-import { NewTransaction, type SignaturesMap, TransactionMessageBytes } from '@solana/transactions';
+import { type SignaturesMap, Transaction, TransactionMessageBytes } from '@solana/transactions';
 import type { PublicKey, VersionedTransaction } from '@solana/web3.js';
 
 import { ReadonlyUint8Array } from '../../codecs-core/dist/types';
@@ -19,7 +19,7 @@ function convertSignatures(transaction: VersionedTransaction, staticAccountKeys:
     );
 }
 
-export function fromVersionedTransaction(transaction: VersionedTransaction): NewTransaction {
+export function fromVersionedTransaction(transaction: VersionedTransaction): Transaction {
     const { message } = transaction;
     const { staticAccountKeys } = message.getAccountKeys();
 

packages/signers/src/__tests__/keypair-signer-test.ts

@@ -3,7 +3,7 @@ import '@solana/test-matchers/toBeFrozenObject';
 import { address, getAddressFromPublicKey } from '@solana/addresses';
 import { SOLANA_ERROR__SIGNER__EXPECTED_KEY_PAIR_SIGNER, SolanaError } from '@solana/errors';
 import { generateKeyPair, SignatureBytes, signBytes } from '@solana/keys';
-import { NewTransaction, partiallySignTransaction } from '@solana/transactions';
+import { partiallySignTransaction, Transaction } from '@solana/transactions';
 
 import {
     assertIsKeyPairSigner,
@@ -144,7 +144,7 @@ describe('createSignerFromKeyPair', () => {
         const mySigner = await createSignerFromKeyPair(myKeyPair);
 
         // And given we have a couple of mock transactions to sign.
-        const mockTransactions = [{} as NewTransaction, {} as NewTransaction];
+        const mockTransactions = [{} as Transaction, {} as Transaction];
 
         // And given we mock the next two calls of the partiallySignTransaction function.
         const mockSignatures = [new Uint8Array([101, 101, 101]), new Uint8Array([201, 201, 201])] as SignatureBytes[];

packages/signers/src/__tests__/noop-signer-test.ts

@@ -1,7 +1,7 @@
 import '@solana/test-matchers/toBeFrozenObject';
 
 import { address } from '@solana/addresses';
-import { NewTransaction } from '@solana/transactions';
+import { Transaction } from '@solana/transactions';
 
 import { createNoopSigner, NoopSigner } from '../noop-signer';
 import { createSignableMessage } from '../signable-message';
@@ -52,7 +52,7 @@ describe('createNoopSigner', () => {
         const mySigner = createNoopSigner(address('Gp7YgHcJciP4px5FdFnywUiMG4UcfMZV9UagSAZzDxdy'));
 
         // And given we have a couple of mock transactions to sign.
-        const mockTransactions = [{} as NewTransaction, {} as NewTransaction];
+        const mockTransactions = [{} as Transaction, {} as Transaction];
 
         // When we sign both transactions using that signer.
         const signatureDictionaries = await mySigner.signTransactions(mockTransactions);
@@ -71,7 +71,7 @@ describe('createNoopSigner', () => {
         const mySigner = createNoopSigner(address('Gp7YgHcJciP4px5FdFnywUiMG4UcfMZV9UagSAZzDxdy'));
 
         // And given we have a couple of mock transactions to sign.
-        const mockTransactions = [{} as NewTransaction, {} as NewTransaction];
+        const mockTransactions = [{} as Transaction, {} as Transaction];
 
         // When we sign both transactions using that signer.
         const signatureDictionaries = await mySigner.signTransactions(mockTransactions);

packages/signers/src/__typetests__/sign-transaction-typetest.ts

@@ -4,7 +4,7 @@ import {
     IDurableNonceTransactionMessage,
     ITransactionMessageWithBlockhashLifetime,
 } from '@solana/transaction-messages';
-import { FullySignedTransaction, NewTransaction } from '@solana/transactions';
+import { FullySignedTransaction, Transaction } from '@solana/transactions';
 import {
     TransactionWithBlockhashLifetime,
     TransactionWithDurableNonceLifetime,
@@ -26,7 +26,7 @@ type CompilableTransactionMessageWithSigners = CompilableTransactionMessage & IT
     const transactionMessage = null as unknown as CompilableTransactionMessageWithSigners &
         ITransactionMessageWithBlockhashLifetime;
     partiallySignTransactionMessageWithSigners(transactionMessage) satisfies Promise<
-        Readonly<NewTransaction & TransactionWithBlockhashLifetime>
+        Readonly<Transaction & TransactionWithBlockhashLifetime>
     >;
 }
 
@@ -35,15 +35,15 @@ type CompilableTransactionMessageWithSigners = CompilableTransactionMessage & IT
     const transactionMessage = null as unknown as CompilableTransactionMessageWithSigners &
         IDurableNonceTransactionMessage;
     partiallySignTransactionMessageWithSigners(transactionMessage) satisfies Promise<
-        Readonly<NewTransaction & TransactionWithDurableNonceLifetime>
+        Readonly<Transaction & TransactionWithDurableNonceLifetime>
     >;
 }
 
 {
     // [partiallySignTransactionMessageWithSigners]: returns a transaction with an unknown lifetime
     const transactionMessage = null as unknown as CompilableTransactionMessageWithSigners;
     partiallySignTransactionMessageWithSigners(transactionMessage) satisfies Promise<
-        Readonly<NewTransaction & TransactionWithLifetime>
+        Readonly<Transaction & TransactionWithLifetime>
     >;
 }
 

packages/signers/src/sign-transaction.ts

@@ -9,7 +9,7 @@ import {
     assertTransactionIsFullySigned,
     compileTransaction,
     FullySignedTransaction,
-    NewTransaction,
+    Transaction,
 } from '@solana/transactions';
 import {
     TransactionWithBlockhashLifetime,
@@ -39,29 +39,29 @@ export async function partiallySignTransactionMessageWithSigners<
 >(
     transactionMessage: TTransactionMessage,
     config?: { abortSignal?: AbortSignal },
-): Promise<NewTransaction & TransactionWithBlockhashLifetime>;
+): Promise<Transaction & TransactionWithBlockhashLifetime>;
 
 export async function partiallySignTransactionMessageWithSigners<
     TTransactionMessage extends CompilableTransactionMessageWithSigners &
         IDurableNonceTransactionMessage = CompilableTransactionMessageWithSigners & IDurableNonceTransactionMessage,
 >(
     transactionMessage: TTransactionMessage,
     config?: { abortSignal?: AbortSignal },
-): Promise<Readonly<NewTransaction & TransactionWithDurableNonceLifetime>>;
+): Promise<Readonly<Transaction & TransactionWithDurableNonceLifetime>>;
 
 export async function partiallySignTransactionMessageWithSigners<
     TTransactionMessage extends CompilableTransactionMessageWithSigners = CompilableTransactionMessageWithSigners,
 >(
     transactionMessage: TTransactionMessage,
     config?: { abortSignal?: AbortSignal },
-): Promise<Readonly<NewTransaction & TransactionWithLifetime>>;
+): Promise<Readonly<Transaction & TransactionWithLifetime>>;
 
 export async function partiallySignTransactionMessageWithSigners<
     TTransactionMessage extends CompilableTransactionMessageWithSigners = CompilableTransactionMessageWithSigners,
 >(
     transactionMessage: TTransactionMessage,
     config: { abortSignal?: AbortSignal } = {},
-): Promise<Readonly<NewTransaction & TransactionWithLifetime>> {
+): Promise<Readonly<Transaction & TransactionWithLifetime>> {
     const { partialSigners, modifyingSigners } = categorizeTransactionSigners(
         deduplicateSigners(getSignersFromTransactionMessage(transactionMessage).filter(isTransactionSigner)),
         { identifySendingSigner: false },
@@ -235,7 +235,7 @@ async function signModifyingAndPartialTransactionSigners<
     modifyingSigners: readonly TransactionModifyingSigner[] = [],
     partialSigners: readonly TransactionPartialSigner[] = [],
     abortSignal?: AbortSignal,
-): Promise<Readonly<NewTransaction & TransactionWithLifetime>> {
+): Promise<Readonly<Transaction & TransactionWithLifetime>> {
     // serialize the transaction
     const transaction = compileTransaction(transactionMessage);
 
@@ -246,7 +246,7 @@ async function signModifyingAndPartialTransactionSigners<
             const [tx] = await modifyingSigner.modifyAndSignTransactions([await transaction], { abortSignal });
             return Object.freeze(tx);
         },
-        Promise.resolve(transaction) as Promise<Readonly<NewTransaction & TransactionWithLifetime>>,
+        Promise.resolve(transaction) as Promise<Readonly<Transaction & TransactionWithLifetime>>,
     );
 
     // Handle partial signers in parallel.
@@ -257,7 +257,7 @@ async function signModifyingAndPartialTransactionSigners<
             return signatures;
         }),
     );
-    const signedTransaction: Readonly<NewTransaction & TransactionWithLifetime> = {
+    const signedTransaction: Readonly<Transaction & TransactionWithLifetime> = {
         ...modifiedTransaction,
         signatures: Object.freeze(
             signatureDictionaries.reduce((signatures, signatureDictionary) => {

packages/signers/src/transaction-modifying-signer.ts

@@ -1,6 +1,6 @@
 import { Address } from '@solana/addresses';
 import { SOLANA_ERROR__SIGNER__EXPECTED_TRANSACTION_MODIFYING_SIGNER, SolanaError } from '@solana/errors';
-import { NewTransaction } from '@solana/transactions';
+import { Transaction } from '@solana/transactions';
 
 import { BaseSignerConfig } from './types';
 
@@ -9,7 +9,7 @@ export type TransactionModifyingSignerConfig = BaseSignerConfig;
 /** Defines a signer capable of signing transactions. */
 export type TransactionModifyingSigner<TAddress extends string = string> = Readonly<{
     address: Address<TAddress>;
-    modifyAndSignTransactions<T extends NewTransaction>(
+    modifyAndSignTransactions<T extends Transaction>(
         transactions: readonly T[],
         config?: TransactionModifyingSignerConfig,
     ): Promise<readonly T[]>;

packages/signers/src/transaction-partial-signer.ts

@@ -1,6 +1,6 @@
 import { Address } from '@solana/addresses';
 import { SOLANA_ERROR__SIGNER__EXPECTED_TRANSACTION_PARTIAL_SIGNER, SolanaError } from '@solana/errors';
-import { NewTransaction } from '@solana/transactions';
+import { Transaction } from '@solana/transactions';
 
 import { BaseSignerConfig, SignatureDictionary } from './types';
 
@@ -10,7 +10,7 @@ export type TransactionPartialSignerConfig = BaseSignerConfig;
 export type TransactionPartialSigner<TAddress extends string = string> = Readonly<{
     address: Address<TAddress>;
     signTransactions(
-        transactions: readonly NewTransaction[],
+        transactions: readonly Transaction[],
         config?: TransactionPartialSignerConfig,
     ): Promise<readonly SignatureDictionary[]>;
 }>;

packages/signers/src/transaction-sending-signer.ts

@@ -1,7 +1,7 @@
 import { Address } from '@solana/addresses';
 import { SOLANA_ERROR__SIGNER__EXPECTED_TRANSACTION_SENDING_SIGNER, SolanaError } from '@solana/errors';
 import { SignatureBytes } from '@solana/keys';
-import { NewTransaction } from '@solana/transactions';
+import { Transaction } from '@solana/transactions';
 
 import { BaseSignerConfig } from './types';
 
@@ -11,7 +11,7 @@ export type TransactionSendingSignerConfig = BaseSignerConfig;
 export type TransactionSendingSigner<TAddress extends string = string> = Readonly<{
     address: Address<TAddress>;
     signAndSendTransactions(
-        transactions: readonly NewTransaction[],
+        transactions: readonly Transaction[],
         config?: TransactionSendingSignerConfig,
     ): Promise<readonly SignatureBytes[]>;
 }>;

packages/transaction-confirmation/src/__tests__/waiters-test.ts

@@ -3,7 +3,7 @@ import { SOLANA_ERROR__TRANSACTION__FEE_PAYER_SIGNATURE_MISSING, SolanaError } f
 import { Signature, SignatureBytes } from '@solana/keys';
 import type { Blockhash } from '@solana/rpc-types';
 import { NewNonce } from '@solana/transaction-messages';
-import { NewTransaction, TransactionMessageBytes } from '@solana/transactions';
+import { Transaction, TransactionMessageBytes } from '@solana/transactions';
 import {
     TransactionWithBlockhashLifetime,
     TransactionWithDurableNonceLifetime,
@@ -21,7 +21,7 @@ const FOREVER_PROMISE = new Promise(() => {
 });
 
 describe('waitForDurableNonceTransactionConfirmation', () => {
-    const MOCK_DURABLE_NONCE_TRANSACTION: NewTransaction & TransactionWithDurableNonceLifetime = {
+    const MOCK_DURABLE_NONCE_TRANSACTION: Transaction & TransactionWithDurableNonceLifetime = {
         lifetimeConstraint: { nonce: 'xyz' as NewNonce, nonceAccountAddress: '5'.repeat(44) as Address },
         messageBytes: new Uint8Array() as ReadonlyUint8Array as TransactionMessageBytes,
         signatures: {
@@ -170,7 +170,7 @@ describe('waitForDurableNonceTransactionConfirmation', () => {
 });
 
 describe('waitForRecentTransactionConfirmation', () => {
-    const MOCK_TRANSACTION: NewTransaction & TransactionWithBlockhashLifetime = {
+    const MOCK_TRANSACTION: Transaction & TransactionWithBlockhashLifetime = {
         lifetimeConstraint: { blockhash: '4'.repeat(44) as Blockhash, lastValidBlockHeight: 123n },
         messageBytes: new Uint8Array() as ReadonlyUint8Array as TransactionMessageBytes,
         signatures: {

packages/transaction-confirmation/src/waiters.ts

@@ -1,5 +1,5 @@
 import { Signature } from '@solana/keys';
-import { getSignatureFromTransaction, NewTransaction } from '@solana/transactions';
+import { getSignatureFromTransaction, Transaction } from '@solana/transactions';
 import {
     TransactionWithBlockhashLifetime,
     TransactionWithDurableNonceLifetime,
@@ -12,13 +12,13 @@ import { getTimeoutPromise } from './confirmation-strategy-timeout';
 
 interface WaitForDurableNonceTransactionConfirmationConfig extends BaseTransactionConfirmationStrategyConfig {
     getNonceInvalidationPromise: ReturnType<typeof createNonceInvalidationPromiseFactory>;
-    transaction: Readonly<NewTransaction & TransactionWithDurableNonceLifetime>;
+    transaction: Readonly<Transaction & TransactionWithDurableNonceLifetime>;
 }
 
 interface WaitForRecentTransactionWithBlockhashLifetimeConfirmationConfig
     extends BaseTransactionConfirmationStrategyConfig {
     getBlockHeightExceedencePromise: ReturnType<typeof createBlockHeightExceedencePromiseFactory>;
-    transaction: Readonly<NewTransaction & TransactionWithBlockhashLifetime>;
+    transaction: Readonly<Transaction & TransactionWithBlockhashLifetime>;
 }
 
 interface WaitForRecentTransactionWithTimeBasedLifetimeConfirmationConfig