@solana/transactions 2.0.0-experimental.68e85dc → 2.0.0-experimental.6910664

package/dist/index.browser.cjs

@@ -5,6 +5,7 @@ var codecsCore = require('@solana/codecs-core');
 var codecsDataStructures = require('@solana/codecs-data-structures');
 var codecsNumbers = require('@solana/codecs-numbers');
 var addresses = require('@solana/addresses');
+var functional = require('@solana/functional');
 var codecsStrings = require('@solana/codecs-strings');
 var keys = require('@solana/keys');
 
@@ -121,7 +122,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;
@@ -129,21 +130,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
     }
@@ -466,6 +484,116 @@ function getCompiledTransaction(transaction) {
     signatures
   };
 }
+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++;
+  }
+  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++;
+  }
+  for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
+    accountMetas.push({
+      address: message.staticAccounts[accountIndex],
+      role: AccountRole.READONLY
+    });
+    accountIndex++;
+  }
+  return accountMetas;
+}
+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 {
+    programAddress,
+    ...accounts && accounts.length ? { accounts } : {},
+    ...data && data.length ? { data } : {}
+  };
+}
+function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
+  if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
+    return {
+      blockhash: messageLifetimeToken,
+      lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+      // U64 MAX
+    };
+  } else {
+    const nonceAccountAddress = firstInstruction.accounts[0].address;
+    addresses.assertIsAddress(nonceAccountAddress);
+    const nonceAuthorityAddress = firstInstruction.accounts[2].address;
+    addresses.assertIsAddress(nonceAuthorityAddress);
+    return {
+      nonce: messageLifetimeToken,
+      nonceAccountAddress,
+      nonceAuthorityAddress
+    };
+  }
+}
+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
+  );
+}
 var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
 var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
 var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
@@ -496,6 +624,32 @@ function getAddressTableLookupEncoder() {
   }
   return memoizedAddressTableLookupEncoder;
 }
+var memoizedAddressTableLookupDecoder;
+function getAddressTableLookupDecoder() {
+  if (!memoizedAddressTableLookupDecoder) {
+    memoizedAddressTableLookupDecoder = codecsDataStructures.getStructDecoder(
+      [
+        ["lookupTableAddress", addresses.getAddressDecoder({ description: lookupTableAddressDescription })],
+        [
+          "writableIndices",
+          codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), {
+            description: writableIndicesDescription,
+            size: codecsNumbers.getShortU16Decoder()
+          })
+        ],
+        [
+          "readableIndices",
+          codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), {
+            description: readableIndicesDescription,
+            size: codecsNumbers.getShortU16Decoder()
+          })
+        ]
+      ],
+      { description: addressTableLookupDescription }
+    );
+  }
+  return memoizedAddressTableLookupDecoder;
+}
 var memoizedU8Encoder;
 function getMemoizedU8Encoder() {
   if (!memoizedU8Encoder)
@@ -509,6 +663,19 @@ function getMemoizedU8EncoderDescription(description) {
     description: description ?? encoder.description
   };
 }
+var memoizedU8Decoder;
+function getMemoizedU8Decoder() {
+  if (!memoizedU8Decoder)
+    memoizedU8Decoder = codecsNumbers.getU8Decoder();
+  return memoizedU8Decoder;
+}
+function getMemoizedU8DecoderDescription(description) {
+  const decoder = getMemoizedU8Decoder();
+  return {
+    ...decoder,
+    description: description ?? decoder.description
+  };
+}
 var numSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction" : void 0;
 var numReadonlySignerAccountsDescription = __DEV__ ? "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;
 var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
@@ -525,6 +692,18 @@ function getMessageHeaderEncoder() {
     }
   );
 }
+function getMessageHeaderDecoder() {
+  return codecsDataStructures.getStructDecoder(
+    [
+      ["numSignerAccounts", getMemoizedU8DecoderDescription(numSignerAccountsDescription)],
+      ["numReadonlySignerAccounts", getMemoizedU8DecoderDescription(numReadonlySignerAccountsDescription)],
+      ["numReadonlyNonSignerAccounts", getMemoizedU8DecoderDescription(numReadonlyNonSignerAccountsDescription)]
+    ],
+    {
+      description: messageHeaderDescription
+    }
+  );
+}
 var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
 var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
 var accountIndicesDescription = __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" : "accountIndices";
@@ -559,12 +738,52 @@ function getInstructionEncoder() {
   }
   return memoizedGetInstructionEncoder;
 }
+var memoizedGetInstructionDecoder;
+function getInstructionDecoder() {
+  if (!memoizedGetInstructionDecoder) {
+    memoizedGetInstructionDecoder = codecsCore.mapDecoder(
+      codecsDataStructures.getStructDecoder([
+        ["programAddressIndex", codecsNumbers.getU8Decoder({ description: programAddressIndexDescription })],
+        [
+          "accountIndices",
+          codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder({ description: accountIndexDescription }), {
+            description: accountIndicesDescription,
+            size: codecsNumbers.getShortU16Decoder()
+          })
+        ],
+        ["data", codecsDataStructures.getBytesDecoder({ description: dataDescription, 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;
+}
 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 decode(bytes, offset = 0) {
+  const firstByte = bytes[offset];
+  if ((firstByte & VERSION_FLAG_MASK) === 0) {
+    return ["legacy", offset];
+  } else {
+    const version = firstByte ^ VERSION_FLAG_MASK;
+    return [version, offset + 1];
+  }
+}
 function encode(value) {
   if (value === "legacy") {
     return new Uint8Array();
@@ -574,6 +793,12 @@ function encode(value) {
   }
   return new Uint8Array([value | VERSION_FLAG_MASK]);
 }
+function getTransactionVersionDecoder() {
+  return {
+    ...BASE_CONFIG,
+    decode
+  };
+}
 function getTransactionVersionEncoder() {
   return {
     ...BASE_CONFIG,
@@ -634,12 +859,47 @@ function getPreludeStructEncoderTuple() {
     ]
   ];
 }
+function getPreludeStructDecoderTuple() {
+  return [
+    ["version", getTransactionVersionDecoder()],
+    ["header", getMessageHeaderDecoder()],
+    [
+      "staticAccounts",
+      codecsDataStructures.getArrayDecoder(addresses.getAddressDecoder(), {
+        description: staticAccountsDescription,
+        size: codecsNumbers.getShortU16Decoder()
+      })
+    ],
+    [
+      "lifetimeToken",
+      codecsStrings.getStringDecoder({
+        description: lifetimeTokenDescription,
+        encoding: codecsStrings.getBase58Decoder(),
+        size: 32
+      })
+    ],
+    [
+      "instructions",
+      codecsDataStructures.getArrayDecoder(getInstructionDecoder(), {
+        description: instructionsDescription,
+        size: codecsNumbers.getShortU16Decoder()
+      })
+    ],
+    ["addressTableLookups", getAddressTableLookupArrayDecoder()]
+  ];
+}
 function getAddressTableLookupArrayEncoder() {
   return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), {
     description: addressTableLookupsDescription,
     size: codecsNumbers.getShortU16Encoder()
   });
 }
+function getAddressTableLookupArrayDecoder() {
+  return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), {
+    description: addressTableLookupsDescription,
+    size: codecsNumbers.getShortU16Decoder()
+  });
+}
 var messageDescription = __DEV__ ? "The wire format of a Solana transaction message" : "message";
 function getCompiledMessageEncoder() {
   return {
@@ -655,10 +915,23 @@ function getCompiledMessageEncoder() {
     maxSize: null
   };
 }
+function getCompiledMessageDecoder() {
+  return codecsCore.mapDecoder(
+    codecsDataStructures.getStructDecoder(getPreludeStructDecoderTuple(), {
+      description: messageDescription
+    }),
+    ({ addressTableLookups, ...restOfMessage }) => {
+      if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
+        return restOfMessage;
+      }
+      return { ...restOfMessage, addressTableLookups };
+    }
+  );
+}
 
 // src/serializers/transaction.ts
-var transactionDescription = __DEV__ ? "The wire format of a Solana transaction" : "transaction";
 var signaturesDescription = __DEV__ ? "A compact array of 64-byte, base-64 encoded Ed25519 signatures" : "signatures";
+var transactionDescription = __DEV__ ? "The wire format of a Solana transaction" : "transaction";
 function getCompiledTransactionEncoder() {
   return codecsDataStructures.getStructEncoder(
     [
@@ -676,9 +949,38 @@ function getCompiledTransactionEncoder() {
     }
   );
 }
+function getSignatureDecoder() {
+  return codecsCore.mapDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), (bytes) => bytes);
+}
+function getCompiledTransactionDecoder() {
+  return codecsDataStructures.getStructDecoder(
+    [
+      [
+        "signatures",
+        codecsDataStructures.getArrayDecoder(getSignatureDecoder(), {
+          description: signaturesDescription,
+          size: codecsNumbers.getShortU16Decoder()
+        })
+      ],
+      ["compiledMessage", getCompiledMessageDecoder()]
+    ],
+    {
+      description: transactionDescription
+    }
+  );
+}
 function getTransactionEncoder() {
   return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
 }
+function getTransactionDecoder(lastValidBlockHeight) {
+  return codecsCore.mapDecoder(
+    getCompiledTransactionDecoder(),
+    (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
+  );
+}
+function getTransactionCodec(lastValidBlockHeight) {
+  return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
+}
 function assertIsTransactionSignature(putativeTransactionSignature) {
   try {
     if (
@@ -754,6 +1056,15 @@ function transactionSignature(putativeTransactionSignature) {
   assertIsTransactionSignature(putativeTransactionSignature);
   return putativeTransactionSignature;
 }
+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}\``);
+    }
+  });
+}
 
 // src/wire-transaction.ts
 function getBase64EncodedWireTransaction(transaction) {
@@ -767,9 +1078,12 @@ exports.appendTransactionInstruction = appendTransactionInstruction;
 exports.assertIsBlockhash = assertIsBlockhash;
 exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
 exports.assertIsTransactionSignature = assertIsTransactionSignature;
+exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
 exports.createTransaction = createTransaction;
 exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
 exports.getSignatureFromTransaction = getSignatureFromTransaction;
+exports.getTransactionCodec = getTransactionCodec;
+exports.getTransactionDecoder = getTransactionDecoder;
 exports.getTransactionEncoder = getTransactionEncoder;
 exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
 exports.isTransactionSignature = isTransactionSignature;
@@ -779,5 +1093,3 @@ exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockh
 exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
 exports.signTransaction = signTransaction;
 exports.transactionSignature = transactionSignature;
-//# sourceMappingURL=out.js.map
-//# sourceMappingURL=index.browser.cjs.map