Relay CMerkleBlocks when asked for MSG_FILTERED_BLOCK

TheBlueMatt · TheBlueMatt · commit b02ddbedcba4 · 2013-01-16T12:48:02.000-05:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -3068,15 +3068,37 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
             if (fDebugNet || (vInv.size() == 1))
                 printf("received getdata for: %s\n", inv.ToString().c_str());
 
-            if (inv.type == MSG_BLOCK)
+            if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
             {
                 // Send block from disk
                 map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(inv.hash);
                 if (mi != mapBlockIndex.end())
                 {
                     CBlock block;
                     block.ReadFromDisk((*mi).second);
-                    pfrom->PushMessage("block", block);
+                    if (inv.type == MSG_BLOCK)
+                        pfrom->PushMessage("block", block);
+                    else // MSG_FILTERED_BLOCK)
+                    {
+                        LOCK(pfrom->cs_filter);
+                        if (pfrom->pfilter)
+                        {
+                            CMerkleBlock merkleBlock(block, *pfrom->pfilter);
+                            typedef boost::tuple<unsigned int, uint256, std::vector<uint256> > TupleType;
+                            // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see 
+                            // This avoids hurting performance by pointlessly requiring a round-trip
+                            // Note that there is currently no way for a node to request any single transactions we didnt send here -
+                            // they must either disconnect and retry or request the full block.
+                            // Thus, the protocol spec specified allows for us to provide duplicate txn here,
+                            // however we MUST always provide at least what the remote peer needs
+                            BOOST_FOREACH(TupleType& tuple, merkleBlock.vtx)
+                                if (!pfrom->setInventoryKnown.count(CInv(MSG_TX, get<1>(tuple))))
+                                    pfrom->PushMessage("tx", block.vtx[get<0>(tuple)]);
+                            pfrom->PushMessage("merkleblock", merkleBlock);
+                        }
+                        // else
+                            // no response
+                    }
 
                     // Trigger them to send a getblocks request for the next batch of inventory
                     if (inv.hash == pfrom->hashContinue)
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -17,6 +17,7 @@ static const char* ppszTypeName[] =
     "ERROR",
     "tx",
     "block",
+    "filtered block"
 };
 
 CMessageHeader::CMessageHeader()
diff --git a/src/protocol.h b/src/protocol.h
@@ -138,6 +138,9 @@ enum
 {
     MSG_TX = 1,
     MSG_BLOCK,
+    // Nodes may always request a MSG_FILTERED_BLOCK in a getdata, however,
+    // MSG_FILTERED_BLOCK should not appear in any invs except as a part of getdata.
+    MSG_FILTERED_BLOCK,
 };
 
 #endif // __INCLUDED_PROTOCOL_H__

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,9 @@ enum`
`138`	`138`	`{`
`139`	`139`	`MSG_TX = 1,`
`140`	`140`	`MSG_BLOCK,`
	`141`	`+ // Nodes may always request a MSG_FILTERED_BLOCK in a getdata, however,`
	`142`	`+ // MSG_FILTERED_BLOCK should not appear in any invs except as a part of getdata.`
	`143`	`+ MSG_FILTERED_BLOCK,`
`141`	`144`	`};`
`142`	`145`
`143`	`146`	`#endif // __INCLUDED_PROTOCOL_H__`