diff --git a/src/agent/index.ts b/src/agent/index.ts
index 23af3ad..c5cbf2b 100644
--- a/src/agent/index.ts
+++ b/src/agent/index.ts
@@ -9,6 +9,8 @@ import {
   transfer,
   trade,
   registerDomain,
+  resolveSolDomain,
+  getPrimaryDomain,
   launchPumpFunToken,
   lendAsset,
   getTPS,
@@ -79,6 +81,14 @@ export class SolanaAgentKit {
     return registerDomain(this, name, spaceKB);
   }
 
+  async resolveSolDomain(domain:string ){
+    return resolveSolDomain(this, domain)
+  }
+
+  async getPrimaryDomain(account: PublicKey){
+    return getPrimaryDomain(this, account)
+  }
+
   async trade(
     outputMint: PublicKey,
     inputAmount: number,
diff --git a/src/langchain/index.ts b/src/langchain/index.ts
index c4d506b..89b3864 100644
--- a/src/langchain/index.ts
+++ b/src/langchain/index.ts
@@ -390,6 +390,93 @@ export class SolanaRegisterDomainTool extends Tool {
   }
 }
 
+export class SolanaResolveDomainTool extends Tool {
+  name = "solana_resolve_domain";
+  description = `Resolve a .sol domain to a Solana PublicKey.
+
+  Inputs:
+  domain: string, eg "pumpfun.sol" or "pumpfun"(required)
+  `;
+
+  constructor(private solanaKit: SolanaAgentKit) {
+    super();
+  }
+
+  private validateInput(input: any): void {
+    if (!input.domain || typeof input.domain !== "string") {
+      throw new Error("domain is required and must be a string");
+    }
+  }
+
+  protected async _call(input: string): Promise<string> {
+    try {
+      const parsedInput = JSON.parse(input);
+      this.validateInput(parsedInput);
+
+      const publicKey = await this.solanaKit.resolveSolDomain(parsedInput.domain);
+
+      return JSON.stringify({
+        status: "success",
+        message: "Domain resolved successfully",
+        publicKey: publicKey.toBase58(),
+      });
+    } catch (error: any) {
+      return JSON.stringify({
+        status: "error",
+        message: error.message,
+        code: error.code || "UNKNOWN_ERROR",
+      });
+    }
+  }
+}
+
+
+export class SolanaGetPrimaryDomainTool extends Tool {
+  name = "solana_get_primary_domain";
+  description = `Retrieve the primary .sol domain associated with a given Solana public key.
+
+  Inputs:
+  account: string, eg "4Be9CvxqHW6BYiRAxW9Q3xu1ycTMWaL5z8NX4HR3ha7t" (required)
+  `;
+
+  constructor(private solanaKit: SolanaAgentKit) {
+    super();
+  }
+
+  private validateInput(input: any): void {
+    if (!input.account || typeof input.account !== "string") {
+      throw new Error("account is required and must be a string");
+    }
+    try { 
+      new PublicKey(input.account);
+    } catch { 
+      throw new Error("account is not a valid public key");
+    }
+  }
+
+  protected async _call(input: string): Promise<string> {
+    try {
+      const parsedInput = JSON.parse(input);
+      this.validateInput(parsedInput);
+
+      const account = new PublicKey(parsedInput.account);
+      const domain = await this.solanaKit.getPrimaryDomain(account);
+
+      return JSON.stringify({
+        status: "success",
+        message: "Primary domain retrieved successfully",
+        domain,
+      });
+    } catch (error: any) {
+      return JSON.stringify({
+        status: "error",
+        message: error.message,
+        code: error.code || "UNKNOWN_ERROR",
+      });
+    }
+  }
+}
+
 export class SolanaGetWalletAddressTool extends Tool {
   name = "solana_get_wallet_address";
   description = `Get the wallet address of the agent`;
diff --git a/src/tools/get_primary_domain.ts b/src/tools/get_primary_domain.ts
index 1fe3892..775af4b 100644
--- a/src/tools/get_primary_domain.ts
+++ b/src/tools/get_primary_domain.ts
@@ -1,4 +1,4 @@
-import { getPrimaryDomain } from "@bonfida/spl-name-service";
+import { getPrimaryDomain as _getPrimaryDomain } from "@bonfida/spl-name-service";
 import { PublicKey } from "@solana/web3.js";
 import { SolanaAgentKit } from "../index";
 
@@ -14,12 +14,12 @@ import { SolanaAgentKit } from "../index";
  * @returns A promise that resolves to the primary .sol domain as a string
  * @throws Error if the domain is stale or if the domain resolution fails
  */
-export async function get_primary_domain(
+export async function getPrimaryDomain(
   agent: SolanaAgentKit,
   account: PublicKey
 ): Promise<string> {
   try {
-    const { reverse, stale } = await getPrimaryDomain(
+    const { reverse, stale } = await _getPrimaryDomain(
       agent.connection,
       account
     );
diff --git a/src/tools/index.ts b/src/tools/index.ts
index dca3c04..8d7576e 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -6,6 +6,8 @@ export * from "./mint_nft";
 export * from "./transfer";
 export * from "./trade";
 export * from "./register_domain";
+export * from "./resolve_sol_domain";
+export * from "./get_primary_domain";
 export * from "./launch_pumpfun_token";
 export * from "./lend";
 export * from "./get_tps";
diff --git a/src/tools/resolve_sol_domain.ts b/src/tools/resolve_sol_domain.ts
index 607d0a1..d8764cc 100644
--- a/src/tools/resolve_sol_domain.ts
+++ b/src/tools/resolve_sol_domain.ts
@@ -14,7 +14,7 @@ import { SolanaAgentKit } from "../index";
  * @returns A promise that resolves to the corresponding Solana PublicKey
  * @throws Error if the domain resolution fails
  */
-export async function resolve_sol_domain(
+export async function resolveSolDomain(
   agent: SolanaAgentKit,
   domain: string
 ): Promise<PublicKey> {