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

package/README.md

@@ -56,7 +56,7 @@ const message = createTransactionMessage({ version: 0 });
 
 ### Types
 
-#### `TransactionMessageWithFeePayer`
+#### `ITransactionMessageWithFeePayer`
 
 This type represents a transaction message for which a fee payer has been declared. A transaction must conform to this type to be compiled and landed on the network.
 
@@ -64,7 +64,7 @@ This type represents a transaction message for which a fee payer has been declar
 
 #### `setTransactionMessageFeePayer()`
 
-Given a base58-encoded address of a system account, this method will return a new transaction message having the same type as the one supplied plus the `TransactionMessageWithFeePayer` type.
+Given a base58-encoded address of a system account, this method will return a new transaction message having the same type as the one supplied plus the `ITransactionMessageWithFeePayer` type.
 
 ```ts
 import { address } from '@solana/addresses';
@@ -171,9 +171,9 @@ function handleSubmit() {
 }
 ```
 
-#### `assertIsTransactionMessageWithDurableNonceLifetime()`
+#### `assertIsDurableNonceTransactionMessage()`
 
-From time to time you might acquire a transaction message that you expect to be a durable nonce transaction, from an untrusted network API or user input. To assert that such an arbitrary transaction is in fact a durable nonce transaction, use the `assertIsTransactionMessageWithDurableNonceLifetime` function.
+From time to time you might acquire a transaction message that you expect to be a durable nonce transaction, from an untrusted network API or user input. To assert that such an arbitrary transaction is in fact a durable nonce transaction, use the `assertIsDurableNonceTransactionMessage` function.
 
 See [`assertIsBlockhash()`](#assertisblockhash) for an example of how to use an assertion function.
 
@@ -181,15 +181,15 @@ See [`assertIsBlockhash()`](#assertisblockhash) for an example of how to use an
 
 ### Types
 
-#### `Instruction`
+#### `IInstruction`
 
 This type represents an instruction to be issued to a program. Objects that conform to this type have a `programAddress` property that is the base58-encoded address of the program in question.
 
-#### `InstructionWithAccounts`
+#### `IInstructionWithAccounts`
 
-This type represents an instruction that specifies a list of accounts that a program may read from, write to, or require be signers of the transaction itself. Objects that conform to this type have an `accounts` property that is an array of `AccountMeta | AccountLookupMeta` in the order the instruction requires.
+This type represents an instruction that specifies a list of accounts that a program may read from, write to, or require be signers of the transaction itself. Objects that conform to this type have an `accounts` property that is an array of `IAccountMeta | IAccountLookupMeta` in the order the instruction requires.
 
-#### `InstructionWithData`
+#### `IInstructionWithData`
 
 This type represents an instruction that supplies some data as input to the program. Objects that conform to this type have a `data` property that can be any type of `Uint8Array`.
 
@@ -234,7 +234,7 @@ This type represents a mapping of lookup table addresses to the addresses of the
 
 #### `compressTransactionMessageUsingAddressLookupTables`
 
-Given a transaction message and a mapping of lookup tables to the addresses stored in them, this function will return a new transaction message with the same instructions but with all non-signer accounts that are found in the given lookup tables represented by an `AccountLookupMeta` instead of an `AccountMeta`.
+Given a transaction message and a mapping of lookup tables to the addresses stored in them, this function will return a new transaction message with the same instructions but with all non-signer accounts that are found in the given lookup tables represented by an `IAccountLookupMeta` instead of an `IAccountMeta`.
 
 This means that these accounts will take up less space in the compiled transaction message. This size reduction is most significant when the transaction includes many accounts from the same lookup table.
 

package/dist/index.browser.cjs

@@ -11,7 +11,14 @@ var functional = require('@solana/functional');
 
 // src/blockhash.ts
 function isTransactionMessageWithBlockhashLifetime(transactionMessage) {
-  return "lifetimeConstraint" in transactionMessage && typeof transactionMessage.lifetimeConstraint.blockhash === "string" && typeof transactionMessage.lifetimeConstraint.lastValidBlockHeight === "bigint" && rpcTypes.isBlockhash(transactionMessage.lifetimeConstraint.blockhash);
+  const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transactionMessage && typeof transactionMessage.lifetimeConstraint.blockhash === "string" && typeof transactionMessage.lifetimeConstraint.lastValidBlockHeight === "bigint";
+  if (!lifetimeConstraintShapeMatches) return false;
+  try {
+    rpcTypes.assertIsBlockhash(transactionMessage.lifetimeConstraint.blockhash);
+    return true;
+  } catch {
+    return false;
+  }
 }
 function assertIsTransactionMessageWithBlockhashLifetime(transactionMessage) {
   if (!isTransactionMessageWithBlockhashLifetime(transactionMessage)) {
@@ -19,13 +26,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}]*$`))) {
@@ -651,14 +660,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 errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION__EXPECTED_NONCE_LIFETIME);
+  }
+}
 function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
   return {
     accounts: [
@@ -684,16 +700,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 errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION__EXPECTED_NONCE_LIFETIME);
-  }
-}
 function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
   return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
 }
@@ -706,7 +715,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)];
@@ -726,7 +735,9 @@ function setTransactionMessageLifetimeUsingDurableNonce({
   return Object.freeze({
     ...transactionMessage,
     instructions: Object.freeze(newInstructions),
-    lifetimeConstraint: Object.freeze({ nonce })
+    lifetimeConstraint: Object.freeze({
+      nonce
+    })
   });
 }
 
@@ -753,10 +764,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) {
@@ -765,10 +773,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])
   });
 }
 
@@ -910,23 +915,17 @@ function decompileTransactionMessage(compiledTransactionMessage, config) {
   return functional.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;
-
 exports.appendTransactionMessageInstruction = appendTransactionMessageInstruction;
 exports.appendTransactionMessageInstructions = appendTransactionMessageInstructions;
 exports.assertIsDurableNonceTransactionMessage = assertIsDurableNonceTransactionMessage;
 exports.assertIsTransactionMessageWithBlockhashLifetime = assertIsTransactionMessageWithBlockhashLifetime;
-exports.assertIsTransactionMessageWithDurableNonceLifetime = assertIsTransactionMessageWithDurableNonceLifetime;
 exports.compileTransactionMessage = compileTransactionMessage;
 exports.compressTransactionMessageUsingAddressLookupTables = compressTransactionMessageUsingAddressLookupTables;
 exports.createTransactionMessage = createTransactionMessage;
@@ -940,7 +939,6 @@ exports.getTransactionVersionEncoder = getTransactionVersionEncoder;
 exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
 exports.isDurableNonceTransaction = isDurableNonceTransaction;
 exports.isTransactionMessageWithBlockhashLifetime = isTransactionMessageWithBlockhashLifetime;
-exports.isTransactionMessageWithDurableNonceLifetime = isTransactionMessageWithDurableNonceLifetime;
 exports.prependTransactionMessageInstruction = prependTransactionMessageInstruction;
 exports.prependTransactionMessageInstructions = prependTransactionMessageInstructions;
 exports.setTransactionMessageFeePayer = setTransactionMessageFeePayer;