Change signature data

Miner now has to sign the hash_checkpoint list to avoid using the signature on blocks having invalid proofs of work
unprll-project · Feb 1, 2019 · a77743d · a77743d
1 parent d93be60
commit a77743d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp
@@ -480,10 +480,16 @@ namespace cryptonote
         b.hash_checkpoints.push_back(h);
         b.invalidate_hashes();
 
+        crypto::hash tree_hash;
+        crypto::tree_hash(b.hash_checkpoints.data(), b.hash_checkpoints.size(), tree_hash);
+
         blobdata data;
         data.append(epee::string_tools::pod_to_hex(b.miner_specific));
         data.append("@");
         data.append(boost::lexical_cast<std::string>(boost::get<cryptonote::txin_gen>(b.miner_tx.vin[0]).height));
+        data.append("@");
+        data.append(epee::string_tools::pod_to_hex(tree_hash));
+
         crypto::hash hash;
         crypto::cn_fast_hash(data.data(), data.size(), hash);
         crypto::signature signature;

diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -356,10 +356,17 @@ namespace cryptonote
       LOG_DEBUG_CC(context, "Could not parse new block");
       return 1;
     }
+
+    crypto::hash tree_hash;
+    crypto::tree_hash(b.hash_checkpoints.data(), b.hash_checkpoints.size(), tree_hash);
+
     blobdata data;
     data.append(epee::string_tools::pod_to_hex(b.miner_specific));
     data.append("@");
     data.append(boost::lexical_cast<std::string>(boost::get<cryptonote::txin_gen>(b.miner_tx.vin[0]).height));
+    data.append("@");
+    data.append(epee::string_tools::pod_to_hex(tree_hash));
+
     crypto::hash hash;
     crypto::cn_fast_hash(data.data(), data.size(), hash);
 
@@ -507,10 +514,17 @@ namespace cryptonote
       LOG_DEBUG_CC(context, "Could not parse new block");
       return 1;
     }
+
+    crypto::hash tree_hash;
+    crypto::tree_hash(b.hash_checkpoints.data(), b.hash_checkpoints.size(), tree_hash);
+
     blobdata data;
     data.append(epee::string_tools::pod_to_hex(b.miner_specific));
     data.append("@");
     data.append(boost::lexical_cast<std::string>(boost::get<cryptonote::txin_gen>(b.miner_tx.vin[0]).height));
+    data.append("@");
+    data.append(epee::string_tools::pod_to_hex(tree_hash));
+
     crypto::hash hash;
     crypto::cn_fast_hash(data.data(), data.size(), hash);