Merge pull request #1863

09e060fe protocol: fix fluffy to normal block dropping txes (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-03-13 17:22:10 +01:00
commit 22e51c5d29
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -605,7 +605,7 @@ namespace cryptonote
NOTIFY_NEW_BLOCK::request reg_arg = AUTO_VAL_INIT(reg_arg);
reg_arg.hop = arg.hop;
reg_arg.current_blockchain_height = arg.current_blockchain_height;
reg_arg.b.block = b.block;
reg_arg.b = b;
relay_block(reg_arg, context);
}
else if( bvc.m_marked_as_orphaned )