@solana/web3.js 1.29.3 → 1.31.0

package/module.flow.js

@@ -799,6 +799,22 @@ declare module "@solana/web3.js" {
     ...
   };
 
+  /**
+   * Configuration object for changing `getSupply` request behavior
+   */
+  declare export type GetSupplyConfig = {
+    /**
+     * The level of commitment desired
+     */
+    commitment?: Commitment,
+
+    /**
+     * Exclude non circulating accounts list from response
+     */
+    excludeNonCirculatingAccountsList?: boolean,
+    ...
+  };
+
   /**
    * Configuration object for changing query behavior
    */
@@ -2121,7 +2137,9 @@ declare module "@solana/web3.js" {
     /**
      * Fetch information about the current supply
      */
-    getSupply(commitment?: Commitment): Promise<RpcResponseAndContext<Supply>>;
+    getSupply(
+      config?: GetSupplyConfig | Commitment
+    ): Promise<RpcResponseAndContext<Supply>>;
 
     /**
      * Fetch the current supply of a token mint

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.29.3",
+  "version": "1.31.0",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -63,13 +63,13 @@
   },
   "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 +84,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": "^14.1.0",
+    "@commitlint/travis-cli": "^14.1.0",
     "@rollup/plugin-alias": "^3.1.2",
     "@rollup/plugin-babel": "^5.2.3",
     "@rollup/plugin-commonjs": "^21.0.0",
@@ -112,13 +112,13 @@
     "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",
     "flow-bin": "^0.150.0",
     "flowgen": "^1.13.0",
-    "http-server": "^13.0.0",
+    "http-server": "^14.0.0",
     "mocha": "^8.2.1",
     "mocha-headless-chrome": "^3.1.0",
     "mockttp": "^2.0.1",
@@ -126,14 +126,14 @@
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "prettier": "^2.3.0",
-    "puppeteer": "^10.2.0",
+    "puppeteer": "^11.0.0",
     "rimraf": "3.0.2",
-    "rollup": "2.58.0",
+    "rollup": "2.60.0",
     "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

@@ -265,6 +265,16 @@ export type GetLargestAccountsConfig = {
   filter?: LargestAccountsFilter;
 };
 
+/**
+ * Configuration object for changing `getSupply` request behavior
+ */
+export type GetSupplyConfig = {
+  /** The level of commitment desired */
+  commitment?: Commitment;
+  /** Exclude non circulating accounts list from response */
+  excludeNonCirculatingAccountsList?: boolean;
+};
+
 /**
  * Configuration object for changing query behavior
  */
@@ -2222,10 +2232,23 @@ export class Connection {
    * Fetch information about the current supply
    */
   async getSupply(
-    commitment?: Commitment,
+    config?: GetSupplyConfig | Commitment,
   ): Promise<RpcResponseAndContext<Supply>> {
-    const args = this._buildArgs([], commitment);
-    const unsafeRes = await this._rpcRequest('getSupply', args);
+    let configArg: GetSupplyConfig = {};
+    if (typeof config === 'string') {
+      configArg = {commitment: config};
+    } else if (config) {
+      configArg = {
+        ...config,
+        commitment: (config && config.commitment) || this.commitment,
+      };
+    } else {
+      configArg = {
+        commitment: this.commitment,
+      };
+    }
+
+    const unsafeRes = await this._rpcRequest('getSupply', [configArg]);
     const res = create(unsafeRes, GetSupplyRpcResult);
     if ('error' in res) {
       throw new Error('failed to get supply: ' + res.error.message);
@@ -2794,13 +2817,11 @@ export class Connection {
    * @deprecated Deprecated since v1.2.8. Please use {@link getSupply} instead.
    */
   async getTotalSupply(commitment?: Commitment): Promise<number> {
-    const args = this._buildArgs([], commitment);
-    const unsafeRes = await this._rpcRequest('getSupply', args);
-    const res = create(unsafeRes, GetSupplyRpcResult);
-    if ('error' in res) {
-      throw new Error('failed to get total supply: ' + res.error.message);
-    }
-    return res.result.value.total;
+    const result = await this.getSupply({
+      commitment,
+      excludeNonCirculatingAccountsList: true,
+    });
+    return result.value.total;
   }
 
   /**

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';
@@ -131,7 +131,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 +155,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);