@solana/transactions 2.0.0-experimental.777610f → 2.0.0-experimental.782d1ea

package/dist/index.development.js

@@ -685,14 +685,14 @@ this.globalThis.solanaWeb3 = (function (exports) {
       throw new Error("No signing implementation could be found");
     }
   }
-  function getBase58EncodedAddressCodec(config) {
+  function getAddressCodec(config) {
     return string({
       description: config?.description ?? ("A 32-byte account address" ),
       encoding: base58,
       size: 32
     });
   }
-  function getBase58EncodedAddressComparator() {
+  function getAddressComparator() {
     return new Intl.Collator("en", {
       caseFirst: "lower",
       ignorePunctuation: false,
@@ -708,17 +708,10 @@ this.globalThis.solanaWeb3 = (function (exports) {
       throw new Error("The `CryptoKey` must be an `Ed25519` public key");
     }
     const publicKeyBytes = await crypto.subtle.exportKey("raw", publicKey);
-    const [base58EncodedAddress] = getBase58EncodedAddressCodec().deserialize(new Uint8Array(publicKeyBytes));
+    const [base58EncodedAddress] = getAddressCodec().deserialize(new Uint8Array(publicKeyBytes));
     return base58EncodedAddress;
   }
 
-  // ../keys/dist/index.browser.js
-  async function signBytes(key, data) {
-    await assertSigningCapabilityIsAvailable();
-    const signedData = await crypto.subtle.sign("Ed25519", key, data);
-    return new Uint8Array(signedData);
-  }
-
   // src/accounts.ts
   function upsert(addressMap, address, update) {
     addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
@@ -772,7 +765,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
                   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
@@ -878,7 +871,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       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 {
@@ -909,7 +902,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         entry.readableIndices.push(account.addressIndex);
       }
     }
-    return Object.keys(index).sort(getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
+    return Object.keys(index).sort(getAddressComparator()).map((lookupTableAddress) => ({
       lookupTableAddress,
       ...index[lookupTableAddress]
     }));
@@ -989,13 +982,31 @@ this.globalThis.solanaWeb3 = (function (exports) {
     };
   }
 
+  // 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/address-table-lookup.ts
   function getAddressTableLookupCodec() {
     return struct(
       [
         [
           "lookupTableAddress",
-          getBase58EncodedAddressCodec(
+          getAddressCodec(
             {
               description: "The address of the address lookup table account from which instruction addresses should be looked up"
             } 
@@ -1196,7 +1207,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       ["header", getMessageHeaderCodec()],
       [
         "staticAccounts",
-        array(getBase58EncodedAddressCodec(), {
+        array(getAddressCodec(), {
           description: "A compact-array of static account addresses belonging to this transaction" ,
           size: shortU16()
         })
@@ -1232,48 +1243,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
     };
   }
 
-  // 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([
-      getAddressFromPublicKey(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: "The wire format of a Solana transaction" ,
@@ -1301,6 +1270,89 @@ this.globalThis.solanaWeb3 = (function (exports) {
     };
   }
 
+  // ../keys/dist/index.browser.js
+  async function signBytes(key, data) {
+    await assertSigningCapabilityIsAvailable();
+    const signedData = await crypto.subtle.sign("Ed25519", key, data);
+    return new Uint8Array(signedData);
+  }
+
+  // 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 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 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([
+          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) {
     const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
@@ -1312,13 +1364,18 @@ this.globalThis.solanaWeb3 = (function (exports) {
   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;
 
   return exports;