refactor(deps): source BN from anchor and drop unused @types/bn.js

basics/account-data/anchor/package.json

@@ -4,7 +4,6 @@
     "@solana/web3.js": "^1.98.4"
   },
   "devDependencies": {
-    "@types/bn.js": "^5.1.0",
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
     "chai": "^6.2.2",

basics/account-data/native/package.json

@@ -8,8 +8,7 @@
   },
   "dependencies": {
     "@solana/kit": "^7.0.0",
-    "@solana-program/system": "^0.13.0",
-    "borsh": "^2.0.0"
+    "@solana-program/system": "^0.13.0"
   },
   "devDependencies": {
     "@types/chai": "^5.2.3",

basics/account-data/native/tests/test.ts

@@ -1,6 +1,4 @@
-import { Buffer } from 'node:buffer';
 import {
-    AccountRole,
     type Address,
     appendTransactionMessageInstruction,
     createTransactionMessage,
@@ -11,33 +9,18 @@ import {
     setTransactionMessageFeePayerSigner,
     signTransactionMessageWithSigners,
 } from '@solana/kit';
-import { SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system';
-import * as borsh from 'borsh';
 import { assert } from 'chai';
 import { FailedTransactionMetadata, LiteSVM } from 'litesvm';
-
-const AddressInfoSchema = {
-    struct: {
-        name: 'string',
-        house_number: 'u8',
-        street: 'string',
-        city: 'string',
-    },
-};
-
-type AddressInfo = {
-    name: string;
-    house_number: number;
-    street: string;
-    city: string;
-};
-
-function borshSerialize(schema: borsh.Schema, data: object): Buffer {
-    return Buffer.from(borsh.serialize(schema, data));
-}
+import { type AddressInfo, addressInfoDecoder, createCreateAddressInfoInstruction } from '../ts';
 
 describe('Account Data!', () => {
     const svm = new LiteSVM();
+    const addressInfo: AddressInfo = {
+        name: 'Joe C',
+        houseNumber: 136,
+        street: 'Mile High Dr.',
+        city: 'Solana Beach',
+    };
     let programId: Address;
     let payer: KeyPairSigner;
     let addressInfoAccount: KeyPairSigner;
@@ -51,30 +34,7 @@ describe('Account Data!', () => {
     });
 
     it('Create the address info account', async () => {
-        console.log(`Program Address      : ${programId}`);
-        console.log(`Payer Address      : ${payer.address}`);
-        console.log(`Address Info Acct  : ${addressInfoAccount.address}`);
-
-        const ix = {
-            programAddress: programId,
-            accounts: [
-                {
-                    address: addressInfoAccount.address,
-                    role: AccountRole.WRITABLE_SIGNER,
-                    signer: addressInfoAccount,
-                },
-                { address: payer.address, role: AccountRole.WRITABLE_SIGNER, signer: payer },
-                { address: SYSTEM_PROGRAM_ADDRESS, role: AccountRole.READONLY },
-            ],
-            data: new Uint8Array(
-                borshSerialize(AddressInfoSchema, {
-                    name: 'Joe C',
-                    house_number: 136,
-                    street: 'Mile High Dr.',
-                    city: 'Solana Beach',
-                }),
-            ),
-        };
+        const ix = createCreateAddressInfoInstruction(addressInfoAccount, payer, programId, addressInfo);
 
         const transactionMessage = pipe(
             createTransactionMessage({ version: 0 }),
@@ -92,10 +52,6 @@ describe('Account Data!', () => {
         const accountInfo = svm.getAccount(addressInfoAccount.address);
         assert(accountInfo.exists, 'address info account not found');
 
-        const readAddressInfo = borsh.deserialize(AddressInfoSchema, Buffer.from(accountInfo.data)) as AddressInfo;
-        console.log(`Name     : ${readAddressInfo.name}`);
-        console.log(`House Num: ${readAddressInfo.house_number}`);
-        console.log(`Street   : ${readAddressInfo.street}`);
-        console.log(`City     : ${readAddressInfo.city}`);
+        assert.deepEqual(addressInfoDecoder.decode(accountInfo.data), addressInfo);
     });
 });

basics/account-data/native/ts/index.ts

@@ -0,0 +1,2 @@
+export * from './instructions';
+export * from './state';

basics/account-data/native/ts/instructions/create.ts

@@ -0,0 +1,41 @@
+import {
+    AccountRole,
+    addEncoderSizePrefix,
+    type Address,
+    getStructEncoder,
+    getU8Encoder,
+    getU32Encoder,
+    getUtf8Encoder,
+    type TransactionSigner,
+} from '@solana/kit';
+import { SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system';
+import type { AddressInfo } from '../state';
+
+// Instruction data layout: the program deserializes the whole payload as an `AddressInfo`.
+export const createAddressInfoEncoder = getStructEncoder([
+    ['name', addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder())],
+    ['houseNumber', getU8Encoder()],
+    ['street', addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder())],
+    ['city', addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder())],
+]);
+
+export function createCreateAddressInfoInstruction(
+    addressInfoAccount: TransactionSigner,
+    payer: TransactionSigner,
+    programId: Address,
+    addressInfo: AddressInfo,
+) {
+    return {
+        programAddress: programId,
+        accounts: [
+            {
+                address: addressInfoAccount.address,
+                role: AccountRole.WRITABLE_SIGNER,
+                signer: addressInfoAccount,
+            },
+            { address: payer.address, role: AccountRole.WRITABLE_SIGNER, signer: payer },
+            { address: SYSTEM_PROGRAM_ADDRESS, role: AccountRole.READONLY },
+        ],
+        data: createAddressInfoEncoder.encode(addressInfo),
+    };
+}

basics/account-data/native/ts/instructions/index.ts

@@ -0,0 +1 @@
+export * from './create';

basics/account-data/native/ts/state/index.ts

@@ -0,0 +1,16 @@
+import { addDecoderSizePrefix, getStructDecoder, getU8Decoder, getU32Decoder, getUtf8Decoder } from '@solana/kit';
+
+export type AddressInfo = {
+    name: string;
+    houseNumber: number;
+    street: string;
+    city: string;
+};
+
+// Account data layout, matching the program's `AddressInfo` struct.
+export const addressInfoDecoder = getStructDecoder([
+    ['name', addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder())],
+    ['houseNumber', getU8Decoder()],
+    ['street', addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder())],
+    ['city', addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder())],
+]);

basics/checking-accounts/anchor/package.json

@@ -10,7 +10,6 @@
     "@solana/web3.js": "^1.98.4"
   },
   "devDependencies": {
-    "@types/bn.js": "^5.1.0",
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
     "anchor-litesvm": "^0.2.1",

basics/close-account/anchor/package.json

@@ -9,7 +9,6 @@
     "litesvm": "^0.8.0"
   },
   "devDependencies": {
-    "@types/bn.js": "^5.1.0",
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
     "chai": "^6.2.2",

basics/cross-program-invocation/anchor/package.json

@@ -10,7 +10,6 @@
     "litesvm": "^0.8.0"
   },
   "devDependencies": {
-    "@types/bn.js": "^5.1.0",
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
     "chai": "^6.2.2",

basics/cross-program-invocation/native/package.json

@@ -9,7 +9,6 @@
   "dependencies": {
     "@solana/kit": "^7.0.0",
     "@solana-program/system": "^0.13.0",
-    "borsh": "^2.0.0",
     "litesvm": "^1.3.0"
   },
   "devDependencies": {