@solana/transactions 2.0.0-experimental.fd64233 → 2.0.0-experimental.feaeef2

package/dist/index.browser.js

@@ -1,33 +1,31 @@
+import { SolanaError, SOLANA_ERROR__TRANSACTION__EXPECTED_BLOCKHASH_LIFETIME, SOLANA_ERROR__TRANSACTION__EXPECTED_NONCE_LIFETIME, SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_FEE_PAYER_MISSING, SOLANA_ERROR__TRANSACTION__FEE_PAYER_SIGNATURE_MISSING, SOLANA_ERROR__TRANSACTION__SIGNATURES_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__BLOCKHASH_STRING_LENGTH_OUT_OF_RANGE, SOLANA_ERROR__INVALID_BLOCKHASH_BYTE_LENGTH, SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_MUST_NOT_BE_WRITABLE, SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_CANNOT_PAY_FEES, SOLANA_ERROR__TRANSACTION__VERSION_NUMBER_OUT_OF_RANGE } from '@solana/errors';
 import { getBase58Decoder, getBase64Decoder, getStringEncoder, getBase58Encoder, getStringDecoder } from '@solana/codecs-strings';
 import { getAddressFromPublicKey, assertIsAddress, getAddressComparator, getAddressEncoder, getAddressDecoder } from '@solana/addresses';
 import { pipe } from '@solana/functional';
 import { createEncoder, mapDecoder, combineCodec, mapEncoder, createDecoder } from '@solana/codecs-core';
 import { getStructDecoder, getArrayDecoder, getBytesDecoder, getStructEncoder, getArrayEncoder, getBytesEncoder } from '@solana/codecs-data-structures';
 import { getShortU16Decoder, getShortU16Encoder, getU8Encoder, getU8Decoder } from '@solana/codecs-numbers';
-import { SolanaError, SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE, SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES } from '@solana/errors';
 import { signBytes } from '@solana/keys';
 
-// ../rpc-types/dist/index.browser.js
+// src/blockhash.ts
 var base58Encoder;
 function assertIsBlockhash(putativeBlockhash) {
   if (!base58Encoder)
     base58Encoder = getBase58Encoder();
-  try {
-    if (
-      // Lowest value (32 bytes of zeroes)
-      putativeBlockhash.length < 32 || // Highest value (32 bytes of 255)
-      putativeBlockhash.length > 44
-    ) {
-      throw new Error("Expected input string to decode to a byte array of length 32.");
-    }
-    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}`);
-    }
-  } catch (e) {
-    throw new Error(`\`${putativeBlockhash}\` is not a blockhash`, {
-      cause: e
+  if (
+    // Lowest value (32 bytes of zeroes)
+    putativeBlockhash.length < 32 || // Highest value (32 bytes of 255)
+    putativeBlockhash.length > 44
+  ) {
+    throw new SolanaError(SOLANA_ERROR__BLOCKHASH_STRING_LENGTH_OUT_OF_RANGE, {
+      actualLength: putativeBlockhash.length
+    });
+  }
+  const bytes = base58Encoder.encode(putativeBlockhash);
+  const numBytes = bytes.byteLength;
+  if (numBytes !== 32) {
+    throw new SolanaError(SOLANA_ERROR__INVALID_BLOCKHASH_BYTE_LENGTH, {
+      actualLength: numBytes
     });
   }
 }
@@ -60,7 +58,7 @@ function isTransactionWithBlockhashLifetime(transaction) {
 }
 function assertIsTransactionWithBlockhashLifetime(transaction) {
   if (!isTransactionWithBlockhashLifetime(transaction)) {
-    throw new Error("Transaction does not have a blockhash lifetime");
+    throw new SolanaError(SOLANA_ERROR__TRANSACTION__EXPECTED_BLOCKHASH_LIFETIME);
   }
 }
 function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
@@ -86,8 +84,6 @@ function createTransaction({
   Object.freeze(out);
   return out;
 }
-
-// ../instructions/dist/index.browser.js
 var AccountRole = /* @__PURE__ */ ((AccountRole2) => {
   AccountRole2[AccountRole2["WRITABLE_SIGNER"] = /* 3 */
   3] = "WRITABLE_SIGNER";
@@ -109,13 +105,11 @@ function isWritableRole(role) {
 function mergeRoles(roleA, roleB) {
   return roleA | roleB;
 }
-
-// src/durable-nonce.ts
 var RECENT_BLOCKHASHES_SYSVAR_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111";
 var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
 function assertIsDurableNonceTransaction(transaction) {
   if (!isDurableNonceTransaction(transaction)) {
-    throw new Error("Transaction is not a durable nonce transaction");
+    throw new SolanaError(SOLANA_ERROR__TRANSACTION__EXPECTED_NONCE_LIFETIME);
   }
 }
 function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
@@ -201,17 +195,23 @@ function setTransactionFeePayer(feePayer, transaction) {
 
 // src/instructions.ts
 function appendTransactionInstruction(instruction, transaction) {
+  return appendTransactionInstructions([instruction], transaction);
+}
+function appendTransactionInstructions(instructions, transaction) {
   const out = {
     ...getUnsignedTransaction(transaction),
-    instructions: [...transaction.instructions, instruction]
+    instructions: [...transaction.instructions, ...instructions]
   };
   Object.freeze(out);
   return out;
 }
 function prependTransactionInstruction(instruction, transaction) {
+  return prependTransactionInstructions([instruction], transaction);
+}
+function prependTransactionInstructions(instructions, transaction) {
   const out = {
     ...getUnsignedTransaction(transaction),
-    instructions: [instruction, ...transaction.instructions]
+    instructions: [...instructions, ...transaction.instructions]
   };
   Object.freeze(out);
   return out;
@@ -258,8 +258,9 @@ function getAddressLookupMetas(compiledAddressTableLookups, addressesByLookupTab
   const compiledAddressTableLookupAddresses = compiledAddressTableLookups.map((l) => l.lookupTableAddress);
   const missing = compiledAddressTableLookupAddresses.filter((a) => addressesByLookupTableAddress[a] === void 0);
   if (missing.length > 0) {
-    const missingAddresses = missing.join(", ");
-    throw new Error(`Addresses not provided for lookup tables: [${missingAddresses}]`);
+    throw new SolanaError(SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_ADDRESS_LOOKUP_TABLE_CONTENTS_MISSING, {
+      lookupTableAddresses: missing
+    });
   }
   const readOnlyMetas = [];
   const writableMetas = [];
@@ -267,8 +268,13 @@ function getAddressLookupMetas(compiledAddressTableLookups, addressesByLookupTab
     const addresses = addressesByLookupTableAddress[lookup.lookupTableAddress];
     const highestIndex = Math.max(...lookup.readableIndices, ...lookup.writableIndices);
     if (highestIndex >= addresses.length) {
-      throw new Error(
-        `Cannot look up index ${highestIndex} in lookup table [${lookup.lookupTableAddress}]. The lookup table may have been extended since the addresses provided were retrieved.`
+      throw new SolanaError(
+        SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_ADDRESS_LOOKUP_TABLE_INDEX_OUT_OF_RANGE,
+        {
+          highestKnownIndex: addresses.length - 1,
+          highestRequestedIndex: highestIndex,
+          lookupTableAddress: lookup.lookupTableAddress
+        }
       );
     }
     const readOnlyForLookup = lookup.readableIndices.map((r) => ({
@@ -291,7 +297,9 @@ function getAddressLookupMetas(compiledAddressTableLookups, addressesByLookupTab
 function convertInstruction(instruction, accountMetas) {
   const programAddress = accountMetas[instruction.programAddressIndex]?.address;
   if (!programAddress) {
-    throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
+    throw new SolanaError(SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_INSTRUCTION_PROGRAM_ADDRESS_NOT_FOUND, {
+      index: instruction.programAddressIndex
+    });
   }
   const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
   const { data } = instruction;
@@ -336,8 +344,9 @@ function convertSignatures(compiledTransaction) {
 function decompileTransaction(compiledTransaction, config) {
   const { compiledMessage } = compiledTransaction;
   const feePayer = compiledMessage.staticAccounts[0];
-  if (!feePayer)
-    throw new Error("No fee payer set in CompiledTransaction");
+  if (!feePayer) {
+    throw new SolanaError(SOLANA_ERROR__TRANSACTION__FAILED_TO_DECOMPILE_FEE_PAYER_MISSING);
+  }
   const accountMetas = getAccountMetas(compiledMessage);
   const accountLookupMetas = "addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups !== void 0 && compiledMessage.addressTableLookups.length > 0 ? getAddressLookupMetas(compiledMessage.addressTableLookups, config?.addressesByLookupTableAddress ?? {}) : [];
   const transactionMetas = [...accountMetas, ...accountLookupMetas];
@@ -377,13 +386,13 @@ function getAddressMapFromInstructions(feePayer, instructions) {
         if (isWritableRole(entry.role)) {
           switch (entry[TYPE]) {
             case 0 /* FEE_PAYER */:
-              throw new Error(
-                `This transaction includes an address (\`${instruction.programAddress}\`) which is both invoked and set as the fee payer. Program addresses may not pay fees.`
-              );
+              throw new SolanaError(SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_CANNOT_PAY_FEES, {
+                programAddress: instruction.programAddress
+              });
             default:
-              throw new Error(
-                `This transaction includes an address (\`${instruction.programAddress}\`) which is both invoked and marked writable. Program addresses may not be writable.`
-              );
+              throw new SolanaError(SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_MUST_NOT_BE_WRITABLE, {
+                programAddress: instruction.programAddress
+              });
           }
         }
         if (entry[TYPE] === 2 /* STATIC */) {
@@ -448,8 +457,11 @@ function getAddressMapFromInstructions(feePayer, instructions) {
                 addressesOfInvokedPrograms.has(account.address)
               ) {
                 if (isWritableRole(accountMeta.role)) {
-                  throw new Error(
-                    `This transaction includes an address (\`${account.address}\`) which is both invoked and marked writable. Program addresses may not be writable.`
+                  throw new SolanaError(
+                    SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_MUST_NOT_BE_WRITABLE,
+                    {
+                      programAddress: account.address
+                    }
                   );
                 }
                 if (entry.role !== nextRole) {
@@ -739,7 +751,9 @@ function getTransactionVersionEncoder() {
         return offset;
       }
       if (value < 0 || value > 127) {
-        throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
+        throw new SolanaError(SOLANA_ERROR__TRANSACTION__VERSION_NUMBER_OUT_OF_RANGE, {
+          actualVersion: value
+        });
       }
       bytes.set([value | VERSION_FLAG_MASK], offset);
       return offset + 1;
@@ -826,12 +840,15 @@ function getCompiledMessageEncoder() {
   });
 }
 function getCompiledMessageDecoder() {
-  return mapDecoder(getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
-    if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
-      return restOfMessage;
+  return mapDecoder(
+    getStructDecoder(getPreludeStructDecoderTuple()),
+    ({ addressTableLookups, ...restOfMessage }) => {
+      if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
+        return restOfMessage;
+      }
+      return { ...restOfMessage, addressTableLookups };
     }
-    return { ...restOfMessage, addressTableLookups };
-  });
+  );
 }
 function getCompiledMessageCodec() {
   return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
@@ -891,7 +908,7 @@ function getSignatureFromTransaction(transaction) {
     base58Decoder = getBase58Decoder();
   const signatureBytes = transaction.signatures[transaction.feePayer];
   if (!signatureBytes) {
-    throw new SolanaError(SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
+    throw new SolanaError(SOLANA_ERROR__TRANSACTION__FEE_PAYER_SIGNATURE_MISSING);
   }
   const transactionSignature = base58Decoder.decode(signatureBytes);
   return transactionSignature;
@@ -931,7 +948,7 @@ function assertTransactionIsFullySigned(transaction) {
     }
   });
   if (missingSigs.length > 0) {
-    throw new SolanaError(SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES, {
+    throw new SolanaError(SOLANA_ERROR__TRANSACTION__SIGNATURES_MISSING, {
       addresses: missingSigs
     });
   }
@@ -941,6 +958,6 @@ function getBase64EncodedWireTransaction(transaction) {
   return getBase64Decoder().decode(wireTransactionBytes);
 }
 
-export { appendTransactionInstruction, assertIsDurableNonceTransaction, assertIsTransactionWithBlockhashLifetime, assertTransactionIsFullySigned, compileMessage, createTransaction, decompileTransaction, getBase64EncodedWireTransaction, getCompiledMessageCodec, getCompiledMessageDecoder, getCompiledMessageEncoder, getCompiledTransactionDecoder, getSignatureFromTransaction, getTransactionCodec, getTransactionDecoder, getTransactionEncoder, isAdvanceNonceAccountInstruction, partiallySignTransaction, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction };
+export { appendTransactionInstruction, appendTransactionInstructions, assertIsDurableNonceTransaction, assertIsTransactionWithBlockhashLifetime, assertTransactionIsFullySigned, compileMessage, createTransaction, decompileTransaction, getBase64EncodedWireTransaction, getCompiledMessageCodec, getCompiledMessageDecoder, getCompiledMessageEncoder, getCompiledTransactionDecoder, getSignatureFromTransaction, getTransactionCodec, getTransactionDecoder, getTransactionEncoder, getUnsignedTransaction, isAdvanceNonceAccountInstruction, partiallySignTransaction, prependTransactionInstruction, prependTransactionInstructions, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.js.map