@solana/transactions 2.0.0-experimental.7da1908 → 2.0.0-experimental.7ed772d

package/dist/index.browser.cjs

@@ -1,11 +1,14 @@
 'use strict';
 
-var umiSerializers = require('@metaplex-foundation/umi-serializers');
+var codecsStrings = require('@solana/codecs-strings');
 var addresses = require('@solana/addresses');
+var codecsCore = require('@solana/codecs-core');
+var codecsDataStructures = require('@solana/codecs-data-structures');
+var codecsNumbers = require('@solana/codecs-numbers');
+var functional = require('@solana/functional');
 var keys = require('@solana/keys');
 
-// ../build-scripts/env-shim.ts
-var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
+// src/blockhash.ts
 
 // src/unsigned-transaction.ts
 function getUnsignedTransaction(transaction) {
@@ -22,7 +25,10 @@ function getUnsignedTransaction(transaction) {
 }
 
 // src/blockhash.ts
+var base58Encoder;
 function assertIsBlockhash(putativeBlockhash) {
+  if (!base58Encoder)
+    base58Encoder = codecsStrings.getBase58Encoder();
   try {
     if (
       // Lowest value (32 bytes of zeroes)
@@ -31,8 +37,8 @@ function assertIsBlockhash(putativeBlockhash) {
     ) {
       throw new Error("Expected input string to decode to a byte array of length 32.");
     }
-    const bytes3 = umiSerializers.base58.serialize(putativeBlockhash);
-    const numBytes = bytes3.byteLength;
+    const bytes = base58Encoder.encode(putativeBlockhash);
+    const numBytes = bytes.byteLength;
     if (numBytes !== 32) {
       throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
     }
@@ -42,6 +48,22 @@ function assertIsBlockhash(putativeBlockhash) {
     });
   }
 }
+function isTransactionWithBlockhashLifetime(transaction) {
+  const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.blockhash === "string" && typeof transaction.lifetimeConstraint.lastValidBlockHeight === "bigint";
+  if (!lifetimeConstraintShapeMatches)
+    return false;
+  try {
+    assertIsBlockhash(transaction.lifetimeConstraint.blockhash);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function assertIsTransactionWithBlockhashLifetime(transaction) {
+  if (!isTransactionWithBlockhashLifetime(transaction)) {
+    throw new Error("Transaction does not have a blockhash lifetime");
+  }
+}
 function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
   if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
     return transaction;
@@ -117,7 +139,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
   instruction.accounts?.length === 3 && // First account is nonce account address
   instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
   instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
-  instruction.accounts[2].address != null && instruction.accounts[2].role === AccountRole.READONLY_SIGNER;
+  instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
 }
 function isAdvanceNonceAccountInstructionData(data) {
   return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
@@ -125,21 +147,38 @@ function isAdvanceNonceAccountInstructionData(data) {
 function isDurableNonceTransaction(transaction) {
   return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
 }
+function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
+  return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
+}
 function setTransactionLifetimeUsingDurableNonce({
   nonce,
   nonceAccountAddress,
   nonceAuthorityAddress
 }, transaction) {
-  const isAlreadyDurableNonceTransaction = isDurableNonceTransaction(transaction);
-  if (isAlreadyDurableNonceTransaction && transaction.lifetimeConstraint.nonce === nonce && transaction.instructions[0].accounts[0].address === nonceAccountAddress && transaction.instructions[0].accounts[2].address === nonceAuthorityAddress) {
-    return transaction;
+  let newInstructions;
+  const firstInstruction = transaction.instructions[0];
+  if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
+    if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
+      if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
+        return transaction;
+      } else {
+        newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
+      }
+    } else {
+      newInstructions = [
+        createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
+        ...transaction.instructions.slice(1)
+      ];
+    }
+  } else {
+    newInstructions = [
+      createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
+      ...transaction.instructions
+    ];
   }
   const out = {
     ...getUnsignedTransaction(transaction),
-    instructions: [
-      createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
-      ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
-    ],
+    instructions: newInstructions,
     lifetimeConstraint: {
       nonce
     }
@@ -230,7 +269,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
                 const shouldReplaceEntry = (
                   // Consider using the new LOOKUP_TABLE if its address is different...
                   entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
-                  (addressComparator || (addressComparator = addresses.getBase58EncodedAddressComparator()))(
+                  (addressComparator ||= addresses.getAddressComparator())(
                     accountMeta.lookupTableAddress,
                     entry.lookupTableAddress
                   ) < 0
@@ -336,7 +375,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
     if (leftIsWritable !== isWritableRole(rightEntry.role)) {
       return leftIsWritable ? -1 : 1;
     }
-    addressComparator || (addressComparator = addresses.getBase58EncodedAddressComparator());
+    addressComparator ||= addresses.getAddressComparator();
     if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
       return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
     } else {
@@ -349,23 +388,22 @@ function getOrderedAccountsFromAddressMap(addressMap) {
   return orderedAccounts;
 }
 function getCompiledAddressTableLookups(orderedAccounts) {
-  var _a;
   const index = {};
   for (const account of orderedAccounts) {
     if (!("lookupTableAddress" in account)) {
       continue;
     }
-    const entry = index[_a = account.lookupTableAddress] || (index[_a] = {
+    const entry = index[account.lookupTableAddress] ||= {
       readableIndices: [],
       writableIndices: []
-    });
+    };
     if (account.role === AccountRole.WRITABLE) {
       entry.writableIndices.push(account.addressIndex);
     } else {
       entry.readableIndices.push(account.addressIndex);
     }
   }
-  return Object.keys(index).sort(addresses.getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
+  return Object.keys(index).sort(addresses.getAddressComparator()).map((lookupTableAddress) => ({
     lookupTableAddress,
     ...index[lookupTableAddress]
   }));
@@ -444,303 +482,395 @@ function compileMessage(transaction) {
     version: transaction.version
   };
 }
-function getAddressTableLookupCodec() {
-  return umiSerializers.struct(
-    [
-      [
-        "lookupTableAddress",
-        addresses.getBase58EncodedAddressCodec(
-          __DEV__ ? {
-            description: "The address of the address lookup table account from which instruction addresses should be looked up"
-          } : void 0
-        )
-      ],
+var memoizedAddressTableLookupEncoder;
+function getAddressTableLookupEncoder() {
+  if (!memoizedAddressTableLookupEncoder) {
+    memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder([
+      ["lookupTableAddress", addresses.getAddressEncoder()],
       [
         "writableIndices",
-        umiSerializers.array(umiSerializers.u8(), {
-          ...__DEV__ ? {
-            description: "The indices of the accounts in the lookup table that should be loaded as writeable"
-          } : null,
-          size: umiSerializers.shortU16()
-        })
+        codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
       ],
       [
         "readableIndices",
-        umiSerializers.array(umiSerializers.u8(), {
-          ...__DEV__ ? {
-            description: "The indices of the accounts in the lookup table that should be loaded as read-only"
-          } : void 0,
-          size: umiSerializers.shortU16()
-        })
+        codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
       ]
-    ],
-    __DEV__ ? {
-      description: "A pointer to the address of an address lookup table, along with the readonly/writeable indices of the addresses that should be loaded from it"
-    } : void 0
-  );
+    ]);
+  }
+  return memoizedAddressTableLookupEncoder;
+}
+var memoizedAddressTableLookupDecoder;
+function getAddressTableLookupDecoder() {
+  if (!memoizedAddressTableLookupDecoder) {
+    memoizedAddressTableLookupDecoder = codecsDataStructures.getStructDecoder([
+      ["lookupTableAddress", addresses.getAddressDecoder()],
+      ["writableIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })],
+      ["readableIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })]
+    ]);
+  }
+  return memoizedAddressTableLookupDecoder;
+}
+var memoizedU8Encoder;
+function getMemoizedU8Encoder() {
+  if (!memoizedU8Encoder)
+    memoizedU8Encoder = codecsNumbers.getU8Encoder();
+  return memoizedU8Encoder;
+}
+var memoizedU8Decoder;
+function getMemoizedU8Decoder() {
+  if (!memoizedU8Decoder)
+    memoizedU8Decoder = codecsNumbers.getU8Decoder();
+  return memoizedU8Decoder;
+}
+function getMessageHeaderEncoder() {
+  return codecsDataStructures.getStructEncoder([
+    ["numSignerAccounts", getMemoizedU8Encoder()],
+    ["numReadonlySignerAccounts", getMemoizedU8Encoder()],
+    ["numReadonlyNonSignerAccounts", getMemoizedU8Encoder()]
+  ]);
+}
+function getMessageHeaderDecoder() {
+  return codecsDataStructures.getStructDecoder([
+    ["numSignerAccounts", getMemoizedU8Decoder()],
+    ["numReadonlySignerAccounts", getMemoizedU8Decoder()],
+    ["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
+  ]);
+}
+var memoizedGetInstructionEncoder;
+function getInstructionEncoder() {
+  if (!memoizedGetInstructionEncoder) {
+    memoizedGetInstructionEncoder = codecsCore.mapEncoder(
+      codecsDataStructures.getStructEncoder([
+        ["programAddressIndex", codecsNumbers.getU8Encoder()],
+        ["accountIndices", codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })],
+        ["data", codecsDataStructures.getBytesEncoder({ size: codecsNumbers.getShortU16Encoder() })]
+      ]),
+      // Convert an instruction to have all fields defined
+      (instruction) => {
+        if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
+          return instruction;
+        }
+        return {
+          ...instruction,
+          accountIndices: instruction.accountIndices ?? [],
+          data: instruction.data ?? new Uint8Array(0)
+        };
+      }
+    );
+  }
+  return memoizedGetInstructionEncoder;
+}
+var memoizedGetInstructionDecoder;
+function getInstructionDecoder() {
+  if (!memoizedGetInstructionDecoder) {
+    memoizedGetInstructionDecoder = codecsCore.mapDecoder(
+      codecsDataStructures.getStructDecoder([
+        ["programAddressIndex", codecsNumbers.getU8Decoder()],
+        ["accountIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })],
+        ["data", codecsDataStructures.getBytesDecoder({ size: codecsNumbers.getShortU16Decoder() })]
+      ]),
+      // Convert an instruction to exclude optional fields if they are empty
+      (instruction) => {
+        if (instruction.accountIndices.length && instruction.data.byteLength) {
+          return instruction;
+        }
+        const { accountIndices, data, ...rest } = instruction;
+        return {
+          ...rest,
+          ...accountIndices.length ? { accountIndices } : null,
+          ...data.byteLength ? { data } : null
+        };
+      }
+    );
+  }
+  return memoizedGetInstructionDecoder;
 }
-function getMessageHeaderCodec() {
-  return umiSerializers.struct(
-    [
-      [
-        "numSignerAccounts",
-        umiSerializers.u8(
-          __DEV__ ? {
-            description: "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction"
-          } : void 0
-        )
-      ],
-      [
-        "numReadonlySignerAccounts",
-        umiSerializers.u8(
-          __DEV__ ? {
-            description: "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction, but may not be writable"
-          } : void 0
-        )
-      ],
-      [
-        "numReadonlyNonSignerAccounts",
-        umiSerializers.u8(
-          __DEV__ ? {
-            description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
-          } : void 0
-        )
-      ]
-    ],
-    __DEV__ ? {
-      description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
-    } : void 0
-  );
+var VERSION_FLAG_MASK = 128;
+function getTransactionVersionEncoder() {
+  return codecsCore.createEncoder({
+    getSizeFromValue: (value) => value === "legacy" ? 0 : 1,
+    maxSize: 1,
+    write: (value, bytes, offset) => {
+      if (value === "legacy") {
+        return offset;
+      }
+      if (value < 0 || value > 127) {
+        throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
+      }
+      bytes.set([value | VERSION_FLAG_MASK], offset);
+      return offset + 1;
+    }
+  });
 }
-function getInstructionCodec() {
-  return umiSerializers.mapSerializer(
-    umiSerializers.struct([
-      [
-        "programAddressIndex",
-        umiSerializers.u8(
-          __DEV__ ? {
-            description: "The index of the program being called, according to the well-ordered accounts list for this transaction"
-          } : void 0
-        )
-      ],
-      [
-        "accountIndices",
-        umiSerializers.array(
-          umiSerializers.u8({
-            description: __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : ""
-          }),
-          {
-            description: __DEV__ ? "An optional list of account indices, according to the well-ordered accounts list for this transaction, in the order in which the program being called expects them" : "",
-            size: umiSerializers.shortU16()
-          }
-        )
-      ],
-      [
-        "data",
-        umiSerializers.bytes({
-          description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
-          size: umiSerializers.shortU16()
-        })
-      ]
+function getTransactionVersionDecoder() {
+  return codecsCore.createDecoder({
+    maxSize: 1,
+    read: (bytes, offset) => {
+      const firstByte = bytes[offset];
+      if ((firstByte & VERSION_FLAG_MASK) === 0) {
+        return ["legacy", offset];
+      } else {
+        const version = firstByte ^ VERSION_FLAG_MASK;
+        return [version, offset + 1];
+      }
+    }
+  });
+}
+
+// src/serializers/message.ts
+function getCompiledMessageLegacyEncoder() {
+  return codecsDataStructures.getStructEncoder(getPreludeStructEncoderTuple());
+}
+function getCompiledMessageVersionedEncoder() {
+  return codecsCore.mapEncoder(
+    codecsDataStructures.getStructEncoder([
+      ...getPreludeStructEncoderTuple(),
+      ["addressTableLookups", getAddressTableLookupArrayEncoder()]
     ]),
     (value) => {
-      if (value.accountIndices !== void 0 && value.data !== void 0) {
+      if (value.version === "legacy") {
         return value;
       }
       return {
         ...value,
-        accountIndices: value.accountIndices ?? [],
-        data: value.data ?? new Uint8Array(0)
+        addressTableLookups: value.addressTableLookups ?? []
       };
+    }
+  );
+}
+function getPreludeStructEncoderTuple() {
+  return [
+    ["version", getTransactionVersionEncoder()],
+    ["header", getMessageHeaderEncoder()],
+    ["staticAccounts", codecsDataStructures.getArrayEncoder(addresses.getAddressEncoder(), { size: codecsNumbers.getShortU16Encoder() })],
+    ["lifetimeToken", codecsStrings.getStringEncoder({ encoding: codecsStrings.getBase58Encoder(), size: 32 })],
+    ["instructions", codecsDataStructures.getArrayEncoder(getInstructionEncoder(), { size: codecsNumbers.getShortU16Encoder() })]
+  ];
+}
+function getPreludeStructDecoderTuple() {
+  return [
+    ["version", getTransactionVersionDecoder()],
+    ["header", getMessageHeaderDecoder()],
+    ["staticAccounts", codecsDataStructures.getArrayDecoder(addresses.getAddressDecoder(), { size: codecsNumbers.getShortU16Decoder() })],
+    ["lifetimeToken", codecsStrings.getStringDecoder({ encoding: codecsStrings.getBase58Decoder(), size: 32 })],
+    ["instructions", codecsDataStructures.getArrayDecoder(getInstructionDecoder(), { size: codecsNumbers.getShortU16Decoder() })],
+    ["addressTableLookups", getAddressTableLookupArrayDecoder()]
+  ];
+}
+function getAddressTableLookupArrayEncoder() {
+  return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), { size: codecsNumbers.getShortU16Encoder() });
+}
+function getAddressTableLookupArrayDecoder() {
+  return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), { size: codecsNumbers.getShortU16Decoder() });
+}
+function getCompiledMessageEncoder() {
+  return codecsCore.createEncoder({
+    getSizeFromValue: (compiledMessage) => {
+      if (compiledMessage.version === "legacy") {
+        return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
+      } else {
+        return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
+      }
     },
-    (value) => {
-      if (value.accountIndices.length && value.data.byteLength) {
-        return value;
+    write: (compiledMessage, bytes, offset) => {
+      if (compiledMessage.version === "legacy") {
+        return getCompiledMessageLegacyEncoder().write(compiledMessage, bytes, offset);
+      } else {
+        return getCompiledMessageVersionedEncoder().write(compiledMessage, bytes, offset);
       }
-      const { accountIndices, data, ...rest } = value;
-      return {
-        ...rest,
-        ...accountIndices.length ? { accountIndices } : null,
-        ...data.byteLength ? { data } : null
-      };
     }
-  );
+  });
 }
-
-// src/serializers/unimplemented.ts
-function getError(type, name) {
-  const functionSuffix = name + type[0].toUpperCase() + type.slice(1);
-  return new Error(
-    `No ${type} exists for ${name}. Use \`get${functionSuffix}()\` if you need a ${type}, and \`get${name}Codec()\` if you need to both encode and decode ${name}`
-  );
+function getCompiledMessageDecoder() {
+  return codecsCore.mapDecoder(codecsDataStructures.getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
+    if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
+      return restOfMessage;
+    }
+    return { ...restOfMessage, addressTableLookups };
+  });
 }
-function getUnimplementedDecoder(name) {
-  return () => {
-    throw getError("decoder", name);
-  };
+function getCompiledMessageCodec() {
+  return codecsCore.combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
 }
 
-// src/serializers/transaction-version.ts
-var VERSION_FLAG_MASK = 128;
-var BASE_CONFIG = {
-  description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
-  fixedSize: null,
-  maxSize: 1
-};
-function deserialize(bytes3, offset = 0) {
-  const firstByte = bytes3[offset];
-  if ((firstByte & VERSION_FLAG_MASK) === 0) {
-    return ["legacy", offset];
+// src/compile-transaction.ts
+function getCompiledTransaction(transaction) {
+  const compiledMessage = compileMessage(transaction);
+  let signatures;
+  if ("signatures" in transaction) {
+    signatures = [];
+    for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
+      signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
+    }
   } else {
-    const version = firstByte ^ VERSION_FLAG_MASK;
-    return [version, offset + 1];
+    signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
   }
+  return {
+    compiledMessage,
+    signatures
+  };
 }
-function serialize(value) {
-  if (value === "legacy") {
-    return new Uint8Array();
+function getAccountMetas(message) {
+  const { header } = message;
+  const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
+  const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
+  const accountMetas = [];
+  let accountIndex = 0;
+  for (let i = 0; i < numWritableSignerAccounts; i++) {
+    accountMetas.push({
+      address: message.staticAccounts[accountIndex],
+      role: AccountRole.WRITABLE_SIGNER
+    });
+    accountIndex++;
   }
-  if (value < 0 || value > 127) {
-    throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
+  for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
+    accountMetas.push({
+      address: message.staticAccounts[accountIndex],
+      role: AccountRole.READONLY_SIGNER
+    });
+    accountIndex++;
+  }
+  for (let i = 0; i < numWritableNonSignerAccounts; i++) {
+    accountMetas.push({
+      address: message.staticAccounts[accountIndex],
+      role: AccountRole.WRITABLE
+    });
+    accountIndex++;
   }
-  return new Uint8Array([value | VERSION_FLAG_MASK]);
+  for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
+    accountMetas.push({
+      address: message.staticAccounts[accountIndex],
+      role: AccountRole.READONLY
+    });
+    accountIndex++;
+  }
+  return accountMetas;
 }
-function getTransactionVersionCodec() {
+function convertInstruction(instruction, accountMetas) {
+  const programAddress = accountMetas[instruction.programAddressIndex]?.address;
+  if (!programAddress) {
+    throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
+  }
+  const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
+  const { data } = instruction;
   return {
-    ...BASE_CONFIG,
-    deserialize,
-    serialize
+    programAddress,
+    ...accounts && accounts.length ? { accounts } : {},
+    ...data && data.length ? { data } : {}
   };
 }
-
-// src/serializers/message.ts
-var BASE_CONFIG2 = {
-  description: __DEV__ ? "The wire format of a Solana transaction message" : "",
-  fixedSize: null,
-  maxSize: null
-};
-function serialize2(compiledMessage) {
-  if (compiledMessage.version === "legacy") {
-    return umiSerializers.struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
+function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
+  if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
+    return {
+      blockhash: messageLifetimeToken,
+      lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+      // U64 MAX
+    };
   } else {
-    return umiSerializers.mapSerializer(
-      umiSerializers.struct([
-        ...getPreludeStructSerializerTuple(),
-        ["addressTableLookups", getAddressTableLookupsSerializer()]
-      ]),
-      (value) => {
-        if (value.version === "legacy") {
-          return value;
-        }
-        return {
-          ...value,
-          addressTableLookups: value.addressTableLookups ?? []
-        };
-      }
-    ).serialize(compiledMessage);
+    const nonceAccountAddress = firstInstruction.accounts[0].address;
+    addresses.assertIsAddress(nonceAccountAddress);
+    const nonceAuthorityAddress = firstInstruction.accounts[2].address;
+    addresses.assertIsAddress(nonceAuthorityAddress);
+    return {
+      nonce: messageLifetimeToken,
+      nonceAccountAddress,
+      nonceAuthorityAddress
+    };
   }
 }
-function getPreludeStructSerializerTuple() {
-  return [
-    ["version", getTransactionVersionCodec()],
-    ["header", getMessageHeaderCodec()],
-    [
-      "staticAccounts",
-      umiSerializers.array(addresses.getBase58EncodedAddressCodec(), {
-        description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
-        size: umiSerializers.shortU16()
-      })
-    ],
+function convertSignatures(compiledTransaction) {
+  const {
+    compiledMessage: { staticAccounts },
+    signatures
+  } = compiledTransaction;
+  return signatures.reduce((acc, sig, index) => {
+    const allZeros = sig.every((byte) => byte === 0);
+    if (allZeros)
+      return acc;
+    const address = staticAccounts[index];
+    return { ...acc, [address]: sig };
+  }, {});
+}
+function decompileTransaction(compiledTransaction, lastValidBlockHeight) {
+  const { compiledMessage } = compiledTransaction;
+  if ("addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups.length > 0) {
+    throw new Error("Cannot convert transaction with addressTableLookups");
+  }
+  const feePayer = compiledMessage.staticAccounts[0];
+  if (!feePayer)
+    throw new Error("No fee payer set in CompiledTransaction");
+  const accountMetas = getAccountMetas(compiledMessage);
+  const instructions = compiledMessage.instructions.map(
+    (compiledInstruction) => convertInstruction(compiledInstruction, accountMetas)
+  );
+  const firstInstruction = instructions[0];
+  const lifetimeConstraint = getLifetimeConstraint(
+    compiledMessage.lifetimeToken,
+    firstInstruction,
+    lastValidBlockHeight
+  );
+  const signatures = convertSignatures(compiledTransaction);
+  return functional.pipe(
+    createTransaction({ version: compiledMessage.version }),
+    (tx) => setTransactionFeePayer(feePayer, tx),
+    (tx) => instructions.reduce((acc, instruction) => {
+      return appendTransactionInstruction(instruction, acc);
+    }, tx),
+    (tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
+    (tx) => compiledTransaction.signatures.length ? { ...tx, signatures } : tx
+  );
+}
+
+// src/serializers/transaction.ts
+function getCompiledTransactionEncoder() {
+  return codecsDataStructures.getStructEncoder([
+    ["signatures", codecsDataStructures.getArrayEncoder(codecsDataStructures.getBytesEncoder({ size: 64 }), { size: codecsNumbers.getShortU16Encoder() })],
+    ["compiledMessage", getCompiledMessageEncoder()]
+  ]);
+}
+function getCompiledTransactionDecoder() {
+  return codecsDataStructures.getStructDecoder([
     [
-      "lifetimeToken",
-      umiSerializers.string({
-        description: __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "",
-        encoding: umiSerializers.base58,
-        size: 32
+      "signatures",
+      codecsDataStructures.getArrayDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), {
+        size: codecsNumbers.getShortU16Decoder()
       })
     ],
-    [
-      "instructions",
-      umiSerializers.array(getInstructionCodec(), {
-        description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
-        size: umiSerializers.shortU16()
-      })
-    ]
-  ];
-}
-function getAddressTableLookupsSerializer() {
-  return umiSerializers.array(getAddressTableLookupCodec(), {
-    ...__DEV__ ? { description: "A compact array of address table lookups belonging to this transaction" } : null,
-    size: umiSerializers.shortU16()
-  });
+    ["compiledMessage", getCompiledMessageDecoder()]
+  ]);
 }
-function getCompiledMessageEncoder() {
-  return {
-    ...BASE_CONFIG2,
-    deserialize: getUnimplementedDecoder("CompiledMessage"),
-    serialize: serialize2
-  };
-}
-
-// src/signatures.ts
-function assertIsTransactionSignature(putativeTransactionSignature) {
-  try {
-    if (
-      // Lowest value (64 bytes of zeroes)
-      putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
-      putativeTransactionSignature.length > 88
-    ) {
-      throw new Error("Expected input string to decode to a byte array of length 64.");
-    }
-    const bytes3 = umiSerializers.base58.serialize(putativeTransactionSignature);
-    const numBytes = bytes3.byteLength;
-    if (numBytes !== 64) {
-      throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
-    }
-  } catch (e) {
-    throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
-      cause: e
-    });
-  }
+function getTransactionEncoder() {
+  return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
 }
-function isTransactionSignature(putativeTransactionSignature) {
-  if (
-    // Lowest value (64 bytes of zeroes)
-    putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
-    putativeTransactionSignature.length > 88
-  ) {
-    return false;
-  }
-  const bytes3 = umiSerializers.base58.serialize(putativeTransactionSignature);
-  const numBytes = bytes3.byteLength;
-  if (numBytes !== 64) {
-    return false;
-  }
-  return true;
+function getTransactionDecoder(lastValidBlockHeight) {
+  return codecsCore.mapDecoder(
+    getCompiledTransactionDecoder(),
+    (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
+  );
 }
-async function getCompiledMessageSignature(message, secretKey) {
-  const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
-  const signature = await keys.signBytes(secretKey, wireMessageBytes);
-  return signature;
+function getTransactionCodec(lastValidBlockHeight) {
+  return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
 }
+var base58Decoder;
 function getSignatureFromTransaction(transaction) {
-  const signature = transaction.signatures[transaction.feePayer];
-  if (!signature) {
+  if (!base58Decoder)
+    base58Decoder = codecsStrings.getBase58Decoder();
+  const signatureBytes = transaction.signatures[transaction.feePayer];
+  if (!signatureBytes) {
     throw new Error(
       "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
     );
   }
-  return signature;
+  const transactionSignature = base58Decoder.decode(signatureBytes);
+  return transactionSignature;
 }
-async function signTransaction(keyPairs, transaction) {
+async function partiallySignTransaction(keyPairs, transaction) {
   const compiledMessage = compileMessage(transaction);
   const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
+  const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
   const publicKeySignaturePairs = await Promise.all(
     keyPairs.map(
-      (keyPair) => Promise.all([
-        addresses.getAddressFromPublicKey(keyPair.publicKey),
-        getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
-      ])
+      (keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
     )
   );
   for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
@@ -753,77 +883,45 @@ async function signTransaction(keyPairs, transaction) {
   Object.freeze(out);
   return out;
 }
-function transactionSignature(putativeTransactionSignature) {
-  assertIsTransactionSignature(putativeTransactionSignature);
-  return putativeTransactionSignature;
+async function signTransaction(keyPairs, transaction) {
+  const out = await partiallySignTransaction(keyPairs, transaction);
+  assertTransactionIsFullySigned(out);
+  Object.freeze(out);
+  return out;
 }
-
-// src/compile-transaction.ts
-function getCompiledTransaction(transaction) {
-  const compiledMessage = compileMessage(transaction);
-  let signatures;
-  if ("signatures" in transaction) {
-    signatures = [];
-    for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
-      signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
+function assertTransactionIsFullySigned(transaction) {
+  const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
+  const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
+  requiredSigners.forEach((address) => {
+    if (!transaction.signatures[address]) {
+      throw new Error(`Transaction is missing signature for address \`${address}\``);
     }
-  } else {
-    signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
-  }
-  return {
-    compiledMessage,
-    signatures
-  };
-}
-
-// src/serializers/transaction.ts
-var BASE_CONFIG3 = {
-  description: __DEV__ ? "The wire format of a Solana transaction" : "",
-  fixedSize: null,
-  maxSize: null
-};
-function serialize3(transaction) {
-  const compiledTransaction = getCompiledTransaction(transaction);
-  return umiSerializers.struct([
-    [
-      "signatures",
-      umiSerializers.array(umiSerializers.bytes({ size: 64 }), {
-        ...__DEV__ ? { description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } : null,
-        size: umiSerializers.shortU16()
-      })
-    ],
-    ["compiledMessage", getCompiledMessageEncoder()]
-  ]).serialize(compiledTransaction);
-}
-function getTransactionEncoder() {
-  return {
-    ...BASE_CONFIG3,
-    deserialize: getUnimplementedDecoder("CompiledMessage"),
-    serialize: serialize3
-  };
+  });
 }
-
-// src/wire-transaction.ts
 function getBase64EncodedWireTransaction(transaction) {
-  const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
-  {
-    return btoa(String.fromCharCode(...wireTransactionBytes));
-  }
+  const wireTransactionBytes = getTransactionEncoder().encode(transaction);
+  return codecsStrings.getBase64Decoder().decode(wireTransactionBytes);
 }
 
 exports.appendTransactionInstruction = appendTransactionInstruction;
 exports.assertIsBlockhash = assertIsBlockhash;
 exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
-exports.assertIsTransactionSignature = assertIsTransactionSignature;
+exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
+exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
+exports.compileMessage = compileMessage;
 exports.createTransaction = createTransaction;
 exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
+exports.getCompiledMessageCodec = getCompiledMessageCodec;
+exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
+exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
 exports.getSignatureFromTransaction = getSignatureFromTransaction;
-exports.isTransactionSignature = isTransactionSignature;
+exports.getTransactionCodec = getTransactionCodec;
+exports.getTransactionDecoder = getTransactionDecoder;
+exports.getTransactionEncoder = getTransactionEncoder;
+exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
+exports.partiallySignTransaction = partiallySignTransaction;
 exports.prependTransactionInstruction = prependTransactionInstruction;
 exports.setTransactionFeePayer = setTransactionFeePayer;
 exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
 exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
 exports.signTransaction = signTransaction;
-exports.transactionSignature = transactionSignature;
-//# sourceMappingURL=out.js.map
-//# sourceMappingURL=index.browser.cjs.map