|
|
|
@ -1090,7 +1090,14 @@ namespace cryptonote
|
|
|
|
|
|
|
|
|
|
// we still need the size
|
|
|
|
|
if (blob_size)
|
|
|
|
|
*blob_size = get_object_blobsize(t);
|
|
|
|
|
{
|
|
|
|
|
if (!t.is_blob_size_valid())
|
|
|
|
|
{
|
|
|
|
|
t.blob_size = blob.size();
|
|
|
|
|
t.set_blob_size_valid(true);
|
|
|
|
|
}
|
|
|
|
|
*blob_size = t.blob_size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
@ -1143,21 +1150,37 @@ namespace cryptonote
|
|
|
|
|
return blob;
|
|
|
|
|
}
|
|
|
|
|
//---------------------------------------------------------------
|
|
|
|
|
bool calculate_block_hash(const block& b, crypto::hash& res)
|
|
|
|
|
bool calculate_block_hash(const block& b, crypto::hash& res, const blobdata *blob)
|
|
|
|
|
{
|
|
|
|
|
blobdata bd;
|
|
|
|
|
if (!blob)
|
|
|
|
|
{
|
|
|
|
|
bd = block_to_blob(b);
|
|
|
|
|
blob = &bd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool hash_result = get_object_hash(get_block_hashing_blob(b), res);
|
|
|
|
|
if (!hash_result)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (b.miner_tx.vin.size() == 1 && b.miner_tx.vin[0].type() == typeid(cryptonote::txin_gen))
|
|
|
|
|
{
|
|
|
|
|
const cryptonote::txin_gen &txin_gen = boost::get<cryptonote::txin_gen>(b.miner_tx.vin[0]);
|
|
|
|
|
if (txin_gen.height != 202612)
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// EXCEPTION FOR BLOCK 202612
|
|
|
|
|
const std::string correct_blob_hash_202612 = "3a8a2b3a29b50fc86ff73dd087ea43c6f0d6b8f936c849194d5c84c737903966";
|
|
|
|
|
const std::string existing_block_id_202612 = "bbd604d2ba11ba27935e006ed39c9bfdd99b76bf4a50654bc1e1e61217962698";
|
|
|
|
|
crypto::hash block_blob_hash = get_blob_hash(block_to_blob(b));
|
|
|
|
|
crypto::hash block_blob_hash = get_blob_hash(*blob);
|
|
|
|
|
|
|
|
|
|
if (string_tools::pod_to_hex(block_blob_hash) == correct_blob_hash_202612)
|
|
|
|
|
{
|
|
|
|
|
string_tools::hex_to_pod(existing_block_id_202612, res);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
bool hash_result = get_object_hash(get_block_hashing_blob(b), res);
|
|
|
|
|
|
|
|
|
|
if (hash_result)
|
|
|
|
|
{
|
|
|
|
|
// make sure that we aren't looking at a block with the 202612 block id but not the correct blobdata
|
|
|
|
|
if (string_tools::pod_to_hex(res) == existing_block_id_202612)
|
|
|
|
@ -1200,9 +1223,9 @@ namespace cryptonote
|
|
|
|
|
bool get_block_longhash(const block& b, crypto::hash& res, uint64_t height)
|
|
|
|
|
{
|
|
|
|
|
// block 202612 bug workaround
|
|
|
|
|
const std::string longhash_202612 = "84f64766475d51837ac9efbef1926486e58563c95a19fef4aec3254f03000000";
|
|
|
|
|
if (height == 202612)
|
|
|
|
|
{
|
|
|
|
|
static const std::string longhash_202612 = "84f64766475d51837ac9efbef1926486e58563c95a19fef4aec3254f03000000";
|
|
|
|
|
string_tools::hex_to_pod(longhash_202612, res);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
@ -1239,7 +1262,7 @@ namespace cryptonote
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
//---------------------------------------------------------------
|
|
|
|
|
bool parse_and_validate_block_from_blob(const blobdata& b_blob, block& b)
|
|
|
|
|
bool parse_and_validate_block_from_blob(const blobdata& b_blob, block& b, crypto::hash *block_hash)
|
|
|
|
|
{
|
|
|
|
|
std::stringstream ss;
|
|
|
|
|
ss << b_blob;
|
|
|
|
@ -1248,9 +1271,26 @@ namespace cryptonote
|
|
|
|
|
CHECK_AND_ASSERT_MES(r, false, "Failed to parse block from blob");
|
|
|
|
|
b.invalidate_hashes();
|
|
|
|
|
b.miner_tx.invalidate_hashes();
|
|
|
|
|
if (block_hash)
|
|
|
|
|
{
|
|
|
|
|
calculate_block_hash(b, *block_hash, &b_blob);
|
|
|
|
|
++block_hashes_calculated_count;
|
|
|
|
|
b.hash = *block_hash;
|
|
|
|
|
b.set_hash_valid(true);
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
//---------------------------------------------------------------
|
|
|
|
|
bool parse_and_validate_block_from_blob(const blobdata& b_blob, block& b)
|
|
|
|
|
{
|
|
|
|
|
return parse_and_validate_block_from_blob(b_blob, b, NULL);
|
|
|
|
|
}
|
|
|
|
|
//---------------------------------------------------------------
|
|
|
|
|
bool parse_and_validate_block_from_blob(const blobdata& b_blob, block& b, crypto::hash &block_hash)
|
|
|
|
|
{
|
|
|
|
|
return parse_and_validate_block_from_blob(b_blob, b, &block_hash);
|
|
|
|
|
}
|
|
|
|
|
//---------------------------------------------------------------
|
|
|
|
|
blobdata block_to_blob(const block& b)
|
|
|
|
|
{
|
|
|
|
|
return t_serializable_object_to_blob(b);
|
|
|
|
@ -1286,6 +1326,7 @@ namespace cryptonote
|
|
|
|
|
crypto::hash get_tx_tree_hash(const block& b)
|
|
|
|
|
{
|
|
|
|
|
std::vector<crypto::hash> txs_ids;
|
|
|
|
|
txs_ids.reserve(1 + b.tx_hashes.size());
|
|
|
|
|
crypto::hash h = null_hash;
|
|
|
|
|
size_t bl_sz = 0;
|
|
|
|
|
get_transaction_hash(b.miner_tx, h, bl_sz);
|
|
|
|
|