@solana/web3.js 1.75.0 → 1.77.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.75.0",
+  "version": "1.77.0",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -41,7 +41,7 @@
     "compile:js": "cross-env NODE_ENV=production rollup -c",
     "compile:typedefs": "./scripts/typegen.sh",
     "build:fixtures": "set -ex; ./test/fixtures/noop-program/build.sh",
-    "clean": "rimraf ./docs ./declarations ./lib",
+    "clean": "rimraf ./doc ./declarations ./lib",
     "dev": "cross-env NODE_ENV=development rollup -c --watch",
     "publish-packages": "semantic-release --repository-url git@github.com:solana-labs/solana-web3.js.git",
     "test:lint": "eslint src/ test/ --ext .js,.ts",
@@ -55,9 +55,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@noble/ed25519": "^1.7.0",
-    "@noble/hashes": "^1.1.2",
-    "@noble/secp256k1": "^1.6.3",
+    "@noble/curves": "^1.0.0",
+    "@noble/hashes": "^1.3.0",
     "@solana/buffer-layout": "^4.0.0",
     "agentkeepalive": "^4.2.1",
     "bigint-buffer": "^1.1.5",
@@ -84,6 +83,7 @@
     "@rollup/plugin-multi-entry": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
+    "@rollup/plugin-terser": "^0.4.0",
     "@solana/spl-token": "^0.3.7",
     "@types/bn.js": "^5.1.0",
     "@types/bs58": "^4.0.1",
@@ -96,12 +96,12 @@
     "@types/node-fetch": "2",
     "@types/sinon": "^10.0.0",
     "@types/sinon-chai": "^3.2.8",
-    "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@typescript-eslint/parser": "^5.40.1",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
+    "@typescript-eslint/parser": "^5.57.1",
     "chai": "^4.3.0",
     "chai-as-promised": "^7.1.1",
     "cross-env": "7.0.3",
-    "eslint": "^8.25.0",
+    "eslint": "^8.37.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-mocha": "^10.1.0",
@@ -113,10 +113,9 @@
     "node-abort-controller": "^3.0.1",
     "prettier": "^2.3.0",
     "rimraf": "4.1.2",
-    "rollup": "2.79.1",
-    "rollup-plugin-dts": "^4.0.0",
+    "rollup": "^3.20.2",
+    "rollup-plugin-dts": "^5.3.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
-    "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^19.0.3",
     "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
@@ -125,7 +124,7 @@
     "ts-node": "^10.0.0",
     "tsconfig": "workspace:*",
     "tslib": "^2.1.0",
-    "typedoc": "^0.23",
-    "typescript": "^4.9"
+    "typedoc": "^0.23.28",
+    "typescript": "^5.0.3"
   }
 }

package/src/connection.ts

@@ -2685,8 +2685,16 @@ export type GetProgramAccountsConfig = {
   filters?: GetProgramAccountsFilter[];
   /** The minimum slot that the request can be evaluated at */
   minContextSlot?: number;
+  /** wrap the result in an RpcResponse JSON object */
+  withContext?: boolean;
 };
 
+export type GetProgramAccountsResponse = readonly Readonly<{
+  account: AccountInfo<Buffer>;
+  /** the account Pubkey as base-58 encoded string */
+  pubkey: PublicKey;
+}>[];
+
 /**
  * Configuration object for getParsedProgramAccounts
  */
@@ -3336,17 +3344,13 @@ export class Connection {
   /**
    * Fetch all the token accounts owned by the specified account
    *
-   * @return {Promise<RpcResponseAndContext<Array<{pubkey: PublicKey, account: AccountInfo<Buffer>}>>>}
+   * @return {Promise<RpcResponseAndContext<GetProgramAccountsResponse>}
    */
   async getTokenAccountsByOwner(
     ownerAddress: PublicKey,
     filter: TokenAccountsFilter,
     commitmentOrConfig?: Commitment | GetTokenAccountsByOwnerConfig,
-  ): Promise<
-    RpcResponseAndContext<
-      Array<{pubkey: PublicKey; account: AccountInfo<Buffer>}>
-    >
-  > {
+  ): Promise<RpcResponseAndContext<GetProgramAccountsResponse>> {
     const {commitment, config} =
       extractCommitmentFromConfig(commitmentOrConfig);
     let _args: any[] = [ownerAddress.toBase58()];
@@ -3621,10 +3625,24 @@ export class Connection {
    *
    * @return {Promise<Array<{pubkey: PublicKey, account: AccountInfo<Buffer>}>>}
    */
+  async getProgramAccounts(
+    programId: PublicKey,
+    configOrCommitment?: GetProgramAccountsConfig &
+      Readonly<{withContext: true}>,
+  ): Promise<RpcResponseAndContext<GetProgramAccountsResponse>>;
+  // eslint-disable-next-line no-dupe-class-members
   async getProgramAccounts(
     programId: PublicKey,
     configOrCommitment?: GetProgramAccountsConfig | Commitment,
-  ): Promise<Array<{pubkey: PublicKey; account: AccountInfo<Buffer>}>> {
+  ): Promise<GetProgramAccountsResponse>;
+  // eslint-disable-next-line no-dupe-class-members
+  async getProgramAccounts(
+    programId: PublicKey,
+    configOrCommitment?: GetProgramAccountsConfig | Commitment,
+  ): Promise<
+    | GetProgramAccountsResponse
+    | RpcResponseAndContext<GetProgramAccountsResponse>
+  > {
     const {commitment, config} =
       extractCommitmentFromConfig(configOrCommitment);
     const {encoding, ...configWithoutEncoding} = config || {};
@@ -3635,7 +3653,11 @@ export class Connection {
       configWithoutEncoding,
     );
     const unsafeRes = await this._rpcRequest('getProgramAccounts', args);
-    const res = create(unsafeRes, jsonRpcResult(array(KeyedAccountInfoResult)));
+    const baseSchema = array(KeyedAccountInfoResult);
+    const res =
+      configWithoutEncoding.withContext === true
+        ? create(unsafeRes, jsonRpcResultAndContext(baseSchema))
+        : create(unsafeRes, jsonRpcResult(baseSchema));
     if ('error' in res) {
       throw new SolanaJSONRPCError(
         res.error,

package/src/loader.ts

@@ -3,6 +3,7 @@ import * as BufferLayout from '@solana/buffer-layout';
 
 import {PublicKey} from './publickey';
 import {Transaction, PACKET_DATA_SIZE} from './transaction';
+import {MS_PER_SLOT} from './timing';
 import {SYSVAR_RENT_PUBKEY} from './sysvar';
 import {sendAndConfirmTransaction} from './utils/send-and-confirm-transaction';
 import {sleep} from './utils/sleep';
@@ -220,14 +221,44 @@ export class Loader {
         programId,
         data,
       });
-      await sendAndConfirmTransaction(
-        connection,
+      const deployCommitment = 'processed';
+      const finalizeSignature = await connection.sendTransaction(
         transaction,
         [payer, program],
+        {preflightCommitment: deployCommitment},
+      );
+      const {context, value} = await connection.confirmTransaction(
         {
-          commitment: 'confirmed',
+          signature: finalizeSignature,
+          lastValidBlockHeight: transaction.lastValidBlockHeight!,
+          blockhash: transaction.recentBlockhash!,
         },
+        deployCommitment,
       );
+      if (value.err) {
+        throw new Error(
+          `Transaction ${finalizeSignature} failed (${JSON.stringify(value)})`,
+        );
+      }
+      // We prevent programs from being usable until the slot after their deployment.
+      // See https://github.com/solana-labs/solana/pull/29654
+      while (
+        true // eslint-disable-line no-constant-condition
+      ) {
+        try {
+          const currentSlot = await connection.getSlot({
+            commitment: deployCommitment,
+          });
+          if (currentSlot > context.slot) {
+            break;
+          }
+        } catch {
+          /* empty */
+        }
+        await new Promise(resolve =>
+          setTimeout(resolve, Math.round(MS_PER_SLOT / 2)),
+        );
+      }
     }
 
     // success

package/src/programs/vote.ts

@@ -366,8 +366,10 @@ export class VoteProgram {
    * This is generated from the solana-vote-program VoteState struct as
    * `VoteState::size_of()`:
    * https://docs.rs/solana-vote-program/1.9.5/solana_vote_program/vote_state/struct.VoteState.html#method.size_of
+   *
+   * KEEP IN SYNC WITH `VoteState::size_of()` in https://github.com/solana-labs/solana/blob/a474cb24b9238f5edcc982f65c0b37d4a1046f7e/sdk/program/src/vote/state/mod.rs#L340-L342
    */
-  static space: number = 3731;
+  static space: number = process.env.TEST_LIVE ? 3762 : 3731;
 
   /**
    * Generate an Initialize instruction.

package/src/utils/ed25519.ts

@@ -1,5 +1,4 @@
-import {sha512} from '@noble/hashes/sha512';
-import * as ed25519 from '@noble/ed25519';
+import {ed25519} from '@noble/curves/ed25519';
 
 /**
  * A 64 byte secret key, the first 32 bytes of which is the
@@ -16,8 +15,6 @@ export interface Ed25519Keypair {
   secretKey: Ed25519SecretKey;
 }
 
-ed25519.utils.sha512Sync = (...m) => sha512(ed25519.utils.concatBytes(...m));
-
 export const generatePrivateKey = ed25519.utils.randomPrivateKey;
 export const generateKeypair = (): Ed25519Keypair => {
   const privateScalar = ed25519.utils.randomPrivateKey();
@@ -30,17 +27,17 @@ export const generateKeypair = (): Ed25519Keypair => {
     secretKey,
   };
 };
-export const getPublicKey = ed25519.sync.getPublicKey;
+export const getPublicKey = ed25519.getPublicKey;
 export function isOnCurve(publicKey: Uint8Array): boolean {
   try {
-    ed25519.Point.fromHex(publicKey, true /* strict */);
+    ed25519.ExtendedPoint.fromHex(publicKey);
     return true;
   } catch {
     return false;
   }
 }
 export const sign = (
-  message: Parameters<typeof ed25519.sync.sign>[0],
+  message: Parameters<typeof ed25519.sign>[0],
   secretKey: Ed25519SecretKey,
-) => ed25519.sync.sign(message, secretKey.slice(0, 32));
-export const verify = ed25519.sync.verify;
+) => ed25519.sign(message, secretKey.slice(0, 32));
+export const verify = ed25519.verify;

package/src/utils/secp256k1.ts

@@ -1,18 +1,11 @@
-import {hmac} from '@noble/hashes/hmac';
-import {sha256} from '@noble/hashes/sha256';
-import * as secp256k1 from '@noble/secp256k1';
-
-// Supply a synchronous hashing algorithm to make this
-// library interoperable with the synchronous APIs in web3.js.
-secp256k1.utils.hmacSha256Sync = (key: Uint8Array, ...msgs: Uint8Array[]) => {
-  const h = hmac.create(sha256, key);
-  msgs.forEach(msg => h.update(msg));
-  return h.digest();
-};
+import {secp256k1} from '@noble/curves/secp256k1';
 
 export const ecdsaSign = (
-  msgHash: Parameters<typeof secp256k1.signSync>[0],
-  privKey: Parameters<typeof secp256k1.signSync>[1],
-) => secp256k1.signSync(msgHash, privKey, {der: false, recovered: true});
+  msgHash: Parameters<typeof secp256k1.sign>[0],
+  privKey: Parameters<typeof secp256k1.sign>[1],
+) => {
+  const signature = secp256k1.sign(msgHash, privKey);
+  return [signature.toCompactRawBytes(), signature.recovery!] as const;
+};
 export const isValidPrivateKey = secp256k1.utils.isValidPrivateKey;
 export const publicKeyCreate = secp256k1.getPublicKey;