@solana/web3.js 1.39.1 → 1.40.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.39.1",
+  "version": "1.40.0",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -79,7 +79,7 @@
     "@babel/preset-typescript": "^7.12.16",
     "@babel/register": "^7.12.13",
     "@commitlint/config-conventional": "^15.0.0",
-    "@commitlint/travis-cli": "^15.0.0",
+    "@commitlint/travis-cli": "^16.2.3",
     "@rollup/plugin-alias": "^3.1.2",
     "@rollup/plugin-babel": "^5.2.3",
     "@rollup/plugin-commonjs": "^21.0.0",
@@ -95,7 +95,7 @@
     "@types/express-serve-static-core": "^4.17.21",
     "@types/mocha": "^9.0.0",
     "@types/mz": "^2.7.3",
-    "@types/node": "^16.0.0",
+    "@types/node": "^17.0.24",
     "@types/secp256k1": "^4.0.1",
     "@types/sinon": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^4.14.2",

package/src/connection.ts

@@ -2120,6 +2120,13 @@ export type ConnectionConfig = {
   confirmTransactionInitialTimeout?: number;
 };
 
+function createSubscriptionWarningMessage(id: number, label: string): string {
+  return (
+    'Ignored unsubscribe request because an active subscription ' +
+    `with id \`${id}\` for '${label}' events could not be found.`
+  );
+}
+
 /**
  * A connection to a fullnode JSON RPC endpoint
  */
@@ -3404,6 +3411,34 @@ export class Connection {
     return res;
   }
 
+  /**
+   * Fetch transaction details for a batch of confirmed transactions.
+   * Similar to {@link getParsedTransactions} but returns a {@link TransactionResponse}.
+   */
+  async getTransactions(
+    signatures: TransactionSignature[],
+    commitment?: Finality,
+  ): Promise<(TransactionResponse | null)[]> {
+    const batch = signatures.map(signature => {
+      const args = this._buildArgsAtLeastConfirmed([signature], commitment);
+      return {
+        methodName: 'getTransaction',
+        args,
+      };
+    });
+
+    const unsafeRes = await this._rpcBatchRequest(batch);
+    const res = unsafeRes.map((unsafeRes: any) => {
+      const res = create(unsafeRes, GetTransactionRpcResult);
+      if ('error' in res) {
+        throw new Error('failed to get transactions: ' + res.error.message);
+      }
+      return res.result;
+    });
+
+    return res;
+  }
+
   /**
    * Fetch a list of Transactions and transaction statuses from the cluster
    * for a confirmed block.
@@ -4353,7 +4388,7 @@ export class Connection {
       await this._unsubscribe(subInfo, 'accountUnsubscribe');
       this._updateSubscriptions();
     } else {
-      throw new Error(`Unknown account change id: ${id}`);
+      console.warn(createSubscriptionWarningMessage(id, 'account change'));
     }
   }
 
@@ -4417,7 +4452,9 @@ export class Connection {
       await this._unsubscribe(subInfo, 'programUnsubscribe');
       this._updateSubscriptions();
     } else {
-      throw new Error(`Unknown program account change id: ${id}`);
+      console.warn(
+        createSubscriptionWarningMessage(id, 'program account change'),
+      );
     }
   }
 
@@ -4446,13 +4483,14 @@ export class Connection {
    * @param id subscription id to deregister.
    */
   async removeOnLogsListener(id: number): Promise<void> {
-    if (!this._logsSubscriptions[id]) {
-      throw new Error(`Unknown logs id: ${id}`);
+    if (this._logsSubscriptions[id]) {
+      const subInfo = this._logsSubscriptions[id];
+      delete this._logsSubscriptions[id];
+      await this._unsubscribe(subInfo, 'logsUnsubscribe');
+      this._updateSubscriptions();
+    } else {
+      console.warn(createSubscriptionWarningMessage(id, 'logs'));
     }
-    const subInfo = this._logsSubscriptions[id];
-    delete this._logsSubscriptions[id];
-    await this._unsubscribe(subInfo, 'logsUnsubscribe');
-    this._updateSubscriptions();
   }
 
   /**
@@ -4511,7 +4549,7 @@ export class Connection {
       await this._unsubscribe(subInfo, 'slotUnsubscribe');
       this._updateSubscriptions();
     } else {
-      throw new Error(`Unknown slot change id: ${id}`);
+      console.warn(createSubscriptionWarningMessage(id, 'slot change'));
     }
   }
 
@@ -4557,7 +4595,7 @@ export class Connection {
       await this._unsubscribe(subInfo, 'slotsUpdatesUnsubscribe');
       this._updateSubscriptions();
     } else {
-      throw new Error(`Unknown slot update id: ${id}`);
+      console.warn(createSubscriptionWarningMessage(id, 'slot update'));
     }
   }
 
@@ -4702,7 +4740,7 @@ export class Connection {
       await this._unsubscribe(subInfo, 'signatureUnsubscribe');
       this._updateSubscriptions();
     } else {
-      throw new Error(`Unknown signature result id: ${id}`);
+      console.warn(createSubscriptionWarningMessage(id, 'signature result'));
     }
   }
 
@@ -4747,7 +4785,7 @@ export class Connection {
       await this._unsubscribe(subInfo, 'rootUnsubscribe');
       this._updateSubscriptions();
     } else {
-      throw new Error(`Unknown root change id: ${id}`);
+      console.warn(createSubscriptionWarningMessage(id, 'root change'));
     }
   }
 }

package/src/publickey.ts

@@ -143,10 +143,10 @@ export class PublicKey extends Struct {
    * Derive a program address from seeds and a program ID.
    */
   /* eslint-disable require-await */
-  static async createProgramAddress(
+  static createProgramAddressSync(
     seeds: Array<Buffer | Uint8Array>,
     programId: PublicKey,
-  ): Promise<PublicKey> {
+  ): PublicKey {
     let buffer = Buffer.alloc(0);
     seeds.forEach(function (seed) {
       if (seed.length > MAX_SEED_LENGTH) {
@@ -167,6 +167,18 @@ export class PublicKey extends Struct {
     return new PublicKey(publicKeyBytes);
   }
 
+  /**
+   * Async version of createProgramAddressSync
+   * For backwards compatibility
+   */
+  /* eslint-disable require-await */
+  static async createProgramAddress(
+    seeds: Array<Buffer | Uint8Array>,
+    programId: PublicKey,
+  ): Promise<PublicKey> {
+    return this.createProgramAddressSync(seeds, programId);
+  }
+
   /**
    * Find a valid program address
    *
@@ -174,16 +186,16 @@ export class PublicKey extends Struct {
    * iterates a nonce until it finds one that when combined with the seeds
    * results in a valid program address.
    */
-  static async findProgramAddress(
+  static findProgramAddressSync(
     seeds: Array<Buffer | Uint8Array>,
     programId: PublicKey,
-  ): Promise<[PublicKey, number]> {
+  ): [PublicKey, number] {
     let nonce = 255;
     let address;
     while (nonce != 0) {
       try {
         const seedsWithNonce = seeds.concat(Buffer.from([nonce]));
-        address = await this.createProgramAddress(seedsWithNonce, programId);
+        address = this.createProgramAddressSync(seedsWithNonce, programId);
       } catch (err) {
         if (err instanceof TypeError) {
           throw err;
@@ -196,11 +208,23 @@ export class PublicKey extends Struct {
     throw new Error(`Unable to find a viable program address nonce`);
   }
 
+  /**
+   * Async version of findProgramAddressSync
+   * For backwards compatibility
+   */
+  static async findProgramAddress(
+    seeds: Array<Buffer | Uint8Array>,
+    programId: PublicKey,
+  ): Promise<[PublicKey, number]> {
+    return this.findProgramAddressSync(seeds, programId);
+  }
+
   /**
    * Check that a pubkey is on the ed25519 curve.
    */
-  static isOnCurve(pubkey: Uint8Array): boolean {
-    return is_on_curve(pubkey) == 1;
+  static isOnCurve(pubkeyData: PublicKeyInitData): boolean {
+    const pubkey = new PublicKey(pubkeyData);
+    return is_on_curve(pubkey.toBytes()) == 1;
   }
 }
 

package/src/stake-program.ts

@@ -601,8 +601,8 @@ export class StakeProgram {
    * Max space of a Stake account
    *
    * This is generated from the solana-stake-program StakeState struct as
-   * `std::mem::size_of::<StakeState>()`:
-   * https://docs.rs/solana-stake-program/1.4.4/solana_stake_program/stake_state/enum.StakeState.html
+   * `StakeState::size_of()`:
+   * https://docs.rs/solana-stake-program/latest/solana_stake_program/stake_state/enum.StakeState.html
    */
   static space: number = 200;
 

package/src/transaction.ts

@@ -167,7 +167,7 @@ export interface TransactionJSON {
     nonceInstruction: TransactionInstructionJSON;
   } | null;
   instructions: TransactionInstructionJSON[];
-  signatures: {publicKey: string; signature: number[] | null}[];
+  signers: string[];
 }
 
 /**
@@ -242,10 +242,9 @@ export class Transaction {
           }
         : null,
       instructions: this.instructions.map(instruction => instruction.toJSON()),
-      signatures: this.signatures.map(({publicKey, signature}) => ({
-        publicKey: publicKey.toJSON(),
-        signature: signature ? [...signature] : null,
-      })),
+      signers: this.signatures.map(({publicKey}) => {
+        return publicKey.toJSON();
+      }),
     };
   }
 
@@ -280,7 +279,7 @@ export class Transaction {
     if (this._message) {
       if (JSON.stringify(this.toJSON()) !== JSON.stringify(this._json)) {
         throw new Error(
-          'Transaction mutated after being populated from Message',
+          'Transaction message mutated after being populated from Message',
         );
       }
       return this._message;