@solana/transactions 2.0.0-experimental.c5061ae → 2.0.0-experimental.c8d8b83

package/dist/index.browser.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var umiSerializers = require('@metaplex-foundation/umi-serializers');
+var addresses = require('@solana/addresses');
 var keys = require('@solana/keys');
 
 // ../build-scripts/env-shim.ts
@@ -96,6 +97,20 @@ function assertIsDurableNonceTransaction(transaction) {
     throw new Error("Transaction is not a durable nonce transaction");
   }
 }
+function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
+  return {
+    accounts: [
+      { address: nonceAccountAddress, role: AccountRole.WRITABLE },
+      {
+        address: RECENT_BLOCKHASHES_SYSVAR_ADDRESS,
+        role: AccountRole.READONLY
+      },
+      { address: nonceAuthorityAddress, role: AccountRole.READONLY_SIGNER }
+    ],
+    data: new Uint8Array([4, 0, 0, 0]),
+    programAddress: SYSTEM_PROGRAM_ADDRESS
+  };
+}
 function isAdvanceNonceAccountInstruction(instruction) {
   return instruction.programAddress === SYSTEM_PROGRAM_ADDRESS && // Test for `AdvanceNonceAccount` instruction data
   instruction.data != null && isAdvanceNonceAccountInstructionData(instruction.data) && // Test for exactly 3 accounts
@@ -110,6 +125,28 @@ function isAdvanceNonceAccountInstructionData(data) {
 function isDurableNonceTransaction(transaction) {
   return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
 }
+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;
+  }
+  const out = {
+    ...getUnsignedTransaction(transaction),
+    instructions: [
+      createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
+      ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
+    ],
+    lifetimeConstraint: {
+      nonce
+    }
+  };
+  Object.freeze(out);
+  return out;
+}
 
 // src/fee-payer.ts
 function setTransactionFeePayer(feePayer, transaction) {
@@ -193,7 +230,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 = keys.getBase58EncodedAddressComparator()))(
+                  (addressComparator || (addressComparator = addresses.getAddressComparator()))(
                     accountMeta.lookupTableAddress,
                     entry.lookupTableAddress
                   ) < 0
@@ -299,7 +336,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
     if (leftIsWritable !== isWritableRole(rightEntry.role)) {
       return leftIsWritable ? -1 : 1;
     }
-    addressComparator || (addressComparator = keys.getBase58EncodedAddressComparator());
+    addressComparator || (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 {
@@ -328,7 +365,7 @@ function getCompiledAddressTableLookups(orderedAccounts) {
       entry.readableIndices.push(account.addressIndex);
     }
   }
-  return Object.keys(index).sort(keys.getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
+  return Object.keys(index).sort(addresses.getAddressComparator()).map((lookupTableAddress) => ({
     lookupTableAddress,
     ...index[lookupTableAddress]
   }));
@@ -407,12 +444,30 @@ function compileMessage(transaction) {
     version: transaction.version
   };
 }
+
+// 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 {
+    signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
+  }
+  return {
+    compiledMessage,
+    signatures
+  };
+}
 function getAddressTableLookupCodec() {
   return umiSerializers.struct(
     [
       [
         "lookupTableAddress",
-        keys.getBase58EncodedAddressCodec(
+        addresses.getAddressCodec(
           __DEV__ ? {
             description: "The address of the address lookup table account from which instruction addresses should be looked up"
           } : void 0
@@ -487,7 +542,7 @@ function getInstructionCodec() {
         )
       ],
       [
-        "addressIndices",
+        "accountIndices",
         umiSerializers.array(
           umiSerializers.u8({
             description: __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : ""
@@ -507,23 +562,23 @@ function getInstructionCodec() {
       ]
     ]),
     (value) => {
-      if (value.addressIndices !== void 0 && value.data !== void 0) {
+      if (value.accountIndices !== void 0 && value.data !== void 0) {
         return value;
       }
       return {
         ...value,
-        addressIndices: value.addressIndices ?? [],
+        accountIndices: value.accountIndices ?? [],
         data: value.data ?? new Uint8Array(0)
       };
     },
     (value) => {
-      if (value.addressIndices.length && value.data.byteLength) {
+      if (value.accountIndices.length && value.data.byteLength) {
         return value;
       }
-      const { addressIndices, data, ...rest } = value;
+      const { accountIndices, data, ...rest } = value;
       return {
         ...rest,
-        ...addressIndices.length ? { addressIndices } : null,
+        ...accountIndices.length ? { accountIndices } : null,
         ...data.byteLength ? { data } : null
       };
     }
@@ -609,7 +664,7 @@ function getPreludeStructSerializerTuple() {
     ["header", getMessageHeaderCodec()],
     [
       "staticAccounts",
-      umiSerializers.array(keys.getBase58EncodedAddressCodec(), {
+      umiSerializers.array(addresses.getAddressCodec(), {
         description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
         size: umiSerializers.shortU16()
       })
@@ -645,48 +700,6 @@ function getCompiledMessageEncoder() {
   };
 }
 
-// src/signatures.ts
-async function getCompiledMessageSignature(message, secretKey) {
-  const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
-  const signature = await keys.signBytes(secretKey, wireMessageBytes);
-  return signature;
-}
-async function signTransaction(keyPair, transaction) {
-  const compiledMessage = compileMessage(transaction);
-  const [signerPublicKey, signature] = await Promise.all([
-    keys.getBase58EncodedAddressFromPublicKey(keyPair.publicKey),
-    getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
-  ]);
-  const nextSignatures = {
-    ..."signatures" in transaction ? transaction.signatures : null,
-    ...{ [signerPublicKey]: signature }
-  };
-  const out = {
-    ...transaction,
-    signatures: nextSignatures
-  };
-  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));
-    }
-  } 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" : "",
@@ -713,6 +726,80 @@ function getTransactionEncoder() {
     serialize: serialize3
   };
 }
+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 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;
+}
+async function getCompiledMessageSignature(message, secretKey) {
+  const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
+  const signature = await keys.signBytes(secretKey, wireMessageBytes);
+  return signature;
+}
+function getSignatureFromTransaction(transaction) {
+  const signature = transaction.signatures[transaction.feePayer];
+  if (!signature) {
+    throw new Error(
+      "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
+    );
+  }
+  return signature;
+}
+async function signTransaction(keyPairs, transaction) {
+  const compiledMessage = compileMessage(transaction);
+  const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
+  const publicKeySignaturePairs = await Promise.all(
+    keyPairs.map(
+      (keyPair) => Promise.all([
+        addresses.getAddressFromPublicKey(keyPair.publicKey),
+        getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
+      ])
+    )
+  );
+  for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
+    nextSignatures[signerPublicKey] = signature;
+  }
+  const out = {
+    ...transaction,
+    signatures: nextSignatures
+  };
+  Object.freeze(out);
+  return out;
+}
+function transactionSignature(putativeTransactionSignature) {
+  assertIsTransactionSignature(putativeTransactionSignature);
+  return putativeTransactionSignature;
+}
 
 // src/wire-transaction.ts
 function getBase64EncodedWireTransaction(transaction) {
@@ -725,9 +812,17 @@ function getBase64EncodedWireTransaction(transaction) {
 exports.appendTransactionInstruction = appendTransactionInstruction;
 exports.assertIsBlockhash = assertIsBlockhash;
 exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
+exports.assertIsTransactionSignature = assertIsTransactionSignature;
 exports.createTransaction = createTransaction;
 exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
+exports.getSignatureFromTransaction = getSignatureFromTransaction;
+exports.getTransactionEncoder = getTransactionEncoder;
+exports.isTransactionSignature = isTransactionSignature;
 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