@solana/transaction-messages 2.4.0-canary-20250709085504 → 2.4.0-canary-20250709090646

package/dist/index.node.mjs

@@ -2,7 +2,7 @@ import { SolanaError, SOLANA_ERROR__TRANSACTION__EXPECTED_BLOCKHASH_LIFETIME, SO
 import { isBlockhash } from '@solana/rpc-types';
 import { getAddressDecoder, getAddressComparator, assertIsAddress, getAddressEncoder } from '@solana/addresses';
 import { createEncoder, createDecoder, combineCodec, transformDecoder, transformEncoder, fixDecoderSize, fixEncoderSize, addDecoderSizePrefix, addEncoderSizePrefix } from '@solana/codecs-core';
-import { getStructDecoder, getStructEncoder, getArrayDecoder, getArrayEncoder, getBytesDecoder, getBytesEncoder } from '@solana/codecs-data-structures';
+import { getStructDecoder, getStructEncoder, getArrayDecoder, getUnionEncoder, getConstantEncoder, getArrayEncoder, getBytesDecoder, getBytesEncoder } from '@solana/codecs-data-structures';
 import { getShortU16Decoder, getShortU16Encoder, getU8Decoder, getU8Encoder } from '@solana/codecs-numbers';
 import { isSignerRole, AccountRole, isWritableRole, mergeRoles } from '@solana/instructions';
 import { pipe } from '@solana/functional';
@@ -269,11 +269,20 @@ function getCompiledMessageVersionedEncoder() {
   );
 }
 function getPreludeStructEncoderTuple() {
+  const lifetimeTokenEncoder = getUnionEncoder(
+    [
+      // Use a 32-byte constant encoder for a missing lifetime token (index 0).
+      getConstantEncoder(new Uint8Array(32)),
+      // Use a 32-byte base58 encoder for a valid lifetime token (index 1).
+      fixEncoderSize(getBase58Encoder(), 32)
+    ],
+    (value) => value === void 0 ? 0 : 1
+  );
   return [
     ["version", getTransactionVersionEncoder()],
     ["header", getMessageHeaderEncoder()],
     ["staticAccounts", getArrayEncoder(getAddressEncoder(), { size: getShortU16Encoder() })],
-    ["lifetimeToken", fixEncoderSize(getBase58Encoder(), 32)],
+    ["lifetimeToken", lifetimeTokenEncoder],
     ["instructions", getArrayEncoder(getInstructionEncoder(), { size: getShortU16Encoder() })]
   ];
 }
@@ -585,22 +594,18 @@ function getCompiledStaticAccounts(orderedAccounts) {
 }
 
 // src/compile/message.ts
-var EMPTY_BLOCKHASH_LIFETIME_CONSTRAINT = {
-  blockhash: "11111111111111111111111111111111",
-  lastValidBlockHeight: 0n
-};
 function compileTransactionMessage(transactionMessage) {
   const addressMap = getAddressMapFromInstructions(
     transactionMessage.feePayer.address,
     transactionMessage.instructions
   );
   const orderedAccounts = getOrderedAccountsFromAddressMap(addressMap);
-  const lifetimeConstraint = transactionMessage.lifetimeConstraint ?? EMPTY_BLOCKHASH_LIFETIME_CONSTRAINT;
+  const lifetimeConstraint = transactionMessage.lifetimeConstraint;
   return {
     ...transactionMessage.version !== "legacy" ? { addressTableLookups: getCompiledAddressTableLookups(orderedAccounts) } : null,
+    ...lifetimeConstraint ? { lifetimeToken: getCompiledLifetimeToken(lifetimeConstraint) } : null,
     header: getCompiledMessageHeader(orderedAccounts),
     instructions: getCompiledInstructions(transactionMessage.instructions, orderedAccounts),
-    lifetimeToken: getCompiledLifetimeToken(lifetimeConstraint),
     staticAccounts: getCompiledStaticAccounts(orderedAccounts),
     version: transactionMessage.version
   };