@solana/transaction-messages 2.2.0-canary-20250708184423 → 2.2.0

package/dist/index.native.mjs

@@ -1,5 +1,5 @@
 import { SolanaError, SOLANA_ERROR__TRANSACTION__EXPECTED_BLOCKHASH_LIFETIME, SOLANA_ERROR__TRANSACTION__VERSION_NUMBER_OUT_OF_RANGE, SOLANA_ERROR__TRANSACTION__EXPECTED_NONCE_LIFETIME, SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_FEE_PAYER_MISSING, SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_ADDRESS_LOOKUP_TABLE_CONTENTS_MISSING, SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_ADDRESS_LOOKUP_TABLE_INDEX_OUT_OF_RANGE, SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_INSTRUCTION_PROGRAM_ADDRESS_NOT_FOUND, SOLANA_ERROR__CODECS__INVALID_STRING_FOR_BASE, SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_MUST_NOT_BE_WRITABLE, SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_CANNOT_PAY_FEES } from '@solana/errors';
-import { isBlockhash } from '@solana/rpc-types';
+import { assertIsBlockhash } 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';
@@ -9,7 +9,14 @@ import { pipe } from '@solana/functional';
 
 // src/blockhash.ts
 function isTransactionMessageWithBlockhashLifetime(transactionMessage) {
-  return "lifetimeConstraint" in transactionMessage && typeof transactionMessage.lifetimeConstraint.blockhash === "string" && typeof transactionMessage.lifetimeConstraint.lastValidBlockHeight === "bigint" && isBlockhash(transactionMessage.lifetimeConstraint.blockhash);
+  const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transactionMessage && typeof transactionMessage.lifetimeConstraint.blockhash === "string" && typeof transactionMessage.lifetimeConstraint.lastValidBlockHeight === "bigint";
+  if (!lifetimeConstraintShapeMatches) return false;
+  try {
+    assertIsBlockhash(transactionMessage.lifetimeConstraint.blockhash);
+    return true;
+  } catch {
+    return false;
+  }
 }
 function assertIsTransactionMessageWithBlockhashLifetime(transactionMessage) {
   if (!isTransactionMessageWithBlockhashLifetime(transactionMessage)) {
@@ -17,13 +24,15 @@ function assertIsTransactionMessageWithBlockhashLifetime(transactionMessage) {
   }
 }
 function setTransactionMessageLifetimeUsingBlockhash(blockhashLifetimeConstraint, transactionMessage) {
-  if ("lifetimeConstraint" in transactionMessage && transactionMessage.lifetimeConstraint && "blockhash" in transactionMessage.lifetimeConstraint && transactionMessage.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transactionMessage.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
+  if ("lifetimeConstraint" in transactionMessage && transactionMessage.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transactionMessage.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
     return transactionMessage;
   }
-  return Object.freeze({
+  const out = {
     ...transactionMessage,
     lifetimeConstraint: Object.freeze(blockhashLifetimeConstraint)
-  });
+  };
+  Object.freeze(out);
+  return out;
 }
 function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
   if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {
@@ -649,14 +658,21 @@ function compressTransactionMessageUsingAddressLookupTables(transactionMessage,
 }
 
 // src/create-transaction-message.ts
-function createTransactionMessage(config) {
+function createTransactionMessage({
+  version
+}) {
   return Object.freeze({
     instructions: Object.freeze([]),
-    version: config.version
+    version
   });
 }
 var RECENT_BLOCKHASHES_SYSVAR_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111";
 var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
+function assertIsDurableNonceTransactionMessage(transactionMessage) {
+  if (!isDurableNonceTransaction(transactionMessage)) {
+    throw new SolanaError(SOLANA_ERROR__TRANSACTION__EXPECTED_NONCE_LIFETIME);
+  }
+}
 function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
   return {
     accounts: [
@@ -682,16 +698,9 @@ function isAdvanceNonceAccountInstruction(instruction) {
 function isAdvanceNonceAccountInstructionData(data) {
   return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
 }
-
-// src/durable-nonce.ts
-function isTransactionMessageWithDurableNonceLifetime(transactionMessage) {
+function isDurableNonceTransaction(transactionMessage) {
   return "lifetimeConstraint" in transactionMessage && typeof transactionMessage.lifetimeConstraint.nonce === "string" && transactionMessage.instructions[0] != null && isAdvanceNonceAccountInstruction(transactionMessage.instructions[0]);
 }
-function assertIsTransactionMessageWithDurableNonceLifetime(transactionMessage) {
-  if (!isTransactionMessageWithDurableNonceLifetime(transactionMessage)) {
-    throw new SolanaError(SOLANA_ERROR__TRANSACTION__EXPECTED_NONCE_LIFETIME);
-  }
-}
 function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
   return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
 }
@@ -704,7 +713,7 @@ function setTransactionMessageLifetimeUsingDurableNonce({
   const firstInstruction = transactionMessage.instructions[0];
   if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
     if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
-      if (isTransactionMessageWithDurableNonceLifetime(transactionMessage) && transactionMessage.lifetimeConstraint.nonce === nonce) {
+      if (isDurableNonceTransaction(transactionMessage) && transactionMessage.lifetimeConstraint.nonce === nonce) {
         return transactionMessage;
       } else {
         newInstructions = [firstInstruction, ...transactionMessage.instructions.slice(1)];
@@ -724,7 +733,9 @@ function setTransactionMessageLifetimeUsingDurableNonce({
   return Object.freeze({
     ...transactionMessage,
     instructions: Object.freeze(newInstructions),
-    lifetimeConstraint: Object.freeze({ nonce })
+    lifetimeConstraint: Object.freeze({
+      nonce
+    })
   });
 }
 
@@ -751,10 +762,7 @@ function appendTransactionMessageInstruction(instruction, transactionMessage) {
 function appendTransactionMessageInstructions(instructions, transactionMessage) {
   return Object.freeze({
     ...transactionMessage,
-    instructions: Object.freeze([
-      ...transactionMessage.instructions,
-      ...instructions
-    ])
+    instructions: Object.freeze([...transactionMessage.instructions, ...instructions])
   });
 }
 function prependTransactionMessageInstruction(instruction, transactionMessage) {
@@ -763,10 +771,7 @@ function prependTransactionMessageInstruction(instruction, transactionMessage) {
 function prependTransactionMessageInstructions(instructions, transactionMessage) {
   return Object.freeze({
     ...transactionMessage,
-    instructions: Object.freeze([
-      ...instructions,
-      ...transactionMessage.instructions
-    ])
+    instructions: Object.freeze([...instructions, ...transactionMessage.instructions])
   });
 }
 
@@ -908,18 +913,13 @@ function decompileTransactionMessage(compiledTransactionMessage, config) {
   return pipe(
     createTransactionMessage({ version: compiledTransactionMessage.version }),
     (m) => setTransactionMessageFeePayer(feePayer, m),
-    (m) => instructions.reduce(
-      (acc, instruction) => appendTransactionMessageInstruction(instruction, acc),
-      m
-    ),
+    (m) => instructions.reduce((acc, instruction) => {
+      return appendTransactionMessageInstruction(instruction, acc);
+    }, m),
     (m) => "blockhash" in lifetimeConstraint ? setTransactionMessageLifetimeUsingBlockhash(lifetimeConstraint, m) : setTransactionMessageLifetimeUsingDurableNonce(lifetimeConstraint, m)
   );
 }
 
-// src/deprecated.ts
-var assertIsDurableNonceTransactionMessage = assertIsTransactionMessageWithDurableNonceLifetime;
-var isDurableNonceTransaction = isTransactionMessageWithDurableNonceLifetime;
-
-export { appendTransactionMessageInstruction, appendTransactionMessageInstructions, assertIsDurableNonceTransactionMessage, assertIsTransactionMessageWithBlockhashLifetime, assertIsTransactionMessageWithDurableNonceLifetime, compileTransactionMessage, compressTransactionMessageUsingAddressLookupTables, createTransactionMessage, decompileTransactionMessage, getCompiledTransactionMessageCodec, getCompiledTransactionMessageDecoder, getCompiledTransactionMessageEncoder, getTransactionVersionCodec, getTransactionVersionDecoder, getTransactionVersionEncoder, isAdvanceNonceAccountInstruction, isDurableNonceTransaction, isTransactionMessageWithBlockhashLifetime, isTransactionMessageWithDurableNonceLifetime, prependTransactionMessageInstruction, prependTransactionMessageInstructions, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, setTransactionMessageLifetimeUsingDurableNonce };
+export { appendTransactionMessageInstruction, appendTransactionMessageInstructions, assertIsDurableNonceTransactionMessage, assertIsTransactionMessageWithBlockhashLifetime, compileTransactionMessage, compressTransactionMessageUsingAddressLookupTables, createTransactionMessage, decompileTransactionMessage, getCompiledTransactionMessageCodec, getCompiledTransactionMessageDecoder, getCompiledTransactionMessageEncoder, getTransactionVersionCodec, getTransactionVersionDecoder, getTransactionVersionEncoder, isAdvanceNonceAccountInstruction, isDurableNonceTransaction, isTransactionMessageWithBlockhashLifetime, prependTransactionMessageInstruction, prependTransactionMessageInstructions, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, setTransactionMessageLifetimeUsingDurableNonce };
 //# sourceMappingURL=index.native.mjs.map
 //# sourceMappingURL=index.native.mjs.map