add TransactionWithXLifetime types

solana-labs · Apr 16, 2024 · fbcde3c · fbcde3c
1 parent 3b6f6ee
commit fbcde3c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 14 deletions.
diff --git a/packages/transaction-confirmation/src/__tests__/waiters-test.ts b/packages/transaction-confirmation/src/__tests__/waiters-test.ts
@@ -5,8 +5,8 @@ import type { Blockhash } from '@solana/rpc-types';
 import { NewNonce } from '@solana/transaction-messages';
 import { NewTransaction, TransactionMessageBytes } from '@solana/transactions';
 import {
-    TransactionBlockhashLifetime,
-    TransactionDurableNonceLifetime,
+    TransactionWithBlockhashLifetime,
+    TransactionWithDurableNonceLifetime,
 } from '@solana/transactions/dist/types/lifetime';
 
 import { ReadonlyUint8Array } from '../../../codecs-core/dist/types';
@@ -21,7 +21,7 @@ const FOREVER_PROMISE = new Promise(() => {
 });
 
 describe('waitForDurableNonceTransactionConfirmation', () => {
-    const MOCK_DURABLE_NONCE_TRANSACTION: NewTransaction & { lifetimeConstraint: TransactionDurableNonceLifetime } = {
+    const MOCK_DURABLE_NONCE_TRANSACTION: NewTransaction & 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 & { lifetimeConstraint: TransactionBlockhashLifetime } = {
+    const MOCK_TRANSACTION: NewTransaction & TransactionWithBlockhashLifetime = {
         lifetimeConstraint: { blockhash: '4'.repeat(44) as Blockhash, lastValidBlockHeight: 123n },
         messageBytes: new Uint8Array() as ReadonlyUint8Array as TransactionMessageBytes,
         signatures: {

diff --git a/packages/transaction-confirmation/src/waiters.ts b/packages/transaction-confirmation/src/waiters.ts
@@ -1,8 +1,8 @@
 import { Signature } from '@solana/keys';
 import { newGetSignatureFromTransaction, NewTransaction } from '@solana/transactions';
 import {
-    TransactionBlockhashLifetime,
-    TransactionDurableNonceLifetime,
+    TransactionWithBlockhashLifetime,
+    TransactionWithDurableNonceLifetime,
 } from '@solana/transactions/dist/types/lifetime';
 
 import { createBlockHeightExceedencePromiseFactory } from './confirmation-strategy-blockheight';
@@ -12,13 +12,13 @@ import { getTimeoutPromise } from './confirmation-strategy-timeout';
 
 interface WaitForDurableNonceTransactionConfirmationConfig extends BaseTransactionConfirmationStrategyConfig {
     getNonceInvalidationPromise: ReturnType<typeof createNonceInvalidationPromiseFactory>;
-    transaction: NewTransaction & { lifetimeConstraint: TransactionDurableNonceLifetime };
+    transaction: NewTransaction & TransactionWithDurableNonceLifetime;
 }
 
 interface WaitForRecentTransactionWithBlockhashLifetimeConfirmationConfig
     extends BaseTransactionConfirmationStrategyConfig {
     getBlockHeightExceedencePromise: ReturnType<typeof createBlockHeightExceedencePromiseFactory>;
-    transaction: NewTransaction & { lifetimeConstraint: TransactionBlockhashLifetime };
+    transaction: NewTransaction & TransactionWithBlockhashLifetime;
 }
 
 interface WaitForRecentTransactionWithTimeBasedLifetimeConfirmationConfig

diff --git a/packages/transactions/src/__typetests__/compile-transaction-typetests.ts b/packages/transactions/src/__typetests__/compile-transaction-typetests.ts
@@ -8,7 +8,13 @@ import {
     NewNonce,
 } from '@solana/transaction-messages';
 
-import { TransactionBlockhashLifetime, TransactionDurableNonceLifetime, TransactionWithLifetime } from '../lifetime';
+import {
+    TransactionBlockhashLifetime,
+    TransactionDurableNonceLifetime,
+    TransactionWithBlockhashLifetime,
+    TransactionWithDurableNonceLifetime,
+    TransactionWithLifetime,
+} from '../lifetime';
 import { compileTransaction } from '../new-compile-transaction';
 import { NewTransaction } from '../transaction';
 
@@ -22,7 +28,7 @@ compileTransaction(
     null as unknown as BaseTransactionMessage &
         ITransactionMessageWithBlockhashLifetime &
         ITransactionMessageWithFeePayer,
-) satisfies NewTransaction & { lifetimeConstraint: TransactionBlockhashLifetime };
+) satisfies NewTransaction & TransactionWithBlockhashLifetime;
 compileTransaction(
     null as unknown as BaseTransactionMessage &
         ITransactionMessageWithBlockhashLifetime &
@@ -35,7 +41,7 @@ compileTransaction(
 ) satisfies NewTransaction & TransactionWithLifetime;
 compileTransaction(
     null as unknown as BaseTransactionMessage & IDurableNonceTransactionMessage & ITransactionMessageWithFeePayer,
-) satisfies NewTransaction & { lifetimeConstraint: TransactionDurableNonceLifetime };
+) satisfies NewTransaction & TransactionWithDurableNonceLifetime;
 compileTransaction(
     null as unknown as BaseTransactionMessage & IDurableNonceTransactionMessage & ITransactionMessageWithFeePayer,
 ).lifetimeConstraint.nonce satisfies NewNonce;

diff --git a/packages/transactions/src/lifetime.ts b/packages/transactions/src/lifetime.ts
@@ -16,6 +16,14 @@ export type TransactionWithLifetime = {
     readonly lifetimeConstraint: TransactionBlockhashLifetime | TransactionDurableNonceLifetime;
 };
 
+export type TransactionWithBlockhashLifetime = {
+    readonly lifetimeConstraint: TransactionBlockhashLifetime;
+};
+
+export type TransactionWithDurableNonceLifetime = {
+    readonly lifetimeConstraint: TransactionDurableNonceLifetime;
+};
+
 export function isTransactionBlockhashLifetime(
     lifetime: TransactionWithLifetime['lifetimeConstraint'],
 ): lifetime is TransactionBlockhashLifetime {

diff --git a/packages/transactions/src/new-compile-transaction.ts b/packages/transactions/src/new-compile-transaction.ts
@@ -10,16 +10,20 @@ import {
     newCompileTransactionMessage,
 } from '@solana/transaction-messages';
 
-import { TransactionBlockhashLifetime, TransactionDurableNonceLifetime, TransactionWithLifetime } from './lifetime';
+import {
+    TransactionWithBlockhashLifetime,
+    TransactionWithDurableNonceLifetime,
+    TransactionWithLifetime,
+} from './lifetime';
 import { NewTransaction, OrderedMap, TransactionMessageBytes } from './transaction';
 
 export function compileTransaction(
     transactionMessage: CompilableTransactionMessage & ITransactionMessageWithBlockhashLifetime,
-): NewTransaction & { lifetimeConstraint: TransactionBlockhashLifetime };
+): NewTransaction & TransactionWithBlockhashLifetime;
 
 export function compileTransaction(
     transactionMessage: CompilableTransactionMessage & IDurableNonceTransactionMessage,
-): NewTransaction & { lifetimeConstraint: TransactionDurableNonceLifetime };
+): NewTransaction & TransactionWithDurableNonceLifetime;
 
 export function compileTransaction(
     transactionMessage: CompilableTransactionMessage,