From 62d4f9b4b2e6d37965a3be75ce838fea2fb6073c Mon Sep 17 00:00:00 2001
From: MengXiangJian <805442788@qq.com>
Date: Mon, 12 Jul 2021 10:27:06 +0800
Subject: [PATCH] Merge PR: change version to v0.18.10 && fix farm InnitGenesis
 without SetAddressInFarmPool (#921)

---
 Makefile          | 2 +-
 x/farm/genesis.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 406f556459..3b037434cb 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ export GO111MODULE=on
 GithubTop=github.com
 
 
-Version=v0.18.9
+Version=v0.18.10
 CosmosSDK=v0.39.2
 Tendermint=v0.33.9
 Iavl=v0.14.3
diff --git a/x/farm/genesis.go b/x/farm/genesis.go
index 2ab844940e..e278bd5fb7 100644
--- a/x/farm/genesis.go
+++ b/x/farm/genesis.go
@@ -21,6 +21,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) {
 
 	for _, lockInfo := range data.LockInfos {
 		k.SetLockInfo(ctx, lockInfo)
+		k.SetAddressInFarmPool(ctx, lockInfo.PoolName, lockInfo.Owner)
 	}
 
 	for _, historical := range data.PoolHistoricalRewards {