@agentlayer.tech/wallet 0.1.28 → 0.1.30

package/.openclaw/extensions/agent-wallet/README.md

@@ -79,7 +79,7 @@ If that runtime is not present, set `plugins.entries.agent-wallet.config.package
 
 That installs the Python backend, Node dependencies for the local BTC/EVM runtimes, patches the OpenClaw plugin config, and provisions the first encrypted per-user Solana mainnet wallet when no explicit signer is already configured. EVM readiness can still be auto-healed during normal wallet switching when the runtime has sealed local vault credentials.
 
-For self-hosted installs, prefer `SOLANA_RPC_URL` / `SOLANA_RPC_URLS` in local env and treat the plugin `rpcUrl` / `rpcUrls` fields as fallback only. If the local runtime exposes `ALCHEMY_API_KEY` or `HELIUS_API_KEY`, the wallet can derive the Solana RPC URL automatically for `mainnet` or `devnet`. Local env always takes precedence over `openclaw.json`.
+For self-hosted installs, prefer `SOLANA_RPC_URL` / `SOLANA_RPC_URLS` in local env and treat the plugin `rpcUrl` / `rpcUrls` fields as fallback only. If the local runtime exposes `ALCHEMY_API_KEY` or `HELIUS_API_KEY`, the wallet can derive the Solana RPC URL automatically for `mainnet`. Local env always takes precedence over `openclaw.json`.
 
 Provide only `AGENT_WALLET_BOOT_KEY` to the runtime. Provision `master_key`, `approval_secret`, and any signer `private_key` into `sealed_keys.json`, not `openclaw.json`.
 
@@ -134,14 +134,13 @@ For staking specifically, the normal agent flow should be:
 
 The extension is already network-aware:
 
-- `plugins.entries.agent-wallet.config.network` selects `mainnet`, `devnet`, or `testnet`
-- each network uses a separate wallet file for the same `userId`
-- switching networks does not merge balances across clusters
+- `plugins.entries.agent-wallet.config.network` selects `mainnet` for Solana, `bitcoin` for BTC, or the supported EVM networks
+- Solana mainnet wallets keep the same per-user file layout
+- switching the configured backend network does not merge balances across chains
 
 Recommended local switch helper:
 
 ```bash
-python agent-wallet/scripts/switch_openclaw_wallet_network.py --network devnet
 python agent-wallet/scripts/switch_openclaw_wallet_network.py --network mainnet
 ```
 

package/.openclaw/extensions/agent-wallet/dist/index.js

@@ -308,13 +308,15 @@ function normalizeEvmNetwork(value) {
     eth: "ethereum",
     "eth-mainnet": "ethereum",
     "base-mainnet": "base",
-    base_sepolia: "base-sepolia",
   };
   return aliases[normalized] || normalized;
 }
 
 function normalizeSelectableEvmNetwork(value) {
   const network = normalizeEvmNetwork(value);
+  if (["sepolia", "base-sepolia", "base_sepolia"].includes(network)) {
+    throw new Error("EVM testnets are no longer supported. Use ethereum or base.");
+  }
   if (!["ethereum", "base"].includes(network)) {
     throw new Error("EVM network must be 'ethereum' or 'base'.");
   }
@@ -331,8 +333,11 @@ function normalizeSolanaNetwork(value) {
     "mainnet-beta": "mainnet",
   };
   const normalized = aliases[network] || network;
-  if (!["mainnet", "devnet", "testnet"].includes(normalized)) {
-    throw new Error("Solana network must be mainnet, devnet, or testnet.");
+  if (["devnet", "testnet"].includes(normalized)) {
+    throw new Error("Solana devnet/testnet are no longer supported. Use mainnet.");
+  }
+  if (normalized !== "mainnet") {
+    throw new Error("Solana network must be mainnet.");
   }
   return normalized;
 }
@@ -347,8 +352,11 @@ function normalizeBtcNetwork(value) {
     mainnet: "bitcoin",
   };
   const normalized = aliases[network] || network;
-  if (!["bitcoin", "testnet", "regtest"].includes(normalized)) {
-    throw new Error("Bitcoin network must be bitcoin, testnet, or regtest.");
+  if (["testnet", "regtest"].includes(normalized)) {
+    throw new Error("Bitcoin testnet/regtest are no longer supported. Use bitcoin.");
+  }
+  if (normalized !== "bitcoin") {
+    throw new Error("Bitcoin network must be bitcoin.");
   }
   return normalized;
 }
@@ -399,7 +407,6 @@ function inferBackendForTool(toolName) {
     toolName === "transfer_spl_token" ||
     toolName === "sign_wallet_message" ||
     toolName === "close_empty_token_accounts" ||
-    toolName === "request_devnet_airdrop" ||
     toolName === "get_wallet_portfolio" ||
     toolName === "get_solana_token_prices"
   ) {
@@ -991,7 +998,7 @@ const walletSessionToolDefinitions = [
         },
         network: {
           type: "string",
-          description: "Optional network for the selected wallet. Examples: mainnet, devnet, ethereum, base, bitcoin, testnet.",
+          description: "Optional network for the selected wallet. Examples: mainnet, ethereum, base, bitcoin.",
         },
       },
       required: ["backend"],
@@ -1269,6 +1276,21 @@ const solanaToolDefinitions = [
       additionalProperties: false,
     },
   },
+  {
+    name: "get_kamino_open_positions",
+    description:
+      "Get all open Kamino lending positions for a Solana wallet on mainnet, aggregated across markets with loan details, reserve APYs, and rewards.",
+    parameters: {
+      type: "object",
+      properties: {
+        user: {
+          type: "string",
+          description: "Optional Solana wallet address override.",
+        },
+      },
+      additionalProperties: false,
+    },
+  },
   {
     name: "sign_wallet_message",
     description: "Sign an arbitrary message with the connected wallet after explicit user confirmation in chat.",
@@ -1683,19 +1705,6 @@ const solanaToolDefinitions = [
       additionalProperties: false,
     },
   },
-  {
-    name: "request_devnet_airdrop",
-    description: "Request devnet or testnet SOL from the faucet.",
-    optional: true,
-    parameters: {
-      type: "object",
-      properties: {
-        amount: { type: "number" },
-      },
-      required: ["amount"],
-      additionalProperties: false,
-    },
-  },
 ];
 
 const btcToolDefinitions = [

package/.openclaw/extensions/agent-wallet/index.ts

@@ -308,13 +308,15 @@ function normalizeEvmNetwork(value) {
     eth: "ethereum",
     "eth-mainnet": "ethereum",
     "base-mainnet": "base",
-    base_sepolia: "base-sepolia",
   };
   return aliases[normalized] || normalized;
 }
 
 function normalizeSelectableEvmNetwork(value) {
   const network = normalizeEvmNetwork(value);
+  if (["sepolia", "base-sepolia", "base_sepolia"].includes(network)) {
+    throw new Error("EVM testnets are no longer supported. Use ethereum or base.");
+  }
   if (!["ethereum", "base"].includes(network)) {
     throw new Error("EVM network must be 'ethereum' or 'base'.");
   }
@@ -331,8 +333,11 @@ function normalizeSolanaNetwork(value) {
     "mainnet-beta": "mainnet",
   };
   const normalized = aliases[network] || network;
-  if (!["mainnet", "devnet", "testnet"].includes(normalized)) {
-    throw new Error("Solana network must be mainnet, devnet, or testnet.");
+  if (["devnet", "testnet"].includes(normalized)) {
+    throw new Error("Solana devnet/testnet are no longer supported. Use mainnet.");
+  }
+  if (normalized !== "mainnet") {
+    throw new Error("Solana network must be mainnet.");
   }
   return normalized;
 }
@@ -347,8 +352,11 @@ function normalizeBtcNetwork(value) {
     mainnet: "bitcoin",
   };
   const normalized = aliases[network] || network;
-  if (!["bitcoin", "testnet", "regtest"].includes(normalized)) {
-    throw new Error("Bitcoin network must be bitcoin, testnet, or regtest.");
+  if (["testnet", "regtest"].includes(normalized)) {
+    throw new Error("Bitcoin testnet/regtest are no longer supported. Use bitcoin.");
+  }
+  if (normalized !== "bitcoin") {
+    throw new Error("Bitcoin network must be bitcoin.");
   }
   return normalized;
 }
@@ -399,7 +407,6 @@ function inferBackendForTool(toolName) {
     toolName === "transfer_spl_token" ||
     toolName === "sign_wallet_message" ||
     toolName === "close_empty_token_accounts" ||
-    toolName === "request_devnet_airdrop" ||
     toolName === "get_wallet_portfolio" ||
     toolName === "get_solana_token_prices"
   ) {
@@ -991,7 +998,7 @@ const walletSessionToolDefinitions = [
         },
         network: {
           type: "string",
-          description: "Optional network for the selected wallet. Examples: mainnet, devnet, ethereum, base, bitcoin, testnet.",
+          description: "Optional network for the selected wallet. Examples: mainnet, ethereum, base, bitcoin.",
         },
       },
       required: ["backend"],
@@ -1269,6 +1276,21 @@ const solanaToolDefinitions = [
       additionalProperties: false,
     },
   },
+  {
+    name: "get_kamino_open_positions",
+    description:
+      "Get all open Kamino lending positions for a Solana wallet on mainnet, aggregated across markets with loan details, reserve APYs, and rewards.",
+    parameters: {
+      type: "object",
+      properties: {
+        user: {
+          type: "string",
+          description: "Optional Solana wallet address override.",
+        },
+      },
+      additionalProperties: false,
+    },
+  },
   {
     name: "sign_wallet_message",
     description: "Sign an arbitrary message with the connected wallet after explicit user confirmation in chat.",
@@ -1683,19 +1705,6 @@ const solanaToolDefinitions = [
       additionalProperties: false,
     },
   },
-  {
-    name: "request_devnet_airdrop",
-    description: "Request devnet or testnet SOL from the faucet.",
-    optional: true,
-    parameters: {
-      type: "object",
-      properties: {
-        amount: { type: "number" },
-      },
-      required: ["amount"],
-      additionalProperties: false,
-    },
-  },
 ];
 
 const btcToolDefinitions = [

package/.openclaw/extensions/agent-wallet/openclaw.plugin.json

@@ -35,6 +35,7 @@
       "get_jupiter_earn_tokens",
       "get_kamino_lend_market_reserves",
       "get_kamino_lend_markets",
+      "get_kamino_open_positions",
       "get_kamino_lend_user_obligations",
       "get_kamino_lend_user_rewards",
       "get_lifi_quote",
@@ -57,7 +58,6 @@
       "manage_evm_aave_position",
       "manage_evm_lido_position",
       "manage_evm_lido_withdrawal",
-      "request_devnet_airdrop",
       "set_evm_network",
       "set_wallet_backend",
       "sign_wallet_message",
@@ -92,7 +92,7 @@
       },
       "network": {
         "type": "string",
-        "description": "Backend network selector. Solana uses mainnet/devnet/testnet. BTC uses bitcoin/testnet/regtest. EVM uses ethereum/sepolia/base/base-sepolia."
+        "description": "Backend network selector. Solana uses mainnet. BTC uses bitcoin. EVM uses ethereum/base."
       },
       "wdkBtcServiceUrl": {
         "type": "string",

package/.openclaw/extensions/agent-wallet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentlayertech/agent-wallet-plugin",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "OpenClaw plugin bridge for the AgentLayer wallet runtime.",
   "type": "module",
   "license": "SEE LICENSE IN ../../../LICENSE",

package/CHANGELOG.md

@@ -2,6 +2,44 @@
 
 ## Unreleased
 
+## v0.1.30 - 2026-05-30
+
+- Added a Claude Code plugin bridge under `claude-code/plugins/agent-wallet` so
+  the existing local wallet runtime can be used directly inside Claude Code
+  without creating a new wallet.
+- The Claude Code bridge connects to the current `~/.openclaw` runtime and
+  reuses the same Solana, Bitcoin, and EVM wallet surface already used by
+  OpenClaw, Hermes, and Codex.
+- Added `wallet claude-code install --yes`, which symlinks the bundled Claude
+  Code plugin into `~/.claude/plugins/agent-wallet` and attempts to register it
+  via the Claude Code CLI.
+- Fixed the `smoke_install_from_github` test, which was failing because
+  `setup.sh` checks for the Codex plugin manifest but the test bundle never
+  created that path.
+- Added the Claude Code plugin manifest check to `setup.sh` so bundle integrity
+  is validated for both the Codex and Claude Code plugin surfaces.
+
+## v0.1.29 - 2026-05-29
+
+- Added a new `Codex` plugin bridge under `codex/plugins/agent-wallet` so the
+  existing local wallet runtime can be used directly inside Codex without
+  creating a second wallet.
+- Kept the Codex bridge non-custodial and additive: it reuses the current
+  `agent-wallet` runtime, existing wallets, and the current tool surface
+  instead of replacing OpenClaw or Hermes.
+- Added `wallet codex install --yes`, which links the bundled Codex plugin into
+  the standard local plugin marketplace path and can ask Codex to install the
+  plugin from that local marketplace.
+- Added `get_kamino_open_positions`, which aggregates the wallet's Kamino
+  positions across markets with loan details, reserve APYs, and rewards.
+- Removed Solana devnet/testnet support from the wallet runtime, host bridges,
+  and local helper scripts so the supported Solana surface is now mainnet-only.
+- Removed EVM testnet support from the wallet runtime and host bridges so the
+  supported EVM surface is now `ethereum` and `base` mainnet only.
+- Removed Bitcoin `testnet` and `regtest` support from the wallet runtime,
+  host bridges, and local helper scripts so the supported BTC surface is now
+  `bitcoin` mainnet only.
+
 ## v0.1.28 - 2026-05-28
 
 - Simplified `x402_pay_request` into a single-shot paid execution flow while

package/README.md

@@ -16,6 +16,12 @@ For Hermes:
 npx @agentlayer.tech/wallet install --yes && npx @agentlayer.tech/wallet hermes install --yes
 ```
 
+For Codex:
+
+```bash
+npx @agentlayer.tech/wallet install --yes && npx @agentlayer.tech/wallet codex install --yes
+```
+
 AgentLayer is a beta local-first wallet and finance stack for agents.
 
 The repository includes:
@@ -23,6 +29,7 @@ The repository includes:
 - `agent-wallet/` - the main wallet backend for AgentLayer
 - `.openclaw/` - the local AgentLayer bridge layer for the OpenClaw wallet integration
 - `hermes/` - optional Hermes Agent plugin bridge for the same wallet backend
+- `codex/` - optional Codex plugin bridge for the same wallet backend
 - `wdk-btc-wallet/` - the local Bitcoin wallet service
 - `wdk-evm-wallet/` - the local EVM wallet service
 - `provider-gateway/` - shared provider access for Solana RPC, Bags, and related finance reads
@@ -84,6 +91,7 @@ Useful npm CLI commands:
 wallet status
 wallet doctor
 wallet hermes install --yes
+wallet codex install --yes
 wallet update --yes
 wallet update --yes --dry-run
 wallet rollback
@@ -200,6 +208,7 @@ Kamino integration gives the wallet a structured Solana lending surface:
 - `get_kamino_lend_market_reserves` - inspect reserve metrics for one Kamino market.
 - `get_kamino_lend_user_obligations` - inspect the wallet's obligations inside a Kamino market.
 - `get_kamino_lend_user_rewards` - fetch the wallet's Kamino rewards summary.
+- `get_kamino_open_positions` - aggregate all open Kamino positions across markets with loan details, reserve APYs, and rewards.
 - `kamino_lend_deposit` - preview, prepare, or execute a lending deposit.
 - `kamino_lend_withdraw` - preview, prepare, or execute a lending withdrawal.
 - `kamino_lend_borrow` - preview, prepare, or execute a borrow.

package/agent-wallet/README.md

@@ -26,7 +26,7 @@ It provides:
 - runtime instructions for safe wallet usage
 - a single `invoke()` method for safe dispatch
 - OpenClaw-style plugin manifest and skill bundle
-- explicit network-aware results so the host and agent can see `devnet` vs `mainnet`
+- explicit network-aware results so the host and agent can see the active chain network
 
 ## Hermes integration
 
@@ -98,6 +98,7 @@ Current safe tools:
 - `get_kamino_lend_market_reserves`
 - `get_kamino_lend_user_obligations`
 - `get_kamino_lend_user_rewards`
+- `get_kamino_open_positions`
 - `jupiter_earn_deposit`
 - `jupiter_earn_withdraw`
 - `kamino_lend_deposit`
@@ -107,7 +108,6 @@ Current safe tools:
 - `close_empty_token_accounts`
 - `deactivate_solana_stake`
 - `withdraw_solana_stake`
-- `request_devnet_airdrop`
 - `x402_search_services`
 - `x402_get_service_details`
 - `x402_preview_request`
@@ -190,7 +190,7 @@ For production `mainnet`, prefer a dedicated RPC instead of the public Solana en
 
 - `SOLANA_RPC_URL` for one primary endpoint
 - `SOLANA_RPC_URLS` as a comma-separated ordered failover list
-- or just `ALCHEMY_API_KEY` / `HELIUS_API_KEY`, which auto-derive a primary Solana RPC for `mainnet` or `devnet`
+- or just `ALCHEMY_API_KEY` / `HELIUS_API_KEY`, which auto-derive a primary Solana RPC for `mainnet`
 
 Production recommendation: treat RPC as deployment-owned config, not wallet logic. Runtime env wins over `openclaw.json` plugin config, so keep `Alchemy/Helius/QuickNode` endpoints in deployment secrets or service env and use plugin `rpcUrl` / `rpcUrls` only as local fallback.
 
@@ -277,9 +277,7 @@ export AGENT_WALLET_BOOT_KEY='paste-generated-secret-here'
 In that mode, `agent-wallet` will auto-resolve:
 
 - `mainnet` -> `https://solana-mainnet.g.alchemy.com/v2/<ALCHEMY_API_KEY>`
-- `devnet` -> `https://solana-devnet.g.alchemy.com/v2/<ALCHEMY_API_KEY>`
 - `mainnet` -> `https://mainnet.helius-rpc.com/?api-key=<HELIUS_API_KEY>`
-- `devnet` -> `https://devnet.helius-rpc.com/?api-key=<HELIUS_API_KEY>`
 
 and still append the official Solana endpoint as fallback.
 
@@ -317,7 +315,7 @@ printf '%s\n' 'your-local-btc-password' | \
 python -m agent_wallet.openclaw_cli btc-wallet-create \
   --user-id alice@example.com \
   --password-stdin \
-  --config-json '{"backend":"wdk_btc_local","network":"testnet","wdkBtcServiceUrl":"http://127.0.0.1:8080"}'
+  --config-json '{"backend":"wdk_btc_local","network":"bitcoin","wdkBtcServiceUrl":"http://127.0.0.1:8080"}'
 ```
 
 If you want a friendlier host-shell flow, use:
@@ -325,7 +323,7 @@ If you want a friendlier host-shell flow, use:
 ```bash
 python scripts/manage_openclaw_btc_wallet.py setup \
   --user-id alice@example.com \
-  --network testnet \
+  --network bitcoin \
   --service-url http://127.0.0.1:8080
 ```
 
@@ -340,11 +338,11 @@ If you want a true one-command OpenClaw bootstrap, use:
 ```bash
 python agent-wallet/scripts/bootstrap_openclaw_btc.py \
   --user-id alice@example.com \
-  --network testnet \
+  --network bitcoin \
   --service-url http://127.0.0.1:8080
 ```
 
-For BTC mainnet, use the same bootstrap with `--network mainnet`. The script normalizes that to `bitcoin` in plugin config automatically.
+You can also pass `--network mainnet`; the bootstrap normalizes that alias to `bitcoin`.
 
 For the simplest host-side UX, use the shell wrapper instead:
 
@@ -356,7 +354,7 @@ That is the intended "agent/host installs, user only enters password" entrypoint
 
 - the script wraps the full BTC bootstrap
 - it auto-starts the local `wdk-btc-wallet` service for localhost URLs if needed
-- it asks for `user-id` and shows a small `mainnet / testnet / regtest` menu if you did not pass them as args or env
+- it asks for `user-id` and defaults BTC network to `mainnet` if you did not pass it explicitly
 - it prompts for the BTC wallet password interactively unless you explicitly pass `--password-stdin`
 - it prefers `/tmp/agent-wallet-venv/bin/python`, then `agent-wallet/.venv/bin/python`, and only then falls back to system `python3`
 - it creates or unlocks the BTC wallet binding and patches local OpenClaw config in one pass
@@ -407,7 +405,7 @@ For the local EVM backend (`backend=wdk_evm_local`), the lifecycle mirrors the B
 - `agent-wallet` talks to it through a local bearer token loaded from `~/.openclaw/wdk-evm-wallet/local-auth-token`
 - `agent-wallet` stores only a per-user EVM wallet binding under `~/.openclaw/users/<normalized-user-id>/wallets/evm-<network>-agent.json`
 - the runtime can auto-create missing EVM bindings or auto-unlock the local vault during ordinary OpenClaw switching/tool calls when `sealed_keys.json` contains `wdk_evm_wallet_password`
-- supported EVM networks are `ethereum`, `sepolia`, `base`, and `base-sepolia`
+- supported EVM networks are `ethereum` and `base`
 - OpenClaw-facing EVM tools accept an optional per-call `network` override for `ethereum` or `base`, so the agent can switch between the two mainnet EVM paths without editing host config
 - EVM `get_wallet_balance` now returns an enriched portfolio-style payload with native balance, discovered ERC-20 balances, and USD values when token discovery and pricing are available
 - if a requested EVM network binding is missing, `agent-wallet` auto-binds it from the same local wallet when there is exactly one reusable EVM wallet for that user or when `wdkEvmWalletId` is provided explicitly
@@ -430,7 +428,7 @@ That wrapper:
 - defaults to `http://127.0.0.1:8081`
 - can auto-start `wdk-evm-wallet/run-local.sh` if the local service is not already healthy
 - creates or unlocks the local EVM wallet binding
-- also binds the paired EVM network by default: `ethereum <-> base`, `sepolia <-> base-sepolia`
+- also binds the paired EVM network by default: `ethereum <-> base`
 - stores the entered EVM vault password into `sealed_keys.json` when `AGENT_WALLET_BOOT_KEY` is available, so later OpenClaw wallet switching can auto-raise the EVM backend without another password prompt
 - patches OpenClaw config to `backend=wdk_evm_local`
 
@@ -441,7 +439,7 @@ printf '%s\n' 'your-local-evm-password' | \
 python -m agent_wallet.openclaw_cli evm-wallet-create \
   --user-id alice@example.com \
   --password-stdin \
-  --config-json '{"backend":"wdk_evm_local","network":"sepolia","wdkEvmServiceUrl":"http://127.0.0.1:8081"}'
+  --config-json '{"backend":"wdk_evm_local","network":"ethereum","wdkEvmServiceUrl":"http://127.0.0.1:8081"}'
 ```
 
 After that, `onboard` and `invoke` can use the bound EVM wallet by `user_id` without manually passing `wdkEvmWalletId` every time.
@@ -500,14 +498,13 @@ This keeps wallet creation and custody in the host/runtime layer while the agent
 
 The wallet backend is already network-scoped:
 
-- `devnet` and `mainnet` use different wallet files
-- per-user wallets are stored as `solana-<network>-agent.json`
-- switching networks does not mix balances or stake accounts across clusters
+- Solana stays on `mainnet`
+- per-user Solana wallets continue to use `solana-mainnet-agent.json`
+- switching BTC or EVM networks does not mix balances across chains
 
 For a local OpenClaw install, use:
 
 ```bash
-python agent-wallet/scripts/switch_openclaw_wallet_network.py --network devnet
 python agent-wallet/scripts/switch_openclaw_wallet_network.py --network mainnet
 ```
 
@@ -570,7 +567,7 @@ Operational notes:
 
 - this path uses Solana RPC and the Stake Program directly, without third-party DeFi APIs
 - stake creation allocates a new stake account controlled by the connected wallet as staker and withdrawer
-- preview and prepare were live-checked on devnet against a real wallet context
+- preview and prepare were live-checked against a real wallet context
 
 ## Official OpenClaw plugin
 
@@ -612,13 +609,13 @@ Public-safe helper scripts are available in `agent-wallet/scripts/`:
 Both scripts now use generic defaults instead of hardcoded local usernames or paths. Sensitive secrets must be supplied via protected environment variables, not config JSON or CLI arguments.
 When `~/.openclaw/agent-wallet-runtime/current` exists, the config installer now prefers that trusted runtime path over a workspace checkout for the plugin manifest, package root, and Python bridge launcher.
 
-Recommended devnet setup:
+Recommended Solana mainnet setup:
 
 ```bash
 AGENT_WALLET_BACKEND=solana_local
 AGENT_WALLET_BOOT_KEY=change-this-in-production
-SOLANA_NETWORK=devnet
-SOLANA_RPC_URLS=https://api.devnet.solana.com
+SOLANA_NETWORK=mainnet
+SOLANA_RPC_URLS=https://api.mainnet-beta.solana.com
 SOLANA_AUTO_CREATE_WALLET=true
 AGENT_WALLET_SIGN_ONLY=false
 ```
@@ -641,4 +638,3 @@ The package now supports:
 - Jupiter-based swap preview and execution on mainnet
 - compact swap `fee_summary` in preview/prepare/execute, including known network fees and route fee bps when Jupiter provides them
 - zero-balance token account cleanup
-- devnet/testnet faucet airdrop

package/agent-wallet/agent_wallet/bootstrap.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import json
 from pathlib import Path
 
-from agent_wallet.config import refuse_mainnet_wallet_recreation
+from agent_wallet.config import normalize_solana_network, refuse_mainnet_wallet_recreation
 from agent_wallet.file_ops import atomic_write_text
 from agent_wallet.wallet_layer.base import WalletBackendError
 from agent_wallet.wallet_layer.base58 import b58encode
@@ -79,11 +79,12 @@ def load_wallet_pin(path: Path) -> dict[str, str] | None:
 
 def write_wallet_pin(path: Path, *, address: str, network: str) -> dict[str, str]:
     """Persist the expected wallet address for later mismatch checks."""
+    normalized_network = normalize_solana_network(network)
     payload = {
         "kind": WALLET_ADDRESS_PIN_KIND,
         "version": WALLET_ADDRESS_PIN_VERSION,
         "address": address,
-        "network": network.strip().lower(),
+        "network": normalized_network,
         "wallet_file": path.name,
     }
     pin_path = resolve_wallet_pin_path(path)
@@ -97,7 +98,7 @@ def write_wallet_pin(path: Path, *, address: str, network: str) -> dict[str, str
 
 def ensure_wallet_pin(path: Path, *, address: str, network: str) -> dict[str, str]:
     """Ensure the wallet pin exists and matches the expected address."""
-    expected_network = network.strip().lower()
+    expected_network = normalize_solana_network(network)
     existing = load_wallet_pin(path)
     if existing is None:
         return write_wallet_pin(path, address=address, network=expected_network)
@@ -114,7 +115,7 @@ def ensure_wallet_pin(path: Path, *, address: str, network: str) -> dict[str, st
 
 def refuse_recreation_if_pinned(path: Path, *, network: str) -> None:
     """Refuse to recreate a wallet when a mainnet address is already pinned."""
-    expected_network = network.strip().lower()
+    expected_network = normalize_solana_network(network)
     if expected_network != "mainnet" or not refuse_mainnet_wallet_recreation():
         return
     existing = load_wallet_pin(path)
@@ -128,7 +129,11 @@ def refuse_recreation_if_pinned(path: Path, *, network: str) -> None:
 
 def ensure_solana_wallet_ready() -> dict[str, str] | None:
     """Ensure that a Solana wallet exists when auto-create is enabled."""
-    from agent_wallet.config import default_solana_wallet_path, resolve_solana_private_key, settings
+    from agent_wallet.config import (
+        default_solana_wallet_path,
+        resolve_solana_private_key,
+        settings,
+    )
 
     if settings.agent_wallet_backend.strip().lower() not in {"solana", "solana_local", "solana-local"}:
         return None
@@ -136,8 +141,13 @@ def ensure_solana_wallet_ready() -> dict[str, str] | None:
     if resolve_solana_private_key():
         return {"address": "", "path": ""}
 
+    normalized_network = normalize_solana_network(settings.solana_network)
     configured_path = settings.solana_agent_keypair_path.strip()
-    path = Path(configured_path).expanduser() if configured_path else default_solana_wallet_path(settings.solana_network)
+    path = (
+        Path(configured_path).expanduser()
+        if configured_path
+        else default_solana_wallet_path(normalized_network)
+    )
 
     if path.exists():
         return {"address": "", "path": str(path)}
@@ -145,9 +155,9 @@ def ensure_solana_wallet_ready() -> dict[str, str] | None:
     if not settings.solana_auto_create_wallet:
         return None
 
-    refuse_recreation_if_pinned(path, network=settings.solana_network)
+    refuse_recreation_if_pinned(path, network=normalized_network)
     created = create_solana_wallet_file(path)
-    write_wallet_pin(path, address=created["address"], network=settings.solana_network)
+    write_wallet_pin(path, address=created["address"], network=normalized_network)
     return created
 
 
@@ -155,22 +165,28 @@ def describe_bootstrap() -> dict[str, str | bool]:
     """Return the effective bootstrap configuration for installer/runtime usage."""
     from agent_wallet.config import (
         default_solana_wallet_path,
+        normalize_solana_network,
         resolve_solana_rpc_url,
         resolve_runtime_solana_rpc_urls,
         settings,
     )
 
+    normalized_network = normalize_solana_network(settings.solana_network)
     configured_path = settings.solana_agent_keypair_path.strip()
-    path = Path(configured_path).expanduser() if configured_path else default_solana_wallet_path(settings.solana_network)
+    path = (
+        Path(configured_path).expanduser()
+        if configured_path
+        else default_solana_wallet_path(normalized_network)
+    )
     rpc_urls = resolve_runtime_solana_rpc_urls(
-        settings.solana_network,
+        normalized_network,
         settings.solana_rpc_url,
         settings.solana_rpc_urls,
     )
     return {
         "backend": settings.agent_wallet_backend,
-        "network": settings.solana_network,
-        "rpc_url": rpc_urls[0] if rpc_urls else resolve_solana_rpc_url(settings.solana_network, ""),
+        "network": normalized_network,
+        "rpc_url": rpc_urls[0] if rpc_urls else resolve_solana_rpc_url(normalized_network, ""),
         "rpc_urls": rpc_urls,
         "auto_create_wallet": settings.solana_auto_create_wallet,
         "keypair_path": str(path),

package/agent-wallet/agent_wallet/btc_user_wallets.py

@@ -6,19 +6,14 @@ import json
 from pathlib import Path
 from typing import Any
 
-from agent_wallet.config import resolve_openclaw_home, settings
+from agent_wallet.config import normalize_btc_network, resolve_openclaw_home, settings
 from agent_wallet.providers.wdk_btc_local import WdkBtcLocalClient
 from agent_wallet.user_wallets import normalize_user_id
 from agent_wallet.wallet_layer.base import WalletBackendError
 
 
 def _normalize_btc_network(value: str | None) -> str:
-    network = str(value or "").strip().lower()
-    aliases = {"mainnet": "bitcoin"}
-    network = aliases.get(network, network)
-    if network not in {"bitcoin", "testnet", "regtest"}:
-        return "bitcoin"
-    return network
+    return normalize_btc_network(value)
 
 
 def _resolve_service_url(service_url: str | None = None) -> str: