Merge pull request #80 from solana-developers/fixes

fix: nodewallet and types

Author: nickfrosty

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.8.1
+
+- Fix issue with CJS import of Anchor's `NodeWallet` to use the correct `Wallet` class exported
+- Fixed type errors on `ArrayBuffer`s and `Uint8Array`s
+
 ## 2.8
 
 - Added `sendVersionedTransaction()` to send a versioned transaction with lookup tables. Also adds priority fee support.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-developers/helpers",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "Solana helper functions",
   "type": "module",
   "main": "./dist/esm/index.js",

package.json

@@ -13,9 +13,9 @@ import {
   EventParser,
   BorshAccountsCoder,
   BorshInstructionCoder,
+  Wallet,
 } from "@coral-xyz/anchor";
 import BN from "bn.js";
-import NodeWallet from "@coral-xyz/anchor/dist/cjs/nodewallet";
 import { formatIdl } from "./convertLegacyIdl";
 
 /**
@@ -60,8 +60,7 @@ export async function getIdlByProgramId<Idl>(
   provider: AnchorProvider,
 ): Promise<Idl> {
   var idl = await Program.fetchIdl(programId, provider);
-  if (!idl)
-    throw new Error(`IDL not found for program ${programId.toString()}`);
+  if (!idl) throw new Error(`IDL not found for program ${programId.toString()}`);
 
   return idl as Idl;
 }
@@ -86,7 +85,7 @@ export function createProviderForConnection(
     commitment: "confirmed",
   },
 ): AnchorProvider {
-  return new AnchorProvider(connection, new NodeWallet(keypair), options);
+  return new AnchorProvider(connection, new Wallet(keypair), options);
 }
 
 /**
@@ -258,17 +257,15 @@ export async function decodeAnchorTransaction(
         const decoded = instructionCoder.decode(Buffer.from(ix.data));
         if (decoded) {
           const ixType = idl.instructions.find((i) => i.name === decoded.name);
-          const accountIndices =
-            "accounts" in ix ? ix.accounts : ix.accountKeyIndexes;
+          const accountIndices = "accounts" in ix ? ix.accounts : ix.accountKeyIndexes;
 
           // Get all accounts involved in this instruction
           const accounts: InvolvedAccount[] = await Promise.all(
             accountIndices.map(async (index, i) => {
               const pubkey = accountKeys.get(index);
               if (!pubkey) return null;
               const accountMeta = ixType?.accounts[i];
-              const accountInfo =
-                await provider.connection.getAccountInfo(pubkey);
+              const accountInfo = await provider.connection.getAccountInfo(pubkey);
 
               let accountData;
               if (accountInfo?.owner.equals(program.programId)) {
@@ -277,9 +274,7 @@ export async function decodeAnchorTransaction(
                     accountInfo.data
                       .slice(0, 8)
                       .equals(
-                        accountsCoder.accountDiscriminator(
-                          acc.name.toLowerCase(),
-                        ),
+                        accountsCoder.accountDiscriminator(acc.name.toLowerCase()) as Uint8Array,
                       ),
                   );
                   if (accountType) {
@@ -312,19 +307,15 @@ export async function decodeAnchorTransaction(
             accounts,
             toString: function () {
               let output = `\nInstruction: ${this.name}\n`;
-              output += `├─ Arguments: ${JSON.stringify(
-                formatData(this.data),
-              )}\n`;
+              output += `├─ Arguments: ${JSON.stringify(formatData(this.data))}\n`;
               output += `└─ Accounts:\n`;
               this.accounts.forEach((acc) => {
                 output += `   ├─ ${acc.name}:\n`;
                 output += `   │  ├─ Address: ${acc.pubkey}\n`;
                 output += `   │  ├─ Signer: ${acc.isSigner}\n`;
                 output += `   │  ├─ Writable: ${acc.isWritable}\n`;
                 if (acc.data) {
-                  output += `   │  └─ Data: ${JSON.stringify(
-                    formatData(acc.data),
-                  )}\n`;
+                  output += `   │  └─ Data: ${JSON.stringify(formatData(acc.data))}\n`;
                 }
               });
               return output;
@@ -358,9 +349,7 @@ function formatData(data: any): any {
     return data.map(formatData);
   }
   if (typeof data === "object" && data !== null) {
-    return Object.fromEntries(
-      Object.entries(data).map(([k, v]) => [k, formatData(v)]),
-    );
+    return Object.fromEntries(Object.entries(data).map(([k, v]) => [k, formatData(v)]));
   }
   return data;
 }

src/lib/idl.ts

@@ -84,9 +84,7 @@ export const getSimulationComputeUnits = async (
   const simulationInstructions = [...instructions];
 
   // Replace or add compute limit instruction
-  const computeLimitIndex = simulationInstructions.findIndex(
-    isSetComputeLimitInstruction,
-  );
+  const computeLimitIndex = simulationInstructions.findIndex(isSetComputeLimitInstruction);
   const simulationLimitIx = ComputeBudgetProgram.setComputeUnitLimit({
     units: 1_400_000,
   });
@@ -116,8 +114,7 @@ export const getSimulationComputeUnits = async (
   if (rpcResponse?.value?.err) {
     const logs = rpcResponse.value.logs?.join("\n  • ") || "No logs available";
     throw new Error(
-      `Transaction simulation failed:\n  •${logs}` +
-        JSON.stringify(rpcResponse?.value?.err),
+      `Transaction simulation failed:\n  •${logs}` + JSON.stringify(rpcResponse?.value?.err),
     );
   }
 
@@ -173,9 +170,7 @@ export type ComputeUnitBuffer = {
 /**
  * Default configuration values for transaction sending
  */
-export const DEFAULT_SEND_OPTIONS: Required<
-  Omit<SendTransactionOptions, "onStatusUpdate">
-> = {
+export const DEFAULT_SEND_OPTIONS: Required<Omit<SendTransactionOptions, "onStatusUpdate">> = {
   maxRetries: MAX_RETRIES,
   initialDelayMs: RETRY_INTERVAL_MS,
   commitment: "confirmed",
@@ -239,7 +234,7 @@ export async function sendTransaction(
   // Skip compute preparation if transaction is already signed or has compute instructions
   if (transaction.signatures.length > 0) {
     console.log("Transaction already signed, skipping compute preparation");
-    return sendRawTransactionWithRetry(connection, transaction.serialize(), {
+    return sendRawTransactionWithRetry(connection, transaction.serialize() as Uint8Array, {
       commitment,
       ...sendOptions,
     });
@@ -256,7 +251,7 @@ export async function sendTransaction(
   );
 
   transaction.sign(...signers);
-  return sendRawTransactionWithRetry(connection, transaction.serialize(), {
+  return sendRawTransactionWithRetry(connection, transaction.serialize() as Uint8Array, {
     commitment,
     ...sendOptions,
   });
@@ -318,8 +313,7 @@ export async function sendVersionedTransaction(
     ...sendOptions
   } = options;
 
-  const hasComputeLimitInstructions =
-    hasSetComputeLimitInstruction(instructions);
+  const hasComputeLimitInstructions = hasSetComputeLimitInstruction(instructions);
 
   if (!hasComputeLimitInstructions) {
     const computeUnitBuffer = userComputeBuffer ?? { multiplier: 1.1 };
@@ -336,20 +330,15 @@ export async function sendVersionedTransaction(
 
   const messageV0 = new TransactionMessage({
     payerKey: signers[0].publicKey,
-    recentBlockhash: (await connection.getLatestBlockhash(commitment))
-      .blockhash,
+    recentBlockhash: (await connection.getLatestBlockhash(commitment)).blockhash,
     instructions,
   }).compileToV0Message(lookupTables);
 
   const transaction = new VersionedTransaction(messageV0);
 
   transaction.sign(signers);
 
-  return await sendRawTransactionWithRetry(
-    connection,
-    transaction.serialize(),
-    sendOptions,
-  );
+  return await sendRawTransactionWithRetry(connection, transaction.serialize(), sendOptions);
 }
 
 /**
@@ -399,9 +388,7 @@ export async function addComputeInstructions(
     // Apply buffer to compute units
     let finalComputeUnits = simulatedCompute;
     if (computeUnitBuffer.multiplier) {
-      finalComputeUnits = Math.floor(
-        finalComputeUnits * computeUnitBuffer.multiplier,
-      );
+      finalComputeUnits = Math.floor(finalComputeUnits * computeUnitBuffer.multiplier);
     }
     if (computeUnitBuffer.fixed) {
       finalComputeUnits += computeUnitBuffer.fixed;
@@ -541,12 +528,11 @@ export async function createLookupTable(
 ): Promise<[PublicKey, AddressLookupTableAccount]> {
   const slot = await connection.getSlot();
 
-  const [lookupTableInst, lookupTableAddress] =
-    AddressLookupTableProgram.createLookupTable({
-      authority: sender.publicKey,
-      payer: sender.publicKey,
-      recentSlot: slot,
-    });
+  const [lookupTableInst, lookupTableAddress] = AddressLookupTableProgram.createLookupTable({
+    authority: sender.publicKey,
+    payer: sender.publicKey,
+    recentSlot: slot,
+  });
 
   const extendInstruction = AddressLookupTableProgram.extendLookupTable({
     payer: sender.publicKey,
@@ -565,16 +551,9 @@ export async function createLookupTable(
   );
 
   // Need to wait until the lookup table is active
-  await confirmTransaction(
-    connection,
-    lookupTableInstructionsSignature,
-    "finalized",
-  );
+  await confirmTransaction(connection, lookupTableInstructionsSignature, "finalized");
 
-  console.log(
-    "Lookup table instructions signature",
-    lookupTableInstructionsSignature,
-  );
+  console.log("Lookup table instructions signature", lookupTableInstructionsSignature);
 
   const lookupTableAccount = (
     await connection.getAddressLookupTable(lookupTableAddress, {