@solana/web3.js 1.41.3 → 1.41.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.41.3",
+  "version": "1.41.6",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -59,6 +59,7 @@
     "@babel/runtime": "^7.12.5",
     "@ethersproject/sha2": "^5.5.0",
     "@solana/buffer-layout": "^4.0.0",
+    "@solana/buffer-layout-utils": "^0.2.0",
     "bn.js": "^5.0.0",
     "borsh": "^0.7.0",
     "bs58": "^4.0.1",
@@ -69,7 +70,6 @@
     "js-sha3": "^0.8.0",
     "rpc-websockets": "^7.4.2",
     "secp256k1": "^4.0.2",
-    "sinon-chai": "^3.7.0",
     "superstruct": "^0.14.2",
     "tweetnacl": "^1.0.0"
   },
@@ -89,7 +89,7 @@
     "@rollup/plugin-multi-entry": "^4.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@solana/spl-token": "^0.1.2",
+    "@solana/spl-token": "^0.2.0",
     "@types/bn.js": "^5.1.0",
     "@types/bs58": "^4.0.1",
     "@types/chai": "^4.2.15",
@@ -127,6 +127,7 @@
     "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^18.0.0",
     "sinon": "^13.0.2",
+    "sinon-chai": "^3.7.0",
     "start-server-and-test": "^1.12.0",
     "ts-mocha": "^9.0.2",
     "ts-node": "^10.0.0",

package/src/connection.ts

@@ -4847,7 +4847,7 @@ export class Connection {
             try {
               this.removeSignatureListener(clientSubscriptionId);
               // eslint-disable-next-line no-empty
-            } catch {
+            } catch (_err) {
               // Already removed.
             }
           }
@@ -4895,7 +4895,7 @@ export class Connection {
           try {
             this.removeSignatureListener(clientSubscriptionId);
             // eslint-disable-next-line no-empty
-          } catch {
+          } catch (_err) {
             // Already removed.
           }
         },

package/src/system-program.ts

@@ -1,4 +1,5 @@
 import * as BufferLayout from '@solana/buffer-layout';
+import {u64} from '@solana/buffer-layout-utils';
 
 import {
   encodeData,
@@ -38,7 +39,7 @@ export type TransferParams = {
   /** Account that will receive transferred lamports */
   toPubkey: PublicKey;
   /** Amount of lamports to transfer */
-  lamports: number;
+  lamports: number | bigint;
 };
 
 /**
@@ -200,7 +201,33 @@ export type TransferWithSeedParams = {
   /** Account that will receive transferred lamports */
   toPubkey: PublicKey;
   /** Amount of lamports to transfer */
-  lamports: number;
+  lamports: number | bigint;
+  /** Seed to use to derive the funding account address */
+  seed: string;
+  /** Program id to use to derive the funding account address */
+  programId: PublicKey;
+};
+
+/** Decoded transfer system transaction instruction */
+export type DecodedTransferInstruction = {
+  /** Account that will transfer lamports */
+  fromPubkey: PublicKey;
+  /** Account that will receive transferred lamports */
+  toPubkey: PublicKey;
+  /** Amount of lamports to transfer */
+  lamports: bigint;
+};
+
+/** Decoded transferWithSeed system transaction instruction */
+export type DecodedTransferWithSeedInstruction = {
+  /** Account that will transfer lamports */
+  fromPubkey: PublicKey;
+  /** Base public key to use to derive the funding account address */
+  basePubkey: PublicKey;
+  /** Account that will receive transferred lamports */
+  toPubkey: PublicKey;
+  /** Amount of lamports to transfer */
+  lamports: bigint;
   /** Seed to use to derive the funding account address */
   seed: string;
   /** Program id to use to derive the funding account address */
@@ -268,7 +295,9 @@ export class SystemInstruction {
   /**
    * Decode a transfer system instruction and retrieve the instruction params.
    */
-  static decodeTransfer(instruction: TransactionInstruction): TransferParams {
+  static decodeTransfer(
+    instruction: TransactionInstruction,
+  ): DecodedTransferInstruction {
     this.checkProgramId(instruction.programId);
     this.checkKeyLength(instruction.keys, 2);
 
@@ -289,7 +318,7 @@ export class SystemInstruction {
    */
   static decodeTransferWithSeed(
     instruction: TransactionInstruction,
-  ): TransferWithSeedParams {
+  ): DecodedTransferWithSeedInstruction {
     this.checkProgramId(instruction.programId);
     this.checkKeyLength(instruction.keys, 3);
 
@@ -577,10 +606,10 @@ type SystemInstructionInputData = {
     authorized: Uint8Array;
   };
   Transfer: IInstructionInputData & {
-    lamports: number;
+    lamports: bigint;
   };
   TransferWithSeed: IInstructionInputData & {
-    lamports: number;
+    lamports: bigint;
     programId: Uint8Array;
     seed: string;
   };
@@ -618,7 +647,7 @@ export const SYSTEM_INSTRUCTION_LAYOUTS = Object.freeze<{
     index: 2,
     layout: BufferLayout.struct<SystemInstructionInputData['Transfer']>([
       BufferLayout.u32('instruction'),
-      BufferLayout.ns64('lamports'),
+      u64('lamports'),
     ]),
   },
   CreateWithSeed: {
@@ -689,7 +718,7 @@ export const SYSTEM_INSTRUCTION_LAYOUTS = Object.freeze<{
     layout: BufferLayout.struct<SystemInstructionInputData['TransferWithSeed']>(
       [
         BufferLayout.u32('instruction'),
-        BufferLayout.ns64('lamports'),
+        u64('lamports'),
         Layout.rustString('seed'),
         Layout.publicKey('programId'),
       ],
@@ -745,7 +774,7 @@ export class SystemProgram {
     if ('basePubkey' in params) {
       const type = SYSTEM_INSTRUCTION_LAYOUTS.TransferWithSeed;
       data = encodeData(type, {
-        lamports: params.lamports,
+        lamports: BigInt(params.lamports),
         seed: params.seed,
         programId: toBuffer(params.programId.toBuffer()),
       });
@@ -756,7 +785,7 @@ export class SystemProgram {
       ];
     } else {
       const type = SYSTEM_INSTRUCTION_LAYOUTS.Transfer;
-      data = encodeData(type, {lamports: params.lamports});
+      data = encodeData(type, {lamports: BigInt(params.lamports)});
       keys = [
         {pubkey: params.fromPubkey, isSigner: true, isWritable: true},
         {pubkey: params.toPubkey, isSigner: false, isWritable: true},

package/src/transaction.ts

@@ -267,12 +267,10 @@ export class Transaction {
    * Compile transaction data
    */
   compileMessage(): Message {
-    if (this._message) {
-      if (JSON.stringify(this.toJSON()) !== JSON.stringify(this._json)) {
-        throw new Error(
-          'Transaction message mutated after being populated from Message',
-        );
-      }
+    if (
+      this._message &&
+      JSON.stringify(this.toJSON()) === JSON.stringify(this._json)
+    ) {
       return this._message;
     }