@solana/web3.js 1.27.0 → 1.28.0

package/lib/index.iife.js

@@ -12442,16 +12442,35 @@ var solanaWeb3 = (function (exports) {
 
       _defineProperty(this, "instructions", void 0);
 
+      _defineProperty(this, "indexToProgramIds", new Map());
+
       this.header = args.header;
       this.accountKeys = args.accountKeys.map(account => new PublicKey(account));
       this.recentBlockhash = args.recentBlockhash;
       this.instructions = args.instructions;
+      this.instructions.forEach(ix => this.indexToProgramIds.set(ix.programIdIndex, this.accountKeys[ix.programIdIndex]));
+    }
+
+    isAccountSigner(index) {
+      return index < this.header.numRequiredSignatures;
     }
 
     isAccountWritable(index) {
       return index < this.header.numRequiredSignatures - this.header.numReadonlySignedAccounts || index >= this.header.numRequiredSignatures && index < this.accountKeys.length - this.header.numReadonlyUnsignedAccounts;
     }
 
+    isProgramId(index) {
+      return this.indexToProgramIds.has(index);
+    }
+
+    programIds() {
+      return [...this.indexToProgramIds.values()];
+    }
+
+    nonProgramIds() {
+      return this.accountKeys.filter((_, index) => !this.isProgramId(index));
+    }
+
     serialize() {
       const numKeys = this.accountKeys.length;
       let keyCount = [];
@@ -13166,7 +13185,7 @@ var solanaWeb3 = (function (exports) {
      */
 
 
-    static populate(message, signatures) {
+    static populate(message, signatures = []) {
       const transaction = new Transaction();
       transaction.recentBlockhash = message.recentBlockhash;
 
@@ -13186,7 +13205,7 @@ var solanaWeb3 = (function (exports) {
           const pubkey = message.accountKeys[account];
           return {
             pubkey,
-            isSigner: transaction.signatures.some(keyObj => keyObj.publicKey.toString() === pubkey.toString()),
+            isSigner: transaction.signatures.some(keyObj => keyObj.publicKey.toString() === pubkey.toString()) || message.isAccountSigner(account),
             isWritable: message.isAccountWritable(account)
           };
         });
@@ -18243,7 +18262,15 @@ var solanaWeb3 = (function (exports) {
   });
   const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(type({
     err: nullable(union([type({}), string()])),
-    logs: nullable(array(string()))
+    logs: nullable(array(string())),
+    accounts: optional(nullable(array(type({
+      executable: boolean(),
+      owner: string(),
+      lamports: number(),
+      data: array(string()),
+      rentEpoch: optional(number())
+    })))),
+    unitsConsumed: optional(number())
   }));
 
   function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRetryOnRateLimit) {
@@ -18969,6 +18996,8 @@ var solanaWeb3 = (function (exports) {
 
     /** @internal */
 
+    /** @internal */
+
     /**
      * Establish a JSON RPC connection
      *
@@ -18978,6 +19007,8 @@ var solanaWeb3 = (function (exports) {
     constructor(endpoint, commitmentOrConfig) {
       _defineProperty(this, "_commitment", void 0);
 
+      _defineProperty(this, "_confirmTransactionInitialTimeout", void 0);
+
       _defineProperty(this, "_rpcEndpoint", void 0);
 
       _defineProperty(this, "_rpcWsEndpoint", void 0);
@@ -19046,6 +19077,7 @@ var solanaWeb3 = (function (exports) {
         this._commitment = commitmentOrConfig;
       } else if (commitmentOrConfig) {
         this._commitment = commitmentOrConfig.commitment;
+        this._confirmTransactionInitialTimeout = commitmentOrConfig.confirmTransactionInitialTimeout;
         wsEndpoint = commitmentOrConfig.wsEndpoint;
         httpHeaders = commitmentOrConfig.httpHeaders;
         fetchMiddleware = commitmentOrConfig.fetchMiddleware;
@@ -19505,7 +19537,7 @@ var solanaWeb3 = (function (exports) {
           reject(err);
         }
       });
-      let timeoutMs = 60 * 1000;
+      let timeoutMs = this._confirmTransactionInitialTimeout || 60 * 1000;
 
       switch (subscriptionCommitment) {
         case 'processed':
@@ -19514,7 +19546,7 @@ var solanaWeb3 = (function (exports) {
         case 'confirmed':
         case 'singleGossip':
           {
-            timeoutMs = 30 * 1000;
+            timeoutMs = this._confirmTransactionInitialTimeout || 30 * 1000;
             break;
           }
       }
@@ -20301,7 +20333,15 @@ var solanaWeb3 = (function (exports) {
      */
 
 
-    async simulateTransaction(transaction, signers) {
+    async simulateTransaction(transactionOrMessage, signers, includeAccounts) {
+      let transaction;
+
+      if (transactionOrMessage instanceof Transaction) {
+        transaction = transactionOrMessage;
+      } else {
+        transaction = Transaction.populate(transactionOrMessage);
+      }
+
       if (transaction.nonceInfo && signers) {
         transaction.sign(...signers);
       } else {
@@ -20334,7 +20374,9 @@ var solanaWeb3 = (function (exports) {
         }
       }
 
-      const signData = transaction.serializeMessage();
+      const message = transaction._compile();
+
+      const signData = message.serialize();
 
       const wireTransaction = transaction._serialize(signData);
 
@@ -20344,6 +20386,14 @@ var solanaWeb3 = (function (exports) {
         commitment: this.commitment
       };
 
+      if (includeAccounts) {
+        const addresses = (Array.isArray(includeAccounts) ? includeAccounts : message.nonProgramIds()).map(key => key.toBase58());
+        config['accounts'] = {
+          encoding: 'base64',
+          addresses
+        };
+      }
+
       if (signers) {
         config.sigVerify = true;
       }