chore(ts): Update some uses of Buffer to TS 5.9 compatibility

Author: jamie-osec

ts/packages/anchor/src/coder/borsh/accounts.ts

@@ -5,6 +5,14 @@ import { Idl, IdlDiscriminator } from "../../idl.js";
 import { IdlCoder } from "./idl.js";
 import { AccountsCoder } from "../index.js";
 
+function bytesEqual(a: Uint8Array, b: Uint8Array): boolean {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i += 1) {
+    if (a[i] !== b[i]) return false;
+  }
+  return true;
+}
+
 /**
  * Encodes and decodes account objects.
  */
@@ -56,22 +64,28 @@ export class BorshAccountsCoder<A extends string = string>
     const len = layout.layout.encode(account, buffer);
     const accountData = buffer.slice(0, len);
     const discriminator = this.accountDiscriminator(accountName);
-    return Buffer.concat([discriminator, accountData]);
+    return Buffer.from([...discriminator, ...accountData]);
   }
 
   public decode<T = any>(accountName: A, data: Buffer): T {
     // Assert the account discriminator is correct.
     const discriminator = this.accountDiscriminator(accountName);
-    if (discriminator.compare(data.slice(0, discriminator.length))) {
+    const givenDisc = Uint8Array.from(data.subarray(0, discriminator.length));
+    if (!bytesEqual(Uint8Array.from(discriminator), givenDisc)) {
       throw new Error("Invalid account discriminator");
     }
     return this.decodeUnchecked(accountName, data);
   }
 
   public decodeAny<T = any>(data: Buffer): T {
     for (const [name, layout] of this.accountLayouts) {
-      const givenDisc = data.subarray(0, layout.discriminator.length);
-      const matches = givenDisc.equals(Buffer.from(layout.discriminator));
+      const givenDisc = Uint8Array.from(
+        data.subarray(0, layout.discriminator.length)
+      );
+      const matches = bytesEqual(
+        Uint8Array.from(layout.discriminator),
+        givenDisc
+      );
       if (matches) return this.decodeUnchecked(name, data);
     }
 
@@ -91,11 +105,12 @@ export class BorshAccountsCoder<A extends string = string>
 
   public memcmp(accountName: A, appendData?: Buffer): any {
     const discriminator = this.accountDiscriminator(accountName);
+    const bytes = appendData
+      ? Uint8Array.from([...discriminator, ...appendData])
+      : Uint8Array.from(discriminator);
     return {
       offset: 0,
-      bytes: bs58.encode(
-        appendData ? Buffer.concat([discriminator, appendData]) : discriminator
-      ),
+      bytes: bs58.encode(Buffer.from(bytes)),
     };
   }
 

ts/packages/anchor/src/coder/borsh/event.ts

@@ -5,6 +5,14 @@ import { Idl, IdlDiscriminator } from "../../idl.js";
 import { IdlCoder } from "./idl.js";
 import { EventCoder } from "../index.js";
 
+function bytesEqual(a: Uint8Array, b: Uint8Array): boolean {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i += 1) {
+    if (a[i] !== b[i]) return false;
+  }
+  return true;
+}
+
 export class BorshEventCoder implements EventCoder {
   /**
    * Maps account type identifier to a layout.
@@ -54,8 +62,13 @@ export class BorshEventCoder implements EventCoder {
     }
 
     for (const [name, layout] of this.layouts) {
-      const givenDisc = logArr.subarray(0, layout.discriminator.length);
-      const matches = givenDisc.equals(Buffer.from(layout.discriminator));
+      const givenDisc = Uint8Array.from(
+        logArr.subarray(0, layout.discriminator.length)
+      );
+      const matches = bytesEqual(
+        Uint8Array.from(layout.discriminator),
+        givenDisc
+      );
       if (matches) {
         return {
           name,

ts/packages/anchor/src/coder/borsh/instruction.ts

@@ -18,6 +18,14 @@ import {
 import { IdlCoder } from "./idl.js";
 import { InstructionCoder } from "../index.js";
 
+function bytesEqual(a: Uint8Array, b: Uint8Array): boolean {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i += 1) {
+    if (a[i] !== b[i]) return false;
+  }
+  return true;
+}
+
 /**
  * Encodes and decodes program instructions.
  */
@@ -53,7 +61,7 @@ export class BorshInstructionCoder implements InstructionCoder {
     const len = encoder.layout.encode(ix, buffer);
     const data = buffer.slice(0, len);
 
-    return Buffer.concat([Buffer.from(encoder.discriminator), data]);
+    return Buffer.from([...Buffer.from(encoder.discriminator), ...data]);
   }
 
   /**
@@ -64,12 +72,18 @@ export class BorshInstructionCoder implements InstructionCoder {
     encoding: "hex" | "base58" = "hex"
   ): Instruction | null {
     if (typeof ix === "string") {
-      ix = encoding === "hex" ? Buffer.from(ix, "hex") : bs58.decode(ix);
+      ix =
+        encoding === "hex"
+          ? Buffer.from(ix, "hex")
+          : Buffer.from(bs58.decode(ix) as Uint8Array);
     }
 
     for (const [name, layout] of this.ixLayouts) {
-      const givenDisc = ix.subarray(0, layout.discriminator.length);
-      const matches = givenDisc.equals(Buffer.from(layout.discriminator));
+      const givenDisc = Uint8Array.from(ix.subarray(0, layout.discriminator.length));
+      const matches = bytesEqual(
+        Uint8Array.from(layout.discriminator),
+        givenDisc
+      );
       if (matches) {
         return {
           name,

ts/packages/anchor/src/nodewallet.ts

@@ -1,4 +1,3 @@
-import { Buffer } from "buffer";
 import {
   Keypair,
   PublicKey,
@@ -24,7 +23,7 @@ export default class NodeWallet implements Wallet {
     }
 
     const payer = Keypair.fromSecretKey(
-      Buffer.from(
+      Uint8Array.from(
         JSON.parse(
           require("fs").readFileSync(process.env.ANCHOR_WALLET, {
             encoding: "utf-8",

ts/packages/anchor/src/program/token-account-layout.ts

@@ -103,7 +103,7 @@ class u64 extends BN {
     }
 
     const zeroPad = Buffer.alloc(8);
-    b.copy(zeroPad);
+    zeroPad.set(Uint8Array.from(b));
     return zeroPad;
   }
 

ts/packages/anchor/src/utils/pubkey.ts

@@ -1,4 +1,3 @@
-import { Buffer } from "buffer";
 import { PublicKey } from "@solana/web3.js";
 import { sha256 } from "@noble/hashes/sha256";
 
@@ -8,10 +7,12 @@ export function createWithSeedSync(
   seed: string,
   programId: PublicKey
 ): PublicKey {
-  const buffer = Buffer.concat([
-    fromPublicKey.toBuffer(),
-    Buffer.from(seed),
-    programId.toBuffer(),
-  ]);
-  return new PublicKey(sha256(buffer));
+  const fromKey = fromPublicKey.toBytes();
+  const seedBytes = new TextEncoder().encode(seed);
+  const program = programId.toBytes();
+  const data = new Uint8Array(fromKey.length + seedBytes.length + program.length);
+  data.set(fromKey, 0);
+  data.set(seedBytes, fromKey.length);
+  data.set(program, fromKey.length + seedBytes.length);
+  return new PublicKey(sha256(data));
 }

ts/packages/anchor/tsconfig.base.json

@@ -3,6 +3,7 @@
     "./src/**/*"
   ],
   "compilerOptions": {
+    "skipLibCheck": true,
     "sourceMap": true,
     "declaration": true,
     "declarationMap": true,

ts/packages/spl-associated-token-account/tsconfig.base.json

@@ -4,6 +4,7 @@
   ],
   "compilerOptions": {
     "sourceMap": true,
+    "skipLibCheck": true,
     "declaration": true,
     "declarationMap": true,
     "allowSyntheticDefaultImports": true,

ts/packages/spl-binary-option/tsconfig.base.json

@@ -4,6 +4,7 @@
   ],
   "compilerOptions": {
     "sourceMap": true,
+    "skipLibCheck": true,
     "declaration": true,
     "declarationMap": true,
     "allowSyntheticDefaultImports": true,

ts/packages/spl-binary-oracle-pair/tsconfig.base.json

@@ -4,6 +4,7 @@
   ],
   "compilerOptions": {
     "sourceMap": true,
+    "skipLibCheck": true,
     "declaration": true,
     "declarationMap": true,
     "allowSyntheticDefaultImports": true,