@solana/web3.js 1.22.1 → 1.23.1

package/module.flow.js

@@ -1728,8 +1728,9 @@ declare module "@solana/web3.js" {
 
     /**
      * Optional encoding for account data (default base64)
+     * To use "jsonParsed" encoding, please refer to `getParsedProgramAccounts` in connection.ts
      */
-    encoding?: "base64" | "jsonParsed",
+    encoding?: "base64",
 
     /**
      * Optional data slice to limit the returned account data
@@ -3647,6 +3648,7 @@ feeCalculator: FeeCalculator,...
     message: Buffer | Uint8Array | Array<number>,
     signature: Buffer | Uint8Array | Array<number>,
     recoveryId: number,
+    instructionIndex?: number,
     ...
   };
 
@@ -3658,6 +3660,7 @@ feeCalculator: FeeCalculator,...
     message: Buffer | Uint8Array | Array<number>,
     signature: Buffer | Uint8Array | Array<number>,
     recoveryId: number,
+    instructionIndex?: number,
     ...
   };
 
@@ -3667,6 +3670,7 @@ feeCalculator: FeeCalculator,...
   declare export type CreateSecp256k1InstructionWithPrivateKeyParams = {
     privateKey: Buffer | Uint8Array | Array<number>,
     message: Buffer | Uint8Array | Array<number>,
+    instructionIndex?: number,
     ...
   };
   declare export class Secp256k1Program {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.22.1",
+  "version": "1.23.1",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -59,11 +59,11 @@
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-typescript": "^7.12.16",
     "@babel/register": "^7.12.13",
-    "@commitlint/config-conventional": "^12.0.1",
-    "@commitlint/travis-cli": "^12.0.1",
+    "@commitlint/config-conventional": "^13.1.0",
+    "@commitlint/travis-cli": "^13.1.0",
     "@rollup/plugin-alias": "^3.1.2",
     "@rollup/plugin-babel": "^5.2.3",
-    "@rollup/plugin-commonjs": "^19.0.0",
+    "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-multi-entry": "^4.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
@@ -74,7 +74,7 @@
     "@types/chai": "^4.2.15",
     "@types/chai-as-promised": "^7.1.3",
     "@types/express-serve-static-core": "^4.17.21",
-    "@types/mocha": "^8.2.1",
+    "@types/mocha": "^9.0.0",
     "@types/mz": "^2.7.3",
     "@types/node": "^16.0.0",
     "@types/node-fetch": "^2.5.8",
@@ -88,7 +88,7 @@
     "cross-env": "7.0.3",
     "eslint": "^7.19.0",
     "eslint-config-prettier": "^8.0.0",
-    "eslint-plugin-import": "2.23.4",
+    "eslint-plugin-import": "2.24.0",
     "eslint-plugin-mocha": "^9.0.0",
     "eslint-plugin-prettier": "^3.0.0",
     "esm": "^3.2.25",
@@ -103,7 +103,7 @@
     "nyc": "^15.1.0",
     "prettier": "^2.3.0",
     "rimraf": "3.0.2",
-    "rollup": "2.53.2",
+    "rollup": "2.56.2",
     "rollup-plugin-dts": "^3.0.1",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "rollup-plugin-terser": "^7.0.2",

package/src/connection.ts

@@ -1646,8 +1646,10 @@ export type GetProgramAccountsFilter = MemcmpFilter | DataSizeFilter;
 export type GetProgramAccountsConfig = {
   /** Optional commitment level */
   commitment?: Commitment;
-  /** Optional encoding for account data (default base64) */
-  encoding?: 'base64' | 'jsonParsed';
+  /** Optional encoding for account data (default base64)
+   * To use "jsonParsed" encoding, please refer to `getParsedProgramAccounts` in connection.ts
+   * */
+  encoding?: 'base64';
   /** Optional data slice to limit the returned account data */
   dataSlice?: DataSlice;
   /** Optional array of filters to apply to accounts */

package/src/secp256k1-program.ts

@@ -23,6 +23,7 @@ export type CreateSecp256k1InstructionWithPublicKeyParams = {
   message: Buffer | Uint8Array | Array<number>;
   signature: Buffer | Uint8Array | Array<number>;
   recoveryId: number;
+  instructionIndex?: number;
 };
 
 /**
@@ -33,6 +34,7 @@ export type CreateSecp256k1InstructionWithEthAddressParams = {
   message: Buffer | Uint8Array | Array<number>;
   signature: Buffer | Uint8Array | Array<number>;
   recoveryId: number;
+  instructionIndex?: number;
 };
 
 /**
@@ -41,6 +43,7 @@ export type CreateSecp256k1InstructionWithEthAddressParams = {
 export type CreateSecp256k1InstructionWithPrivateKeyParams = {
   privateKey: Buffer | Uint8Array | Array<number>;
   message: Buffer | Uint8Array | Array<number>;
+  instructionIndex?: number;
 };
 
 const SECP256K1_INSTRUCTION_LAYOUT = BufferLayout.struct([
@@ -98,12 +101,14 @@ export class Secp256k1Program {
   static createInstructionWithPublicKey(
     params: CreateSecp256k1InstructionWithPublicKeyParams,
   ): TransactionInstruction {
-    const {publicKey, message, signature, recoveryId} = params;
+    const {publicKey, message, signature, recoveryId, instructionIndex} =
+      params;
     return Secp256k1Program.createInstructionWithEthAddress({
       ethAddress: Secp256k1Program.publicKeyToEthAddress(publicKey),
       message,
       signature,
       recoveryId,
+      instructionIndex,
     });
   }
 
@@ -114,7 +119,13 @@ export class Secp256k1Program {
   static createInstructionWithEthAddress(
     params: CreateSecp256k1InstructionWithEthAddressParams,
   ): TransactionInstruction {
-    const {ethAddress: rawAddress, message, signature, recoveryId} = params;
+    const {
+      ethAddress: rawAddress,
+      message,
+      signature,
+      recoveryId,
+      instructionIndex = 0,
+    } = params;
 
     let ethAddress;
     if (typeof rawAddress === 'string') {
@@ -146,12 +157,12 @@ export class Secp256k1Program {
       {
         numSignatures,
         signatureOffset,
-        signatureInstructionIndex: 0,
+        signatureInstructionIndex: instructionIndex,
         ethAddressOffset,
-        ethAddressInstructionIndex: 0,
+        ethAddressInstructionIndex: instructionIndex,
         messageDataOffset,
         messageDataSize: message.length,
-        messageInstructionIndex: 0,
+        messageInstructionIndex: instructionIndex,
         signature: toBuffer(signature),
         ethAddress: toBuffer(ethAddress),
         recoveryId,
@@ -175,7 +186,7 @@ export class Secp256k1Program {
   static createInstructionWithPrivateKey(
     params: CreateSecp256k1InstructionWithPrivateKeyParams,
   ): TransactionInstruction {
-    const {privateKey: pkey, message} = params;
+    const {privateKey: pkey, message, instructionIndex} = params;
 
     assert(
       pkey.length === PRIVATE_KEY_BYTES,
@@ -195,6 +206,7 @@ export class Secp256k1Program {
         message,
         signature,
         recoveryId,
+        instructionIndex,
       });
     } catch (error) {
       throw new Error(`Error creating instruction; ${error}`);