@solana/web3.js 1.92.0 → 1.92.2

package/lib/index.cjs.js

@@ -2162,42 +2162,52 @@ class SendTransactionError extends Error {
     action,
     signature,
     transactionMessage,
-    transactionLogs
+    logs
   }) {
+    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;
     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.';
+        message = `Transaction ${signature} resulted in an error. \n` + `${transactionMessage}. ` + 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.';
+        message = `Simulation failed. \nMessage: ${transactionMessage}. \n` + maybeLogsOutput + guideText;
         break;
       default:
-        message = 'Unknown action';
+        {
+          message = `Unknown action '${(a => a)(action)}'`;
+        }
     }
     super(message);
     this.signature = void 0;
     this.transactionMessage = void 0;
     this.transactionLogs = void 0;
-    this.resolvedLogs = void 0;
     this.signature = signature;
     this.transactionMessage = transactionMessage;
-    this.transactionLogs = transactionLogs;
-    this.resolvedLogs = transactionLogs ? transactionLogs : undefined;
+    this.transactionLogs = logs ? logs : undefined;
   }
   get transactionError() {
     return {
       message: this.transactionMessage,
-      logs: this.transactionLogs
+      logs: Array.isArray(this.transactionLogs) ? this.transactionLogs : undefined
     };
   }
+
+  /* @deprecated Use `await getLogs()` instead */
+  get logs() {
+    const cachedLogs = this.transactionLogs;
+    if (cachedLogs != null && typeof cachedLogs === 'object' && 'then' in cachedLogs) {
+      return undefined;
+    }
+    return cachedLogs;
+  }
   async getLogs(connection) {
-    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 {
@@ -2206,7 +2216,7 @@ class SendTransactionError extends Error {
         }).catch(reject);
       });
     }
-    return await this.resolvedLogs;
+    return await this.transactionLogs;
   }
 }
 
@@ -7998,7 +8008,7 @@ class Connection {
         action: 'simulate',
         signature: '',
         transactionMessage: res.error.message,
-        transactionLogs: logs
+        logs: logs
       });
     }
     return res.result;
@@ -8108,7 +8118,7 @@ class Connection {
         action: skipPreflight ? 'send' : 'simulate',
         signature: '',
         transactionMessage: res.error.message,
-        transactionLogs: logs
+        logs: logs
       });
     }
     return res.result;