fix(epoch): fix nil epoch storeKey in perp keeper (#796)

* Update CHANGELOG.md * fix panic * update changelog Co-authored-by: NibiruHeisenberg <[email protected]>
NibiruChain · Aug 4, 2022 · 6b5e307 · 6b5e307
1 parent 1c98706
commit 6b5e307
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+* [#796](https://github.com/NibiruChain/nibiru/pull/796) - fix bug that caused that epochKeeper was nil when running epoch hook from Perp module
+
 ## [v0.12.0](https://github.com/NibiruChain/nibiru/releases/tag/v0.12.0) - 2022-08-03
 
 ### Improvements

diff --git a/app/app.go b/app/app.go
@@ -443,15 +443,16 @@ func NewNibiruApp(
 		app.PricefeedKeeper,
 	)
 
+	app.EpochsKeeper = epochskeeper.NewKeeper(
+		appCodec, keys[epochstypes.StoreKey],
+	)
+
 	app.PerpKeeper = perpkeeper.NewKeeper(
 		appCodec, keys[perptypes.StoreKey],
 		app.GetSubspace(perptypes.ModuleName),
 		app.AccountKeeper, app.BankKeeper, app.PricefeedKeeper, app.VpoolKeeper, app.EpochsKeeper,
 	)
 
-	app.EpochsKeeper = epochskeeper.NewKeeper(
-		appCodec, keys[epochstypes.StoreKey],
-	)
 	app.EpochsKeeper.SetHooks(
 		epochstypes.NewMultiEpochHooks(app.StablecoinKeeper.Hooks(), app.PerpKeeper.Hooks()),
 	)