@solana/web3.js 1.47.1 → 1.47.4

package/lib/index.d.ts

@@ -885,11 +885,17 @@ declare module '@solana/web3.js' {
     /** Optional rent epoch info for account */
     rentEpoch?: number;
   };
+  export type TransactionReturnDataEncoding = 'base64';
+  export type TransactionReturnData = {
+    programId: string;
+    data: [string, TransactionReturnDataEncoding];
+  };
   export type SimulatedTransactionResponse = {
     err: TransactionError | string | null;
     logs: Array<string> | null;
     accounts?: (SimulatedTransactionAccountInfo | null)[] | null;
     unitsConsumed?: number;
+    returnData?: TransactionReturnData | null;
   };
   export type ParsedInnerInstruction = {
     index: number;

package/lib/index.esm.js

@@ -2471,15 +2471,34 @@ class Transaction {
 
     if (!opts) {
       return;
-    } else if (Object.prototype.hasOwnProperty.call(opts, 'lastValidBlockHeight')) {
-      const newOpts = opts;
-      Object.assign(this, newOpts);
-      this.recentBlockhash = newOpts.blockhash;
-      this.lastValidBlockHeight = newOpts.lastValidBlockHeight;
+    }
+
+    if (opts.feePayer) {
+      this.feePayer = opts.feePayer;
+    }
+
+    if (opts.signatures) {
+      this.signatures = opts.signatures;
+    }
+
+    if (Object.prototype.hasOwnProperty.call(opts, 'lastValidBlockHeight')) {
+      const {
+        blockhash,
+        lastValidBlockHeight
+      } = opts;
+      this.recentBlockhash = blockhash;
+      this.lastValidBlockHeight = lastValidBlockHeight;
     } else {
-      const oldOpts = opts;
-      Object.assign(this, oldOpts);
-      this.recentBlockhash = oldOpts.recentBlockhash;
+      const {
+        recentBlockhash,
+        nonceInfo
+      } = opts;
+
+      if (nonceInfo) {
+        this.nonceInfo = nonceInfo;
+      }
+
+      this.recentBlockhash = recentBlockhash;
     }
   }
   /**
@@ -4422,6 +4441,8 @@ var fastStableStringify = function(val) {
 
 var fastStableStringify$1 = fastStableStringify;
 
+const URL = globalThis.URL;
+
 const DESTROY_TIMEOUT_MS = 5000;
 class AgentManager {
   static _newAgent(useHttps) {
@@ -4871,7 +4892,11 @@ const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(type({
     data: array(string()),
     rentEpoch: optional(number())
   }))))),
-  unitsConsumed: optional(number())
+  unitsConsumed: optional(number()),
+  returnData: optional(nullable(type({
+    programId: string(),
+    data: tuple([string(), literal('base64')])
+  })))
 }));
 
 /**
@@ -6214,16 +6239,6 @@ class Connection {
         reject(err);
       }
     });
-
-    const checkBlockHeight = async () => {
-      try {
-        const blockHeight = await this.getBlockHeight(commitment);
-        return blockHeight;
-      } catch (_e) {
-        return -1;
-      }
-    };
-
     const expiryPromise = new Promise(resolve => {
       if (typeof strategy === 'string') {
         let timeoutMs = this._confirmTransactionInitialTimeout || 60 * 1000;
@@ -6247,6 +6262,15 @@ class Connection {
       } else {
         let config = strategy;
 
+        const checkBlockHeight = async () => {
+          try {
+            const blockHeight = await this.getBlockHeight(commitment);
+            return blockHeight;
+          } catch (_e) {
+            return -1;
+          }
+        };
+
         (async () => {
           let currentBlockHeight = await checkBlockHeight();
           if (done) return;
@@ -6610,9 +6634,7 @@ class Connection {
 
 
   async getRecentPerformanceSamples(limit) {
-    const args = this._buildArgs(limit ? [limit] : []);
-
-    const unsafeRes = await this._rpcRequest('getRecentPerformanceSamples', args);
+    const unsafeRes = await this._rpcRequest('getRecentPerformanceSamples', limit ? [limit] : []);
     const res = create(unsafeRes, GetRecentPerformanceSamplesRpcResult);
 
     if ('error' in res) {