Merge pull request #284 from evoskuil/master

Prevent tx send for confirmed txs, add disabled announce logging.

Author: evoskuil

data/bn.cfg

@@ -29,6 +29,8 @@ protocol_minimum = 31402
 services = 1
 # The magic number for message headers, defaults to 3652501241 (use 118034699 for testnet).
 identifier = 3652501241
+# Validate the checksum of network messages, defaults to false.
+validate_checksum = false
 # The port for incoming connections, defaults to 8333 (use 18333 for testnet).
 inbound_port = 8333
 # The target number of incoming network connections, defaults to 8.

src/parser.cpp

@@ -192,6 +192,11 @@ options_metadata parser::load_settings()
         value<uint64_t>(&configured.network.services),
         "The services exposed by network connections, defaults to 1 (full node)."
     )
+    (
+        "network.validate_checksum",
+        value<bool>(&configured.network.validate_checksum),
+        "Validate the checksum of network messages, defaults to false."
+    )
     (
         "network.identifier",
         value<uint32_t>(&configured.network.identifier),

src/protocols/protocol_block_in.cpp

@@ -211,7 +211,6 @@ bool protocol_block_in::handle_receive_headers(const code& ec,
     message->to_inventory(response->inventories(), inventory::type_id::block);
 
     // Remove hashes of blocks that we already have.
-    // BUGBUG: this removes blocks that are not in the main chain.
     chain_.filter_blocks(response, BIND2(send_get_data, _1, response));
     return true;
 }
@@ -227,7 +226,6 @@ bool protocol_block_in::handle_receive_inventory(const code& ec,
     message->reduce(response->inventories(), inventory::type_id::block);
 
     // Remove hashes of blocks that we already have.
-    // BUGBUG: this removes blocks that are not in the main chain.
     chain_.filter_blocks(response, BIND2(send_get_data, _1, response));
     return true;
 }

src/protocols/protocol_block_out.cpp

@@ -461,7 +461,15 @@ bool protocol_block_out::handle_reorganized(code ec, size_t fork_height,
                 announce.elements().push_back(block->header());
 
         if (!announce.elements().empty())
+        {
             SEND2(announce, handle_send, _1, announce.command);
+
+            ////const auto hash = announce.elements().front().hash();
+            ////LOG_DEBUG(LOG_NODE)
+            ////    << "Announced block header [" << encode_hash(hash)
+            ////    << "] to [" << authority() << "].";
+        }
+
         return true;
     }
     else
@@ -474,7 +482,15 @@ bool protocol_block_out::handle_reorganized(code ec, size_t fork_height,
                     { inventory::type_id::block, block->header().hash() });
 
         if (!announce.inventories().empty())
+        {
             SEND2(announce, handle_send, _1, announce.command);
+
+            ////const auto hash = announce.inventories().front().hash();
+            ////LOG_DEBUG(LOG_NODE)
+            ////    << "Announced block inventory [" << encode_hash(hash)
+            ////    << "] to [" << authority() << "].";
+        }
+
         return true;
     }
 }

src/protocols/protocol_transaction_out.cpp

@@ -33,6 +33,7 @@ namespace node {
 
 using namespace bc::blockchain;
 using namespace bc::chain;
+using namespace bc::database;
 using namespace bc::message;
 using namespace bc::network;
 using namespace std::placeholders;
@@ -175,12 +176,16 @@ void protocol_transaction_out::send_next_data(inventory_ptr inventory)
 
 // TODO: send block_transaction message as applicable.
 void protocol_transaction_out::send_transaction(const code& ec,
-    transaction_ptr transaction, size_t, size_t, inventory_ptr inventory)
+    transaction_ptr transaction, size_t, size_t position,
+    inventory_ptr inventory)
 {
     if (stopped(ec))
         return;
 
-    if (ec == error::not_found)
+    // Treat already confirmed transactions as not found.
+    auto confirmed = !ec && position != transaction_database::unconfirmed;
+
+    if (ec == error::not_found || confirmed)
     {
         LOG_DEBUG(LOG_NODE)
             << "Transaction requested by [" << authority() << "] not found.";
@@ -189,6 +194,8 @@ void protocol_transaction_out::send_transaction(const code& ec,
         BITCOIN_ASSERT(!inventory->inventories().empty());
         const not_found reply{ inventory->inventories().back() };
         SEND2(reply, handle_send, _1, reply.command);
+
+        // TODO: recursion hazard.
         handle_send_next(error::success, inventory);
         return;
     }
@@ -243,6 +250,10 @@ bool protocol_transaction_out::handle_notification(const code& ec,
     static const auto id = inventory::type_id::transaction;
     const inventory announce{ { id, message->hash() } };
     SEND2(announce, handle_send, _1, announce.command);
+
+    ////LOG_DEBUG(LOG_NODE)
+    ////    << "Announced tx [" << encode_hash(message->hash()) << "] to ["
+    ////    << authority() << "].";
     return true;
 }