Sweetbread/Alfis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored block and transaction structure. Introduced a 'confirmation' entity to avoid block interceptions (at least make them pointless).

Browse Source
This commit is contained in:
Revertron
2021-02-13 23:37:44 +01:00
parent 279b3e87c3
commit 1331f44b0e
9 changed files with 97 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p2p/network.rs
+6 -5
View File
@@ -176,7 +176,7 @@ fn handle_connection_event(context: Arc<Mutex<Context>>, peers: &mut Peers, regi
println!("Sending hello to socket {}", event.token().0);
let data: String = {
let mut c = context.lock().unwrap();
let message = Message::hand(&c.settings.chain_name, c.settings.version_flags, c.settings.public);
let message = Message::hand(&c.settings.origin, c.settings.version, c.settings.public);
serde_json::to_string(&message).unwrap()
};
send_message(peer.get_stream(), &data.into_bytes());
@@ -255,17 +255,18 @@ fn handle_message(context: Arc<Mutex<Context>>, message: Message, peers: &mut Pe
context.blockchain.height()
};
match message {
Message::Hand { chain, version, public } => {
Message::Hand { origin: origin, version, public } => {
let context = context.lock().unwrap();
if chain == context.settings.chain_name && version == context.settings.version_flags {
if origin == context.settings.origin && version == context.settings.version {
let mut peer = peers.get_mut_peer(token).unwrap();
peer.set_public(public);
State::message(Message::shake(true, context.blockchain.height()))
State::message(Message::shake(&context.settings.origin, context.settings.version, true, context.blockchain.height()))
} else {
State::Error
}
}
Message::Shake { ok, height } => {
Message::Shake { origin, version, ok, height } => {
// TODO check origin and version for compatibility
if ok {
if height > my_height {
State::message(Message::GetBlock { index: my_height + 1u64 })