@solana/web3.js 1.92.0 → 1.92.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.92.0",
+  "version": "1.92.2",
   "description": "Solana Javascript API",
   "keywords": [
     "api",

package/src/connection.ts

@@ -5787,7 +5787,7 @@ export class Connection {
         action: 'simulate',
         signature: '',
         transactionMessage: res.error.message,
-        transactionLogs: logs,
+        logs: logs,
       });
     }
     return res.result;
@@ -5928,7 +5928,7 @@ export class Connection {
         action: skipPreflight ? 'send' : 'simulate',
         signature: '',
         transactionMessage: res.error.message,
-        transactionLogs: logs,
+        logs: logs,
       });
     }
     return res.result;

package/src/errors.ts

@@ -4,64 +4,80 @@ import {TransactionSignature} from './transaction';
 export class SendTransactionError extends Error {
   private signature: TransactionSignature;
   private transactionMessage: string;
-  private transactionLogs?: string[];
-  private resolvedLogs: string[] | Promise<string[]> | undefined;
+  private transactionLogs: string[] | Promise<string[]> | undefined;
 
   constructor({
     action,
     signature,
     transactionMessage,
-    transactionLogs,
+    logs,
   }: {
     action: 'send' | 'simulate';
     signature: TransactionSignature;
     transactionMessage: string;
-    transactionLogs?: string[];
+    logs?: string[];
   }) {
+    const maybeLogsOutput = logs
+      ? `Logs: \n${JSON.stringify(logs.slice(-10), null, 2)}. `
+      : '';
+    const guideText =
+      '\nCatch the `SendTransactionError` and call `getLogs()` on it for full details.';
     let message: 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.';
+          maybeLogsOutput +
+          guideText;
         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.';
+          maybeLogsOutput +
+          guideText;
         break;
-      default:
-        message = 'Unknown action';
+      default: {
+        message = `Unknown action '${((a: never) => a)(action)}'`;
+      }
     }
     super(message);
 
     this.signature = signature;
     this.transactionMessage = transactionMessage;
-    this.transactionLogs = transactionLogs;
-    this.resolvedLogs = transactionLogs ? transactionLogs : undefined;
+    this.transactionLogs = logs ? logs : undefined;
   }
 
   get transactionError(): {message: string; logs?: string[]} {
-    return {message: this.transactionMessage, logs: this.transactionLogs};
+    return {
+      message: this.transactionMessage,
+      logs: Array.isArray(this.transactionLogs)
+        ? this.transactionLogs
+        : undefined,
+    };
+  }
+
+  /* @deprecated Use `await getLogs()` instead */
+  get logs(): string[] | undefined {
+    const cachedLogs = this.transactionLogs;
+    if (
+      cachedLogs != null &&
+      typeof cachedLogs === 'object' &&
+      'then' in cachedLogs
+    ) {
+      return undefined;
+    }
+    return cachedLogs;
   }
 
   async getLogs(connection: Connection): Promise<string[]> {
-    if (this.resolvedLogs === undefined) {
-      this.resolvedLogs = new Promise((resolve, reject) => {
+    if (!Array.isArray(this.transactionLogs)) {
+      this.transactionLogs = 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 {
@@ -71,7 +87,7 @@ export class SendTransactionError extends Error {
           .catch(reject);
       });
     }
-    return await this.resolvedLogs;
+    return await this.transactionLogs;
   }
 }