Skip to content

wire: Allow user to manually connect with a peer #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2023
Merged

wire: Allow user to manually connect with a peer #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion crates/floresta-wire/src/p2p_wire/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use async_std::{
use bitcoin::{
hashes::{sha256, Hash},
network::{
address::AddrV2Message,
address::{AddrV2, AddrV2Message},
constants::ServiceFlags,
message_blockdata::Inventory,
utreexo::{UData, UtreexoBlock},
Expand Down Expand Up @@ -979,6 +979,21 @@ where
self.handle_get_peer_info();
continue;
}
UserRequest::Connect((addr, port)) => {
let addr_v2 = match addr {
IpAddr::V4(addr) => AddrV2::Ipv4(addr),
IpAddr::V6(addr) => AddrV2::Ipv6(addr),
};
let id = rand::random::<usize>();
let local_addr =
LocalAddress::new(addr_v2, 0, AddressState::NeverTried, 0.into(), port, id);
self.open_connection(false, 0, local_addr).await;
self.1.user_requests.send_answer(
UserRequest::Connect((addr, port)),
Some(NodeResponse::Connect(true)),
);
continue;
}
};
let peer = self.send_to_random_peer(req, ServiceFlags::NONE).await;
if let Ok(peer) = peer {
Expand Down
18 changes: 17 additions & 1 deletion crates/floresta-wire/src/p2p_wire/node_interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{sync::Mutex, time::Instant};
use std::{net::IpAddr, sync::Mutex, time::Instant};

use bitcoin::{network::utreexo::UtreexoBlock, Block, BlockHash, Transaction, Txid};
use serde::{Deserialize, Serialize};
Expand All @@ -9,6 +9,7 @@ pub enum UserRequest {
UtreexoBlock(BlockHash),
MempoolTransaction(Txid),
GetPeerInfo,
Connect((IpAddr, u16)),
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct PeerInfo {
Expand All @@ -24,6 +25,7 @@ pub enum NodeResponse {
UtreexoBlock(UtreexoBlock),
MempoolTransaction(Transaction),
GetPeerInfo(Vec<PeerInfo>),
Connect(bool),
}

pub trait NodeMethods {
Expand All @@ -37,6 +39,7 @@ pub trait NodeMethods {
txid: Txid,
) -> Result<Option<Transaction>, oneshot::RecvError>;
fn get_peer_info(&self) -> Result<Vec<PeerInfo>, oneshot::RecvError>;
fn connect(&self, addr: IpAddr, port: u16) -> Result<bool, oneshot::RecvError>;
}
#[derive(Debug)]
pub struct NodeInterface {
Expand All @@ -59,6 +62,19 @@ impl NodeInterface {
}
}
impl NodeMethods for NodeInterface {
fn connect(&self, addr: IpAddr, port: u16) -> Result<bool, oneshot::RecvError> {
let (tx, rx) = oneshot::channel();
self.requests.lock().unwrap().push(RequestData {
time: Instant::now(),
resolve: tx,
req: UserRequest::Connect((addr, port)),
});
let connected = rx.recv()?;
Ok(match connected {
Some(NodeResponse::Connect(connected)) => connected,
_ => unreachable!(),
})
}
fn get_block(&self, block: BlockHash) -> Result<Option<Block>, oneshot::RecvError> {
let (tx, rx) = oneshot::channel();
self.requests.lock().unwrap().push(RequestData {
Expand Down