@solana/web3.js 1.30.0 → 1.32.0

package/module.flow.js

@@ -1,7 +1,7 @@
 /**
  * Flowtype definitions for index
  * Generated by Flowgen from a Typescript Definition
- * Flowgen v1.15.0
+ * Flowgen v1.16.0
  */
 
 declare module "@solana/web3.js" {
@@ -64,6 +64,7 @@ declare module "@solana/web3.js" {
      * Return the base-58 representation of the public key
      */
     toBase58(): string;
+    toJSON(): string;
 
     /**
      * Return the byte array representation of the public key
@@ -1028,6 +1029,7 @@ declare module "@solana/web3.js" {
   declare export type TokenBalance = {
     accountIndex: number,
     mint: string,
+    owner?: string,
     uiTokenAmount: TokenAmount,
     ...
   };
@@ -1817,6 +1819,22 @@ declare module "@solana/web3.js" {
     ...
   };
 
+  /**
+   * Configuration object for getMultipleAccounts
+   */
+  declare export type GetMultipleAccountsConfig = {
+    /**
+     * Optional commitment level
+     */
+    commitment?: Commitment,
+
+    /**
+     * Optional encoding for account data (default base64)
+     */
+    encoding?: "base64" | "jsonParsed",
+    ...
+  };
+
   /**
    * Information describing an account
    */
@@ -1842,7 +1860,7 @@ declare module "@solana/web3.js" {
     data: T,
 
     /**
-     * Optional rent epoch infor for account
+     * Optional rent epoch info for account
      */
     rentEpoch?: number,
     ...
@@ -2047,7 +2065,7 @@ declare module "@solana/web3.js" {
   declare export type FetchMiddleware = (
     url: string,
     options: any,
-    fetch: Function
+    fetch: (modifiedUrl: string, modifiedOptions: any) => void
   ) => void;
 
   /**
@@ -2246,8 +2264,8 @@ account: AccountInfo<ParsedAccountData>,...
      */
     getMultipleAccountsInfo(
       publicKeys: PublicKey[],
-      commitment?: Commitment
-    ): Promise<(AccountInfo<Buffer> | null)[]>;
+      configOrCommitment?: GetMultipleAccountsConfig | Commitment
+    ): Promise<(AccountInfo<Buffer | ParsedAccountData> | null)[]>;
 
     /**
      * Returns epoch activation information for a stake account that has been delegated
@@ -2424,6 +2442,14 @@ feeCalculator: FeeCalculator,...
       commitment?: Commitment
     ): Promise<RpcResponseAndContext<FeeCalculator | null>>;
 
+    /**
+     * Fetch the fee for a message from the cluster, return with context
+     */
+    getFeeForMessage(
+      message: Message,
+      commitment?: Commitment
+    ): Promise<RpcResponseAndContext<number>>;
+
     /**
  * Fetch a recent blockhash from the cluster
  * @return {Promise<{
@@ -3935,21 +3961,36 @@ feeCalculator: FeeCalculator,...
     prevCredits: number,
     ...
   };
+  declare export type AuthorizedVoter = {
+    epoch: number,
+    authorizedVoter: PublicKey,
+    ...
+  };
+  declare export type PriorVoter = {
+    authorizedPubkey: PublicKey,
+    epochOfLastAuthorizedSwitch: number,
+    targetEpoch: number,
+    ...
+  };
+  declare export type BlockTimestamp = {
+    slot: number,
+    timetamp: number,
+    ...
+  };
 
   /**
    * VoteAccount class
    */
   declare export class VoteAccount {
     nodePubkey: PublicKey;
-    authorizedVoterPubkey: PublicKey;
-    authorizedWithdrawerPubkey: PublicKey;
+    authorizedWithdrawer: PublicKey;
     commission: number;
-    votes: Array<Lockout>;
     rootSlot: number | null;
-    epoch: number;
-    credits: number;
-    lastEpochCredits: number;
-    epochCredits: Array<EpochCredits>;
+    votes: Lockout[];
+    authorizedVoters: AuthorizedVoter[];
+    priorVoters: PriorVoter[];
+    epochCredits: EpochCredits[];
+    lastTimestamp: BlockTimestamp;
 
     /**
      * Deserialize VoteAccount from the account data.
@@ -3961,11 +4002,14 @@ feeCalculator: FeeCalculator,...
     ): VoteAccount;
   }
   declare export var SYSVAR_CLOCK_PUBKEY: PublicKey;
+  declare export var SYSVAR_EPOCH_SCHEDULE_PUBKEY: PublicKey;
+  declare export var SYSVAR_INSTRUCTIONS_PUBKEY: PublicKey;
   declare export var SYSVAR_RECENT_BLOCKHASHES_PUBKEY: PublicKey;
   declare export var SYSVAR_RENT_PUBKEY: PublicKey;
   declare export var SYSVAR_REWARDS_PUBKEY: PublicKey;
+  declare export var SYSVAR_SLOT_HASHES_PUBKEY: PublicKey;
+  declare export var SYSVAR_SLOT_HISTORY_PUBKEY: PublicKey;
   declare export var SYSVAR_STAKE_HISTORY_PUBKEY: PublicKey;
-  declare export var SYSVAR_INSTRUCTIONS_PUBKEY: PublicKey;
   declare export class SendTransactionError mixins Error {
     logs: string[] | void;
     constructor(message: string, logs?: string[]): this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.30.0",
+  "version": "1.32.0",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -38,7 +38,6 @@
   ],
   "scripts": {
     "build": "npm run clean; cross-env NODE_ENV=production rollup -c; npm run type:gen; npm run flow:gen; npm run flow:check",
-    "build:browser-test": "rollup -c test/rollup.config.js",
     "build:fixtures": "set -ex; ./test/fixtures/noop-program/build.sh",
     "clean": "rimraf ./coverage ./lib",
     "codecov": "set -ex; npm run test:cover; cat ./coverage/lcov.info | codecov",
@@ -55,21 +54,18 @@
     "re": "semantic-release --repository-url git@github.com:solana-labs/solana-web3.js.git",
     "test": "mocha -r ts-node/register './test/**/*.test.ts'",
     "test:cover": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' nyc --reporter=lcov mocha -r ts-node/register './test/**/*.test.ts'",
-    "test:browser": "TEST_LIVE=1 npm run build:browser-test && mocha-headless-chrome -f http://localhost:8080/mocha.html --timeout 180000",
-    "test:browser-with-server": "start-server-and-test 'http-server -p 8080' 8080 test:browser",
-    "test:browser-with-test-validator": "start-server-and-test 'solana-test-validator --reset --quiet' http://localhost:8899/health test:browser-with-server",
     "test:live": "TEST_LIVE=1 npm run test",
     "test:live-with-test-validator": "start-server-and-test 'solana-test-validator --reset --quiet' http://localhost:8899/health test:live"
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
+    "@ethersproject/sha2": "^5.5.0",
     "@solana/buffer-layout": "^3.0.0",
     "bn.js": "^5.0.0",
     "borsh": "^0.4.0",
     "bs58": "^4.0.1",
     "buffer": "6.0.1",
     "cross-fetch": "^3.1.4",
-    "ethers": "^5.5.1",
     "jayson": "^3.4.4",
     "js-sha3": "^0.8.0",
     "rpc-websockets": "^7.4.2",
@@ -84,8 +80,8 @@
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-typescript": "^7.12.16",
     "@babel/register": "^7.12.13",
-    "@commitlint/config-conventional": "^13.1.0",
-    "@commitlint/travis-cli": "^13.1.0",
+    "@commitlint/config-conventional": "^15.0.0",
+    "@commitlint/travis-cli": "^15.0.0",
     "@rollup/plugin-alias": "^3.1.2",
     "@rollup/plugin-babel": "^5.2.3",
     "@rollup/plugin-commonjs": "^21.0.0",
@@ -112,7 +108,7 @@
     "cross-env": "7.0.3",
     "eslint": "^7.19.0",
     "eslint-config-prettier": "^8.0.0",
-    "eslint-plugin-import": "2.25.2",
+    "eslint-plugin-import": "2.25.3",
     "eslint-plugin-mocha": "^9.0.0",
     "eslint-plugin-prettier": "^4.0.0",
     "esm": "^3.2.25",
@@ -120,20 +116,19 @@
     "flowgen": "^1.13.0",
     "http-server": "^14.0.0",
     "mocha": "^8.2.1",
-    "mocha-headless-chrome": "^3.1.0",
     "mockttp": "^2.0.1",
     "mz": "^2.7.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "prettier": "^2.3.0",
-    "puppeteer": "^10.2.0",
+    "puppeteer": "^12.0.0",
     "rimraf": "3.0.2",
-    "rollup": "2.58.0",
+    "rollup": "2.60.2",
     "rollup-plugin-dts": "^4.0.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^18.0.0",
-    "sinon": "^11.0.0",
+    "sinon": "^12.0.0",
     "start-server-and-test": "^1.12.0",
     "ts-node": "^10.0.0",
     "tslib": "^2.1.0",

package/src/account.ts

@@ -1,4 +1,4 @@
-import * as nacl from 'tweetnacl';
+import nacl from 'tweetnacl';
 import type {SignKeyPair as KeyPair} from 'tweetnacl';
 import type {Buffer} from 'buffer';
 

package/src/connection.ts

@@ -498,6 +498,7 @@ export type ParsedInnerInstruction = {
 export type TokenBalance = {
   accountIndex: number;
   mint: string;
+  owner?: string;
   uiTokenAmount: TokenAmount;
 };
 
@@ -760,19 +761,24 @@ function createRpcClient(
     agentManager = new AgentManager(useHttps);
   }
 
-  let fetchWithMiddleware: (url: string, options: any) => Promise<Response>;
+  let fetchWithMiddleware:
+    | ((url: string, options: any) => Promise<Response>)
+    | undefined;
 
   if (fetchMiddleware) {
-    fetchWithMiddleware = (url: string, options: any) => {
-      return new Promise<Response>((resolve, reject) => {
-        fetchMiddleware(url, options, async (url: string, options: any) => {
+    fetchWithMiddleware = async (url: string, options: any) => {
+      const modifiedFetchArgs = await new Promise<[string, any]>(
+        (resolve, reject) => {
           try {
-            resolve(await fetch(url, options));
+            fetchMiddleware(url, options, (modifiedUrl, modifiedOptions) =>
+              resolve([modifiedUrl, modifiedOptions]),
+            );
           } catch (error) {
             reject(error);
           }
-        });
-      });
+        },
+      );
+      return await fetch(...modifiedFetchArgs);
     };
   }
 
@@ -1432,6 +1438,7 @@ const ParsedConfirmedTransactionResult = pick({
 const TokenBalanceResult = pick({
   accountIndex: number(),
   mint: string(),
+  owner: optional(string()),
   uiTokenAmount: TokenAmountResult,
 });
 
@@ -1706,6 +1713,16 @@ export type GetParsedProgramAccountsConfig = {
   filters?: GetProgramAccountsFilter[];
 };
 
+/**
+ * Configuration object for getMultipleAccounts
+ */
+export type GetMultipleAccountsConfig = {
+  /** Optional commitment level */
+  commitment?: Commitment;
+  /** Optional encoding for account data (default base64) */
+  encoding?: 'base64' | 'jsonParsed';
+};
+
 /**
  * Information describing an account
  */
@@ -1718,7 +1735,7 @@ export type AccountInfo<T> = {
   lamports: number;
   /** Optional data assigned to the account */
   data: T;
-  /** Optional rent epoch infor for account */
+  /** Optional rent epoch info for account */
   rentEpoch?: number;
 };
 
@@ -1972,7 +1989,7 @@ export type HttpHeaders = {[header: string]: string};
 export type FetchMiddleware = (
   url: string,
   options: any,
-  fetch: Function,
+  fetch: (modifiedUrl: string, modifiedOptions: any) => void,
 ) => void;
 
 /**
@@ -2474,14 +2491,27 @@ export class Connection {
    */
   async getMultipleAccountsInfo(
     publicKeys: PublicKey[],
-    commitment?: Commitment,
-  ): Promise<(AccountInfo<Buffer> | null)[]> {
+    configOrCommitment?: GetMultipleAccountsConfig | Commitment,
+  ): Promise<(AccountInfo<Buffer | ParsedAccountData> | null)[]> {
     const keys = publicKeys.map(key => key.toBase58());
-    const args = this._buildArgs([keys], commitment, 'base64');
+
+    let commitment;
+    let encoding: 'base64' | 'jsonParsed' = 'base64';
+    if (configOrCommitment) {
+      if (typeof configOrCommitment === 'string') {
+        commitment = configOrCommitment;
+        encoding = 'base64';
+      } else {
+        commitment = configOrCommitment.commitment;
+        encoding = configOrCommitment.encoding || 'base64';
+      }
+    }
+
+    const args = this._buildArgs([keys], commitment, encoding);
     const unsafeRes = await this._rpcRequest('getMultipleAccounts', args);
     const res = create(
       unsafeRes,
-      jsonRpcResultAndContext(array(nullable(AccountInfoResult))),
+      jsonRpcResultAndContext(array(nullable(ParsedAccountInfoResult))),
     );
     if ('error' in res) {
       throw new Error(
@@ -2993,6 +3023,27 @@ export class Connection {
     };
   }
 
+  /**
+   * Fetch the fee for a message from the cluster, return with context
+   */
+  async getFeeForMessage(
+    message: Message,
+    commitment?: Commitment,
+  ): Promise<RpcResponseAndContext<number>> {
+    const wireMessage = message.serialize().toString('base64');
+    const args = this._buildArgs([wireMessage], commitment);
+    const unsafeRes = await this._rpcRequest('getFeeForMessage', args);
+
+    const res = create(unsafeRes, jsonRpcResultAndContext(nullable(number())));
+    if ('error' in res) {
+      throw new Error('failed to get slot: ' + res.error.message);
+    }
+    if (res.result === null) {
+      throw new Error('invalid blockhash');
+    }
+    return res.result as unknown as RpcResponseAndContext<number>;
+  }
+
   /**
    * Fetch a recent blockhash from the cluster
    * @return {Promise<{blockhash: Blockhash, feeCalculator: FeeCalculator}>}

package/src/keypair.ts

@@ -1,4 +1,4 @@
-import * as nacl from 'tweetnacl';
+import nacl from 'tweetnacl';
 
 import {PublicKey} from './publickey';
 

package/src/publickey.ts

@@ -2,7 +2,7 @@ import BN from 'bn.js';
 import bs58 from 'bs58';
 import {Buffer} from 'buffer';
 import nacl from 'tweetnacl';
-import {ethers} from 'ethers';
+import {sha256} from '@ethersproject/sha2';
 
 import {Struct, SOLANA_SCHEMA} from './util/borsh-schema';
 import {toBuffer} from './util/to-buffer';
@@ -87,6 +87,10 @@ export class PublicKey extends Struct {
     return bs58.encode(this.toBytes());
   }
 
+  toJSON(): string {
+    return this.toBase58();
+  }
+
   /**
    * Return the byte array representation of the public key
    */
@@ -131,7 +135,7 @@ export class PublicKey extends Struct {
       Buffer.from(seed),
       programId.toBuffer(),
     ]);
-    const hash = ethers.utils.sha256(new Uint8Array(buffer)).slice(2);
+    const hash = sha256(new Uint8Array(buffer)).slice(2);
     return new PublicKey(Buffer.from(hash, 'hex'));
   }
 
@@ -155,7 +159,7 @@ export class PublicKey extends Struct {
       programId.toBuffer(),
       Buffer.from('ProgramDerivedAddress'),
     ]);
-    let hash = ethers.utils.sha256(new Uint8Array(buffer)).slice(2);
+    let hash = sha256(new Uint8Array(buffer)).slice(2);
     let publicKeyBytes = new BN(hash, 16).toArray(undefined, 32);
     if (is_on_curve(publicKeyBytes)) {
       throw new Error(`Invalid seeds, address must fall off the curve`);

package/src/secp256k1-program.ts

@@ -1,7 +1,7 @@
 import {Buffer} from 'buffer';
 import * as BufferLayout from '@solana/buffer-layout';
 import secp256k1 from 'secp256k1';
-import {keccak_256} from 'js-sha3';
+import sha3 from 'js-sha3';
 
 import {PublicKey} from './publickey';
 import {TransactionInstruction} from './transaction';
@@ -86,9 +86,9 @@ export class Secp256k1Program {
     );
 
     try {
-      return Buffer.from(keccak_256.update(toBuffer(publicKey)).digest()).slice(
-        -ETHEREUM_ADDRESS_BYTES,
-      );
+      return Buffer.from(
+        sha3.keccak_256.update(toBuffer(publicKey)).digest(),
+      ).slice(-ETHEREUM_ADDRESS_BYTES);
     } catch (error) {
       throw new Error(`Error constructing Ethereum address: ${error}`);
     }
@@ -197,7 +197,7 @@ export class Secp256k1Program {
       const privateKey = toBuffer(pkey);
       const publicKey = publicKeyCreate(privateKey, false).slice(1); // throw away leading byte
       const messageHash = Buffer.from(
-        keccak_256.update(toBuffer(message)).digest(),
+        sha3.keccak_256.update(toBuffer(message)).digest(),
       );
       const {signature, recid: recoveryId} = ecdsaSign(messageHash, privateKey);
 

package/src/sysvar.ts

@@ -4,6 +4,14 @@ export const SYSVAR_CLOCK_PUBKEY = new PublicKey(
   'SysvarC1ock11111111111111111111111111111111',
 );
 
+export const SYSVAR_EPOCH_SCHEDULE_PUBKEY = new PublicKey(
+  'SysvarEpochSchedu1e111111111111111111111111',
+);
+
+export const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey(
+  'Sysvar1nstructions1111111111111111111111111',
+);
+
 export const SYSVAR_RECENT_BLOCKHASHES_PUBKEY = new PublicKey(
   'SysvarRecentB1ockHashes11111111111111111111',
 );
@@ -16,10 +24,14 @@ export const SYSVAR_REWARDS_PUBKEY = new PublicKey(
   'SysvarRewards111111111111111111111111111111',
 );
 
-export const SYSVAR_STAKE_HISTORY_PUBKEY = new PublicKey(
-  'SysvarStakeHistory1111111111111111111111111',
+export const SYSVAR_SLOT_HASHES_PUBKEY = new PublicKey(
+  'SysvarS1otHashes111111111111111111111111111',
 );
 
-export const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey(
-  'Sysvar1nstructions1111111111111111111111111',
+export const SYSVAR_SLOT_HISTORY_PUBKEY = new PublicKey(
+  'SysvarS1otHistory11111111111111111111111111',
+);
+
+export const SYSVAR_STAKE_HISTORY_PUBKEY = new PublicKey(
+  'SysvarStakeHistory1111111111111111111111111',
 );

package/src/transaction.ts

@@ -259,9 +259,12 @@ export class Transaction {
 
     // Sort. Prioritizing first by signer, then by writable
     accountMetas.sort(function (x, y) {
+      const pubkeySorting = x.pubkey
+        .toBase58()
+        .localeCompare(y.pubkey.toBase58());
       const checkSigner = x.isSigner === y.isSigner ? 0 : x.isSigner ? -1 : 1;
       const checkWritable =
-        x.isWritable === y.isWritable ? 0 : x.isWritable ? -1 : 1;
+        x.isWritable === y.isWritable ? pubkeySorting : x.isWritable ? -1 : 1;
       return checkSigner || checkWritable;
     });