Merge remote-tracking branch 'origin/master' into igm/tester

macalinao · macalinao · commit 00fe65c37205 · 2025-10-24T02:35:34.000+08:00
diff --git a/bun.lock b/bun.lock
diff --git a/packages/grill/CHANGELOG.md b/packages/grill/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @macalinao/grill
 
+## 0.7.1
+
+### Patch Changes
+
+- 90affa8: Add ALT fetching hooks
+- f4b610c: Reorganize directory structure of account/pda fetchers
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/grill/package.json b/packages/grill/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@macalinao/grill",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Modern Solana development kit for React applications with automatic account batching, caching, and transaction notifications",
   "license": "Apache-2.0",
   "author": "Ian Macalinao <me@ianm.com>",
@@ -53,7 +53,8 @@
     "@macalinao/solana-batch-accounts-loader": "workspace:^",
     "@macalinao/token-utils": "workspace:^",
     "@macalinao/zod-solana": "workspace:^",
-    "@solana-program/token": "^0.7.0"
+    "@solana-program/token": "^0.7.0",
+    "@solana-program/address-lookup-table": "^0.7.0"
   },
   "devDependencies": {
     "@macalinao/eslint-config-react": "catalog:",
diff --git a/packages/grill/src/accounts/address-lookup-table.ts b/packages/grill/src/accounts/address-lookup-table.ts
@@ -0,0 +1,13 @@
+import {
+  createDecodedAccountHook,
+  createDecodedAccountsHook,
+} from "@macalinao/grill";
+import { getAddressLookupTableDecoder } from "@solana-program/address-lookup-table";
+
+export const useAddressLookupTable = createDecodedAccountHook(
+  getAddressLookupTableDecoder(),
+);
+
+export const useAddressLookupTables = createDecodedAccountsHook(
+  getAddressLookupTableDecoder(),
+);
diff --git a/packages/grill/src/accounts/index.ts b/packages/grill/src/accounts/index.ts
@@ -0,0 +1,3 @@
+export * from "./address-lookup-table.js";
+export * from "./mint.js";
+export * from "./token-account.js";
diff --git a/packages/grill/src/accounts/mint.ts b/packages/grill/src/accounts/mint.ts
@@ -1,9 +1,11 @@
 import type { Mint } from "@solana-program/token";
-import type { UseDecodedAccountHook } from "./create-decoded-account-hook.js";
-import type { UseDecodedAccountsHook } from "./create-decoded-accounts-hook.js";
+import type { UseDecodedAccountHook } from "../hooks/create-decoded-account-hook.js";
+import type { UseDecodedAccountsHook } from "../hooks/create-decoded-accounts-hook.js";
+import {
+  createDecodedAccountHook,
+  createDecodedAccountsHook,
+} from "@macalinao/grill";
 import { getMintDecoder } from "@solana-program/token";
-import { createDecodedAccountHook } from "./create-decoded-account-hook.js";
-import { createDecodedAccountsHook } from "./create-decoded-accounts-hook.js";
 
 /**
  * Hook for fetching and decoding a mint account
diff --git a/packages/grill/src/accounts/token-account.ts b/packages/grill/src/accounts/token-account.ts
@@ -0,0 +1,16 @@
+import type {
+  UseDecodedAccountHook,
+  UseDecodedAccountsHook,
+} from "@macalinao/grill";
+import type { Token } from "@solana-program/token";
+import {
+  createDecodedAccountHook,
+  createDecodedAccountsHook,
+} from "@macalinao/grill";
+import { getTokenDecoder } from "@solana-program/token";
+
+export const useTokenAccount: UseDecodedAccountHook<Token> =
+  createDecodedAccountHook<Token>(getTokenDecoder());
+
+export const useTokenAccounts: UseDecodedAccountsHook<Token> =
+  createDecodedAccountsHook<Token>(getTokenDecoder());
diff --git a/packages/grill/src/hooks/index.ts b/packages/grill/src/hooks/index.ts
@@ -5,13 +5,10 @@ export * from "./create-pdas-hook.js";
 export * from "./use-account.js";
 export * from "./use-accounts.js";
 export * from "./use-associated-token-account.js";
-export * from "./use-associated-token-pda.js";
 export * from "./use-ata-balance.js";
 export { useConnectedWallet } from "./use-connected-wallet.js";
 export { useKitWallet } from "./use-kit-wallet.js";
-export * from "./use-mint-account.js";
 export * from "./use-send-tx.js";
-export * from "./use-token-account.js";
 export * from "./use-token-balance.js";
 export * from "./use-token-info.js";
 export * from "./use-token-infos.js";
diff --git a/packages/grill/src/hooks/use-associated-token-account.ts b/packages/grill/src/hooks/use-associated-token-account.ts
@@ -2,8 +2,8 @@ import type { Account, Address } from "@solana/kit";
 import type { Token } from "@solana-program/token";
 import type { UseQueryResult } from "@tanstack/react-query";
 import { TOKEN_PROGRAM_ADDRESS } from "@solana-program/token";
-import { useAssociatedTokenPda } from "./use-associated-token-pda.js";
-import { useTokenAccount } from "./use-token-account.js";
+import { useTokenAccount } from "../accounts/token-account.js";
+import { useAssociatedTokenPda } from "../pdas/associated-token.js";
 
 export interface UseAssociatedTokenAccountOptions {
   /** The mint address of the token */
diff --git a/packages/grill/src/hooks/use-associated-token-pda.ts b/packages/grill/src/hooks/use-associated-token-pda.ts
diff --git a/packages/grill/src/hooks/use-token-account.ts b/packages/grill/src/hooks/use-token-account.ts
diff --git a/packages/grill/src/hooks/use-token-balance.ts b/packages/grill/src/hooks/use-token-balance.ts
@@ -2,7 +2,7 @@ import type { TokenAmount } from "@macalinao/token-utils";
 import type { Address } from "@solana/kit";
 import { createTokenAmount } from "@macalinao/token-utils";
 import { useMemo } from "react";
-import { useTokenAccount } from "./use-token-account.js";
+import { useTokenAccount } from "../accounts/token-account.js";
 import { useTokenInfo } from "./use-token-info.js";
 
 export interface UseTokenBalanceOptions {
diff --git a/packages/grill/src/hooks/use-token-info.ts b/packages/grill/src/hooks/use-token-info.ts
@@ -3,9 +3,9 @@ import type { Address } from "@solana/kit";
 import type { UseQueryResult } from "@tanstack/react-query";
 import { fetchTokenInfo } from "@macalinao/gill-extra";
 import { useQuery } from "@tanstack/react-query";
+import { useMintAccount } from "../accounts/mint.js";
 import { useGrillContext } from "../contexts/grill-context.js";
 import { createTokenInfoQueryKey } from "../query-keys.js";
-import { useMintAccount } from "./use-mint-account.js";
 import { useTokenMetadataAccount } from "./use-token-metadata-account.js";
 
 export interface UseTokenInfoInput {
diff --git a/packages/grill/src/hooks/use-token-infos.ts b/packages/grill/src/hooks/use-token-infos.ts
@@ -2,9 +2,9 @@ import type { TokenInfo } from "@macalinao/token-utils";
 import type { Address } from "@solana/kit";
 import { fetchTokenInfo } from "@macalinao/gill-extra";
 import { useQueries } from "@tanstack/react-query";
+import { useMintAccounts } from "../accounts/mint.js";
 import { useGrillContext } from "../contexts/grill-context.js";
 import { createTokenInfoQueryKey } from "../query-keys.js";
-import { useMintAccounts } from "./use-mint-account.js";
 import { useTokenMetadataAccounts } from "./use-token-metadata-account.js";
 
 export interface UseTokenInfosInput {
diff --git a/packages/grill/src/index.ts b/packages/grill/src/index.ts
@@ -1,7 +1,9 @@
 export { SolanaProvider, useSolanaClient } from "@gillsdk/react";
 export * from "@macalinao/gill-extra";
+export * from "./accounts/index.js";
 export * from "./contexts/index.js";
 export * from "./hooks/index.js";
+export * from "./pdas/index.js";
 export * from "./providers/index.js";
 export * from "./query-keys.js";
 export * from "./types.js";
diff --git a/packages/grill/src/pdas/associated-token.ts b/packages/grill/src/pdas/associated-token.ts
@@ -0,0 +1,47 @@
+import { createPdaHook, createPdasHook } from "@macalinao/grill";
+import { findAssociatedTokenPda } from "@solana-program/token";
+
+/**
+ * Hook to compute the Associated Token Account (ATA) address for a given mint and owner
+ *
+ * @example
+ * ```typescript
+ * const { data: ataPda, isLoading } = useAssociatedTokenPda({
+ *   mint: mintAddress,
+ *   owner: ownerAddress,
+ *   tokenProgram: TOKEN_PROGRAM_ADDRESS,
+ * });
+ *
+ * if (ataPda) {
+ *   const [ataAddress, bump] = ataPda;
+ *   console.log("ATA address:", ataAddress);
+ * }
+ * ```
+ */
+export const useAssociatedTokenPda = createPdaHook(
+  findAssociatedTokenPda,
+  "associatedTokenPda",
+);
+
+/**
+ * Hook to compute multiple Associated Token Account (ATA) addresses for given mints and owners
+ *
+ * @example
+ * ```typescript
+ * const { data: ataPdas, isLoading } = useAssociatedTokenPdas([
+ *   { mint: mintAddress1, owner: ownerAddress1 },
+ *   { mint: mintAddress2, owner: ownerAddress2 },
+ * ]);
+ *
+ * ataPdas?.forEach((ataPda, index) => {
+ *   if (ataPda) {
+ *     const [ataAddress, bump] = ataPda;
+ *     console.log(`ATA ${index} address:`, ataAddress);
+ *   }
+ * });
+ * ```
+ */
+export const useAssociatedTokenPdas = createPdasHook(
+  findAssociatedTokenPda,
+  "associatedTokenPdas",
+);
diff --git a/packages/grill/src/pdas/index.ts b/packages/grill/src/pdas/index.ts
@@ -0,0 +1 @@
+export * from "./associated-token.js";

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export * from "./address-lookup-table.js";`
	`2`	`+export * from "./mint.js";`
	`3`	`+export * from "./token-account.js";`