From 4ecdb3a768be34e2a99604ef64672f0dbf188414 Mon Sep 17 00:00:00 2001 From: pmitchev Date: Wed, 31 Jan 2018 13:22:35 +0200 Subject: [PATCH] Block 202612 and 685498 should apply only to Monero --- extensions/core/monero.json | 54 ++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/extensions/core/monero.json b/extensions/core/monero.json index 3813028..73b782a 100644 --- a/extensions/core/monero.json +++ b/extensions/core/monero.json @@ -494,9 +494,56 @@ } ] }, - - - + { + "path": "/src/blockchain_db/blockchain_db.cpp", + "changes": [ + { + "description": "Monero fixes should apply to Monero only", + "action": "replace", + "marker": "if (height() > 202612)", + "parameters": { + "text": [ + " if (height() > 202612 && CRYPTONOTE_NAME == \"monero\")" + ] + } + }, + { + "description": "Monero fixes should apply to Monero only", + "action": "replace", + "marker": "if (height() > 685498)", + "parameters": { + "text": [ + " if (height() > 685498 && CRYPTONOTE_NAME == \"monero\")" + ] + } + } + ] + }, + { + "path": "/src/cryptonote_basic/cryptonote_format_utils.cpp", + "changes": [ + { + "description": "Monero fixes should apply to Monero only", + "action": "replace", + "marker": "if (string_tools::pod_to_hex(block_blob_hash) == correct_blob_hash_202612)", + "parameters": { + "text": [ + " if (string_tools::pod_to_hex(block_blob_hash) == correct_blob_hash_202612 && CRYPTONOTE_NAME == \"monero\")" + ] + } + }, + { + "description": "Monero fixes should apply to Monero only", + "action": "replace", + "marker": "if (string_tools::pod_to_hex(res) == existing_block_id_202612)", + "parameters": { + "text": [ + " if (string_tools::pod_to_hex(res) == existing_block_id_202612 && CRYPTONOTE_NAME == \"monero\")" + ] + } + } + ] + }, { "path": "/src/common/dns_utils.cpp", "changes": [ @@ -522,7 +569,6 @@ } ] }, - { "path": "/src/blocks/blocks.dat", "action": "remove"