@solana/web3.js 1.27.1 → 1.28.1

package/lib/index.d.ts

@@ -302,8 +302,13 @@ declare module '@solana/web3.js' {
     accountKeys: PublicKey[];
     recentBlockhash: Blockhash;
     instructions: CompiledInstruction[];
+    private indexToProgramIds;
     constructor(args: MessageArgs);
+    isAccountSigner(index: number): boolean;
     isAccountWritable(index: number): boolean;
+    isProgramId(index: number): boolean;
+    programIds(): PublicKey[];
+    nonProgramIds(): PublicKey[];
     serialize(): Buffer;
     /**
      * Decode a compiled message into a Message object.
@@ -505,7 +510,7 @@ declare module '@solana/web3.js' {
     /**
      * Populate Transaction object from message and signatures
      */
-    static populate(message: Message, signatures: Array<string>): Transaction;
+    static populate(message: Message, signatures?: Array<string>): Transaction;
   }
 
   export type TokenAccountsFilter =
@@ -720,9 +725,23 @@ declare module '@solana/web3.js' {
     'solana-core': string;
     'feature-set'?: number;
   };
+  export type SimulatedTransactionAccountInfo = {
+    /** `true` if this account's data contains a loaded program */
+    executable: boolean;
+    /** Identifier of the program that owns the account */
+    owner: string;
+    /** Number of lamports assigned to the account */
+    lamports: number;
+    /** Optional data assigned to the account */
+    data: string[];
+    /** Optional rent epoch info for account */
+    rentEpoch?: number;
+  };
   export type SimulatedTransactionResponse = {
     err: TransactionError | string | null;
     logs: Array<string> | null;
+    accounts?: SimulatedTransactionAccountInfo[] | null;
+    unitsConsumed?: number;
   };
   export type ParsedInnerInstruction = {
     index: number;
@@ -1172,6 +1191,8 @@ declare module '@solana/web3.js' {
     lamports: number;
     /** Optional data assigned to the account */
     data: T;
+    /** Optional rent epoch infor for account */
+    rentEpoch?: number;
   };
   /**
    * Account information identified by pubkey
@@ -1334,6 +1355,8 @@ declare module '@solana/web3.js' {
     fetchMiddleware?: FetchMiddleware;
     /** Optional Disable retring calls when server responds with HTTP 429 (Too Many Requests) */
     disableRetryOnRateLimit?: boolean;
+    /** time to allow for the server to initially process a transaction (in milliseconds) */
+    confirmTransactionInitialTimeout?: number;
   };
   /**
    * A connection to a fullnode JSON RPC endpoint
@@ -1767,8 +1790,9 @@ declare module '@solana/web3.js' {
      * Simulate a transaction
      */
     simulateTransaction(
-      transaction: Transaction,
+      transactionOrMessage: Transaction | Message,
       signers?: Array<Signer>,
+      includeAccounts?: boolean | Array<PublicKey>,
     ): Promise<RpcResponseAndContext<SimulatedTransactionResponse>>;
     /**
      * Sign and send a transaction

package/lib/index.esm.js

@@ -491,16 +491,35 @@ class Message {
 
     _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 = [];
@@ -1214,7 +1233,7 @@ class Transaction {
    */
 
 
-  static populate(message, signatures) {
+  static populate(message, signatures = []) {
     const transaction = new Transaction();
     transaction.recentBlockhash = message.recentBlockhash;
 
@@ -1234,7 +1253,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)
         };
       });
@@ -2666,7 +2685,15 @@ const VersionResult = type({
 });
 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) {
@@ -3398,6 +3425,8 @@ class Connection {
 
   /** @internal */
 
+  /** @internal */
+
   /**
    * Establish a JSON RPC connection
    *
@@ -3407,6 +3436,8 @@ class Connection {
   constructor(endpoint, commitmentOrConfig) {
     _defineProperty(this, "_commitment", void 0);
 
+    _defineProperty(this, "_confirmTransactionInitialTimeout", void 0);
+
     _defineProperty(this, "_rpcEndpoint", void 0);
 
     _defineProperty(this, "_rpcWsEndpoint", void 0);
@@ -3475,6 +3506,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;
@@ -3934,7 +3966,7 @@ class Connection {
         reject(err);
       }
     });
-    let timeoutMs = 60 * 1000;
+    let timeoutMs = this._confirmTransactionInitialTimeout || 60 * 1000;
 
     switch (subscriptionCommitment) {
       case 'processed':
@@ -3943,7 +3975,7 @@ class Connection {
       case 'confirmed':
       case 'singleGossip':
         {
-          timeoutMs = 30 * 1000;
+          timeoutMs = this._confirmTransactionInitialTimeout || 30 * 1000;
           break;
         }
     }
@@ -4730,7 +4762,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 {
@@ -4763,7 +4803,9 @@ class Connection {
       }
     }
 
-    const signData = transaction.serializeMessage();
+    const message = transaction._compile();
+
+    const signData = message.serialize();
 
     const wireTransaction = transaction._serialize(signData);
 
@@ -4773,6 +4815,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;
     }