@solana/web3.js 1.87.5 → 1.88.0

package/lib/index.browser.esm.js

@@ -1124,6 +1124,8 @@ const VersionedMessage = {
   }
 };
 
+/** @internal */
+
 /**
  * Transaction signature as base-58 encoded string
  */
@@ -1739,29 +1741,31 @@ class Transaction {
    *
    * @param {boolean} [requireAllSignatures=true] Require a fully signed Transaction
    */
-  verifySignatures(requireAllSignatures) {
-    return this._verifySignatures(this.serializeMessage(), requireAllSignatures === undefined ? true : requireAllSignatures);
+  verifySignatures(requireAllSignatures = true) {
+    const signatureErrors = this._getMessageSignednessErrors(this.serializeMessage(), requireAllSignatures);
+    return !signatureErrors;
   }
 
   /**
    * @internal
    */
-  _verifySignatures(signData, requireAllSignatures) {
+  _getMessageSignednessErrors(message, requireAllSignatures) {
+    const errors = {};
     for (const {
       signature,
       publicKey
     } of this.signatures) {
       if (signature === null) {
         if (requireAllSignatures) {
-          return false;
+          (errors.missing ||= []).push(publicKey);
         }
       } else {
-        if (!verify(signature, signData, publicKey.toBytes())) {
-          return false;
+        if (!verify(signature, message, publicKey.toBytes())) {
+          (errors.invalid ||= []).push(publicKey);
         }
       }
     }
-    return true;
+    return errors.invalid || errors.missing ? errors : undefined;
   }
 
   /**
@@ -1780,8 +1784,18 @@ class Transaction {
       verifySignatures: true
     }, config);
     const signData = this.serializeMessage();
-    if (verifySignatures && !this._verifySignatures(signData, requireAllSignatures)) {
-      throw new Error('Signature verification failed');
+    if (verifySignatures) {
+      const sigErrors = this._getMessageSignednessErrors(signData, requireAllSignatures);
+      if (sigErrors) {
+        let errorMessage = 'Signature verification failed.';
+        if (sigErrors.invalid) {
+          errorMessage += `\nInvalid signature for public key${sigErrors.invalid.length === 1 ? '' : '(s)'} [\`${sigErrors.invalid.map(p => p.toBase58()).join('`, `')}\`].`;
+        }
+        if (sigErrors.missing) {
+          errorMessage += `\nMissing signature for public key${sigErrors.missing.length === 1 ? '' : '(s)'} [\`${sigErrors.missing.map(p => p.toBase58()).join('`, `')}\`].`;
+        }
+        throw new Error(errorMessage);
+      }
     }
     return this._serialize(signData);
   }
@@ -3535,7 +3549,7 @@ function makeWebsocketUrl(endpoint) {
   const startPort = portWithColon == null ? null : parseInt(portWithColon.slice(1), 10);
   const websocketPort =
   // Only shift the port by +1 as a convention for ws(s) only if given endpoint
-  // is explictly specifying the endpoint port (HTTP-based RPC), assuming
+  // is explicitly specifying the endpoint port (HTTP-based RPC), assuming
   // we're directly trying to connect to solana-validator's ws listening port.
   // When the endpoint omits the port, we're connecting to the protocol
   // default ports: http(80) or https(443) and it's assumed we're behind a reverse
@@ -9251,7 +9265,7 @@ class StakeProgram {
     if (custodianPubkey) {
       keys.push({
         pubkey: custodianPubkey,
-        isSigner: false,
+        isSigner: true,
         isWritable: false
       });
     }
@@ -9299,7 +9313,7 @@ class StakeProgram {
     if (custodianPubkey) {
       keys.push({
         pubkey: custodianPubkey,
-        isSigner: false,
+        isSigner: true,
         isWritable: false
       });
     }
@@ -9464,7 +9478,7 @@ class StakeProgram {
     if (custodianPubkey) {
       keys.push({
         pubkey: custodianPubkey,
-        isSigner: false,
+        isSigner: true,
         isWritable: false
       });
     }