@solana/web3.js 1.91.8 → 1.92.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.91.8",
+  "version": "1.92.0",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -55,7 +55,7 @@
     "test:unit:node": "cross-env NODE_ENV=test NODE_OPTIONS='--import tsx' mocha './test/**/*.test.ts'"
   },
   "dependencies": {
-    "@babel/runtime": "^7.24.5",
+    "@babel/runtime": "^7.24.6",
     "@noble/curves": "^1.4.0",
     "@noble/hashes": "^1.4.0",
     "@solana/buffer-layout": "^4.0.1",
@@ -68,7 +68,7 @@
     "fast-stable-stringify": "^1.0.0",
     "jayson": "^4.1.0",
     "node-fetch": "^2.7.0",
-    "rpc-websockets": "^7.11.0",
-    "superstruct": "^0.14.2"
+    "rpc-websockets": "^7.11.1",
+    "superstruct": "^1.0.4"
   }
 }

package/src/__forks__/browser/rpc-websocket-factory.ts

@@ -1 +1 @@
-export {default} from 'rpc-websockets/dist/lib/client/websocket.browser';
+export {default} from 'rpc-websockets/dist/lib/client/websocket.browser.cjs';

package/src/__forks__/react-native/rpc-websocket-factory.ts

@@ -1 +1 @@
-export {default} from 'rpc-websockets/dist/lib/client/websocket.browser';
+export {default} from 'rpc-websockets/dist/lib/client/websocket.browser.cjs';

package/src/connection.ts

@@ -5782,10 +5782,13 @@ export class Connection {
           console.error(res.error.message, logTrace);
         }
       }
-      throw new SendTransactionError(
-        'failed to simulate transaction: ' + res.error.message,
-        logs,
-      );
+
+      throw new SendTransactionError({
+        action: 'simulate',
+        signature: '',
+        transactionMessage: res.error.message,
+        transactionLogs: logs,
+      });
     }
     return res.result;
   }
@@ -5916,14 +5919,17 @@ export class Connection {
     const unsafeRes = await this._rpcRequest('sendTransaction', args);
     const res = create(unsafeRes, SendTransactionRpcResult);
     if ('error' in res) {
-      let logs;
+      let logs = undefined;
       if ('data' in res.error) {
         logs = res.error.data.logs;
       }
-      throw new SendTransactionError(
-        'failed to send transaction: ' + res.error.message,
-        logs,
-      );
+
+      throw new SendTransactionError({
+        action: skipPreflight ? 'send' : 'simulate',
+        signature: '',
+        transactionMessage: res.error.message,
+        transactionLogs: logs,
+      });
     }
     return res.result;
   }

package/src/errors.ts

@@ -1,10 +1,77 @@
+import {Connection} from './connection';
+import {TransactionSignature} from './transaction';
+
 export class SendTransactionError extends Error {
-  logs: string[] | undefined;
+  private signature: TransactionSignature;
+  private transactionMessage: string;
+  private transactionLogs?: string[];
+  private resolvedLogs: string[] | Promise<string[]> | undefined;
+
+  constructor({
+    action,
+    signature,
+    transactionMessage,
+    transactionLogs,
+  }: {
+    action: 'send' | 'simulate';
+    signature: TransactionSignature;
+    transactionMessage: string;
+    transactionLogs?: string[];
+  }) {
+    let message: string;
 
-  constructor(message: string, logs?: string[]) {
+    switch (action) {
+      case 'send':
+        message =
+          `Transaction ${signature} resulted in an error. \n` +
+          `${transactionMessage}. ` +
+          (transactionLogs
+            ? `Logs: \n${JSON.stringify(transactionLogs.slice(-10), null, 2)}. `
+            : '') +
+          '\nCatch the SendTransactionError and call `getLogs()` on it for full details.';
+        break;
+      case 'simulate':
+        message =
+          `Simulation failed. \nMessage: ${transactionMessage}. \n` +
+          (transactionLogs
+            ? `Logs: \n${JSON.stringify(transactionLogs.slice(-10), null, 2)}. `
+            : '') +
+          '\nCatch the SendTransactionError and call `getLogs()` on it for full details.';
+        break;
+      default:
+        message = 'Unknown action';
+    }
     super(message);
 
-    this.logs = logs;
+    this.signature = signature;
+    this.transactionMessage = transactionMessage;
+    this.transactionLogs = transactionLogs;
+    this.resolvedLogs = transactionLogs ? transactionLogs : undefined;
+  }
+
+  get transactionError(): {message: string; logs?: string[]} {
+    return {message: this.transactionMessage, logs: this.transactionLogs};
+  }
+
+  async getLogs(connection: Connection): Promise<string[]> {
+    if (this.resolvedLogs === undefined) {
+      this.resolvedLogs = new Promise((resolve, reject) => {
+        connection
+          .getTransaction(this.signature)
+          .then(tx => {
+            if (tx && tx.meta && tx.meta.logMessages) {
+              const logs = tx.meta.logMessages;
+              this.resolvedLogs = logs;
+              this.transactionLogs = logs;
+              resolve(logs);
+            } else {
+              reject(new Error('Log messages not found'));
+            }
+          })
+          .catch(reject);
+      });
+    }
+    return await this.resolvedLogs;
   }
 }
 

package/src/rpc-websocket-factory.ts

@@ -1,4 +1,4 @@
-import {ICommonWebSocketFactory} from 'rpc-websockets/dist/lib/client/client.types';
-import WebsocketFactory from 'rpc-websockets/dist/lib/client/websocket';
+import {ICommonWebSocketFactory} from 'rpc-websockets/dist/lib/client/client.types.cjs';
+import WebsocketFactory from 'rpc-websockets/dist/lib/client/websocket.cjs';
 
 export default WebsocketFactory as ICommonWebSocketFactory;

package/src/rpc-websocket.ts

@@ -1,11 +1,11 @@
-import RpcWebSocketCommonClient from 'rpc-websockets/dist/lib/client';
-import RpcWebSocketBrowserFactory from 'rpc-websockets/dist/lib/client/websocket.browser';
+import RpcWebSocketCommonClient from 'rpc-websockets/dist/lib/client.cjs';
+import WebSocketBrowserImpl from 'rpc-websockets/dist/lib/client/websocket.cjs';
 import {
   ICommonWebSocket,
   IWSClientAdditionalOptions,
   NodeWebSocketType,
   NodeWebSocketTypeOptions,
-} from 'rpc-websockets/dist/lib/client/client.types';
+} from 'rpc-websockets/dist/lib/client/client.types.cjs';
 
 import createRpc from './rpc-websocket-factory';
 
@@ -32,9 +32,9 @@ export default class RpcWebSocketClient extends RpcWebSocketCommonClient {
         ...options,
       });
       if ('socket' in rpc) {
-        this.underlyingSocket = (
-          rpc as ReturnType<typeof RpcWebSocketBrowserFactory>
-        ).socket;
+        this.underlyingSocket = rpc.socket as ReturnType<
+          typeof WebSocketBrowserImpl
+        >;
       } else {
         this.underlyingSocket = rpc as NodeWebSocketType;
       }

package/src/utils/makeWebsocketUrl.ts

@@ -17,7 +17,7 @@ export function makeWebsocketUrl(endpoint: string) {
   const websocketPort =
     // Only shift the port by +1 as a convention for ws(s) only if given endpoint
     // is explicitly specifying the endpoint port (HTTP-based RPC), assuming
-    // we're directly trying to connect to solana-validator's ws listening port.
+    // we're directly trying to connect to agave-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
     // proxy which manages WebSocket upgrade and backend port redirection.

package/src/utils/send-and-confirm-raw-transaction.ts

@@ -8,6 +8,7 @@ import {
 } from '../connection';
 import type {TransactionSignature} from '../transaction';
 import type {ConfirmOptions} from '../connection';
+import {SendTransactionError} from '../errors';
 
 /**
  * Send and confirm a raw transaction
@@ -93,6 +94,13 @@ export async function sendAndConfirmRawTransaction(
   const status = (await confirmationPromise).value;
 
   if (status.err) {
+    if (signature != null) {
+      throw new SendTransactionError({
+        action: sendOptions?.skipPreflight ? 'send' : 'simulate',
+        signature: signature,
+        transactionMessage: `Status: (${JSON.stringify(status)})`,
+      });
+    }
     throw new Error(
       `Raw transaction ${signature} failed (${JSON.stringify(status)})`,
     );

package/src/utils/send-and-confirm-transaction.ts

@@ -3,6 +3,7 @@ import {Transaction} from '../transaction';
 import type {ConfirmOptions} from '../connection';
 import type {Signer} from '../keypair';
 import type {TransactionSignature} from '../transaction';
+import {SendTransactionError} from '../errors';
 
 /**
  * Sign, send and confirm a transaction.
@@ -89,6 +90,13 @@ export async function sendAndConfirmTransaction(
   }
 
   if (status.err) {
+    if (signature != null) {
+      throw new SendTransactionError({
+        action: 'send',
+        signature: signature,
+        transactionMessage: `Status: (${JSON.stringify(status)})`,
+      });
+    }
     throw new Error(
       `Transaction ${signature} failed (${JSON.stringify(status)})`,
     );