From ef5c4fc0871fc16cef50243cfbdc162aeab728bf Mon Sep 17 00:00:00 2001
From: Aziz Ahmed <aziz.ahmed@urbanstems.com>
Date: Wed, 19 Mar 2025 21:52:03 -0500
Subject: [PATCH 1/3] Initial commit

---
 typescript/packages/core/src/types/Chain.ts   |   7 +-
 typescript/packages/wallets/tron/CHANGELOG.md | 156 ++++++++++++++++++
 typescript/packages/wallets/tron/README.md    |  49 ++++++
 typescript/packages/wallets/tron/package.json |  34 ++++
 .../tron/src/TronKeypairWalletClient.ts       |  21 +++
 .../wallets/tron/src/TronWalletClient.ts      |  80 +++++++++
 typescript/packages/wallets/tron/src/index.ts |   4 +
 .../wallets/tron/src/sendTRX.plugin.ts        |  47 ++++++
 .../wallets/tron/src/types/TronTypes.ts       |   9 +
 .../packages/wallets/tron/src/types/index.ts  |   1 +
 .../packages/wallets/tron/tsconfig.json       |   6 +
 .../packages/wallets/tron/tsup.config.ts      |   6 +
 typescript/packages/wallets/tron/turbo.json   |  11 ++
 13 files changed, 430 insertions(+), 1 deletion(-)
 create mode 100644 typescript/packages/wallets/tron/CHANGELOG.md
 create mode 100644 typescript/packages/wallets/tron/README.md
 create mode 100644 typescript/packages/wallets/tron/package.json
 create mode 100644 typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
 create mode 100644 typescript/packages/wallets/tron/src/TronWalletClient.ts
 create mode 100644 typescript/packages/wallets/tron/src/index.ts
 create mode 100644 typescript/packages/wallets/tron/src/sendTRX.plugin.ts
 create mode 100644 typescript/packages/wallets/tron/src/types/TronTypes.ts
 create mode 100644 typescript/packages/wallets/tron/src/types/index.ts
 create mode 100644 typescript/packages/wallets/tron/tsconfig.json
 create mode 100644 typescript/packages/wallets/tron/tsup.config.ts
 create mode 100644 typescript/packages/wallets/tron/turbo.json

diff --git a/typescript/packages/core/src/types/Chain.ts b/typescript/packages/core/src/types/Chain.ts
index dc5cd1cfe..ef76256fb 100644
--- a/typescript/packages/core/src/types/Chain.ts
+++ b/typescript/packages/core/src/types/Chain.ts
@@ -13,7 +13,8 @@ export type Chain =
     | CosmosChain
     | StarknetChain
     | RadixChain
-    | ZetrixChain;
+    | ZetrixChain
+    | TronChain;
 
 export type SuiChain = {
     type: "sui";
@@ -62,3 +63,7 @@ export type RadixChain = {
 export type ZetrixChain = {
     type: "zetrix";
 };
+
+export type TronChain = {
+    type: "tron";
+};
diff --git a/typescript/packages/wallets/tron/CHANGELOG.md b/typescript/packages/wallets/tron/CHANGELOG.md
new file mode 100644
index 000000000..e91965d17
--- /dev/null
+++ b/typescript/packages/wallets/tron/CHANGELOG.md
@@ -0,0 +1,156 @@
+# @goat-sdk/wallet-solana
+
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies [f73ce74]
+  - @goat-sdk/core@0.4.9
+
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies [3091a49]
+  - @goat-sdk/core@0.4.8
+
+## 0.2.13
+
+### Patch Changes
+
+- Updated dependencies [a21a1f3]
+  - @goat-sdk/core@0.4.7
+
+## 0.2.12
+
+### Patch Changes
+
+- 1f361d5: Support raw txs
+
+## 0.2.11
+
+### Patch Changes
+
+- Updated dependencies [2b4b8e8]
+  - @goat-sdk/core@0.4.6
+
+## 0.2.10
+
+### Patch Changes
+
+- Updated dependencies [b9af25b]
+  - @goat-sdk/core@0.4.5
+
+## 0.2.9
+
+### Patch Changes
+
+- Updated dependencies [50180d4]
+  - @goat-sdk/core@0.4.4
+
+## 0.2.8
+
+### Patch Changes
+
+- 87eed18: Support pump.fun plugin
+
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies [778440b]
+  - @goat-sdk/core@0.4.3
+
+## 0.2.6
+
+### Patch Changes
+
+- Updated dependencies [279dfcd]
+  - @goat-sdk/core@0.4.2
+
+## 0.2.5
+
+### Patch Changes
+
+- Updated dependencies [6c03f61]
+  - @goat-sdk/core@0.4.1
+
+## 0.2.4
+
+### Patch Changes
+
+- de8533d: Fix transaction instructions
+
+## 0.2.3
+
+### Patch Changes
+
+- b9cb39c: Wait for transaction confirmation
+
+## 0.2.2
+
+### Patch Changes
+
+- 608f9f1: Move to imperative prompts
+
+## 0.2.1
+
+### Patch Changes
+
+- ab3b1dc: Add accountsToSign to Solana tx
+
+## 0.2.0
+
+### Minor Changes
+
+- d3d9a7d: Upgrade to new plugin architecture
+
+### Patch Changes
+
+- Updated dependencies [d3d9a7d]
+  - @goat-sdk/core@0.4.0
+
+## 0.1.9
+
+### Patch Changes
+
+- a66ceec: Fix jupiter swap tokens tx
+- Updated dependencies [a66ceec]
+  - @goat-sdk/core@0.3.15
+
+## 0.1.8
+
+### Patch Changes
+
+- d289856: Fix send transaction options
+
+## 0.1.7
+
+### Patch Changes
+
+- 16271ab: Simplify core architecture
+- Updated dependencies [16271ab]
+  - @goat-sdk/core@0.3.14
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies [cad06c0]
+- Updated dependencies [ad45f94]
+  - @goat-sdk/core@0.3.13
+
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies [bf161b7]
+  - @goat-sdk/core@0.3.12
+
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies [f5ea302]
+- Updated dependencies [e61b658]
+  - @goat-sdk/core@0.3.11
diff --git a/typescript/packages/wallets/tron/README.md b/typescript/packages/wallets/tron/README.md
new file mode 100644
index 000000000..abd9f8a7a
--- /dev/null
+++ b/typescript/packages/wallets/tron/README.md
@@ -0,0 +1,49 @@
+<div align="center">
+<a href="https://github.com/goat-sdk/goat">
+
+<img src="https://github.com/user-attachments/assets/5fc7f121-259c-492c-8bca-f15fe7eb830c" alt="GOAT" width="100px" height="auto" style="object-fit: contain;">
+</a>
+</div>
+
+# TRON Wallet for GOAT
+
+## Installation
+```
+npm install @goat-sdk/wallet-tron
+yarn add @goat-sdk/wallet-tron
+pnpm add @goat-sdk/wallet-tron
+```
+
+## Usage
+```typescript
+import { getOnChainTools } from "@goat-sdk/adapter-vercel-ai";
+import { tron } from "@goat-sdk/wallet-tron";
+
+import { Connection, Keypair } from "@solana/web3.js";
+import * as bip39 from "bip39";
+
+const connection = new Connection(
+    "https://api.mainnet-beta.solana.com",
+    "confirmed"
+);
+
+const mnemonic = process.env.WALLET_MNEMONIC;
+
+const seed = bip39.mnemonicToSeedSync(mnemonic);
+const keypair = Keypair.fromSeed(Uint8Array.from(seed).subarray(0, 32));
+
+const tools = await getOnChainTools({
+    wallet: solana({
+        keypair,
+        connection,
+    }),
+});
+```
+
+<footer>
+<br/>
+<br/>
+<div>
+<a href="https://github.com/goat-sdk/goat">
+  <img src="https://github.com/user-attachments/assets/4821833e-52e5-4126-a2a1-59e9fa9bebd7" alt="GOAT" width="100%" height="auto" style="object-fit: contain; max-width: 800px;">
+</a>
diff --git a/typescript/packages/wallets/tron/package.json b/typescript/packages/wallets/tron/package.json
new file mode 100644
index 000000000..16555201b
--- /dev/null
+++ b/typescript/packages/wallets/tron/package.json
@@ -0,0 +1,34 @@
+{
+    "name": "@goat-sdk/wallet-tron",
+    "version": "0.2.15",
+    "sideEffects": false,
+    "files": ["dist/**/*", "README.md", "package.json"],
+    "scripts": {
+        "build": "tsup",
+        "clean": "rm -rf dist",
+        "test": "vitest run --passWithNoTests"
+    },
+    "main": "./dist/index.js",
+    "module": "./dist/index.mjs",
+    "types": "./dist/index.d.ts",
+    "dependencies": {
+        "@goat-sdk/core": "workspace:*",
+        "tronweb": "^6.0.0",
+        "tweetnacl": "^1.0.3",
+        "viem": "catalog:",
+        "zod": "catalog:"
+    },
+    "peerDependencies": {
+        "@goat-sdk/core": "workspace:*"
+    },
+    "homepage": "https://ohmygoat.dev",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/goat-sdk/goat.git"
+    },
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/goat-sdk/goat/issues"
+    },
+    "keywords": ["ai", "agents", "web3"]
+}
diff --git a/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts b/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
new file mode 100644
index 000000000..bf9d51b04
--- /dev/null
+++ b/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
@@ -0,0 +1,21 @@
+import { TronWalletClient } from "./TronWalletClient";
+
+export class TronKeyPairWalletClient extends TronWalletClient {
+    private privateKey: string;
+
+    constructor(privateKey: string) {
+        super();
+        if (!privateKey || privateKey.length !== 64) {
+            throw new Error("Invalid Tron private key.");
+        }
+        this.privateKey = privateKey;
+        // Configure TronWeb with the provided private key for signing transactions.
+        this.tronWeb.setPrivateKey(privateKey);
+        // Derive the wallet address (Base58 format) from the private key.
+        const address = this.tronWeb.address.fromPrivateKey(privateKey);
+        if (!address || typeof address !== "string") {
+            throw new Error("Failed to derive a valid address from the provided private key.");
+        }
+        this.fromAddress = address;
+    }
+}
diff --git a/typescript/packages/wallets/tron/src/TronWalletClient.ts b/typescript/packages/wallets/tron/src/TronWalletClient.ts
new file mode 100644
index 000000000..f723fe8a0
--- /dev/null
+++ b/typescript/packages/wallets/tron/src/TronWalletClient.ts
@@ -0,0 +1,80 @@
+// src/TronWalletClient.ts
+
+import { Chain, WalletClientBase } from "@goat-sdk/core";
+import { TronWeb } from "tronweb";
+
+export abstract class TronWalletClient extends WalletClientBase {
+    protected tronWeb: TronWeb;
+    protected fromAddress = "";
+
+    constructor() {
+        super();
+        // Initialize TronWeb using public endpoints (adjust these URLs if needed)
+        this.tronWeb = new TronWeb("https://api.trongrid.io", "https://api.trongrid.io", "https://api.trongrid.io");
+    }
+
+    // Return a minimal chain object identifying this chain as "tron"
+    getChain(): Chain {
+        return { type: "tron" } as const;
+    }
+
+    // Return the wallet address (Base58 format)
+    getAddress(): string {
+        if (!this.fromAddress) {
+            throw new Error("Wallet address is not set.");
+        }
+        return this.fromAddress;
+    }
+
+    // Sign a message using TronWeb's signing functionality
+    async signMessage(message: string): Promise<{ signature: string }> {
+        const hexMessage = this.tronWeb.toHex(message);
+        const signature = await this.tronWeb.trx.sign(hexMessage);
+        return { signature };
+    }
+
+    // Return the TRX balance for a given address.
+    // Note: TronWeb returns balances in SUN (1 TRX = 1,000,000 SUN).
+    async balanceOf(address: string): Promise<{
+        decimals: number;
+        symbol: string;
+        name: string;
+        value: string;
+        inBaseUnits: string;
+    }> {
+        if (!this.tronWeb.isAddress(address)) {
+            throw new Error("Invalid Tron address.");
+        }
+        const balanceSun = await this.tronWeb.trx.getBalance(address);
+        const balanceTRX = balanceSun / 1_000_000;
+        return {
+            decimals: 6,
+            symbol: "TRX",
+            name: "TRX",
+            value: balanceTRX.toString(),
+            inBaseUnits: balanceSun.toString(),
+        };
+    }
+
+    // Send a TRX transaction from the wallet to another address.
+    async sendTransaction(transaction: { to: string; value: number }): Promise<{ hash: string }> {
+        const { to, value } = transaction;
+        if (!this.tronWeb.isAddress(to)) {
+            throw new Error("Invalid recipient Tron address.");
+        }
+        // Convert the amount from TRX to SUN.
+        const amountSun = Math.floor(value * 1_000_000);
+
+        // Build an unsigned transaction
+        const unsignedTx = await this.tronWeb.transactionBuilder.sendTrx(to, amountSun, this.fromAddress);
+
+        // Sign the transaction (the private key must already be set on tronWeb)
+        const signedTx = await this.tronWeb.trx.sign(unsignedTx);
+        // Broadcast the signed transaction
+        const broadcast = await this.tronWeb.trx.sendRawTransaction(signedTx);
+        if (broadcast.result) {
+            return { hash: signedTx.txID };
+        }
+        throw new Error("Transaction failed to broadcast.");
+    }
+}
diff --git a/typescript/packages/wallets/tron/src/index.ts b/typescript/packages/wallets/tron/src/index.ts
new file mode 100644
index 000000000..57ab4f228
--- /dev/null
+++ b/typescript/packages/wallets/tron/src/index.ts
@@ -0,0 +1,4 @@
+export * from "./types";
+export * from "./TronWalletClient";
+export * from "./TronKeypairWalletClient";
+export * from "./sendTRX.plugin";
diff --git a/typescript/packages/wallets/tron/src/sendTRX.plugin.ts b/typescript/packages/wallets/tron/src/sendTRX.plugin.ts
new file mode 100644
index 000000000..f6ac01796
--- /dev/null
+++ b/typescript/packages/wallets/tron/src/sendTRX.plugin.ts
@@ -0,0 +1,47 @@
+// src/sendTRX.plugin.ts
+
+import { Chain, PluginBase, createTool } from "@goat-sdk/core";
+import { z } from "zod";
+import { TronWalletClient } from "./TronWalletClient";
+
+const sendTRXParametersSchema = z.object({
+    to: z.string().describe("The address to send TRX to"),
+    amount: z.number().describe("The amount of TRX to send"),
+});
+
+async function sendTRXMethod(
+    walletClient: TronWalletClient,
+    parameters: z.infer<typeof sendTRXParametersSchema>,
+): Promise<string> {
+    try {
+        const { to, amount } = parameters;
+        const tx = await walletClient.sendTransaction({ to, value: amount });
+        return tx.hash;
+    } catch (error) {
+        throw new Error(`Failed to send TRX: ${error}`);
+    }
+}
+
+export class SendTRXPlugin extends PluginBase<TronWalletClient> {
+    constructor() {
+        super("sendTRX", []);
+    }
+
+    supportsChain(chain: Chain): boolean {
+        return chain.type === "tron";
+    }
+
+    getTools(walletClient: TronWalletClient) {
+        const tool = createTool(
+            {
+                name: "send_trx",
+                description: "Send TRX to an address.",
+                parameters: sendTRXParametersSchema,
+            },
+            (parameters: z.infer<typeof sendTRXParametersSchema>) => sendTRXMethod(walletClient, parameters),
+        );
+        return [tool];
+    }
+}
+
+export const sendTRX = () => new SendTRXPlugin();
diff --git a/typescript/packages/wallets/tron/src/types/TronTypes.ts b/typescript/packages/wallets/tron/src/types/TronTypes.ts
new file mode 100644
index 000000000..ebc41a7bc
--- /dev/null
+++ b/typescript/packages/wallets/tron/src/types/TronTypes.ts
@@ -0,0 +1,9 @@
+// src/types/TronTypes.ts
+
+export type TronChain = {
+    type: "tron";
+    // Optionally, you could add more fields (for example, name, symbol, decimals)
+    name?: string; // e.g., "Tron Mainnet"
+    symbol?: string; // e.g., "TRX"
+    decimals?: number; // e.g., 6
+};
diff --git a/typescript/packages/wallets/tron/src/types/index.ts b/typescript/packages/wallets/tron/src/types/index.ts
new file mode 100644
index 000000000..3d9e0e09d
--- /dev/null
+++ b/typescript/packages/wallets/tron/src/types/index.ts
@@ -0,0 +1 @@
+export * from "./TronTypes";
diff --git a/typescript/packages/wallets/tron/tsconfig.json b/typescript/packages/wallets/tron/tsconfig.json
new file mode 100644
index 000000000..b4ae67c1f
--- /dev/null
+++ b/typescript/packages/wallets/tron/tsconfig.json
@@ -0,0 +1,6 @@
+{
+    "$schema": "https://json.schemastore.org/tsconfig",
+    "extends": "../../../tsconfig.base.json",
+    "include": ["src/**/*"],
+    "exclude": ["node_modules", "dist"]
+}
diff --git a/typescript/packages/wallets/tron/tsup.config.ts b/typescript/packages/wallets/tron/tsup.config.ts
new file mode 100644
index 000000000..2d38789ad
--- /dev/null
+++ b/typescript/packages/wallets/tron/tsup.config.ts
@@ -0,0 +1,6 @@
+import { defineConfig } from "tsup";
+import { treeShakableConfig } from "../../../tsup.config.base";
+
+export default defineConfig({
+    ...treeShakableConfig,
+});
diff --git a/typescript/packages/wallets/tron/turbo.json b/typescript/packages/wallets/tron/turbo.json
new file mode 100644
index 000000000..45f951676
--- /dev/null
+++ b/typescript/packages/wallets/tron/turbo.json
@@ -0,0 +1,11 @@
+{
+    "$schema": "https://turbo.build/schema.json",
+    "extends": ["//"],
+    "tasks": {
+        "build": {
+            "inputs": ["src/**", "tsup.config.ts", "!./**/*.test.{ts,tsx}", "tsconfig.json"],
+            "dependsOn": ["^build"],
+            "outputs": ["dist/**"]
+        }
+    }
+}

From c19e577b5f5019928a1877000b47991b00394daf Mon Sep 17 00:00:00 2001
From: Aziz Ahmed <aziz.ahmed@urbanstems.com>
Date: Fri, 21 Mar 2025 07:18:12 -0500
Subject: [PATCH 2/3] Initial commit for examples

---
 .../.env.template                             |   3 +
 .../tron-send-and-receive-tokens/README.md    |  77 +++++++++
 .../tron-send-and-receive-tokens/index.ts     |  78 +++++++++
 .../tron-send-and-receive-tokens/package.json |  20 +++
 .../tsconfig.json                             |   8 +
 typescript/packages/wallets/tron/CHANGELOG.md | 156 +-----------------
 .../tron/src/TronKeypairWalletClient.ts       |   3 +
 .../wallets/tron/src/TronWalletClient.ts      |  14 +-
 8 files changed, 195 insertions(+), 164 deletions(-)
 create mode 100644 typescript/examples/by-use-case/tron-send-and-receive-tokens/.env.template
 create mode 100644 typescript/examples/by-use-case/tron-send-and-receive-tokens/README.md
 create mode 100644 typescript/examples/by-use-case/tron-send-and-receive-tokens/index.ts
 create mode 100644 typescript/examples/by-use-case/tron-send-and-receive-tokens/package.json
 create mode 100644 typescript/examples/by-use-case/tron-send-and-receive-tokens/tsconfig.json

diff --git a/typescript/examples/by-use-case/tron-send-and-receive-tokens/.env.template b/typescript/examples/by-use-case/tron-send-and-receive-tokens/.env.template
new file mode 100644
index 000000000..4978c22f3
--- /dev/null
+++ b/typescript/examples/by-use-case/tron-send-and-receive-tokens/.env.template
@@ -0,0 +1,3 @@
+OPENAI_API_KEY=
+SOLANA_RPC_URL=
+SOLANA_PRIVATE_KEY=
diff --git a/typescript/examples/by-use-case/tron-send-and-receive-tokens/README.md b/typescript/examples/by-use-case/tron-send-and-receive-tokens/README.md
new file mode 100644
index 000000000..ddc844bfe
--- /dev/null
+++ b/typescript/examples/by-use-case/tron-send-and-receive-tokens/README.md
@@ -0,0 +1,77 @@
+
+<div align="center">
+<img src="https://github.com/user-attachments/assets/5fc7f121-259c-492c-8bca-f15fe7eb830c" alt="GOAT" width="100px" height="auto" style="object-fit: contain;">
+</div>
+
+# Solana
+## 🚀 Quickstart
+
+This example demonstrates how to use GOAT to **send and receive SOL and SPL tokens** on the Solana network.
+
+You can use this example with any other agent framework and wallet of your choice.
+
+## Setup
+1. Clone the repository:
+```bash
+git clone https://github.com/goat-sdk/goat.git && cd goat
+```
+
+2. Run the following commands from the `typescript` directory:
+```bash
+cd typescript
+pnpm install
+pnpm build
+```
+
+3. Go to the example directory:
+```bash
+cd examples/by-use-case/solana-send-and-receive-tokens
+```
+
+4. Copy the `.env.template` and populate with your values:
+```bash
+cp .env.template .env
+```
+- `OPENAI_API_KEY`
+- `SOLANA_PRIVATE_KEY`
+- `SOLANA_RPC_URL`
+
+## Usage
+1. Run the interactive CLI:
+```bash
+pnpm ts-node index.ts
+```
+
+2. Chat with the agent:
+- Check your balance for SOL
+- Send SOL to another address
+- Check your balance again to see the SOL you just sent
+- Check your balance for SPL tokens
+- Send SPL tokens to another address
+- Check your balance again to see the SPL tokens you just sent
+
+## Using in production
+In production, developers require advanced wallet setups that utilize [smart wallets](https://docs.goat-sdk.com/concepts/smart-wallets), which allow them to:
+1. **Increase security** by setting programmable permissions (e.g. limiting fund amounts, restricting contract interactions, and defining required signatures)
+2. **Maintain regulatory compliance** by ensuring agent wallets are non-custodial. This means that:
+     - Launchpads, wallet providers, or agent platforms never have access to agents' wallets.
+     - Agent platforms do not require money transmitter licenses.
+
+### Agent Wallets
+[Crossmint](https://docs.crossmint.com/wallets/quickstarts/agent-wallets) offers one of the most advanced solutions for agent developers and launchpads: [Agent Wallets](https://docs.crossmint.com/wallets/quickstarts/agent-wallets).
+
+To integrate Agent Wallets with GOAT, check out the following quickstarts:
+1. Agent Wallets Quickstart [[EVM](https://github.com/goat-sdk/goat/tree/main/typescript/examples/by-wallet/crossmint-smart-wallets), [Solana](https://github.com/goat-sdk/goat/tree/main/typescript/examples/by-wallet/crossmint-smart-wallets)]
+2. [Agent Launchpad Starter Kit](https://github.com/Crossmint/agent-launchpad-starter-kit/)
+
+
+
+
+<footer>
+<br/>
+<br/>
+<div>
+  <img src="https://github.com/user-attachments/assets/4821833e-52e5-4126-a2a1-59e9fa9bebd7" alt="GOAT" width="100%" height="auto" style="object-fit: contain; max-width: 800px;">
+
+<div>
+</footer>
diff --git a/typescript/examples/by-use-case/tron-send-and-receive-tokens/index.ts b/typescript/examples/by-use-case/tron-send-and-receive-tokens/index.ts
new file mode 100644
index 000000000..bbc5e2491
--- /dev/null
+++ b/typescript/examples/by-use-case/tron-send-and-receive-tokens/index.ts
@@ -0,0 +1,78 @@
+import readline from "node:readline";
+import { openai } from "@ai-sdk/openai";
+import { getOnChainTools } from "@goat-sdk/adapter-vercel-ai";
+import { sendTRX, tron } from "@goat-sdk/wallet-tron";
+import { generateText } from "ai";
+import dotenv from "dotenv";
+
+dotenv.config();
+
+// 1. Create the wallet client using the Tron factory function.
+// Ensure your .env file includes a TRON_PRIVATE_KEY variable.
+const privateKey = process.env.TRON_PRIVATE_KEY as string;
+if (!privateKey) {
+    throw new Error("Please define TRON_PRIVATE_KEY in your .env file");
+}
+const wallet = tron(privateKey);
+
+async function chat() {
+    // 2. Get the on-chain tools for the wallet.
+    const tools = await getOnChainTools({
+        wallet,
+        plugins: [
+            sendTRX(), // Enable TRX transfers.
+        ],
+    });
+
+    // 3. Create a readline interface to interact with the agent.
+    type Message = {
+        role: "user" | "assistant";
+        content: string;
+    };
+
+    console.log("Chat started. Type 'exit' to end the conversation.");
+
+    const conversationHistory: Message[] = [];
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+
+    const askQuestion = () => {
+        rl.question("You: ", async (prompt) => {
+            if (prompt.toLowerCase() === "exit") {
+                rl.close();
+                return;
+            }
+            conversationHistory.push({ role: "user", content: prompt });
+
+            const result = await generateText({
+                model: openai("gpt-4o-mini"),
+                tools: tools,
+                maxSteps: 10, // Maximum number of tool invocations per request.
+                prompt: `You are a crypto degen assistant knowledgeable about TRON and DeFi. 
+You help users send TRX and provide market insights. 
+Keep responses concise and use crypto slang.
+
+Previous conversation:
+${conversationHistory.map((m) => `${m.role}: ${m.content}`).join("\n")}
+
+Current request: ${prompt}`,
+                onStepFinish: (event) => {
+                    console.log("Tool execution:", event.toolResults);
+                },
+            });
+
+            conversationHistory.push({
+                role: "assistant",
+                content: result.text,
+            });
+            console.log("Assistant:", result.text);
+            askQuestion();
+        });
+    };
+
+    askQuestion();
+}
+
+chat().catch(console.error);
diff --git a/typescript/examples/by-use-case/tron-send-and-receive-tokens/package.json b/typescript/examples/by-use-case/tron-send-and-receive-tokens/package.json
new file mode 100644
index 000000000..6151a1b57
--- /dev/null
+++ b/typescript/examples/by-use-case/tron-send-and-receive-tokens/package.json
@@ -0,0 +1,20 @@
+{
+    "name": "goat-examples-tron-send-and-receive-tokens",
+    "version": "0.0.0",
+    "description": "Example to test TRX send and receive functionality using Goat SDK on Tron",
+    "private": true,
+    "scripts": {
+        "test": "vitest run --passWithNoTests"
+    },
+    "author": "",
+    "license": "MIT",
+    "dependencies": {
+        "@ai-sdk/openai": "~1.0.4",
+        "@goat-sdk/adapter-vercel-ai": "0.2.10",
+        "@goat-sdk/core": "0.4.9",
+        "@goat-sdk/wallet-tron": "workspace:*",
+        "tronweb": "^6.0.0",
+        "dotenv": "^16.4.5",
+        "zod": "3.23.8"
+    }
+}
diff --git a/typescript/examples/by-use-case/tron-send-and-receive-tokens/tsconfig.json b/typescript/examples/by-use-case/tron-send-and-receive-tokens/tsconfig.json
new file mode 100644
index 000000000..a7fc4a937
--- /dev/null
+++ b/typescript/examples/by-use-case/tron-send-and-receive-tokens/tsconfig.json
@@ -0,0 +1,8 @@
+{
+    "extends": "../../../tsconfig.base.json",
+    "compilerOptions": {
+        "outDir": "dist"
+    },
+    "include": ["index.ts"],
+    "exclude": ["node_modules", "dist"]
+}
diff --git a/typescript/packages/wallets/tron/CHANGELOG.md b/typescript/packages/wallets/tron/CHANGELOG.md
index e91965d17..1f7f3a68b 100644
--- a/typescript/packages/wallets/tron/CHANGELOG.md
+++ b/typescript/packages/wallets/tron/CHANGELOG.md
@@ -1,156 +1,2 @@
-# @goat-sdk/wallet-solana
+# @goat-sdk/wallet-tron
 
-## 0.2.15
-
-### Patch Changes
-
-- Updated dependencies [f73ce74]
-  - @goat-sdk/core@0.4.9
-
-## 0.2.14
-
-### Patch Changes
-
-- Updated dependencies [3091a49]
-  - @goat-sdk/core@0.4.8
-
-## 0.2.13
-
-### Patch Changes
-
-- Updated dependencies [a21a1f3]
-  - @goat-sdk/core@0.4.7
-
-## 0.2.12
-
-### Patch Changes
-
-- 1f361d5: Support raw txs
-
-## 0.2.11
-
-### Patch Changes
-
-- Updated dependencies [2b4b8e8]
-  - @goat-sdk/core@0.4.6
-
-## 0.2.10
-
-### Patch Changes
-
-- Updated dependencies [b9af25b]
-  - @goat-sdk/core@0.4.5
-
-## 0.2.9
-
-### Patch Changes
-
-- Updated dependencies [50180d4]
-  - @goat-sdk/core@0.4.4
-
-## 0.2.8
-
-### Patch Changes
-
-- 87eed18: Support pump.fun plugin
-
-## 0.2.7
-
-### Patch Changes
-
-- Updated dependencies [778440b]
-  - @goat-sdk/core@0.4.3
-
-## 0.2.6
-
-### Patch Changes
-
-- Updated dependencies [279dfcd]
-  - @goat-sdk/core@0.4.2
-
-## 0.2.5
-
-### Patch Changes
-
-- Updated dependencies [6c03f61]
-  - @goat-sdk/core@0.4.1
-
-## 0.2.4
-
-### Patch Changes
-
-- de8533d: Fix transaction instructions
-
-## 0.2.3
-
-### Patch Changes
-
-- b9cb39c: Wait for transaction confirmation
-
-## 0.2.2
-
-### Patch Changes
-
-- 608f9f1: Move to imperative prompts
-
-## 0.2.1
-
-### Patch Changes
-
-- ab3b1dc: Add accountsToSign to Solana tx
-
-## 0.2.0
-
-### Minor Changes
-
-- d3d9a7d: Upgrade to new plugin architecture
-
-### Patch Changes
-
-- Updated dependencies [d3d9a7d]
-  - @goat-sdk/core@0.4.0
-
-## 0.1.9
-
-### Patch Changes
-
-- a66ceec: Fix jupiter swap tokens tx
-- Updated dependencies [a66ceec]
-  - @goat-sdk/core@0.3.15
-
-## 0.1.8
-
-### Patch Changes
-
-- d289856: Fix send transaction options
-
-## 0.1.7
-
-### Patch Changes
-
-- 16271ab: Simplify core architecture
-- Updated dependencies [16271ab]
-  - @goat-sdk/core@0.3.14
-
-## 0.1.6
-
-### Patch Changes
-
-- Updated dependencies [cad06c0]
-- Updated dependencies [ad45f94]
-  - @goat-sdk/core@0.3.13
-
-## 0.1.5
-
-### Patch Changes
-
-- Updated dependencies [bf161b7]
-  - @goat-sdk/core@0.3.12
-
-## 0.1.4
-
-### Patch Changes
-
-- Updated dependencies [f5ea302]
-- Updated dependencies [e61b658]
-  - @goat-sdk/core@0.3.11
diff --git a/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts b/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
index bf9d51b04..081e90346 100644
--- a/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
+++ b/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
@@ -19,3 +19,6 @@ export class TronKeyPairWalletClient extends TronWalletClient {
         this.fromAddress = address;
     }
 }
+
+// Export the wallet client with a factory function.
+export const tron = (privateKey: string): TronKeyPairWalletClient => new TronKeyPairWalletClient(privateKey);
diff --git a/typescript/packages/wallets/tron/src/TronWalletClient.ts b/typescript/packages/wallets/tron/src/TronWalletClient.ts
index f723fe8a0..a29283fb9 100644
--- a/typescript/packages/wallets/tron/src/TronWalletClient.ts
+++ b/typescript/packages/wallets/tron/src/TronWalletClient.ts
@@ -1,5 +1,3 @@
-// src/TronWalletClient.ts
-
 import { Chain, WalletClientBase } from "@goat-sdk/core";
 import { TronWeb } from "tronweb";
 
@@ -9,8 +7,8 @@ export abstract class TronWalletClient extends WalletClientBase {
 
     constructor() {
         super();
-        // Initialize TronWeb using public endpoints (adjust these URLs if needed)
-        this.tronWeb = new TronWeb("https://api.trongrid.io", "https://api.trongrid.io", "https://api.trongrid.io");
+        // Initialize TronWeb using the Nile testnet endpoints.
+        this.tronWeb = new TronWeb("https://nile.trongrid.io", "https://nile.trongrid.io", "https://nile.trongrid.io");
     }
 
     // Return a minimal chain object identifying this chain as "tron"
@@ -64,13 +62,11 @@ export abstract class TronWalletClient extends WalletClientBase {
         }
         // Convert the amount from TRX to SUN.
         const amountSun = Math.floor(value * 1_000_000);
-
-        // Build an unsigned transaction
+        // Build an unsigned transaction.
         const unsignedTx = await this.tronWeb.transactionBuilder.sendTrx(to, amountSun, this.fromAddress);
-
-        // Sign the transaction (the private key must already be set on tronWeb)
+        // Sign the transaction (the private key must already be set on tronWeb).
         const signedTx = await this.tronWeb.trx.sign(unsignedTx);
-        // Broadcast the signed transaction
+        // Broadcast the signed transaction.
         const broadcast = await this.tronWeb.trx.sendRawTransaction(signedTx);
         if (broadcast.result) {
             return { hash: signedTx.txID };

From 4e4ba43dc9901135b423d547bbf036a15d8e72c0 Mon Sep 17 00:00:00 2001
From: Aziz Ahmed <aziz.ahmed@urbanstems.com>
Date: Sat, 22 Mar 2025 11:31:05 -0500
Subject: [PATCH 3/3] Added example

---
 .../.env.template                             |  4 +-
 .../tron-send-and-receive-tokens/README.md    | 21 +++----
 .../tron-send-and-receive-tokens/index.ts     | 55 +++++++++++--------
 typescript/packages/wallets/tron/README.md    | 18 ------
 .../tron/src/TronKeypairWalletClient.ts       | 28 +++++-----
 .../wallets/tron/src/TronWalletClient.ts      | 30 ++++------
 .../wallets/tron/src/sendTRX.plugin.ts        | 20 +++----
 7 files changed, 77 insertions(+), 99 deletions(-)

diff --git a/typescript/examples/by-use-case/tron-send-and-receive-tokens/.env.template b/typescript/examples/by-use-case/tron-send-and-receive-tokens/.env.template
index 4978c22f3..6baff96d1 100644
--- a/typescript/examples/by-use-case/tron-send-and-receive-tokens/.env.template
+++ b/typescript/examples/by-use-case/tron-send-and-receive-tokens/.env.template
@@ -1,3 +1,3 @@
 OPENAI_API_KEY=
-SOLANA_RPC_URL=
-SOLANA_PRIVATE_KEY=
+TRON_RPC_URL=
+TRON_PRIVATE_KEY=
diff --git a/typescript/examples/by-use-case/tron-send-and-receive-tokens/README.md b/typescript/examples/by-use-case/tron-send-and-receive-tokens/README.md
index ddc844bfe..e49df4903 100644
--- a/typescript/examples/by-use-case/tron-send-and-receive-tokens/README.md
+++ b/typescript/examples/by-use-case/tron-send-and-receive-tokens/README.md
@@ -3,10 +3,10 @@
 <img src="https://github.com/user-attachments/assets/5fc7f121-259c-492c-8bca-f15fe7eb830c" alt="GOAT" width="100px" height="auto" style="object-fit: contain;">
 </div>
 
-# Solana
+# TRON
 ## 🚀 Quickstart
 
-This example demonstrates how to use GOAT to **send and receive SOL and SPL tokens** on the Solana network.
+This example demonstrates how to use GOAT to **send and receive TRX tokens** on the TRON network.
 
 You can use this example with any other agent framework and wallet of your choice.
 
@@ -25,7 +25,7 @@ pnpm build
 
 3. Go to the example directory:
 ```bash
-cd examples/by-use-case/solana-send-and-receive-tokens
+cd examples/by-use-case/tron-send-and-receive-tokens
 ```
 
 4. Copy the `.env.template` and populate with your values:
@@ -33,8 +33,8 @@ cd examples/by-use-case/solana-send-and-receive-tokens
 cp .env.template .env
 ```
 - `OPENAI_API_KEY`
-- `SOLANA_PRIVATE_KEY`
-- `SOLANA_RPC_URL`
+- `TRON_PRIVATE_KEY`
+- `TRON_RPC_URL`
 
 ## Usage
 1. Run the interactive CLI:
@@ -43,12 +43,9 @@ pnpm ts-node index.ts
 ```
 
 2. Chat with the agent:
-- Check your balance for SOL
-- Send SOL to another address
-- Check your balance again to see the SOL you just sent
-- Check your balance for SPL tokens
-- Send SPL tokens to another address
-- Check your balance again to see the SPL tokens you just sent
+- Check your balance for TRX
+- Send TRX to another address
+- Check your balance again to see the TRX you just sent
 
 ## Using in production
 In production, developers require advanced wallet setups that utilize [smart wallets](https://docs.goat-sdk.com/concepts/smart-wallets), which allow them to:
@@ -61,7 +58,7 @@ In production, developers require advanced wallet setups that utilize [smart wal
 [Crossmint](https://docs.crossmint.com/wallets/quickstarts/agent-wallets) offers one of the most advanced solutions for agent developers and launchpads: [Agent Wallets](https://docs.crossmint.com/wallets/quickstarts/agent-wallets).
 
 To integrate Agent Wallets with GOAT, check out the following quickstarts:
-1. Agent Wallets Quickstart [[EVM](https://github.com/goat-sdk/goat/tree/main/typescript/examples/by-wallet/crossmint-smart-wallets), [Solana](https://github.com/goat-sdk/goat/tree/main/typescript/examples/by-wallet/crossmint-smart-wallets)]
+1. Agent Wallets Quickstart [[EVM](https://github.com/goat-sdk/goat/tree/main/typescript/examples/by-wallet/crossmint-smart-wallets), [TRON](https://github.com/goat-sdk/goat/tree/main/typescript/examples/by-wallet/crossmint-smart-wallets)]
 2. [Agent Launchpad Starter Kit](https://github.com/Crossmint/agent-launchpad-starter-kit/)
 
 
diff --git a/typescript/examples/by-use-case/tron-send-and-receive-tokens/index.ts b/typescript/examples/by-use-case/tron-send-and-receive-tokens/index.ts
index bbc5e2491..ac1e4303d 100644
--- a/typescript/examples/by-use-case/tron-send-and-receive-tokens/index.ts
+++ b/typescript/examples/by-use-case/tron-send-and-receive-tokens/index.ts
@@ -1,30 +1,40 @@
 import readline from "node:readline";
 import { openai } from "@ai-sdk/openai";
 import { getOnChainTools } from "@goat-sdk/adapter-vercel-ai";
-import { sendTRX, tron } from "@goat-sdk/wallet-tron";
+import { WalletClientBase } from "@goat-sdk/core";
+import { sendTRX } from "@goat-sdk/wallet-tron";
+import { tron } from "@goat-sdk/wallet-tron";
 import { generateText } from "ai";
 import dotenv from "dotenv";
+import { TronWeb } from "tronweb";
 
 dotenv.config();
 
-// 1. Create the wallet client using the Tron factory function.
-// Ensure your .env file includes a TRON_PRIVATE_KEY variable.
-const privateKey = process.env.TRON_PRIVATE_KEY as string;
-if (!privateKey) {
-    throw new Error("Please define TRON_PRIVATE_KEY in your .env file");
+const fullNode: string = process.env.TRON_FULL_NODE || "https://nile.trongrid.io";
+const solidityNode: string = process.env.TRON_SOLIDITY_NODE || "https://nile.trongrid.io";
+const eventServer: string = process.env.TRON_EVENT_SERVER || "https://nile.trongrid.io";
+
+const tronWeb: TronWeb = new TronWeb(fullNode, solidityNode, eventServer);
+
+const privateKey: string = process.env.TRON_PRIVATE_KEY as string;
+if (!privateKey || privateKey.length !== 64) {
+    throw new Error("Invalid TRON private key.");
 }
-const wallet = tron(privateKey);
+tronWeb.setPrivateKey(privateKey);
+const maybeAddress: string | false = tronWeb.address.fromPrivateKey(privateKey);
+if (!maybeAddress) {
+    throw new Error("Failed to derive a valid Tron address from the provided private key.");
+}
+const address: string = maybeAddress;
+
+const wallet = tron({ tronWeb, address, privateKey }) as unknown as WalletClientBase;
 
-async function chat() {
-    // 2. Get the on-chain tools for the wallet.
+async function chat(): Promise<void> {
     const tools = await getOnChainTools({
         wallet,
-        plugins: [
-            sendTRX(), // Enable TRX transfers.
-        ],
+        plugins: [sendTRX()],
     });
 
-    // 3. Create a readline interface to interact with the agent.
     type Message = {
         role: "user" | "assistant";
         content: string;
@@ -33,26 +43,26 @@ async function chat() {
     console.log("Chat started. Type 'exit' to end the conversation.");
 
     const conversationHistory: Message[] = [];
+
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
     });
 
-    const askQuestion = () => {
-        rl.question("You: ", async (prompt) => {
+    const askQuestion = (): void => {
+        rl.question("You: ", async (prompt: string) => {
             if (prompt.toLowerCase() === "exit") {
                 rl.close();
                 return;
             }
+
             conversationHistory.push({ role: "user", content: prompt });
 
             const result = await generateText({
                 model: openai("gpt-4o-mini"),
-                tools: tools,
-                maxSteps: 10, // Maximum number of tool invocations per request.
-                prompt: `You are a crypto degen assistant knowledgeable about TRON and DeFi. 
-You help users send TRX and provide market insights. 
-Keep responses concise and use crypto slang.
+                tools, // Agus, Here is an issue.
+                maxSteps: 10, // Maximum number of tool invocations per request
+                prompt: `You are a based crypto degen assistant. You're knowledgeable about DeFi, NFTs, and trading. You use crypto slang naturally and stay up to date with the Tron ecosystem. You help users with their trades and provide market insights. Keep responses concise and use emojis occasionally.
 
 Previous conversation:
 ${conversationHistory.map((m) => `${m.role}: ${m.content}`).join("\n")}
@@ -63,10 +73,7 @@ Current request: ${prompt}`,
                 },
             });
 
-            conversationHistory.push({
-                role: "assistant",
-                content: result.text,
-            });
+            conversationHistory.push({ role: "assistant", content: result.text });
             console.log("Assistant:", result.text);
             askQuestion();
         });
diff --git a/typescript/packages/wallets/tron/README.md b/typescript/packages/wallets/tron/README.md
index abd9f8a7a..32db1b3eb 100644
--- a/typescript/packages/wallets/tron/README.md
+++ b/typescript/packages/wallets/tron/README.md
@@ -19,25 +19,7 @@ pnpm add @goat-sdk/wallet-tron
 import { getOnChainTools } from "@goat-sdk/adapter-vercel-ai";
 import { tron } from "@goat-sdk/wallet-tron";
 
-import { Connection, Keypair } from "@solana/web3.js";
-import * as bip39 from "bip39";
 
-const connection = new Connection(
-    "https://api.mainnet-beta.solana.com",
-    "confirmed"
-);
-
-const mnemonic = process.env.WALLET_MNEMONIC;
-
-const seed = bip39.mnemonicToSeedSync(mnemonic);
-const keypair = Keypair.fromSeed(Uint8Array.from(seed).subarray(0, 32));
-
-const tools = await getOnChainTools({
-    wallet: solana({
-        keypair,
-        connection,
-    }),
-});
 ```
 
 <footer>
diff --git a/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts b/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
index 081e90346..706fcfbab 100644
--- a/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
+++ b/typescript/packages/wallets/tron/src/TronKeypairWalletClient.ts
@@ -1,24 +1,26 @@
+import { TronWeb } from "tronweb";
 import { TronWalletClient } from "./TronWalletClient";
 
+export type TronKeypairWalletClientCtorParams = {
+    tronWeb: TronWeb;
+    address: string;
+    privateKey: string;
+};
+
 export class TronKeyPairWalletClient extends TronWalletClient {
     private privateKey: string;
 
-    constructor(privateKey: string) {
-        super();
-        if (!privateKey || privateKey.length !== 64) {
+    constructor(params: TronKeypairWalletClientCtorParams) {
+        super(params.tronWeb);
+        if (!params.privateKey || params.privateKey.length !== 64) {
             throw new Error("Invalid Tron private key.");
         }
-        this.privateKey = privateKey;
-        // Configure TronWeb with the provided private key for signing transactions.
-        this.tronWeb.setPrivateKey(privateKey);
-        // Derive the wallet address (Base58 format) from the private key.
-        const address = this.tronWeb.address.fromPrivateKey(privateKey);
-        if (!address || typeof address !== "string") {
-            throw new Error("Failed to derive a valid address from the provided private key.");
+        this.privateKey = params.privateKey;
+        if (!params.tronWeb.isAddress(params.address)) {
+            throw new Error("Invalid Tron address derived from the provided private key.");
         }
-        this.fromAddress = address;
+        this.fromAddress = params.address;
     }
 }
 
-// Export the wallet client with a factory function.
-export const tron = (privateKey: string): TronKeyPairWalletClient => new TronKeyPairWalletClient(privateKey);
+export const tron = (params: TronKeypairWalletClientCtorParams) => new TronKeyPairWalletClient(params);
diff --git a/typescript/packages/wallets/tron/src/TronWalletClient.ts b/typescript/packages/wallets/tron/src/TronWalletClient.ts
index a29283fb9..a63ac9eaf 100644
--- a/typescript/packages/wallets/tron/src/TronWalletClient.ts
+++ b/typescript/packages/wallets/tron/src/TronWalletClient.ts
@@ -3,20 +3,20 @@ import { TronWeb } from "tronweb";
 
 export abstract class TronWalletClient extends WalletClientBase {
     protected tronWeb: TronWeb;
-    protected fromAddress = "";
+    protected fromAddress: string;
 
-    constructor() {
+    constructor(tronWeb?: TronWeb) {
         super();
-        // Initialize TronWeb using the Nile testnet endpoints.
-        this.tronWeb = new TronWeb("https://nile.trongrid.io", "https://nile.trongrid.io", "https://nile.trongrid.io");
+        // Allow injection of a TronWeb instance or fallback to Nile testnet endpoints.
+        this.tronWeb =
+            tronWeb ?? new TronWeb("https://nile.trongrid.io", "https://nile.trongrid.io", "https://nile.trongrid.io");
+        this.fromAddress = "";
     }
 
-    // Return a minimal chain object identifying this chain as "tron"
     getChain(): Chain {
         return { type: "tron" } as const;
     }
 
-    // Return the wallet address (Base58 format)
     getAddress(): string {
         if (!this.fromAddress) {
             throw new Error("Wallet address is not set.");
@@ -24,15 +24,12 @@ export abstract class TronWalletClient extends WalletClientBase {
         return this.fromAddress;
     }
 
-    // Sign a message using TronWeb's signing functionality
     async signMessage(message: string): Promise<{ signature: string }> {
-        const hexMessage = this.tronWeb.toHex(message);
-        const signature = await this.tronWeb.trx.sign(hexMessage);
+        const hexMessage: string = this.tronWeb.toHex(message);
+        const signature: string = await this.tronWeb.trx.sign(hexMessage);
         return { signature };
     }
 
-    // Return the TRX balance for a given address.
-    // Note: TronWeb returns balances in SUN (1 TRX = 1,000,000 SUN).
     async balanceOf(address: string): Promise<{
         decimals: number;
         symbol: string;
@@ -43,8 +40,8 @@ export abstract class TronWalletClient extends WalletClientBase {
         if (!this.tronWeb.isAddress(address)) {
             throw new Error("Invalid Tron address.");
         }
-        const balanceSun = await this.tronWeb.trx.getBalance(address);
-        const balanceTRX = balanceSun / 1_000_000;
+        const balanceSun: number = await this.tronWeb.trx.getBalance(address);
+        const balanceTRX: number = balanceSun / 1_000_000;
         return {
             decimals: 6,
             symbol: "TRX",
@@ -54,19 +51,14 @@ export abstract class TronWalletClient extends WalletClientBase {
         };
     }
 
-    // Send a TRX transaction from the wallet to another address.
     async sendTransaction(transaction: { to: string; value: number }): Promise<{ hash: string }> {
         const { to, value } = transaction;
         if (!this.tronWeb.isAddress(to)) {
             throw new Error("Invalid recipient Tron address.");
         }
-        // Convert the amount from TRX to SUN.
-        const amountSun = Math.floor(value * 1_000_000);
-        // Build an unsigned transaction.
+        const amountSun: number = Math.floor(value * 1_000_000);
         const unsignedTx = await this.tronWeb.transactionBuilder.sendTrx(to, amountSun, this.fromAddress);
-        // Sign the transaction (the private key must already be set on tronWeb).
         const signedTx = await this.tronWeb.trx.sign(unsignedTx);
-        // Broadcast the signed transaction.
         const broadcast = await this.tronWeb.trx.sendRawTransaction(signedTx);
         if (broadcast.result) {
             return { hash: signedTx.txID };
diff --git a/typescript/packages/wallets/tron/src/sendTRX.plugin.ts b/typescript/packages/wallets/tron/src/sendTRX.plugin.ts
index f6ac01796..e4aaf4353 100644
--- a/typescript/packages/wallets/tron/src/sendTRX.plugin.ts
+++ b/typescript/packages/wallets/tron/src/sendTRX.plugin.ts
@@ -1,6 +1,4 @@
-// src/sendTRX.plugin.ts
-
-import { Chain, PluginBase, createTool } from "@goat-sdk/core";
+import { Chain, PluginBase, WalletClientBase, createTool } from "@goat-sdk/core";
 import { z } from "zod";
 import { TronWalletClient } from "./TronWalletClient";
 
@@ -10,12 +8,14 @@ const sendTRXParametersSchema = z.object({
 });
 
 async function sendTRXMethod(
-    walletClient: TronWalletClient,
+    walletClient: WalletClientBase,
     parameters: z.infer<typeof sendTRXParametersSchema>,
 ): Promise<string> {
+    // Cast to TronWalletClient since we know this plugin is for Tron.
+    const tronWalletClient = walletClient as TronWalletClient;
     try {
         const { to, amount } = parameters;
-        const tx = await walletClient.sendTransaction({ to, value: amount });
+        const tx = await tronWalletClient.sendTransaction({ to, value: amount });
         return tx.hash;
     } catch (error) {
         throw new Error(`Failed to send TRX: ${error}`);
@@ -27,12 +27,10 @@ export class SendTRXPlugin extends PluginBase<TronWalletClient> {
         super("sendTRX", []);
     }
 
-    supportsChain(chain: Chain): boolean {
-        return chain.type === "tron";
-    }
+    supportsChain = (chain: Chain) => chain.type === "tron";
 
-    getTools(walletClient: TronWalletClient) {
-        const tool = createTool(
+    getTools(walletClient: WalletClientBase) {
+        const sendTool = createTool(
             {
                 name: "send_trx",
                 description: "Send TRX to an address.",
@@ -40,7 +38,7 @@ export class SendTRXPlugin extends PluginBase<TronWalletClient> {
             },
             (parameters: z.infer<typeof sendTRXParametersSchema>) => sendTRXMethod(walletClient, parameters),
         );
-        return [tool];
+        return [sendTool];
     }
 }