@awaken-finance/agent-kit 1.1.0 → 1.2.0

package/README.md

@@ -184,12 +184,14 @@ All commands output standardized JSON on success. Errors go to stderr with `[ERR
 
 2. Update the path and environment variables:
 
+**EOA mode** (direct private key signing):
+
 ```json
 {
   "mcpServers": {
     "awaken-agent-kit": {
       "command": "bun",
-      "args": ["run", "/ABSOLUTE/PATH/TO/scripts/skills/src/mcp/server.ts"],
+      "args": ["run", "/ABSOLUTE/PATH/TO/src/mcp/server.ts"],
       "env": {
         "AELF_PRIVATE_KEY": "your_private_key_here",
         "AWAKEN_NETWORK": "mainnet"
@@ -199,6 +201,25 @@ All commands output standardized JSON on success. Errors go to stderr with `[ERR
 }
 ```
 
+**CA mode** (Portkey Contract Account):
+
+```json
+{
+  "mcpServers": {
+    "awaken-agent-kit": {
+      "command": "bun",
+      "args": ["run", "/ABSOLUTE/PATH/TO/src/mcp/server.ts"],
+      "env": {
+        "PORTKEY_PRIVATE_KEY": "your_manager_private_key",
+        "PORTKEY_CA_HASH": "your_ca_hash",
+        "PORTKEY_CA_ADDRESS": "your_ca_address",
+        "AWAKEN_NETWORK": "mainnet"
+      }
+    }
+  }
+}
+```
+
 3. Start the MCP server manually (for debugging):
 
 ```bash
@@ -279,7 +300,10 @@ bun run test:e2e
 
 | Variable | Required | Default | Description |
 |----------|----------|---------|-------------|
-| `AELF_PRIVATE_KEY` | For trades | — | aelf wallet private key |
+| `AELF_PRIVATE_KEY` | For trades (EOA) | — | aelf wallet private key |
+| `PORTKEY_PRIVATE_KEY` | For trades (CA) | — | Portkey Manager private key |
+| `PORTKEY_CA_HASH` | For trades (CA) | — | Portkey CA hash |
+| `PORTKEY_CA_ADDRESS` | For trades (CA) | — | Portkey CA address |
 | `AWAKEN_NETWORK` | No | `mainnet` | `mainnet` or `testnet` |
 | `AWAKEN_RPC_URL` | No | Per network | Override RPC endpoint |
 | `AWAKEN_API_BASE_URL` | No | Per network | Override API endpoint |

package/awaken_trade_skill.ts

@@ -3,12 +3,12 @@
 // Awaken Trade Skill - CLI Adapter (thin shell)
 // ============================================================
 // Commands: swap, add-liquidity, remove-liquidity, approve
-// Requires: AELF_PRIVATE_KEY env var
+// Requires: AELF_PRIVATE_KEY (EOA) or PORTKEY_PRIVATE_KEY + CA env vars
 // Core logic lives in src/core/trade.ts
 
 import { Command } from 'commander';
+import { createSignerFromEnv } from '@portkey/aelf-signer';
 import { getNetworkConfig, DEFAULT_SLIPPAGE } from './lib/config';
-import { getWalletByPrivateKey } from './lib/aelf-client';
 import { outputSuccess, outputError } from './cli-helpers';
 import { executeSwap, addLiquidity, removeLiquidity, approveTokenSpending } from './src/core/trade';
 
@@ -16,7 +16,7 @@ const program = new Command();
 
 program
   .name('awaken-trade')
-  .description('Awaken DEX trading tool (requires AELF_PRIVATE_KEY)')
+  .description('Awaken DEX trading tool (requires AELF_PRIVATE_KEY or Portkey CA env vars)')
   .version('1.0.0')
   .option('--network <network>', 'Network: mainnet or testnet', process.env.AWAKEN_NETWORK || 'mainnet');
 
@@ -31,8 +31,8 @@ program
   .action(async (opts) => {
     try {
       const config = getNetworkConfig(program.opts().network);
-      const wallet = getWalletByPrivateKey();
-      const result = await executeSwap(config, wallet, {
+      const signer = createSignerFromEnv();
+      const result = await executeSwap(config, signer, {
         symbolIn: opts.symbolIn,
         symbolOut: opts.symbolOut,
         amountIn: opts.amountIn,
@@ -57,8 +57,8 @@ program
   .action(async (opts) => {
     try {
       const config = getNetworkConfig(program.opts().network);
-      const wallet = getWalletByPrivateKey();
-      const result = await addLiquidity(config, wallet, {
+      const signer = createSignerFromEnv();
+      const result = await addLiquidity(config, signer, {
         tokenA: opts.tokenA,
         tokenB: opts.tokenB,
         amountA: opts.amountA,
@@ -84,8 +84,8 @@ program
   .action(async (opts) => {
     try {
       const config = getNetworkConfig(program.opts().network);
-      const wallet = getWalletByPrivateKey();
-      const result = await removeLiquidity(config, wallet, {
+      const signer = createSignerFromEnv();
+      const result = await removeLiquidity(config, signer, {
         tokenA: opts.tokenA,
         tokenB: opts.tokenB,
         lpAmount: opts.lpAmount,
@@ -108,8 +108,8 @@ program
   .action(async (opts) => {
     try {
       const config = getNetworkConfig(program.opts().network);
-      const wallet = getWalletByPrivateKey();
-      const result = await approveTokenSpending(config, wallet, {
+      const signer = createSignerFromEnv();
+      const result = await approveTokenSpending(config, signer, {
         symbol: opts.symbol,
         spender: opts.spender,
         amount: opts.amount,

package/lib/aelf-client.ts

@@ -2,10 +2,11 @@
 // Awaken OpenClaw Skills - aelf SDK Client
 // ============================================================
 // Wraps aelf-sdk for both view (read) and send (write) contract calls.
-// For send methods, requires AELF_PRIVATE_KEY env var.
+// Supports both EOA and CA wallets via @portkey/aelf-signer.
 
 import AElf from 'aelf-sdk';
 import BigNumber from 'bignumber.js';
+import type { AelfSigner } from '@portkey/aelf-signer';
 import type { NetworkConfig, TxResult } from './types';
 
 // ---- Caches ----
@@ -141,21 +142,26 @@ export async function getTokenInfo(
 
 // ---- Approve ----
 
+/**
+ * Approve a contract to spend tokens.
+ * Accepts AelfSigner (EOA or CA) — signing is handled transparently.
+ */
 export async function approveToken(
   config: NetworkConfig,
-  wallet: any,
+  signer: AelfSigner,
   symbol: string,
   spender: string,
   amount: string,
 ): Promise<TxResult> {
-  const result = await callSendMethod(config.rpcUrl, config.tokenContract, 'Approve', wallet, {
+  const result = await signer.sendContractCall(config.rpcUrl, config.tokenContract, 'Approve', {
     symbol,
     spender,
     amount,
   });
-  const txId = result?.TransactionId || result?.transactionId;
-  if (!txId) throw new Error('[ERROR] Approve failed: no transactionId returned');
-  return getTxResult(config.rpcUrl, txId);
+  return {
+    transactionId: result.transactionId,
+    status: (result.txResult.Status || 'mined').toLowerCase(),
+  };
 }
 
 // ---- Utility ----

package/mcp-config.example.json

@@ -5,6 +5,7 @@
   "_cursor_project": ".cursor/mcp.json (in project root)",
   "_cursor_global": "~/.cursor/mcp.json",
 
+  "_eoa_mode": "EOA mode — direct private key signing:",
   "mcpServers": {
     "awaken-agent-kit": {
       "command": "bun",
@@ -14,5 +15,19 @@
         "AWAKEN_NETWORK": "mainnet"
       }
     }
+  },
+
+  "_ca_mode": "CA mode — Portkey Contract Account via ManagerForwardCall:",
+  "_mcpServers_ca_example": {
+    "awaken-agent-kit": {
+      "command": "bun",
+      "args": ["run", "/ABSOLUTE/PATH/TO/awaken-agent-skills/src/mcp/server.ts"],
+      "env": {
+        "PORTKEY_PRIVATE_KEY": "your_manager_private_key",
+        "PORTKEY_CA_HASH": "your_ca_hash",
+        "PORTKEY_CA_ADDRESS": "your_ca_address",
+        "AWAKEN_NETWORK": "mainnet"
+      }
+    }
   }
 }

package/openclaw.json

@@ -33,25 +33,25 @@
     {
       "name": "awaken-trade-swap",
       "command": "bun run awaken_trade_skill.ts swap --symbol-in {{symbolIn}} --symbol-out {{symbolOut}} --amount-in {{amountIn}} --slippage {{slippage}}",
-      "description": "Execute a token swap on Awaken DEX. REQUIRES AELF_PRIVATE_KEY env var. This sends a real on-chain transaction. Parameters: --symbol-in (token to sell), --symbol-out (token to buy), --amount-in (human-readable amount to sell), --slippage (tolerance, default 0.005 = 0.5%). The tool auto-queries the best route, approves if needed, and executes the swap. Returns: transactionId, estimated amounts, explorer URL.",
+      "description": "Execute a token swap on Awaken DEX. Requires wallet env vars: AELF_PRIVATE_KEY (EOA) or PORTKEY_PRIVATE_KEY + PORTKEY_CA_HASH + PORTKEY_CA_ADDRESS (CA). This sends a real on-chain transaction. Parameters: --symbol-in (token to sell), --symbol-out (token to buy), --amount-in (human-readable amount to sell), --slippage (tolerance, default 0.005 = 0.5%). The tool auto-queries the best route, approves if needed, and executes the swap. Returns: transactionId, estimated amounts, explorer URL.",
       "cwd": "."
     },
     {
       "name": "awaken-trade-add-liquidity",
       "command": "bun run awaken_trade_skill.ts add-liquidity --token-a {{tokenA}} --token-b {{tokenB}} --amount-a {{amountA}} --amount-b {{amountB}} --fee-rate {{feeRate}}",
-      "description": "Add liquidity to an Awaken DEX trading pair. REQUIRES AELF_PRIVATE_KEY env var. Parameters: --token-a and --token-b (token symbols), --amount-a and --amount-b (human-readable amounts), --fee-rate (pool fee tier, default 0.3), --slippage (tolerance, default 0.005). Auto-approves both tokens before adding.",
+      "description": "Add liquidity to an Awaken DEX trading pair. Requires wallet env vars (EOA or CA). Parameters: --token-a and --token-b (token symbols), --amount-a and --amount-b (human-readable amounts), --fee-rate (pool fee tier, default 0.3), --slippage (tolerance, default 0.005). Auto-approves both tokens before adding.",
       "cwd": "."
     },
     {
       "name": "awaken-trade-remove-liquidity",
       "command": "bun run awaken_trade_skill.ts remove-liquidity --token-a {{tokenA}} --token-b {{tokenB}} --lp-amount {{lpAmount}} --fee-rate {{feeRate}}",
-      "description": "Remove liquidity from an Awaken DEX trading pair. REQUIRES AELF_PRIVATE_KEY env var. Parameters: --token-a and --token-b (token symbols), --lp-amount (LP token amount to burn), --fee-rate (pool fee tier, default 0.3). Returns the underlying tokens to your wallet.",
+      "description": "Remove liquidity from an Awaken DEX trading pair. Requires wallet env vars (EOA or CA). Parameters: --token-a and --token-b (token symbols), --lp-amount (LP token amount to burn), --fee-rate (pool fee tier, default 0.3). Returns the underlying tokens to your wallet.",
       "cwd": "."
     },
     {
       "name": "awaken-trade-approve",
       "command": "bun run awaken_trade_skill.ts approve --symbol {{symbol}} --spender {{spender}} --amount {{amount}}",
-      "description": "Approve a contract to spend your tokens. REQUIRES AELF_PRIVATE_KEY env var. Parameters: --symbol (token to approve), --spender (contract address), --amount (human-readable amount). Use this before swap/liquidity if you need manual control over approvals.",
+      "description": "Approve a contract to spend your tokens. Requires wallet env vars (EOA or CA). Parameters: --symbol (token to approve), --spender (contract address), --amount (human-readable amount). Use this before swap/liquidity if you need manual control over approvals.",
       "cwd": "."
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awaken-finance/agent-kit",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "AI Agent toolkit for Awaken DEX on aelf blockchain — swap tokens, manage liquidity, fetch K-line data. Supports MCP, CLI, and SDK usage.",
   "type": "module",
   "main": "index.ts",
@@ -63,6 +63,7 @@
   "dependencies": {
     "@microsoft/signalr": "^8.0.0",
     "@modelcontextprotocol/sdk": "^1.26.0",
+    "@portkey/aelf-signer": "^1.0.0",
     "aelf-sdk": "^3.4.8",
     "axios": "^1.7.0",
     "bignumber.js": "^9.1.2",

package/src/core/trade.ts

@@ -12,14 +12,12 @@ import {
   CHANNEL_ID,
   SWAP_LABS_FEE_RATE,
 } from '../../lib/config';
+import type { AelfSigner } from '@portkey/aelf-signer';
 import {
-  getWalletByPrivateKey,
-  callSendMethod,
   callViewMethod,
   getTokenInfo,
   getAllowance,
   approveToken,
-  getTxResult,
   timesDecimals,
   divDecimals,
 } from '../../lib/aelf-client';
@@ -33,24 +31,23 @@ import type {
   LiquidityRemoveResult,
   ApproveParams,
   ApproveResult,
-  TxResult,
 } from '../../lib/types';
 
 // ---- Helper: ensure approval ----
 
 async function ensureApproval(
   config: NetworkConfig,
-  wallet: any,
+  signer: AelfSigner,
   symbol: string,
   spender: string,
   requiredAmount: string,
 ): Promise<void> {
-  const owner = wallet.address;
+  const owner = signer.address;
   const currentAllowance = await getAllowance(config.rpcUrl, config.tokenContract, symbol, owner, spender);
 
   if (new BigNumber(currentAllowance).lt(requiredAmount)) {
     const approveAmount = new BigNumber(requiredAmount).times(10).toFixed(0);
-    await approveToken(config, wallet, symbol, spender, approveAmount);
+    await approveToken(config, signer, symbol, spender, approveAmount);
   }
 }
 
@@ -58,10 +55,10 @@ async function ensureApproval(
 
 export async function executeSwap(
   config: NetworkConfig,
-  wallet: any,
+  signer: AelfSigner,
   params: SwapParams,
 ): Promise<SwapResult> {
-  const account = wallet.address;
+  const account = signer.address;
   const slippage = params.slippage || DEFAULT_SLIPPAGE;
 
   // 1. Get token info
@@ -109,28 +106,23 @@ export async function executeSwap(
   const swapHookAddress = config.swapHookContract;
 
   // 5. Approve input token to swap hook contract
-  await ensureApproval(config, wallet, params.symbolIn, swapHookAddress, rawAmountIn);
+  await ensureApproval(config, signer, params.symbolIn, swapHookAddress, rawAmountIn);
 
-  // 6. Execute swap via swap hook contract
-  const result = await callSendMethod(config.rpcUrl, swapHookAddress, 'SwapExactTokensForTokens', wallet, {
+  // 6. Execute swap via signer (EOA: direct sign, CA: ManagerForwardCall)
+  const sendResult = await signer.sendContractCall(config.rpcUrl, swapHookAddress, 'SwapExactTokensForTokens', {
     swapTokens,
     labsFeeRate: SWAP_LABS_FEE_RATE,
   });
 
-  const txId = result?.TransactionId || result?.transactionId;
-  if (!txId) throw new Error('Swap failed: no transactionId returned');
-
-  const txResult = await getTxResult(config.rpcUrl, txId);
-
   return {
-    transactionId: txResult.transactionId,
-    status: txResult.status,
+    transactionId: sendResult.transactionId,
+    status: (sendResult.txResult.Status || 'mined').toLowerCase(),
     symbolIn: params.symbolIn,
     symbolOut: params.symbolOut,
     amountIn: params.amountIn,
     estimatedAmountOut: divDecimals(rawAmountOut, tokenOutInfo.decimals).toFixed(),
     minAmountOut: divDecimals(amountOutMin, tokenOutInfo.decimals).toFixed(),
-    explorerUrl: `${config.explorerUrl}/tx/${txResult.transactionId}`,
+    explorerUrl: `${config.explorerUrl}/tx/${sendResult.transactionId}`,
   };
 }
 
@@ -138,10 +130,10 @@ export async function executeSwap(
 
 export async function addLiquidity(
   config: NetworkConfig,
-  wallet: any,
+  signer: AelfSigner,
   params: LiquidityAddParams,
 ): Promise<LiquidityAddResult> {
-  const account = wallet.address;
+  const account = signer.address;
   const feeRate = params.feeRate || '0.3';
   const slippage = params.slippage || DEFAULT_SLIPPAGE;
 
@@ -160,12 +152,12 @@ export async function addLiquidity(
 
   // Approve both tokens
   await Promise.all([
-    ensureApproval(config, wallet, params.tokenA, routerAddress, rawAmountA),
-    ensureApproval(config, wallet, params.tokenB, routerAddress, rawAmountB),
+    ensureApproval(config, signer, params.tokenA, routerAddress, rawAmountA),
+    ensureApproval(config, signer, params.tokenB, routerAddress, rawAmountB),
   ]);
 
-  // Execute addLiquidity
-  const result = await callSendMethod(config.rpcUrl, routerAddress, 'AddLiquidity', wallet, {
+  // Execute addLiquidity via signer
+  const sendResult = await signer.sendContractCall(config.rpcUrl, routerAddress, 'AddLiquidity', {
     symbolA: params.tokenA,
     symbolB: params.tokenB,
     amountADesired: rawAmountA,
@@ -177,20 +169,15 @@ export async function addLiquidity(
     channel: CHANNEL_ID,
   });
 
-  const txId = result?.TransactionId || result?.transactionId;
-  if (!txId) throw new Error('Add liquidity failed: no transactionId');
-
-  const txResult = await getTxResult(config.rpcUrl, txId);
-
   return {
-    transactionId: txResult.transactionId,
-    status: txResult.status,
+    transactionId: sendResult.transactionId,
+    status: (sendResult.txResult.Status || 'mined').toLowerCase(),
     tokenA: params.tokenA,
     tokenB: params.tokenB,
     amountA: params.amountA,
     amountB: params.amountB,
     feeRate,
-    explorerUrl: `${config.explorerUrl}/tx/${txResult.transactionId}`,
+    explorerUrl: `${config.explorerUrl}/tx/${sendResult.transactionId}`,
   };
 }
 
@@ -198,10 +185,10 @@ export async function addLiquidity(
 
 export async function removeLiquidity(
   config: NetworkConfig,
-  wallet: any,
+  signer: AelfSigner,
   params: LiquidityRemoveParams,
 ): Promise<LiquidityRemoveResult> {
-  const account = wallet.address;
+  const account = signer.address;
   const feeRate = params.feeRate || '0.3';
 
   const LP_DECIMALS = 8;
@@ -221,16 +208,15 @@ export async function removeLiquidity(
     spender: routerAddress,
   });
   if (new BigNumber(currentAllowance?.allowance ?? '0').lt(rawLiquidity)) {
-    const approveResult = await callSendMethod(config.rpcUrl, factoryAddress, 'Approve', wallet, {
+    await signer.sendContractCall(config.rpcUrl, factoryAddress, 'Approve', {
       symbol: lpSymbol,
       spender: routerAddress,
       amount: new BigNumber(rawLiquidity).times(10).toFixed(0),
     });
-    const approveTxId = approveResult?.TransactionId || approveResult?.transactionId;
-    if (approveTxId) await getTxResult(config.rpcUrl, approveTxId);
   }
 
-  const result = await callSendMethod(config.rpcUrl, routerAddress, 'RemoveLiquidity', wallet, {
+  // Remove liquidity via signer
+  const sendResult = await signer.sendContractCall(config.rpcUrl, routerAddress, 'RemoveLiquidity', {
     symbolA: params.tokenA,
     symbolB: params.tokenB,
     amountAMin: '1',
@@ -240,18 +226,13 @@ export async function removeLiquidity(
     deadline: { seconds: getDeadline(), nanos: 0 },
   });
 
-  const txId = result?.TransactionId || result?.transactionId;
-  if (!txId) throw new Error('Remove liquidity failed: no transactionId');
-
-  const txResult = await getTxResult(config.rpcUrl, txId);
-
   return {
-    transactionId: txResult.transactionId,
-    status: txResult.status,
+    transactionId: sendResult.transactionId,
+    status: (sendResult.txResult.Status || 'mined').toLowerCase(),
     tokenA: params.tokenA,
     tokenB: params.tokenB,
     lpAmount: params.lpAmount,
-    explorerUrl: `${config.explorerUrl}/tx/${txResult.transactionId}`,
+    explorerUrl: `${config.explorerUrl}/tx/${sendResult.transactionId}`,
   };
 }
 
@@ -259,13 +240,13 @@ export async function removeLiquidity(
 
 export async function approveTokenSpending(
   config: NetworkConfig,
-  wallet: any,
+  signer: AelfSigner,
   params: ApproveParams,
 ): Promise<ApproveResult> {
   const tokenInfo = await getTokenInfo(config.rpcUrl, config.tokenContract, params.symbol);
   const rawAmount = timesDecimals(params.amount, tokenInfo.decimals).toFixed(0);
 
-  const txResult = await approveToken(config, wallet, params.symbol, params.spender, rawAmount);
+  const txResult = await approveToken(config, signer, params.symbol, params.spender, rawAmount);
 
   return {
     transactionId: txResult.transactionId,

package/src/mcp/server.ts

@@ -12,8 +12,8 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
 
+import { createSignerFromEnv } from '@portkey/aelf-signer';
 import { getNetworkConfig } from '../../lib/config';
-import { getWalletByPrivateKey } from '../../lib/aelf-client';
 import { getQuote, getPair, getTokenBalance, getTokenAllowance, getLiquidityPositions } from '../core/query';
 import { executeSwap, addLiquidity, removeLiquidity, approveTokenSpending } from '../core/trade';
 import { fetchKline, getKlineIntervals } from '../core/kline';
@@ -151,14 +151,14 @@ server.registerTool(
 );
 
 // ============================================================
-// Trade Tools (require AELF_PRIVATE_KEY env var)
+// Trade Tools (require AELF_PRIVATE_KEY or PORTKEY_PRIVATE_KEY + CA env vars)
 // ============================================================
 
 server.registerTool(
   'awaken_swap',
   {
     description:
-      'Execute a token swap on Awaken DEX. REQUIRES AELF_PRIVATE_KEY env var. Sends a real on-chain transaction. Auto-queries the best route, approves if needed, and executes the swap. Returns transactionId, estimated amounts, explorer URL.',
+      'Execute a token swap on Awaken DEX. Requires wallet env vars (AELF_PRIVATE_KEY for EOA, or PORTKEY_PRIVATE_KEY + PORTKEY_CA_HASH + PORTKEY_CA_ADDRESS for CA). Sends a real on-chain transaction. Auto-queries the best route, approves if needed, and executes the swap. Returns transactionId, estimated amounts, explorer URL.',
     inputSchema: {
       symbolIn: z.string().describe('Token to sell (e.g. ELF)'),
       symbolOut: z.string().describe('Token to buy (e.g. USDT)'),
@@ -170,8 +170,8 @@ server.registerTool(
   async ({ symbolIn, symbolOut, amountIn, slippage, network }) => {
     try {
       const config = getNetworkConfig(network);
-      const wallet = getWalletByPrivateKey();
-      const result = await executeSwap(config, wallet, { symbolIn, symbolOut, amountIn, slippage });
+      const signer = createSignerFromEnv();
+      const result = await executeSwap(config, signer, { symbolIn, symbolOut, amountIn, slippage });
       return ok(result);
     } catch (err) {
       return fail(err);
@@ -183,7 +183,7 @@ server.registerTool(
   'awaken_add_liquidity',
   {
     description:
-      'Add liquidity to an Awaken DEX trading pair. REQUIRES AELF_PRIVATE_KEY env var. Auto-approves both tokens before adding.',
+      'Add liquidity to an Awaken DEX trading pair. Requires wallet env vars (EOA or CA). Auto-approves both tokens before adding.',
     inputSchema: {
       tokenA: z.string().describe('Token A symbol (e.g. ELF)'),
       tokenB: z.string().describe('Token B symbol (e.g. USDT)'),
@@ -197,8 +197,8 @@ server.registerTool(
   async ({ tokenA, tokenB, amountA, amountB, feeRate, slippage, network }) => {
     try {
       const config = getNetworkConfig(network);
-      const wallet = getWalletByPrivateKey();
-      const result = await addLiquidity(config, wallet, { tokenA, tokenB, amountA, amountB, feeRate, slippage });
+      const signer = createSignerFromEnv();
+      const result = await addLiquidity(config, signer, { tokenA, tokenB, amountA, amountB, feeRate, slippage });
       return ok(result);
     } catch (err) {
       return fail(err);
@@ -210,7 +210,7 @@ server.registerTool(
   'awaken_remove_liquidity',
   {
     description:
-      'Remove liquidity from an Awaken DEX trading pair. REQUIRES AELF_PRIVATE_KEY env var. Returns the underlying tokens to your wallet.',
+      'Remove liquidity from an Awaken DEX trading pair. Requires wallet env vars (EOA or CA). Returns the underlying tokens to your wallet.',
     inputSchema: {
       tokenA: z.string().describe('Token A symbol'),
       tokenB: z.string().describe('Token B symbol'),
@@ -222,8 +222,8 @@ server.registerTool(
   async ({ tokenA, tokenB, lpAmount, feeRate, network }) => {
     try {
       const config = getNetworkConfig(network);
-      const wallet = getWalletByPrivateKey();
-      const result = await removeLiquidity(config, wallet, { tokenA, tokenB, lpAmount, feeRate });
+      const signer = createSignerFromEnv();
+      const result = await removeLiquidity(config, signer, { tokenA, tokenB, lpAmount, feeRate });
       return ok(result);
     } catch (err) {
       return fail(err);
@@ -235,7 +235,7 @@ server.registerTool(
   'awaken_approve',
   {
     description:
-      'Approve a contract to spend your tokens. REQUIRES AELF_PRIVATE_KEY env var. Use this before swap/liquidity if you need manual control over approvals.',
+      'Approve a contract to spend your tokens. Requires wallet env vars (EOA or CA). Use this before swap/liquidity if you need manual control over approvals.',
     inputSchema: {
       symbol: z.string().describe('Token to approve (e.g. ELF)'),
       spender: z.string().describe('Contract address to approve'),
@@ -246,8 +246,8 @@ server.registerTool(
   async ({ symbol, spender, amount, network }) => {
     try {
       const config = getNetworkConfig(network);
-      const wallet = getWalletByPrivateKey();
-      const result = await approveTokenSpending(config, wallet, { symbol, spender, amount });
+      const signer = createSignerFromEnv();
+      const result = await approveTokenSpending(config, signer, { symbol, spender, amount });
       return ok(result);
     } catch (err) {
       return fail(err);