feat: add support for new event kind 30935 and enhance copy-trade functionality

- Updated relayer configuration to include new allowed kind 30935.
- Modified trader configuration to replace platform_shared_key with relayer_nostr_pubkey.
- Enhanced README and documentation to reflect changes in configuration.
- Implemented agent registration event handling in event router.
- Updated signal service to use EncryptedDirectMessage for payload encryption.
- Added agent registration payload and event classes.
- Improved copy-trade listener to handle encrypted messages.
- Refactored trading bot to support follower mode in copy-trading.
- Introduced new test parameters for strategies to allow configuration overrides.

Author: ai-chen2050

docker/relayer.config.toml

@@ -11,7 +11,7 @@ lru_size = 100_000
 rocksdb_path = "./data/rocksdb"
 
 [filters]
-allowed_kinds = [30931, 30932, 30933, 30934]
+allowed_kinds = [30931, 30932, 30933, 30934, 30935]
 
 [output]
 websocket_enabled = true

docker/trader.config.json

@@ -54,7 +54,7 @@
     },
     "nostr": {
         "nsec": "nsec1yourprivatekey",
-        "platform_shared_key": "64_hex_shared_key_from_platform",
+        "relayer_nostr_pubkey": "npub1relayerpublickeyplaceholderxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
         "relays": [
             "wss://nostr.parallel.hetu.org:8443"
         ],
@@ -63,12 +63,11 @@
     },
     "copytrade": {
         "enabled": false,
+        "role": "leader",
         "follow_pubkeys": [
-            "npub_of_leader"
-        ],
-        "symbols": [
-            "HYPE"
+            "0xleader_eth_address"
         ],
+        "symbols": [],
         "size_pct": 0.05,
         "min_order_value": 10.0
     }

relayer/README.md

@@ -111,7 +111,7 @@ Config snippet:
 
 ```toml
 [filters]
-allowed_kinds = [30931, 30932, 30933, 30934]
+allowed_kinds = [30931, 30932, 30933, 30934, 30935]
 
 [postgres]
 dsn = "postgres://postgres:postgres@localhost:5432/moltrade"

relayer/config.template.toml

@@ -5,12 +5,7 @@ lru_size = 100000
 rocksdb_path = "./data/rocksdb"
 
 [filters]
-allowed_kinds = [
-    30931,
-    30932,
-    30933,
-    30934,
-]
+allowed_kinds = [30931, 30932, 30933, 30934, 30935]
 
 [monitoring]
 log_level = "debug"
@@ -31,7 +26,7 @@ dsn = "postgres://postgres:postgres@localhost:5432/moltrade"
 max_connections = 5
 
 [relay]
-bootstrap_relays = ["ws://62.72.41.239:8000"]
+bootstrap_relays = ["wss://nostr.parallel.hetu.org:8443"]
 health_check_interval = 30
 max_connections = 10000
 

relayer/src/config/mod.rs

@@ -39,7 +39,7 @@ pub struct FilterConfig {
 }
 
 fn default_allowed_kinds() -> Vec<u16> {
-    vec![30931, 30932, 30933, 30934]
+    vec![30931, 30932, 30933, 30934, 30935]
 }
 
 #[derive(Debug, Clone, Deserialize)]

relayer/src/core/event_router.rs

@@ -12,10 +12,17 @@ use crate::core::dedupe_engine::DeduplicationEngine;
 use crate::core::subscription::{FanoutMessage, SubscriptionService};
 use nostr_sdk::Kind;
 use nostr_sdk::nips::nip04;
-use nostr_sdk::prelude::{Client, EventBuilder, Keys, PublicKey, Tag};
+use nostr_sdk::prelude::{Client, EventBuilder, Keys, PublicKey, Tag, Timestamp};
 use serde_json::Value;
 use std::str::FromStr;
 
+const KIND_TRADE_SIGNAL: u16 = 30931;
+const KIND_COPYTRADE_INTENT: u16 = 30932;
+const KIND_HEARTBEAT: u16 = 30933;
+const KIND_EXECUTION_REPORT: u16 = 30934;
+const KIND_AGENT_REGISTER: u16 = 30935;
+const STALE_AFTER: Duration = Duration::from_secs(10 * 60);
+
 /// Wrapper for Event to enable sorting by timestamp
 #[derive(Clone)]
 struct EventWrapper {
@@ -190,6 +197,17 @@ impl EventRouter {
 
         // Send events to downstream in timestamp order
         for event in batch {
+            if self.is_stale(&event) {
+                debug!(
+                    "Skip stale event id={} kind={} age_secs={}",
+                    event.id.to_hex(),
+                    event.kind.as_u16(),
+                    Timestamp::now()
+                        .as_secs()
+                        .saturating_sub(event.created_at.as_secs())
+                );
+                continue;
+            }
             self.maybe_update_last_seen(&event).await;
             if let Err(e) = self.handle_copytrade_fanout(&event).await {
                 error!("Fanout processing failed: {}", e);
@@ -237,6 +255,72 @@ impl EventRouter {
     }
 
     async fn handle_copytrade_fanout(&self, event: &Event) -> Result<()> {
+        // Short-circuit heartbeat-like events: no decrypt/fanout required
+        if matches!(event.kind.as_u16(), KIND_HEARTBEAT | KIND_EXECUTION_REPORT) {
+            return Ok(());
+        }
+
+        // Agent registration is plaintext and upserts the bot record
+        if event.kind.as_u16() == KIND_AGENT_REGISTER {
+            let subs = match &self.subscription_service {
+                Some(s) => s,
+                None => return Ok(()),
+            };
+
+            let parsed: Value = match serde_json::from_str(&event.content) {
+                Ok(v) => v,
+                Err(e) => {
+                    error!(
+                        "Agent register decode failed for {}: {}",
+                        event.id.to_hex(),
+                        e
+                    );
+                    return Ok(());
+                }
+            };
+
+            let nostr_pubkey = parsed
+                .get("nostr_pubkey")
+                .and_then(|v| v.as_str())
+                .map(|s| s.to_string())
+                .unwrap_or_else(|| event.pubkey.to_hex());
+            let bot_pubkey = parsed
+                .get("bot_pubkey")
+                .and_then(|v| v.as_str())
+                .map(|s| s.to_string())
+                .unwrap_or_else(|| event.pubkey.to_hex());
+            let eth_address = parsed
+                .get("eth_address")
+                .or_else(|| parsed.get("account"))
+                .and_then(|v| v.as_str())
+                .unwrap_or("")
+                .to_string();
+            let name = parsed
+                .get("name")
+                .and_then(|v| v.as_str())
+                .unwrap_or("agent")
+                .to_string();
+
+            if eth_address.is_empty() {
+                error!("Agent register missing eth_address for {}", bot_pubkey);
+                return Ok(());
+            }
+
+            if let Err(e) = subs
+                .register_bot(&bot_pubkey, &nostr_pubkey, &eth_address, &name)
+                .await
+            {
+                error!("Agent register upsert failed for {}: {}", bot_pubkey, e);
+            } else {
+                info!(
+                    "Registered bot via nostr: bot_pubkey={} eth={}",
+                    bot_pubkey, eth_address
+                );
+            }
+
+            return Ok(());
+        }
+
         // Preconditions: need subscription service and platform nostr keys
         let subs = match &self.subscription_service {
             Some(s) => s,
@@ -247,6 +331,12 @@ impl EventRouter {
             None => return Ok(()),
         };
 
+        // Skip decrypting events we just published (self-sent fanout echoes)
+        if event.pubkey == nostr_keys.public_key() {
+            debug!("Skip self-published fanout event {}", event.id.to_hex());
+            return Ok(());
+        }
+
         // Decrypt content using platform key and sender pubkey
         let plaintext = match nip04::decrypt(nostr_keys.secret_key(), &event.pubkey, &event.content)
         {
@@ -257,6 +347,19 @@ impl EventRouter {
             }
         };
 
+        let preview = if plaintext.len() > 256 {
+            format!("{}...", &plaintext[..256])
+        } else {
+            plaintext.clone()
+        };
+        debug!(
+            "Decrypted nostr event id={} kind={} from={} preview={}",
+            event.id.to_hex(),
+            event.kind.as_u16(),
+            event.pubkey.to_hex(),
+            preview,
+        );
+
         // Extract agent eth address from JSON payload
         let agent_eth = extract_agent_eth(&plaintext)
             .ok_or_else(|| anyhow::anyhow!("agent eth address missing"))?;
@@ -299,12 +402,13 @@ impl EventRouter {
         // Publish encrypted nostr events to followers if client exists
         if let Some(client) = &self.nostr_client {
             for follower in followers {
-                let follower_pk = match PublicKey::from_str(&follower.follower_pubkey) {
+                let follower_pk_str = follower.shared_secret.as_str();
+                let follower_pk = match PublicKey::from_str(follower_pk_str) {
                     Ok(pk) => pk,
                     Err(e) => {
                         error!(
-                            "Invalid follower pubkey {}: {}",
-                            follower.follower_pubkey, e
+                            "Invalid follower shared_secret pubkey {}: {}",
+                            follower_pk_str, e
                         );
                         continue;
                     }
@@ -314,10 +418,7 @@ impl EventRouter {
                     match nip04::encrypt(nostr_keys.secret_key(), &follower_pk, &plaintext) {
                         Ok(ct) => ct,
                         Err(e) => {
-                            error!(
-                                "Encrypt for follower {} failed: {}",
-                                follower.follower_pubkey, e
-                            );
+                            error!("Encrypt for follower {} failed: {}", follower_pk_str, e);
                             continue;
                         }
                     };
@@ -326,10 +427,7 @@ impl EventRouter {
                 builder = builder.tag(Tag::public_key(follower_pk));
 
                 if let Err(e) = client.send_event_builder(builder).await {
-                    error!(
-                        "Publish to follower {} failed: {}",
-                        follower.follower_pubkey, e
-                    );
+                    error!("Publish to follower {} failed: {}", follower_pk_str, e);
                 }
             }
         }
@@ -339,8 +437,14 @@ impl EventRouter {
 }
 
 impl EventRouter {
+    fn is_stale(&self, event: &Event) -> bool {
+        let now = Timestamp::now().as_secs();
+        let created = event.created_at.as_secs();
+        now.saturating_sub(created) > STALE_AFTER.as_secs()
+    }
+
     async fn maybe_update_last_seen(&self, event: &Event) {
-        const HEARTBEAT_KIND: u16 = 30934;
+        const HEARTBEAT_KIND: u16 = KIND_HEARTBEAT;
         const MIN_INTERVAL: Duration = Duration::from_secs(15 * 60);
 
         if event.kind.as_u16() != HEARTBEAT_KIND {
@@ -384,6 +488,7 @@ fn extract_agent_eth(plaintext: &str) -> Option<String> {
     parsed
         .get("agent_eth_address")
         .or_else(|| parsed.get("agent"))
+        .or_else(|| parsed.get("account"))
         .or_else(|| parsed.get("eth_address"))
         .and_then(|v| v.as_str())
         .map(|s| s.to_string())

skills/moltrade/SKILL.md

@@ -17,7 +17,7 @@ Paths are repo-root relative. Keep actions deterministic and redact secrets.
 
 - Read `trader/config.example.json` or `config.json` if present.
 - Summarize `trading` (exchange/default_strategy/sizing/stops), `risk_management`, `nostr`, `telegram`.
-- Do not log keys; redact `wallet_address`, `private_key`, `nostr.nsec`, `platform_shared_key`.
+- Do not log keys; redact `wallet_address`, `private_key`, `nostr.nsec`, `nostr.relayer_nostr_pubkey`.
 
 ## Update Config Safely
 
@@ -39,7 +39,7 @@ Paths are repo-root relative. Keep actions deterministic and redact secrets.
 
 ## Broadcast Signals to Nostr
 
-- Check `nostr` block: `nsec`, `platform_shared_key`, `relays`, `sid`.
+- Check `nostr` block: `nsec`, `relayer_nostr_pubkey`, `relays`, `sid`.
 - `SignalBroadcaster` is wired in `main.py`. In test mode, verify `send_trade_signal` / `send_execution_report` run without errors.
 
 ## Add Exchange Adapter

tests/trader/trader_smoke.py

@@ -16,7 +16,7 @@ def main() -> None:
     cfg = {
         "nostr": {
             "nsec": "",  # keep disabled to avoid network work
-            "platform_shared_key": "",
+            "relayer_nostr_pubkey": "",
             "sid": "smoke",
             "role": "bot",
             "relays": [],
@@ -46,6 +46,7 @@ def main() -> None:
         pnl=None,
         pnl_percent=None,
         test_mode=True,
+        account=None,
         note=None,
     ) is False
 

trader/README.md

@@ -31,6 +31,7 @@ cp config.example.json config.json
 - `wallet_address`, `private_key`: required for Hyperliquid (keep safe)
 - `trading.default_strategy`, `position_size`, stops
 - Optional: `telegram` block for alerts; `nostr` block for encrypted signal broadcast
+- Copy-trade follower: set `copytrade.enabled=true`, `copytrade.role="follower"`, and `copytrade.follow_pubkeys=["<leader_eth_address>"]`. You can copy the leader ETH address from the leaderboard on https://moltrade.ai/.
 
 ### Telegram (optional)
 
@@ -71,7 +72,7 @@ To add your own, see `strategies/INTEGRATION.md` and register it in `get_strateg
 
 ## Nostr Signals (optional)
 
-- Requires `nostr` config (`nsec`, `platform_shared_key`, `relays`).
+- Requires `nostr` config (`nsec`, `relayer_nostr_pubkey`, `relays`).
 - Bot broadcasts encrypted trade signals and execution reports via `SignalBroadcaster` (already wired in `main.py`).
 
 ## Risk Warning

trader/config.example.json

@@ -17,6 +17,7 @@
     "exchange": "hyperliquid",
     "default_symbol": "HYPE",
     "default_strategy": "test",
+    "refresh_interval_seconds": 60,
     "position_size": 0.08,
     "max_position_size": 0.2,
     "stop_loss_percent": 0.03,
@@ -46,16 +47,23 @@
     "trend_following": {
       "min_trade_interval": 14400,
       "min_adx": 30
+    },
+    "test": {
+      "rsi_oversold": 35,
+      "rsi_overbought": 65,
+      "adx_threshold": 20,
+      "signal_threshold": 0.3,
+      "required_conditions": 2
     }
   },
   "risk_management": {
-    "max_daily_loss": 0.05,
-    "max_trades_per_day": 8,
-    "cool_down_seconds": 300
+    "max_daily_loss": 0.5,
+    "max_trades_per_day": 500,
+    "cool_down_seconds": 60
   },
   "nostr": {
-    "nsec": "nsec1yourprivatekey",
-    "platform_shared_key": "64_hex_shared_key_from_platform",
+    "nsec": "nsec19rs65lkqpqqhmft5s97cw94u627mfrhunt02jsftn9fycxv3dhhs0p45dh",
+    "relayer_nostr_pubkey": "npub1relayerpublickeyplaceholderxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
     "relays": [
       "wss://nostr.parallel.hetu.org:8443"
     ],
@@ -64,12 +72,11 @@
   },
   "copytrade": {
     "enabled": false,
+    "role": "leader",
     "follow_pubkeys": [
-      "npub_of_leader"
-    ],
-    "symbols": [
-      "HYPE"
+      "0xleader_eth_address"
     ],
+    "symbols": [],
     "size_pct": 0.05,
     "min_order_value": 10.0
   }