Skip to content
Merged
Changes from all commits
Commits
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
63 changes: 35 additions & 28 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -703,36 +703,39 @@ fn run(
info!("Sending GetReceipts message");
let mut receipts: Vec<Vec<Receipt>> = vec![];

while receipts.len() < hashes.len() {
let get_receipts = eth::create_get_receipts_message(&hashes[receipts.len()..].to_vec());
utils::send_message(get_receipts, &mut stream, &mut egress_mac, &mut egress_aes)?;

/******************
*
* Handle Receipts message
*
******************/

let mut uncrypted_body: Vec<u8>;
let mut code;
loop {
uncrypted_body = rx_tcp.recv()?;

code = uncrypted_body[0] - 16;
if code == 16 {
break;
if version == 69 {
while receipts.len() < hashes.len() {
let get_receipts =
eth::create_get_receipts_message(&hashes[receipts.len()..].to_vec());
utils::send_message(get_receipts, &mut stream, &mut egress_mac, &mut egress_aes)?;

/******************
*
* Handle Receipts message
*
******************/

let mut uncrypted_body: Vec<u8>;
let mut code;
loop {
uncrypted_body = rx_tcp.recv()?;

code = uncrypted_body[0] - 16;
if code == 16 {
break;
}
}
}
assert_eq!(code, 16);
assert_eq!(code, 16);

let tmp_rpt: Vec<Vec<Receipt>> = eth::parse_receipts(uncrypted_body[1..].to_vec());
receipts.extend(tmp_rpt);
let tmp_rpt: Vec<Vec<Receipt>> = eth::parse_receipts(uncrypted_body[1..].to_vec());
receipts.extend(tmp_rpt);

info!(
"Handling Receipts message ({}/{} block receipts received)",
receipts.len(),
hashes.len()
);
info!(
"Handling Receipts message ({}/{} block receipts received)",
receipts.len(),
hashes.len()
);
}
}

let mut blocks: Vec<(
Expand All @@ -751,7 +754,11 @@ fn run(
txs.to_owned(),
ommers.to_owned(),
withdrawals.to_owned(),
receipts[i].clone(),
if version == 69 {
receipts[i].clone()
} else {
vec![]
},
));
});

Expand Down