From a6bbc819620b37a14b0c172d2513689ac34f3d30 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Thu, 9 Sep 2021 12:55:08 +0100
Subject: [PATCH] Revert "Merge pull request #58 from QuickMythril/536140-fix"

This reverts commit 6d1f7b36a7af3d0c12085f5718b2d42162ffd521, reversing
changes made to 6b74ef77e610bb693c92655fc2dc0e0837e050ea.

# Conflicts:
#	src/main/java/org/qortal/block/Block536140.java
---
 src/main/java/org/qortal/block/Block.java     |  4 --
 .../java/org/qortal/block/Block536140.java    | 62 -------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 src/main/java/org/qortal/block/Block536140.java

diff --git a/src/main/java/org/qortal/block/Block.java b/src/main/java/org/qortal/block/Block.java
index 7b155a53..e84250ca 100644
--- a/src/main/java/org/qortal/block/Block.java
+++ b/src/main/java/org/qortal/block/Block.java
@@ -1100,10 +1100,6 @@ public class Block {
 				// Apply fix for block 535658 but fix will be rolled back before we exit method
 				Block535658.processFix(this);
 			}
-			else if (this.blockData.getHeight() == 536140) {
-				// Apply fix for block 536140 but fix will be rolled back before we exit method
-				Block536140.processFix(this);
-			}
 
 			for (Transaction transaction : this.getTransactions()) {
 				TransactionData transactionData = transaction.getTransactionData();
diff --git a/src/main/java/org/qortal/block/Block536140.java b/src/main/java/org/qortal/block/Block536140.java
deleted file mode 100644
index c731f95a..00000000
--- a/src/main/java/org/qortal/block/Block536140.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.qortal.block;
-
-import org.qortal.naming.Name;
-import org.qortal.repository.DataException;
-
-/**
- * Block 536140
- * <p>
- * This block had the same problem as block 535658.
- * <p>
- * Original transaction:
- * <code><pre>
- {
-     "type": "REGISTER_NAME",
-     "timestamp": 1630701955448,
-     "reference": "5CytqtRzhP1irQjiJfKBwNkKBVM9gfvkWQEwqT49VNAofcyNHtSpqrVKB9v44NkhxytHwvfneCndCQTp3J8wU9p7",
-     "fee": "0.00100000",
-     "signature": "sPhiAfQ7MenpJAarTZ99neQHBrmyQ3jDFxRp79BTDmkRf7fMsQinuZJvWbsCzGeihr6zEjuPCD2k9srNGkzLhSS",
-     "txGroupId": 0,
-     "blockHeight": 535172,
-     "approvalStatus": "NOT_REQUIRED",
-     "creatorAddress": "QSUnyUZugWanhDtPaySLdaAGyKLzN3SurS",
-     "registrantPublicKey": "C83r2taaX3pGQTgjmb7QNnFN8GWJqZxnhwptJEViJSqM",
-     "name": "Qweb",
-     "data": "{\"age\":30}"
- }
- </pre></code>
- * <p>
- * Duplicate transaction:
- * <code><pre>
- {
-	 "type": "REGISTER_NAME",
-	 "timestamp": 1630777397713,
-	 "reference": "sPhiAfQ7MenpJAarTZ99neQHBrmyQ3jDFxRp79BTDmkRf7fMsQinuZJvWbsCzGeihr6zEjuPCD2k9srNGkzLhSS",
-	 "fee": "0.00100000",
-	 "signature": "45knBoCoKxraJaJWuwANTyM75Su9TAz45bvU8mQLj9wxwNvkVwrFXneLQtiNzN6ctcmNcGLTR4npiJ7PdxtxbJQA",
-	 "txGroupId": 0,
-	 "blockHeight": 536140,
-	 "approvalStatus": "NOT_REQUIRED",
-	 "creatorAddress": "QSUnyUZugWanhDtPaySLdaAGyKLzN3SurS",
-	 "registrantPublicKey": "C83r2taaX3pGQTgjmb7QNnFN8GWJqZxnhwptJEViJSqM",
-	 "name": "Qweb",
-	 "data": "Registered Name on the Qortal Chain"
- }
- </pre></code>
- */
-public final class Block536140 {
-
-	private Block536140() {
-		/* Do not instantiate */
-	}
-
-	public static void processFix(Block block) throws DataException {
-		// Unregister the existing name record if it exists
-		// This ensures that the duplicate name is considered valid, and therefore
-		// the second (i.e. duplicate) REGISTER_NAME transaction data is applied.
-		// Both were issued by the same user account, so there is no conflict.
-		Name name = new Name(block.repository, "Qweb");
-		name.unregister();
-	}
-
-}