@solana/transactions 2.0.0-experimental.bb6ba5b → 2.0.0-experimental.be901cf

package/dist/index.browser.js

@@ -1,5 +1,8 @@
-import { base58, struct, array, bytes, shortU16, mapSerializer, string, u8 } from '@metaplex-foundation/umi-serializers';
-import { getBase58EncodedAddressFromPublicKey, getBase58EncodedAddressComparator, getBase58EncodedAddressCodec } from '@solana/addresses';
+import { base58, struct, array, bytes, shortU16, mapSerializer, string } from '@metaplex-foundation/umi-serializers';
+import { getAddressFromPublicKey, getAddressComparator, getAddressCodec, getAddressEncoder, getAddressDecoder } from '@solana/addresses';
+import { combineCodec, mapEncoder, mapDecoder } from '@solana/codecs-core';
+import { getStructCodec, getStructEncoder, getArrayEncoder, getStructDecoder, getArrayDecoder, getBytesEncoder, getBytesDecoder } from '@solana/codecs-data-structures';
+import { getU8Encoder, getShortU16Encoder, getU8Decoder, getShortU16Decoder, getU8Codec } from '@solana/codecs-numbers';
 import { signBytes } from '@solana/keys';
 
 // ../build-scripts/env-shim.ts
@@ -29,8 +32,8 @@ function assertIsBlockhash(putativeBlockhash) {
     ) {
       throw new Error("Expected input string to decode to a byte array of length 32.");
     }
-    const bytes3 = base58.serialize(putativeBlockhash);
-    const numBytes = bytes3.byteLength;
+    const bytes2 = base58.serialize(putativeBlockhash);
+    const numBytes = bytes2.byteLength;
     if (numBytes !== 32) {
       throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
     }
@@ -228,7 +231,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 = getBase58EncodedAddressComparator()))(
+                  (addressComparator || (addressComparator = getAddressComparator()))(
                     accountMeta.lookupTableAddress,
                     entry.lookupTableAddress
                   ) < 0
@@ -334,7 +337,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
     if (leftIsWritable !== isWritableRole(rightEntry.role)) {
       return leftIsWritable ? -1 : 1;
     }
-    addressComparator || (addressComparator = getBase58EncodedAddressComparator());
+    addressComparator || (addressComparator = getAddressComparator());
     if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
       return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
     } else {
@@ -363,7 +366,7 @@ function getCompiledAddressTableLookups(orderedAccounts) {
       entry.readableIndices.push(account.addressIndex);
     }
   }
-  return Object.keys(index).sort(getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
+  return Object.keys(index).sort(getAddressComparator()).map((lookupTableAddress) => ({
     lookupTableAddress,
     ...index[lookupTableAddress]
   }));
@@ -442,151 +445,188 @@ function compileMessage(transaction) {
     version: transaction.version
   };
 }
-function getAddressTableLookupCodec() {
-  return struct(
-    [
+
+// 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
+  };
+}
+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";
+var addressTableLookupDescription = __DEV__ ? "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" : "addressTableLookup";
+var memoizedAddressTableLookupEncoder;
+function getAddressTableLookupEncoder() {
+  if (!memoizedAddressTableLookupEncoder) {
+    memoizedAddressTableLookupEncoder = getStructEncoder(
       [
-        "lookupTableAddress",
-        getBase58EncodedAddressCodec(
-          __DEV__ ? {
-            description: "The address of the address lookup table account from which instruction addresses should be looked up"
-          } : void 0
-        )
+        ["lookupTableAddress", getAddressEncoder({ description: lookupTableAddressDescription })],
+        [
+          "writableIndices",
+          getArrayEncoder(getU8Encoder(), {
+            description: writableIndicesDescription,
+            size: getShortU16Encoder()
+          })
+        ],
+        [
+          "readableIndices",
+          getArrayEncoder(getU8Encoder(), {
+            description: readableIndicesDescription,
+            size: getShortU16Encoder()
+          })
+        ]
       ],
+      { description: addressTableLookupDescription }
+    );
+  }
+  return memoizedAddressTableLookupEncoder;
+}
+var memoizedAddressTableLookupDecoder;
+function getAddressTableLookupDecoder() {
+  if (!memoizedAddressTableLookupDecoder) {
+    memoizedAddressTableLookupDecoder = getStructDecoder(
       [
-        "writableIndices",
-        array(u8(), {
-          ...__DEV__ ? {
-            description: "The indices of the accounts in the lookup table that should be loaded as writeable"
-          } : null,
-          size: shortU16()
-        })
+        ["lookupTableAddress", getAddressDecoder({ description: lookupTableAddressDescription })],
+        [
+          "writableIndices",
+          getArrayDecoder(getU8Decoder(), {
+            description: writableIndicesDescription,
+            size: getShortU16Decoder()
+          })
+        ],
+        [
+          "readableIndices",
+          getArrayDecoder(getU8Decoder(), {
+            description: readableIndicesDescription,
+            size: getShortU16Decoder()
+          })
+        ]
       ],
-      [
-        "readableIndices",
-        array(u8(), {
-          ...__DEV__ ? {
-            description: "The indices of the accounts in the lookup table that should be loaded as read-only"
-          } : void 0,
-          size: shortU16()
-        })
-      ]
-    ],
-    __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
-  );
+      { description: addressTableLookupDescription }
+    );
+  }
+  return memoizedAddressTableLookupDecoder;
+}
+function getAddressTableLookupCodec() {
+  return combineCodec(getAddressTableLookupEncoder(), getAddressTableLookupDecoder());
+}
+var memoizedU8Codec;
+function getMemoizedU8Codec() {
+  if (!memoizedU8Codec)
+    memoizedU8Codec = getU8Codec();
+  return memoizedU8Codec;
+}
+function getMemoizedU8CodecDescription(description) {
+  const codec = getMemoizedU8Codec();
+  return {
+    ...codec,
+    description: description ?? codec.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;
+var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
 function getMessageHeaderCodec() {
-  return struct(
+  return getStructCodec(
     [
-      [
-        "numSignerAccounts",
-        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",
-        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",
-        u8(
-          __DEV__ ? {
-            description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
-          } : void 0
-        )
-      ]
+      ["numSignerAccounts", getMemoizedU8CodecDescription(numSignerAccountsDescription)],
+      ["numReadonlySignerAccounts", getMemoizedU8CodecDescription(numReadonlySignerAccountsDescription)],
+      ["numReadonlyNonSignerAccounts", getMemoizedU8CodecDescription(numReadonlyNonSignerAccountsDescription)]
     ],
-    __DEV__ ? {
-      description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
-    } : void 0
+    {
+      description: messageHeaderDescription
+    }
   );
 }
-function getInstructionCodec() {
-  return mapSerializer(
-    struct([
-      [
-        "programAddressIndex",
-        u8(
-          __DEV__ ? {
-            description: "The index of the program being called, according to the well-ordered accounts list for this transaction"
-          } : void 0
-        )
-      ],
-      [
-        "accountIndices",
-        array(
-          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: shortU16()
-          }
-        )
-      ],
-      [
-        "data",
-        bytes({
-          description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
-          size: shortU16()
-        })
-      ]
-    ]),
-    (value) => {
-      if (value.accountIndices !== void 0 && value.data !== void 0) {
-        return value;
+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";
+var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
+var memoizedGetInstructionEncoder;
+function getInstructionEncoder() {
+  if (!memoizedGetInstructionEncoder) {
+    memoizedGetInstructionEncoder = mapEncoder(
+      getStructEncoder([
+        ["programAddressIndex", getU8Encoder({ description: programAddressIndexDescription })],
+        [
+          "accountIndices",
+          getArrayEncoder(getU8Encoder({ description: accountIndexDescription }), {
+            description: accountIndicesDescription,
+            size: getShortU16Encoder()
+          })
+        ],
+        ["data", getBytesEncoder({ description: dataDescription, size: 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 {
-        ...value,
-        accountIndices: value.accountIndices ?? [],
-        data: value.data ?? new Uint8Array(0)
-      };
-    },
-    (value) => {
-      if (value.accountIndices.length && value.data.byteLength) {
-        return value;
+    );
+  }
+  return memoizedGetInstructionEncoder;
+}
+var memoizedGetInstructionDecoder;
+function getInstructionDecoder() {
+  if (!memoizedGetInstructionDecoder) {
+    memoizedGetInstructionDecoder = mapDecoder(
+      getStructDecoder([
+        ["programAddressIndex", getU8Decoder({ description: programAddressIndexDescription })],
+        [
+          "accountIndices",
+          getArrayDecoder(getU8Decoder({ description: accountIndexDescription }), {
+            description: accountIndicesDescription,
+            size: getShortU16Decoder()
+          })
+        ],
+        ["data", getBytesDecoder({ description: dataDescription, size: 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
+        };
       }
-      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}`
-  );
+    );
+  }
+  return memoizedGetInstructionDecoder;
 }
-function getUnimplementedDecoder(name) {
-  return () => {
-    throw getError("decoder", name);
-  };
+function getInstructionCodec() {
+  return combineCodec(getInstructionEncoder(), getInstructionDecoder());
 }
-
-// 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];
+function decode(bytes2, offset = 0) {
+  const firstByte = bytes2[offset];
   if ((firstByte & VERSION_FLAG_MASK) === 0) {
     return ["legacy", offset];
   } else {
@@ -594,7 +634,7 @@ function deserialize(bytes3, offset = 0) {
     return [version, offset + 1];
   }
 }
-function serialize(value) {
+function encode(value) {
   if (value === "legacy") {
     return new Uint8Array();
   }
@@ -603,11 +643,32 @@ function serialize(value) {
   }
   return new Uint8Array([value | VERSION_FLAG_MASK]);
 }
-function getTransactionVersionCodec() {
+function getTransactionVersionDecoder() {
   return {
     ...BASE_CONFIG,
-    deserialize,
-    serialize
+    decode
+  };
+}
+function getTransactionVersionEncoder() {
+  return {
+    ...BASE_CONFIG,
+    encode
+  };
+}
+function getTransactionVersionCodec() {
+  return combineCodec(getTransactionVersionEncoder(), getTransactionVersionDecoder());
+}
+
+// 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 getUnimplementedDecoder(name) {
+  return () => {
+    throw getError("decoder", name);
   };
 }
 
@@ -617,7 +678,7 @@ var BASE_CONFIG2 = {
   fixedSize: null,
   maxSize: null
 };
-function serialize2(compiledMessage) {
+function serialize(compiledMessage) {
   if (compiledMessage.version === "legacy") {
     return struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
   } else {
@@ -638,13 +699,22 @@ function serialize2(compiledMessage) {
     ).serialize(compiledMessage);
   }
 }
+function toSerializer(codec) {
+  return {
+    description: codec.description,
+    deserialize: codec.decode,
+    fixedSize: codec.fixedSize,
+    maxSize: codec.maxSize,
+    serialize: codec.encode
+  };
+}
 function getPreludeStructSerializerTuple() {
   return [
-    ["version", getTransactionVersionCodec()],
-    ["header", getMessageHeaderCodec()],
+    ["version", toSerializer(getTransactionVersionCodec())],
+    ["header", toSerializer(getMessageHeaderCodec())],
     [
       "staticAccounts",
-      array(getBase58EncodedAddressCodec(), {
+      array(toSerializer(getAddressCodec()), {
         description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
         size: shortU16()
       })
@@ -659,7 +729,7 @@ function getPreludeStructSerializerTuple() {
     ],
     [
       "instructions",
-      array(getInstructionCodec(), {
+      array(toSerializer(getInstructionCodec()), {
         description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
         size: shortU16()
       })
@@ -667,7 +737,7 @@ function getPreludeStructSerializerTuple() {
   ];
 }
 function getAddressTableLookupsSerializer() {
-  return array(getAddressTableLookupCodec(), {
+  return array(toSerializer(getAddressTableLookupCodec()), {
     ...__DEV__ ? { description: "A compact array of address table lookups belonging to this transaction" } : null,
     size: shortU16()
   });
@@ -676,49 +746,7 @@ function getCompiledMessageEncoder() {
   return {
     ...BASE_CONFIG2,
     deserialize: getUnimplementedDecoder("CompiledMessage"),
-    serialize: serialize2
-  };
-}
-
-// src/signatures.ts
-async function getCompiledMessageSignature(message, secretKey) {
-  const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
-  const signature = await signBytes(secretKey, wireMessageBytes);
-  return signature;
-}
-async function signTransaction(keyPair, transaction) {
-  const compiledMessage = compileMessage(transaction);
-  const [signerPublicKey, signature] = await Promise.all([
-    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
+    serialize
   };
 }
 
@@ -728,7 +756,7 @@ var BASE_CONFIG3 = {
   fixedSize: null,
   maxSize: null
 };
-function serialize3(transaction) {
+function serialize2(transaction) {
   const compiledTransaction = getCompiledTransaction(transaction);
   return struct([
     [
@@ -745,8 +773,83 @@ function getTransactionEncoder() {
   return {
     ...BASE_CONFIG3,
     deserialize: getUnimplementedDecoder("CompiledMessage"),
-    serialize: serialize3
+    serialize: serialize2
+  };
+}
+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 bytes2 = base58.serialize(putativeTransactionSignature);
+    const numBytes = bytes2.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 bytes2 = base58.serialize(putativeTransactionSignature);
+  const numBytes = bytes2.byteLength;
+  if (numBytes !== 64) {
+    return false;
+  }
+  return true;
+}
+async function getCompiledMessageSignature(message, secretKey) {
+  const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
+  const signature = await signBytes(secretKey, wireMessageBytes);
+  return signature;
+}
+function getSignatureFromTransaction(transaction) {
+  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."
+    );
+  }
+  const transactionSignature2 = base58.deserialize(signatureBytes)[0];
+  return transactionSignature2;
+}
+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([
+        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
@@ -757,6 +860,6 @@ function getBase64EncodedWireTransaction(transaction) {
   }
 }
 
-export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, createTransaction, getBase64EncodedWireTransaction, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction };
+export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, assertIsTransactionSignature, createTransaction, getBase64EncodedWireTransaction, getSignatureFromTransaction, getTransactionEncoder, isAdvanceNonceAccountInstruction, isTransactionSignature, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction, transactionSignature };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.js.map