@solana/web3.js 1.27.1 → 1.28.1

package/module.flow.js

@@ -362,7 +362,11 @@ declare module "@solana/web3.js" {
     recentBlockhash: Blockhash;
     instructions: CompiledInstruction[];
     constructor(args: MessageArgs): this;
+    isAccountSigner(index: number): boolean;
     isAccountWritable(index: number): boolean;
+    isProgramId(index: number): boolean;
+    programIds(): PublicKey[];
+    nonProgramIds(): PublicKey[];
     serialize(): Buffer;
 
     /**
@@ -626,7 +630,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;
   }
   declare export type TokenAccountsFilter =
     | {
@@ -966,9 +970,38 @@ declare module "@solana/web3.js" {
     "feature-set"?: number,
     ...
   };
+  declare 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,
+    ...
+  };
   declare export type SimulatedTransactionResponse = {
     err: TransactionError | string | null,
     logs: Array<string> | null,
+    accounts?: SimulatedTransactionAccountInfo[] | null,
+    unitsConsumed?: number,
     ...
   };
   declare export type ParsedInnerInstruction = {
@@ -1791,6 +1824,11 @@ declare module "@solana/web3.js" {
      * Optional data assigned to the account
      */
     data: T,
+
+    /**
+     * Optional rent epoch infor for account
+     */
+    rentEpoch?: number,
     ...
   };
 
@@ -2024,6 +2062,11 @@ declare module "@solana/web3.js" {
      * 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,
     ...
   };
 
@@ -2527,8 +2570,9 @@ feeCalculator: FeeCalculator,...
      * Simulate a transaction
      */
     simulateTransaction(
-      transaction: Transaction,
-      signers?: Array<Signer>
+      transactionOrMessage: Transaction | Message,
+      signers?: Array<Signer>,
+      includeAccounts?: boolean | Array<PublicKey>
     ): Promise<RpcResponseAndContext<SimulatedTransactionResponse>>;
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.27.1",
+  "version": "1.28.1",
   "description": "Solana Javascript API",
   "keywords": [
     "api",

package/src/connection.ts

@@ -439,15 +439,44 @@ const VersionResult = pick({
   'feature-set': optional(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;
 };
 
 const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(
   pick({
     err: nullable(union([pick({}), string()])),
     logs: nullable(array(string())),
+    accounts: optional(
+      nullable(
+        array(
+          pick({
+            executable: boolean(),
+            owner: string(),
+            lamports: number(),
+            data: array(string()),
+            rentEpoch: optional(number()),
+          }),
+        ),
+      ),
+    ),
+    unitsConsumed: optional(number()),
   }),
 );
 
@@ -1679,6 +1708,8 @@ export type AccountInfo<T> = {
   lamports: number;
   /** Optional data assigned to the account */
   data: T;
+  /** Optional rent epoch infor for account */
+  rentEpoch?: number;
 };
 
 /**
@@ -1948,6 +1979,8 @@ export type ConnectionConfig = {
   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;
 };
 
 /**
@@ -1955,6 +1988,7 @@ export type ConnectionConfig = {
  */
 export class Connection {
   /** @internal */ _commitment?: Commitment;
+  /** @internal */ _confirmTransactionInitialTimeout?: number;
   /** @internal */ _rpcEndpoint: string;
   /** @internal */ _rpcWsEndpoint: string;
   /** @internal */ _rpcClient: RpcClient;
@@ -2039,6 +2073,8 @@ export 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;
@@ -2598,14 +2634,14 @@ export class Connection {
       }
     });
 
-    let timeoutMs = 60 * 1000;
+    let timeoutMs = this._confirmTransactionInitialTimeout || 60 * 1000;
     switch (subscriptionCommitment) {
       case 'processed':
       case 'recent':
       case 'single':
       case 'confirmed':
       case 'singleGossip': {
-        timeoutMs = 30 * 1000;
+        timeoutMs = this._confirmTransactionInitialTimeout || 30 * 1000;
         break;
       }
       // exhaust enums to ensure full coverage
@@ -3430,9 +3466,17 @@ export class Connection {
    * Simulate a transaction
    */
   async simulateTransaction(
-    transaction: Transaction,
+    transactionOrMessage: Transaction | Message,
     signers?: Array<Signer>,
+    includeAccounts?: boolean | Array<PublicKey>,
   ): Promise<RpcResponseAndContext<SimulatedTransactionResponse>> {
+    let transaction;
+    if (transactionOrMessage instanceof Transaction) {
+      transaction = transactionOrMessage;
+    } else {
+      transaction = Transaction.populate(transactionOrMessage);
+    }
+
     if (transaction.nonceInfo && signers) {
       transaction.sign(...signers);
     } else {
@@ -3466,7 +3510,8 @@ export class Connection {
       }
     }
 
-    const signData = transaction.serializeMessage();
+    const message = transaction._compile();
+    const signData = message.serialize();
     const wireTransaction = transaction._serialize(signData);
     const encodedTransaction = wireTransaction.toString('base64');
     const config: any = {
@@ -3474,6 +3519,19 @@ export 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;
     }

package/src/message.ts

@@ -66,11 +66,26 @@ export class Message {
   recentBlockhash: Blockhash;
   instructions: CompiledInstruction[];
 
+  private indexToProgramIds: Map<number, PublicKey> = new Map<
+    number,
+    PublicKey
+  >();
+
   constructor(args: MessageArgs) {
     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: number): boolean {
+    return index < this.header.numRequiredSignatures;
   }
 
   isAccountWritable(index: number): boolean {
@@ -84,6 +99,18 @@ export class Message {
     );
   }
 
+  isProgramId(index: number): boolean {
+    return this.indexToProgramIds.has(index);
+  }
+
+  programIds(): PublicKey[] {
+    return [...this.indexToProgramIds.values()];
+  }
+
+  nonProgramIds(): PublicKey[] {
+    return this.accountKeys.filter((_, index) => !this.isProgramId(index));
+  }
+
   serialize(): Buffer {
     const numKeys = this.accountKeys.length;
 

package/src/transaction.ts

@@ -666,7 +666,10 @@ export class Transaction {
   /**
    * Populate Transaction object from message and signatures
    */
-  static populate(message: Message, signatures: Array<string>): Transaction {
+  static populate(
+    message: Message,
+    signatures: Array<string> = [],
+  ): Transaction {
     const transaction = new Transaction();
     transaction.recentBlockhash = message.recentBlockhash;
     if (message.header.numRequiredSignatures > 0) {
@@ -688,9 +691,10 @@ export 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),
         };
       });