@solana/web3.js 1.27.0 → 1.28.0

package/lib/index.cjs.js

@@ -498,16 +498,35 @@ class Message {
 
     _defineProperty__default['default'](this, "instructions", void 0);
 
+    _defineProperty__default['default'](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 = [];
@@ -1222,7 +1241,7 @@ class Transaction {
    */
 
 
-  static populate(message, signatures) {
+  static populate(message, signatures = []) {
     const transaction = new Transaction();
     transaction.recentBlockhash = message.recentBlockhash;
 
@@ -1242,7 +1261,7 @@ class Transaction {
         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)
         };
       });
@@ -2674,7 +2693,15 @@ const VersionResult = superstruct.type({
 });
 const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(superstruct.type({
   err: superstruct.nullable(superstruct.union([superstruct.type({}), superstruct.string()])),
-  logs: superstruct.nullable(superstruct.array(superstruct.string()))
+  logs: superstruct.nullable(superstruct.array(superstruct.string())),
+  accounts: superstruct.optional(superstruct.nullable(superstruct.array(superstruct.type({
+    executable: superstruct.boolean(),
+    owner: superstruct.string(),
+    lamports: superstruct.number(),
+    data: superstruct.array(superstruct.string()),
+    rentEpoch: superstruct.optional(superstruct.number())
+  })))),
+  unitsConsumed: superstruct.optional(superstruct.number())
 }));
 
 function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRetryOnRateLimit) {
@@ -3406,6 +3433,8 @@ class Connection {
 
   /** @internal */
 
+  /** @internal */
+
   /**
    * Establish a JSON RPC connection
    *
@@ -3415,6 +3444,8 @@ class Connection {
   constructor(endpoint, commitmentOrConfig) {
     _defineProperty__default['default'](this, "_commitment", void 0);
 
+    _defineProperty__default['default'](this, "_confirmTransactionInitialTimeout", void 0);
+
     _defineProperty__default['default'](this, "_rpcEndpoint", void 0);
 
     _defineProperty__default['default'](this, "_rpcWsEndpoint", void 0);
@@ -3483,6 +3514,7 @@ class Connection {
       this._commitment = commitmentOrConfig;
     } else if (commitmentOrConfig) {
       this._commitment = commitmentOrConfig.commitment;
+      this._confirmTransactionInitialTimeout = commitmentOrConfig.confirmTransactionInitialTimeout;
       wsEndpoint = commitmentOrConfig.wsEndpoint;
       httpHeaders = commitmentOrConfig.httpHeaders;
       fetchMiddleware = commitmentOrConfig.fetchMiddleware;
@@ -3942,7 +3974,7 @@ class Connection {
         reject(err);
       }
     });
-    let timeoutMs = 60 * 1000;
+    let timeoutMs = this._confirmTransactionInitialTimeout || 60 * 1000;
 
     switch (subscriptionCommitment) {
       case 'processed':
@@ -3951,7 +3983,7 @@ class Connection {
       case 'confirmed':
       case 'singleGossip':
         {
-          timeoutMs = 30 * 1000;
+          timeoutMs = this._confirmTransactionInitialTimeout || 30 * 1000;
           break;
         }
     }
@@ -4738,7 +4770,15 @@ class Connection {
    */
 
 
-  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 {
@@ -4771,7 +4811,9 @@ class Connection {
       }
     }
 
-    const signData = transaction.serializeMessage();
+    const message = transaction._compile();
+
+    const signData = message.serialize();
 
     const wireTransaction = transaction._serialize(signData);
 
@@ -4781,6 +4823,14 @@ class Connection {
       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;
     }