Merge pull request #12 from second-state/rename-x402-common

juntao · web-flow · commit 2de955cdaa70 · 2026-02-01T17:57:52.000+08:00
Rename x402-common to payment-common
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -32,7 +32,7 @@ Payment skill for AI agents (Claude Code, OpenClaw, OpenCode) to make and receiv
 
 ## Directory Structure
 
-- `x402-common/` - Shared library (config, wallet, errors)
+- `payment-common/` - Shared library (config, wallet, errors)
 - `create-wallet/` - Wallet creation tool
 - `get-address/` - Get wallet address and balance
 - `pay/` - Make payments
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-    "x402-common",
+    "payment-common",
     "payment-config",
     "create-wallet",
     "get-address",
diff --git a/PLAN.md b/PLAN.md
@@ -10,7 +10,7 @@ This skill enables Claude agents to handle HTTP 402 (Payment Required) responses
 x402_skill/
 ├── Cargo.toml              # Workspace manifest
 ├── PLAN.md                 # This file
-├── x402-common/            # Shared library crate
+├── payment-common/         # Shared library crate
 │   ├── Cargo.toml
 │   └── src/
 │       ├── lib.rs
@@ -175,7 +175,7 @@ x402_skill/
 
 ## Shared Components
 
-Consider creating a shared library crate (`x402-common`) for:
+Consider creating a shared library crate (`payment-common`) for:
 - Wallet loading/decryption
 - Configuration file handling (`~/.payment/config.toml`)
 - Common types and error handling
@@ -340,9 +340,9 @@ payment-config use-network base-mainnet
 
 ## Implementation Order
 
-1. **x402-common** - Shared library with config and wallet utilities
+1. **payment-common** - Shared library with config and wallet utilities
 2. **payment-config** - Configuration management; needed to set up environment
-3. **create-wallet** - Wallet generation (uses x402-common)
+3. **create-wallet** - Wallet generation (uses payment-common)
 4. **get-address** - Simple, validates wallet format
 5. **pay** - Core payment logic
 6. **x402curl** - Integrates everything
diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ This is a Rust workspace with the following crates:
 
 | Crate | Description |
 |-------|-------------|
-| `x402-common` | Shared library for configuration, errors, and utilities |
+| `payment-common` | Shared library for configuration, errors, and utilities |
 | `create-wallet` | Wallet creation CLI |
 | `get-address` | Address retrieval CLI |
 | `pay` | Token payment CLI |
diff --git a/create-wallet/Cargo.toml b/create-wallet/Cargo.toml
@@ -4,12 +4,12 @@ version.workspace = true
 edition = "2021"
 authors.workspace = true
 license.workspace = true
-description = "Create a new Ethereum-compatible wallet for x402 payments"
+description = "Create a new Ethereum-compatible wallet for payments"
 
 [[bin]]
 name = "create-wallet"
 path = "src/main.rs"
 
 [dependencies]
-x402_common = { path = "../x402-common" }
+payment_common = { path = "../payment-common" }
 clap = { version = "4", features = ["derive"] }
diff --git a/create-wallet/src/main.rs b/create-wallet/src/main.rs
@@ -1,8 +1,8 @@
 use clap::Parser;
+use payment_common::{default_config_path, Config, Wallet};
 use std::fs;
 use std::path::PathBuf;
 use std::process::ExitCode;
-use x402_common::{default_config_path, Config, Wallet};
 
 /// Create a new Ethereum-compatible wallet for x402 payments
 #[derive(Parser, Debug)]
@@ -43,7 +43,7 @@ fn main() -> ExitCode {
     }
 }
 
-fn run(args: Args) -> x402_common::Result<()> {
+fn run(args: Args) -> payment_common::Result<()> {
     // Check if config file exists
     let config_path = args.config.clone().unwrap_or_else(default_config_path);
 
@@ -52,7 +52,7 @@ fn run(args: Args) -> x402_common::Result<()> {
             "Missing the {} file. Please create one using:\n  payment-config use-network base-sepolia",
             config_path.display()
         );
-        return Err(x402_common::Error::MissingConfig(
+        return Err(payment_common::Error::MissingConfig(
             config_path.display().to_string(),
         ));
     }
@@ -73,7 +73,7 @@ fn run(args: Args) -> x402_common::Result<()> {
                 "Error: Wallet already exists at {}\nUse --force to overwrite.",
                 wallet_path.display()
             );
-            return Err(x402_common::Error::WalletExists(
+            return Err(payment_common::Error::WalletExists(
                 wallet_path.display().to_string(),
             ));
         }
diff --git a/get-address/Cargo.toml b/get-address/Cargo.toml
@@ -11,7 +11,7 @@ name = "get-address"
 path = "src/main.rs"
 
 [dependencies]
-x402_common = { path = "../x402-common" }
+payment_common = { path = "../payment-common" }
 clap = { version = "4", features = ["derive"] }
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 alloy = { version = "1.0", default-features = false, features = [
diff --git a/get-address/src/main.rs b/get-address/src/main.rs
@@ -2,10 +2,10 @@ use alloy::primitives::Address;
 use alloy::providers::ProviderBuilder;
 use alloy::sol;
 use clap::Parser;
+use payment_common::{Config, Wallet};
 use serde::Serialize;
 use std::path::PathBuf;
 use std::process::ExitCode;
-use x402_common::{Config, Wallet};
 
 // ERC-20 balanceOf function
 sol! {
diff --git a/pay/Cargo.toml b/pay/Cargo.toml
@@ -4,14 +4,14 @@ version.workspace = true
 edition = "2021"
 authors.workspace = true
 license.workspace = true
-description = "Make token payments from an x402 wallet"
+description = "Make token payments from a payment wallet"
 
 [[bin]]
 name = "pay"
 path = "src/main.rs"
 
 [dependencies]
-x402_common = { path = "../x402-common" }
+payment_common = { path = "../payment-common" }
 clap = { version = "4", features = ["derive"] }
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 alloy = { version = "1.0", default-features = false, features = [
diff --git a/pay/src/main.rs b/pay/src/main.rs
@@ -4,10 +4,10 @@ use alloy::providers::{Provider, ProviderBuilder};
 use alloy::signers::local::PrivateKeySigner;
 use alloy::sol;
 use clap::Parser;
+use payment_common::Config;
 use std::fs;
 use std::path::PathBuf;
 use std::process::ExitCode;
-use x402_common::Config;
 
 // ERC-20 transfer function
 sol! {
diff --git a/payment-common/Cargo.toml b/payment-common/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "x402_common"
+name = "payment_common"
 version.workspace = true
 edition = "2021"
 authors.workspace = true
 license.workspace = true
-description = "Shared utilities for x402 payment tools"
+description = "Shared utilities for payment tools"
 
 [dependencies]
 # Ethereum - use rustls for static builds
diff --git a/payment-common/src/config.rs b/payment-common/src/config.rs
diff --git a/payment-common/src/error.rs b/payment-common/src/error.rs
diff --git a/payment-common/src/lib.rs b/payment-common/src/lib.rs
diff --git a/payment-common/src/wallet.rs b/payment-common/src/wallet.rs
diff --git a/payment-config/Cargo.toml b/payment-config/Cargo.toml
@@ -11,6 +11,6 @@ name = "payment-config"
 path = "src/main.rs"
 
 [dependencies]
-x402_common = { path = "../x402-common" }
+payment_common = { path = "../payment-common" }
 clap = { version = "4", features = ["derive"] }
 serde_json = "1"
diff --git a/payment-config/src/main.rs b/payment-config/src/main.rs
@@ -1,9 +1,9 @@
 use clap::{Parser, Subcommand};
+use payment_common::config::NETWORK_PROFILES;
+use payment_common::Config;
 use std::process::ExitCode;
-use x402_common::config::NETWORK_PROFILES;
-use x402_common::Config;
 
-/// Configuration management for x402 tools
+/// Configuration management for payment tools
 #[derive(Parser, Debug)]
 #[command(name = "payment-config")]
 #[command(version, about, long_about = None)]
@@ -55,7 +55,7 @@ fn main() -> ExitCode {
     }
 }
 
-fn run(args: Args) -> x402_common::Result<()> {
+fn run(args: Args) -> payment_common::Result<()> {
     match args.command {
         Commands::Show => cmd_show(),
         Commands::Get { key } => cmd_get(&key),
@@ -66,7 +66,7 @@ fn run(args: Args) -> x402_common::Result<()> {
     }
 }
 
-fn cmd_show() -> x402_common::Result<()> {
+fn cmd_show() -> payment_common::Result<()> {
     let config = Config::load()?;
 
     println!("[wallet]");
@@ -103,7 +103,7 @@ fn cmd_show() -> x402_common::Result<()> {
     Ok(())
 }
 
-fn cmd_get(key: &str) -> x402_common::Result<()> {
+fn cmd_get(key: &str) -> payment_common::Result<()> {
     let config = Config::load()?;
 
     match config.get(key) {
@@ -117,7 +117,7 @@ fn cmd_get(key: &str) -> x402_common::Result<()> {
                 // Key is valid but not set - output nothing (empty)
                 Ok(())
             } else {
-                Err(x402_common::Error::Config(format!(
+                Err(payment_common::Error::Config(format!(
                     "Unknown config key: {}",
                     key
                 )))
@@ -126,9 +126,9 @@ fn cmd_get(key: &str) -> x402_common::Result<()> {
     }
 }
 
-fn cmd_set(pairs: &[String]) -> x402_common::Result<()> {
+fn cmd_set(pairs: &[String]) -> payment_common::Result<()> {
     if !pairs.len().is_multiple_of(2) {
-        return Err(x402_common::Error::InvalidArgument(
+        return Err(payment_common::Error::InvalidArgument(
             "Arguments must be key-value pairs".to_string(),
         ));
     }
@@ -148,7 +148,7 @@ fn cmd_set(pairs: &[String]) -> x402_common::Result<()> {
     Ok(())
 }
 
-fn cmd_use_network(profile: &str) -> x402_common::Result<()> {
+fn cmd_use_network(profile: &str) -> payment_common::Result<()> {
     let mut config = Config::load()?;
     config.apply_network_profile(profile)?;
     config.save()?;
@@ -191,7 +191,7 @@ fn cmd_use_network(profile: &str) -> x402_common::Result<()> {
     Ok(())
 }
 
-fn cmd_list_networks() -> x402_common::Result<()> {
+fn cmd_list_networks() -> payment_common::Result<()> {
     println!("Available network profiles:");
     println!();
     for profile in NETWORK_PROFILES {
@@ -214,7 +214,7 @@ fn cmd_list_networks() -> x402_common::Result<()> {
     Ok(())
 }
 
-fn cmd_list_keys() -> x402_common::Result<()> {
+fn cmd_list_keys() -> payment_common::Result<()> {
     println!("Valid configuration keys:");
     println!();
     for key in Config::valid_keys() {
