From fbb382d45a7a347b2969345e00fa792208e460f2 Mon Sep 17 00:00:00 2001
From: Brannon King <countprimes@gmail.com>
Date: Thu, 12 Aug 2021 11:22:54 -0400
Subject: [PATCH] eliminate delay workaround post-fork

---
 claimtrie/node/manager.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/claimtrie/node/manager.go b/claimtrie/node/manager.go
index d098005c..5b200c31 100644
--- a/claimtrie/node/manager.go
+++ b/claimtrie/node/manager.go
@@ -269,6 +269,10 @@ func hasZeroActiveClaims(n *Node) bool {
 // aWorkaroundIsNeeded handles bugs that existed in previous versions
 func (nm *BaseManager) aWorkaroundIsNeeded(n *Node, chg change.Change) bool {
 
+	if chg.Height >= param.ActiveParams.GrandForkHeight {
+		return false
+	}
+
 	if chg.Type == change.SpendClaim || chg.Type == change.SpendSupport {
 		return false
 	}