From 843b74947d988d806893a37b812cc5178a482337 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 08:57:35 -0800
Subject: [PATCH] fix ICS equivocation proposal (#2197) (#2199)

* replace sdk with Shawn's fork

* fix equivocation bug on ICS

* clean go mod

(cherry picked from commit d943cc3c7c7e3edb3b5a9d8c8252b0d238f00a07)

Co-authored-by: Simon Noetzlin <simon.ntz@gmail.com>
---
 app/keepers/keepers.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index 0b270420b7a..ed7fd888550 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -263,6 +263,14 @@ func NewAppKeeper(
 		appKeepers.ScopedIBCKeeper,
 	)
 
+	// EvidenceKeeper must be created before ProviderKeeper
+	appKeepers.EvidenceKeeper = *evidencekeeper.NewKeeper(
+		appCodec,
+		appKeepers.keys[evidencetypes.StoreKey],
+		&appKeepers.StakingKeeper,
+		appKeepers.SlashingKeeper,
+	)
+
 	appKeepers.ProviderKeeper = ibcproviderkeeper.NewKeeper(
 		appCodec,
 		appKeepers.keys[providertypes.StoreKey],
@@ -366,13 +374,6 @@ func NewAppKeeper(
 
 	appKeepers.IBCKeeper.SetRouter(ibcRouter)
 
-	appKeepers.EvidenceKeeper = *evidencekeeper.NewKeeper(
-		appCodec,
-		appKeepers.keys[evidencetypes.StoreKey],
-		&appKeepers.StakingKeeper,
-		appKeepers.SlashingKeeper,
-	)
-
 	return appKeepers
 }