bsv-rs 0.3.5

BSV blockchain SDK for Rust - primitives, script, transactions, and more
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
//! Core Peer implementation for BRC-31 authentication.
//!
//! The `Peer` type manages mutual authentication with remote peers,
//! including handshake, certificate exchange, and message signing/verification.

use crate::auth::{
    certificates::VerifiableCertificate,
    session_manager::SessionManager,
    transports::Transport,
    types::{
        AuthMessage, MessageType, PeerSession, RequestedCertificateSet, AUTH_PROTOCOL_ID,
        AUTH_VERSION,
    },
    utils::{create_nonce, get_verifiable_certificates, validate_certificates, verify_nonce},
};
use crate::primitives::to_base64;
use crate::primitives::PublicKey;
use crate::wallet::{
    Counterparty, CreateSignatureArgs, GetPublicKeyArgs, Protocol, SecurityLevel,
    VerifySignatureArgs, WalletInterface,
};
use crate::{Error, Result};
use rand::RngCore;
use std::collections::HashMap;
use std::sync::atomic::{AtomicU32, Ordering};
use std::sync::Arc;
use tokio::sync::{oneshot, RwLock};

/// Type alias for general message callbacks.
pub type GeneralMessageCallback = Box<
    dyn Fn(
            PublicKey,
            Vec<u8>,
        ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + Send>>
        + Send
        + Sync,
>;

/// Type alias for certificate received callbacks.
pub type CertificateCallback = Box<
    dyn Fn(
            PublicKey,
            Vec<VerifiableCertificate>,
        ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + Send>>
        + Send
        + Sync,
>;

/// Type alias for certificate request callbacks.
pub type CertificateRequestCallback = Box<
    dyn Fn(
            PublicKey,
            RequestedCertificateSet,
        ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + Send>>
        + Send
        + Sync,
>;

/// Configuration options for creating a Peer.
pub struct PeerOptions<W: WalletInterface, T: Transport> {
    /// Wallet for cryptographic operations.
    pub wallet: W,
    /// Transport for sending/receiving messages.
    pub transport: T,
    /// Certificates to request from peers during handshake.
    pub certificates_to_request: Option<RequestedCertificateSet>,
    /// Existing session manager (creates new if None).
    pub session_manager: Option<SessionManager>,
    /// Whether to automatically persist the last peer session.
    pub auto_persist_last_session: bool,
    /// Application originator identifier.
    pub originator: Option<String>,
}

/// Peer for authenticated communication (BRC-31 Authrite).
///
/// The Peer manages mutual authentication between parties, including:
/// - Initial handshake with nonce exchange
/// - Certificate request and validation
/// - Signed message exchange
///
/// # Example
///
/// ```rust,ignore
/// use bsv_rs::auth::{Peer, PeerOptions, SimplifiedFetchTransport};
/// use bsv_rs::wallet::ProtoWallet;
///
/// let wallet = ProtoWallet::new(Some(PrivateKey::random()));
/// let transport = SimplifiedFetchTransport::new("https://example.com");
///
/// let peer = Peer::new(PeerOptions {
///     wallet,
///     transport,
///     certificates_to_request: None,
///     session_manager: None,
///     auto_persist_last_session: true,
///     originator: Some("myapp.com".into()),
/// });
///
/// // Send authenticated message
/// peer.to_peer(b"Hello!", Some(&recipient_key_hex), None).await?;
/// ```
pub struct Peer<W: WalletInterface, T: Transport> {
    wallet: W,
    transport: Arc<T>,
    session_manager: Arc<RwLock<SessionManager>>,
    certificates_to_request: Option<RequestedCertificateSet>,

    // Callbacks
    general_message_callbacks: Arc<RwLock<HashMap<u32, GeneralMessageCallback>>>,
    certificate_callbacks: Arc<RwLock<HashMap<u32, CertificateCallback>>>,
    certificate_request_callbacks: Arc<RwLock<HashMap<u32, CertificateRequestCallback>>>,
    next_callback_id: AtomicU32,

    // Pending handshakes: session_nonce -> oneshot sender
    pending_handshakes: Arc<RwLock<HashMap<String, oneshot::Sender<Result<PeerSession>>>>>,

    // Options
    #[allow(dead_code)]
    auto_persist_last_session: bool,
    originator: String,

    // Cached identity key
    identity_key: Arc<RwLock<Option<PublicKey>>>,
}

impl<W: WalletInterface + 'static, T: Transport + 'static> Peer<W, T> {
    /// Creates a new Peer with the given options.
    ///
    /// Note: After creating the Peer, you should call `start()` to set up
    /// the transport callback for receiving messages.
    pub fn new(options: PeerOptions<W, T>) -> Self {
        let originator = options.originator.unwrap_or_else(|| "unknown".to_string());

        Self {
            wallet: options.wallet,
            transport: Arc::new(options.transport),
            session_manager: Arc::new(RwLock::new(options.session_manager.unwrap_or_default())),
            certificates_to_request: options.certificates_to_request,
            general_message_callbacks: Arc::new(RwLock::new(HashMap::new())),
            certificate_callbacks: Arc::new(RwLock::new(HashMap::new())),
            certificate_request_callbacks: Arc::new(RwLock::new(HashMap::new())),
            next_callback_id: AtomicU32::new(1),
            pending_handshakes: Arc::new(RwLock::new(HashMap::new())),
            auto_persist_last_session: options.auto_persist_last_session,
            originator,
            identity_key: Arc::new(RwLock::new(None)),
        }
    }

    /// Sets up the transport callback for **client-side** peers.
    ///
    /// This must be called after creating the Peer for it to receive responses.
    /// The callback handles InitialResponse, CertificateRequest/Response, and
    /// General messages but does **not** handle InitialRequest.
    ///
    /// For server-side peers that need to accept incoming handshakes, use
    /// [`start_server()`](Self::start_server) instead.
    pub fn start(&self) {
        // Clone all the Arc references we need for the callback
        let session_manager = self.session_manager.clone();
        let pending_handshakes = self.pending_handshakes.clone();
        let general_message_callbacks = self.general_message_callbacks.clone();
        let certificate_callbacks = self.certificate_callbacks.clone();
        let certificate_request_callbacks = self.certificate_request_callbacks.clone();

        // Set up the transport callback
        self.transport.set_callback(Box::new(move |message| {
            let session_manager = session_manager.clone();
            let pending_handshakes = pending_handshakes.clone();
            let general_message_callbacks = general_message_callbacks.clone();
            let certificate_callbacks = certificate_callbacks.clone();
            let certificate_request_callbacks = certificate_request_callbacks.clone();

            Box::pin(async move {
                // Process the message based on type
                match message.message_type {
                    MessageType::InitialResponse => {
                        // Process InitialResponse - complete the handshake.
                        // Errors must be sent through the oneshot channel so the
                        // caller gets the real error instead of a timeout.
                        let result: Result<(String, String)> = (|| {
                            // yourNonce is the client's session nonce (echoed back by server)
                            let client_nonce = message.your_nonce.as_ref().ok_or_else(|| {
                                Error::AuthError("InitialResponse missing your_nonce".into())
                            })?;

                            // The server's session nonce. Our own process_initial_request()
                            // sets both `nonce` and `initial_nonce`, but the TS SDK only sends
                            // `initialNonce` (no `nonce` field). The Go SDK sends both.
                            // Fall back to initial_nonce when nonce is absent for cross-SDK compat.
                            let server_nonce = message
                                .nonce
                                .as_ref()
                                .or(message.initial_nonce.as_ref())
                                .ok_or_else(|| {
                                    Error::AuthError(
                                        "InitialResponse missing nonce and initial_nonce".into(),
                                    )
                                })?;

                            Ok((client_nonce.clone(), server_nonce.clone()))
                        })();

                        match result {
                            Ok((client_nonce, server_nonce)) => {
                                // Find and update the existing session (created in initiate_handshake).
                                // Use get_session + clone + update_session to properly refresh the
                                // identity key secondary index in the session manager.
                                let session_result = {
                                    let mut mgr = session_manager.write().await;
                                    if let Some(existing) = mgr.get_session(&client_nonce).cloned()
                                    {
                                        let mut updated = existing;
                                        updated.peer_identity_key =
                                            Some(message.identity_key.clone());
                                        updated.peer_nonce = Some(server_nonce.clone());
                                        updated.is_authenticated = true;
                                        updated.touch();
                                        let session_clone = updated.clone();
                                        mgr.update_session(updated);
                                        Ok(session_clone)
                                    } else {
                                        let mut session =
                                            PeerSession::with_nonce(client_nonce.clone());
                                        session.peer_identity_key =
                                            Some(message.identity_key.clone());
                                        session.peer_nonce = Some(server_nonce.clone());
                                        session.is_authenticated = true;
                                        session.touch();
                                        mgr.add_session(session.clone()).map(|_| session)
                                    }
                                };

                                // Resolve pending handshake using client's nonce
                                let mut pending = pending_handshakes.write().await;
                                if let Some(tx) = pending.remove(&client_nonce) {
                                    let _ = tx.send(session_result);
                                }
                            }
                            Err(e) => {
                                // Try to find the pending handshake to deliver the error.
                                // Use your_nonce if available, since that's our session nonce.
                                if let Some(ref client_nonce) = message.your_nonce {
                                    let mut pending = pending_handshakes.write().await;
                                    if let Some(tx) = pending.remove(client_nonce) {
                                        let _ = tx.send(Err(e.clone()));
                                    }
                                }
                                return Err(e);
                            }
                        }
                    }
                    MessageType::General => {
                        // Route to general message callbacks
                        let payload = message.payload.clone().unwrap_or_default();
                        let sender = message.identity_key.clone();

                        let cbs = general_message_callbacks.read().await;
                        for (_, callback) in cbs.iter() {
                            callback(sender.clone(), payload.clone()).await?;
                        }
                    }
                    MessageType::CertificateRequest => {
                        // Route to certificate request callbacks
                        let sender = message.identity_key.clone();
                        let requested = message.requested_certificates.clone().unwrap_or_default();

                        let cbs = certificate_request_callbacks.read().await;
                        for (_, callback) in cbs.iter() {
                            callback(sender.clone(), requested.clone()).await?;
                        }
                    }
                    MessageType::CertificateResponse => {
                        // Route to certificate response callbacks
                        let sender = message.identity_key.clone();
                        let certs = message.certificates.clone().unwrap_or_default();

                        let cbs = certificate_callbacks.read().await;
                        for (_, callback) in cbs.iter() {
                            callback(sender.clone(), certs.clone()).await?;
                        }
                    }
                    MessageType::InitialRequest => {
                        // InitialRequest is not handled in this lightweight callback.
                        // Use start_server() for server-side peers that need to accept
                        // incoming InitialRequest handshakes.
                    }
                }

                Ok(())
            })
        }));
    }

    /// Sets up the transport callback to handle ALL incoming message types,
    /// including InitialRequest (needed for server-side peers).
    ///
    /// Unlike `start()`, this method requires the Peer to be wrapped in `Arc`
    /// so the callback can call `handle_incoming_message()` which has access to
    /// the wallet and transport for processing handshake requests.
    ///
    /// Use this instead of `start()` when your Peer acts as a server accepting
    /// incoming connections (e.g., WebSocket server).
    pub fn start_server(self: &Arc<Self>) {
        let peer = Arc::clone(self);
        self.transport.set_callback(Box::new(move |message| {
            let peer = Arc::clone(&peer);
            Box::pin(async move { peer.handle_incoming_message(message).await })
        }));
    }

    /// Sends a message to a peer.
    ///
    /// Initiates authentication handshake if no authenticated session exists.
    ///
    /// # Arguments
    /// * `message` - Message payload to send
    /// * `identity_key` - Peer's identity key (hex string) or session nonce
    /// * `max_wait_time` - Maximum time to wait for handshake (milliseconds)
    pub async fn to_peer(
        &self,
        message: &[u8],
        identity_key: Option<&str>,
        max_wait_time: Option<u64>,
    ) -> Result<()> {
        // Get or create authenticated session
        let session = self
            .get_authenticated_session(identity_key, max_wait_time)
            .await?;

        // Build general message
        let my_identity = self.get_identity_key().await?;
        let mut msg = AuthMessage::new(MessageType::General, my_identity);

        // Use simple random bytes for message nonce (not HMAC-based)
        // This matches TypeScript's behavior: Utils.toBase64(Random(32))
        let mut random_bytes = [0u8; 32];
        rand::thread_rng().fill_bytes(&mut random_bytes);
        let msg_nonce = to_base64(&random_bytes);
        msg.nonce = Some(msg_nonce);

        msg.your_nonce = session.peer_nonce.clone();
        msg.payload = Some(message.to_vec());

        // Sign message
        self.sign_message(&mut msg, &session).await?;

        // Send
        self.transport.send(&msg).await?;

        Ok(())
    }

    /// Gets or creates an authenticated session with a peer.
    ///
    /// # Arguments
    /// * `identity_key` - Peer's identity key (hex) or session nonce
    /// * `max_wait_time` - Maximum time to wait for handshake (milliseconds)
    pub async fn get_authenticated_session(
        &self,
        identity_key: Option<&str>,
        max_wait_time: Option<u64>,
    ) -> Result<PeerSession> {
        // Check for existing authenticated session
        if let Some(key) = identity_key {
            let mgr = self.session_manager.read().await;
            if let Some(session) = mgr.get_session(key) {
                if session.is_authenticated {
                    return Ok(session.clone());
                }
            }
        }

        // Initiate handshake
        self.initiate_handshake(identity_key, max_wait_time).await
    }

    /// Requests certificates from a peer.
    ///
    /// # Arguments
    /// * `requested` - Certificate requirements
    /// * `identity_key` - Peer's identity key or session nonce
    /// * `max_wait_time` - Maximum time to wait (milliseconds)
    pub async fn request_certificates(
        &self,
        requested: RequestedCertificateSet,
        identity_key: Option<&str>,
        max_wait_time: Option<u64>,
    ) -> Result<()> {
        let session = self
            .get_authenticated_session(identity_key, max_wait_time)
            .await?;

        let my_identity = self.get_identity_key().await?;
        let mut msg = AuthMessage::new(MessageType::CertificateRequest, my_identity);

        // Use simple random bytes for message nonce
        let mut random_bytes = [0u8; 32];
        rand::thread_rng().fill_bytes(&mut random_bytes);
        msg.nonce = Some(to_base64(&random_bytes));

        msg.your_nonce = session.peer_nonce.clone();
        msg.requested_certificates = Some(requested);

        self.sign_message(&mut msg, &session).await?;
        self.transport.send(&msg).await
    }

    /// Sends certificates to a peer.
    ///
    /// # Arguments
    /// * `verifier_identity_key` - Verifier's identity key (hex)
    /// * `certificates` - Certificates to send
    pub async fn send_certificate_response(
        &self,
        verifier_identity_key: &str,
        certificates: Vec<VerifiableCertificate>,
    ) -> Result<()> {
        let mgr = self.session_manager.read().await;
        let session = mgr
            .get_session(verifier_identity_key)
            .ok_or_else(|| Error::AuthError("No session with peer".into()))?
            .clone();
        drop(mgr);

        let my_identity = self.get_identity_key().await?;
        let mut msg = AuthMessage::new(MessageType::CertificateResponse, my_identity);

        // Use simple random bytes for message nonce
        let mut random_bytes = [0u8; 32];
        rand::thread_rng().fill_bytes(&mut random_bytes);
        msg.nonce = Some(to_base64(&random_bytes));

        msg.your_nonce = session.peer_nonce.clone();
        msg.certificates = Some(certificates);

        self.sign_message(&mut msg, &session).await?;
        self.transport.send(&msg).await
    }

    /// Registers a listener for general messages.
    ///
    /// # Returns
    /// Callback ID that can be used to stop listening.
    pub async fn listen_for_general_messages<F>(&self, callback: F) -> u32
    where
        F: Fn(
                PublicKey,
                Vec<u8>,
            )
                -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + Send>>
            + Send
            + Sync
            + 'static,
    {
        let id = self.next_callback_id.fetch_add(1, Ordering::SeqCst);
        let mut cbs = self.general_message_callbacks.write().await;
        cbs.insert(id, Box::new(callback));
        id
    }

    /// Stops listening for general messages.
    pub async fn stop_listening_for_general_messages(&self, callback_id: u32) {
        let mut cbs = self.general_message_callbacks.write().await;
        cbs.remove(&callback_id);
    }

    /// Registers a listener for received certificates.
    ///
    /// # Returns
    /// Callback ID that can be used to stop listening.
    pub async fn listen_for_certificates_received<F>(&self, callback: F) -> u32
    where
        F: Fn(
                PublicKey,
                Vec<VerifiableCertificate>,
            )
                -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + Send>>
            + Send
            + Sync
            + 'static,
    {
        let id = self.next_callback_id.fetch_add(1, Ordering::SeqCst);
        let mut cbs = self.certificate_callbacks.write().await;
        cbs.insert(id, Box::new(callback));
        id
    }

    /// Stops listening for received certificates.
    pub async fn stop_listening_for_certificates_received(&self, callback_id: u32) {
        let mut cbs = self.certificate_callbacks.write().await;
        cbs.remove(&callback_id);
    }

    /// Registers a listener for certificate requests.
    ///
    /// # Returns
    /// Callback ID that can be used to stop listening.
    pub async fn listen_for_certificates_requested<F>(&self, callback: F) -> u32
    where
        F: Fn(
                PublicKey,
                RequestedCertificateSet,
            )
                -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + Send>>
            + Send
            + Sync
            + 'static,
    {
        let id = self.next_callback_id.fetch_add(1, Ordering::SeqCst);
        let mut cbs = self.certificate_request_callbacks.write().await;
        cbs.insert(id, Box::new(callback));
        id
    }

    /// Stops listening for certificate requests.
    pub async fn stop_listening_for_certificates_requested(&self, callback_id: u32) {
        let mut cbs = self.certificate_request_callbacks.write().await;
        cbs.remove(&callback_id);
    }

    /// Returns the session manager.
    pub fn session_manager(&self) -> &Arc<RwLock<SessionManager>> {
        &self.session_manager
    }

    /// Returns this peer's identity key.
    pub async fn get_identity_key(&self) -> Result<PublicKey> {
        {
            let cached = self.identity_key.read().await;
            if let Some(ref key) = *cached {
                return Ok(key.clone());
            }
        }

        // Get from wallet
        let result = self
            .wallet
            .get_public_key(
                GetPublicKeyArgs {
                    identity_key: true,
                    protocol_id: None,
                    key_id: None,
                    counterparty: None,
                    for_self: None,
                },
                &self.originator,
            )
            .await?;

        // Parse the public key from hex string
        let key = PublicKey::from_hex(&result.public_key)?;
        let mut cached = self.identity_key.write().await;
        *cached = Some(key.clone());
        Ok(key)
    }

    /// Handles an incoming message from the transport.
    pub async fn handle_incoming_message(&self, message: AuthMessage) -> Result<()> {
        // Validate message structure
        if message.version != AUTH_VERSION {
            return Err(Error::AuthError(format!(
                "Invalid auth version: expected {}, got {}",
                AUTH_VERSION, message.version
            )));
        }

        match message.message_type {
            MessageType::InitialRequest => self.process_initial_request(message).await,
            MessageType::InitialResponse => self.process_initial_response(message).await,
            MessageType::CertificateRequest => self.process_certificate_request(message).await,
            MessageType::CertificateResponse => self.process_certificate_response(message).await,
            MessageType::General => self.process_general_message(message).await,
        }
    }

    // ========================================================================
    // Private methods
    // ========================================================================

    async fn sign_message(&self, message: &mut AuthMessage, session: &PeerSession) -> Result<()> {
        let data = message.signing_data();
        let key_id = message.get_key_id(session.peer_nonce.as_deref());

        let protocol = Protocol::new(SecurityLevel::Counterparty, AUTH_PROTOCOL_ID);
        let counterparty = session
            .peer_identity_key
            .as_ref()
            .map(|k| Counterparty::Other(k.clone()));

        let result = self
            .wallet
            .create_signature(
                CreateSignatureArgs {
                    data: Some(data.clone()),
                    hash_to_directly_sign: None,
                    protocol_id: protocol,
                    key_id: key_id.clone(),
                    counterparty,
                },
                &self.originator,
            )
            .await?;

        message.signature = Some(result.signature);
        Ok(())
    }

    async fn verify_message_signature(
        &self,
        message: &AuthMessage,
        session: &PeerSession,
    ) -> Result<bool> {
        let data = message.signing_data();
        let key_id = message.get_key_id(session.session_nonce.as_deref());

        let signature = message
            .signature
            .as_ref()
            .ok_or_else(|| Error::AuthError("Message not signed".into()))?;

        let protocol = Protocol::new(SecurityLevel::Counterparty, AUTH_PROTOCOL_ID);

        let result = self
            .wallet
            .verify_signature(
                VerifySignatureArgs {
                    data: Some(data),
                    hash_to_directly_verify: None,
                    signature: signature.clone(),
                    protocol_id: protocol,
                    key_id,
                    counterparty: Some(Counterparty::Other(message.identity_key.clone())),
                    for_self: None,
                },
                &self.originator,
            )
            .await?;

        Ok(result.valid)
    }

    async fn initiate_handshake(
        &self,
        _identity_key: Option<&str>,
        max_wait_time: Option<u64>,
    ) -> Result<PeerSession> {
        let my_identity = self.get_identity_key().await?;

        // Create session with new nonce
        let session_nonce = create_nonce(&self.wallet, None, &self.originator).await?;
        let session = PeerSession::with_nonce(session_nonce.clone());

        // Add to session manager
        {
            let mut mgr = self.session_manager.write().await;
            mgr.add_session(session.clone())?;
        }

        // Build InitialRequest message
        // Note: InitialRequest uses initial_nonce (not nonce) for the session nonce
        let mut msg = AuthMessage::new(MessageType::InitialRequest, my_identity);
        msg.initial_nonce = Some(session_nonce.clone());
        if let Some(ref req) = self.certificates_to_request {
            msg.requested_certificates = Some(req.clone());
        }

        // Create oneshot channel for response
        let (tx, rx) = oneshot::channel();
        {
            let mut pending = self.pending_handshakes.write().await;
            pending.insert(session_nonce.clone(), tx);
        }

        // Send the request
        self.transport.send(&msg).await?;

        // Wait for response with timeout
        let timeout = max_wait_time.unwrap_or(30000);
        let result = tokio::time::timeout(tokio::time::Duration::from_millis(timeout), rx)
            .await
            .map_err(|_| Error::AuthError("Handshake timeout".into()))?
            .map_err(|_| Error::AuthError("Handshake cancelled".into()))??;

        Ok(result)
    }

    async fn process_initial_request(&self, message: AuthMessage) -> Result<()> {
        let my_identity = self.get_identity_key().await?;

        // Create our session nonce (counterparty=None=Self, matching Go/TS)
        let session_nonce = create_nonce(&self.wallet, None, &self.originator).await?;
        let mut session = PeerSession::with_nonce(session_nonce.clone());
        session.peer_identity_key = Some(message.identity_key.clone());
        session.peer_nonce = message.initial_nonce.clone();
        session.is_authenticated = true;
        session.touch();

        // Check if certificates are required
        if let Some(ref req) = message.requested_certificates {
            if !req.is_empty() {
                session.certificates_required = true;
            }
        }

        // Add to session manager
        {
            let mut mgr = self.session_manager.write().await;
            mgr.add_session(session.clone())?;
        }

        // Build InitialResponse (matching Go/TS field mapping)
        // initial_nonce = responder's session nonce (matches Go: InitialNonce = session.SessionNonce)
        // nonce = responder's session nonce (same value, matches Go: Nonce = ourNonce)
        // your_nonce = initiator's nonce echoed back (for session lookup by initiator)
        let mut response = AuthMessage::new(MessageType::InitialResponse, my_identity);
        response.nonce = Some(session_nonce.clone());
        response.initial_nonce = Some(session_nonce);
        response.your_nonce = message.initial_nonce.clone();

        // Sign the response
        self.sign_message(&mut response, &session).await?;

        // Send response
        self.transport.send(&response).await?;

        // If peer requested certificates, try to provide them
        if let Some(ref req) = message.requested_certificates {
            if !req.is_empty() {
                let certs = get_verifiable_certificates(
                    &self.wallet,
                    req,
                    &message.identity_key,
                    &self.originator,
                )
                .await
                .unwrap_or_default();

                if !certs.is_empty() {
                    self.send_certificate_response(&message.identity_key.to_hex(), certs)
                        .await?;
                }
            }
        }

        Ok(())
    }

    async fn process_initial_response(&self, message: AuthMessage) -> Result<()> {
        // Find the pending handshake using your_nonce (our nonce echoed back)
        // Matches Go: session = sessionManager.GetSession(message.YourNonce)
        // Matches TS: peerSession = sessionManager.getSession(message.yourNonce)
        let our_nonce = message
            .your_nonce
            .as_ref()
            .ok_or_else(|| Error::AuthError("InitialResponse missing your_nonce".into()))?
            .clone();

        // Process the response, catching any errors so they can be sent through
        // the oneshot channel. Without this, errors from verify_message_signature
        // would propagate via `?` and get swallowed by the routing task, causing
        // the caller to time out instead of receiving the actual error.
        let result = self
            .process_initial_response_inner(&message, &our_nonce)
            .await;

        if let Err(ref e) = result {
            let mut pending = self.pending_handshakes.write().await;
            if let Some(tx) = pending.remove(&our_nonce) {
                let _ = tx.send(Err(e.clone()));
            }
        }

        result
    }

    async fn process_initial_response_inner(
        &self,
        message: &AuthMessage,
        our_nonce: &str,
    ) -> Result<()> {
        // Verify the signature
        // For InitialResponse, we need a temporary session for verification
        let temp_session = PeerSession {
            session_nonce: Some(our_nonce.to_string()),
            peer_identity_key: Some(message.identity_key.clone()),
            peer_nonce: message.initial_nonce.clone(),
            ..Default::default()
        };

        if !self
            .verify_message_signature(message, &temp_session)
            .await?
        {
            return Err(Error::AuthError("InitialResponse signature invalid".into()));
        }

        // Verify the nonce (optional, matches Go/TS behavior).
        // Use nonce if present, fall back to initial_nonce for TS SDK compat.
        let nonce_to_verify = message
            .nonce
            .as_deref()
            .or(message.initial_nonce.as_deref())
            .unwrap_or("");
        if !verify_nonce(
            nonce_to_verify,
            &self.wallet,
            Some(&message.identity_key),
            &self.originator,
        )
        .await
        .unwrap_or(false)
        {
            // Nonce verification is optional, continue anyway
        }

        // Update the session and its secondary index (identity key mapping).
        // We read the session, build a modified copy, and use update_session
        // so the secondary index (identity key -> nonce) is properly refreshed.
        {
            let mut mgr = self.session_manager.write().await;
            if let Some(existing) = mgr.get_session(our_nonce).cloned() {
                let mut updated = existing;
                updated.peer_identity_key = Some(message.identity_key.clone());
                // Store responder's session nonce as peer_nonce
                // Matches Go: session.PeerNonce = message.InitialNonce
                // Matches TS: peerSession.peerNonce = message.initialNonce
                updated.peer_nonce = message.initial_nonce.clone();
                updated.is_authenticated = true;
                updated.touch();

                // Check if we need certificates
                if let Some(ref req) = self.certificates_to_request {
                    if !req.is_empty() {
                        updated.certificates_required = true;
                    }
                }

                let session_clone = updated.clone();
                mgr.update_session(updated);

                // Notify pending handshake
                let mut pending = self.pending_handshakes.write().await;
                if let Some(tx) = pending.remove(our_nonce) {
                    let _ = tx.send(Ok(session_clone));
                }
            }
        }

        Ok(())
    }

    async fn process_certificate_request(&self, message: AuthMessage) -> Result<()> {
        // Find session
        let sender_hex = message.identity_key.to_hex();
        let mgr = self.session_manager.read().await;
        let session = mgr
            .get_session(&sender_hex)
            .ok_or_else(|| Error::AuthError("No session with sender".into()))?;

        // Verify signature
        if !self.verify_message_signature(&message, session).await? {
            return Err(Error::AuthError(
                "CertificateRequest signature invalid".into(),
            ));
        }

        drop(mgr);

        // Notify callbacks
        if let Some(ref requested) = message.requested_certificates {
            let cbs = self.certificate_request_callbacks.read().await;
            for (_, callback) in cbs.iter() {
                let _ = callback(message.identity_key.clone(), requested.clone()).await;
            }
        }

        Ok(())
    }

    async fn process_certificate_response(&self, message: AuthMessage) -> Result<()> {
        // Find session
        let sender_hex = message.identity_key.to_hex();
        let mgr = self.session_manager.read().await;
        let session = mgr
            .get_session(&sender_hex)
            .ok_or_else(|| Error::AuthError("No session with sender".into()))?
            .clone();
        drop(mgr);

        // Verify signature
        if !self.verify_message_signature(&message, &session).await? {
            return Err(Error::AuthError(
                "CertificateResponse signature invalid".into(),
            ));
        }

        // Validate certificates
        validate_certificates(
            &self.wallet,
            &message,
            self.certificates_to_request.as_ref(),
            &self.originator,
        )
        .await?;

        // Update session
        {
            let mut mgr = self.session_manager.write().await;
            if let Some(session) = mgr.get_session_mut(&sender_hex) {
                session.certificates_validated = true;
                session.touch();
            }
        }

        // Notify callbacks
        if let Some(ref certs) = message.certificates {
            let cbs = self.certificate_callbacks.read().await;
            for (_, callback) in cbs.iter() {
                let _ = callback(message.identity_key.clone(), certs.clone()).await;
            }
        }

        Ok(())
    }

    async fn process_general_message(&self, message: AuthMessage) -> Result<()> {
        // Find session
        let sender_hex = message.identity_key.to_hex();
        let mgr = self.session_manager.read().await;
        let session = mgr
            .get_session(&sender_hex)
            .ok_or_else(|| Error::AuthError("No session with sender".into()))?
            .clone();
        drop(mgr);

        // Verify the session is authenticated
        if !session.is_authenticated {
            return Err(Error::AuthError("Session not authenticated".into()));
        }

        // Verify signature
        if !self.verify_message_signature(&message, &session).await? {
            return Err(Error::AuthError("General message signature invalid".into()));
        }

        // Update session
        {
            let mut mgr = self.session_manager.write().await;
            if let Some(s) = mgr.get_session_mut(&sender_hex) {
                s.peer_nonce = message.nonce.clone();
                s.touch();
            }
        }

        // Notify callbacks
        if let Some(ref payload) = message.payload {
            let cbs = self.general_message_callbacks.read().await;
            for (_, callback) in cbs.iter() {
                let _ = callback(message.identity_key.clone(), payload.clone()).await;
            }
        }

        Ok(())
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::auth::transports::MockTransport;
    use crate::primitives::PrivateKey;
    use crate::wallet::ProtoWallet;

    fn make_peer() -> Peer<ProtoWallet, MockTransport> {
        let wallet = ProtoWallet::new(Some(PrivateKey::random()));
        let transport = MockTransport::new();
        Peer::new(PeerOptions {
            wallet,
            transport,
            certificates_to_request: None,
            session_manager: None,
            auto_persist_last_session: false,
            originator: Some("test".into()),
        })
    }

    #[tokio::test]
    async fn test_peer_creation() {
        let peer = make_peer();
        let identity = peer.get_identity_key().await.unwrap();
        assert_eq!(identity.to_compressed().len(), 33);
    }

    #[tokio::test]
    async fn test_listener_registration() {
        let peer = make_peer();

        let id = peer
            .listen_for_general_messages(|_sender, _payload| Box::pin(async { Ok(()) }))
            .await;
        assert!(id > 0);

        peer.stop_listening_for_general_messages(id).await;
    }

    #[tokio::test]
    async fn test_session_manager_access() {
        let peer = make_peer();
        let mgr = peer.session_manager.read().await;
        assert!(mgr.is_empty());
    }
}