MErge from main chihuahua

Makefile

@@ -2,7 +2,7 @@
 
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git log -1 --format='%H')
-GO_VERSION := "1.20"
+GO_VERSION := "1.22"
 
 # don't override user values
 ifeq (,$(VERSION))
@@ -156,4 +156,4 @@ docs:
 	@echo
 	@echo "=========== Generate Complete ============"
 	@echo
-.PHONY: docs
+.PHONY: docs

README.md

@@ -3,7 +3,7 @@
 # ChihuahuaChain
 ##### _The Cosmos MEME Coin_
 Stay up to date with the latest news on our Socials
- - Join our [Telegram Community](https://t.me/chihuahua_cosmos)
+ - Join our [Telegram Community](https://t.me/chihuahua_wtf)
  - Join our [Discord](https://discord.gg/chihuahuachain-878201449421619211)
  - Follow us on [Twitter](https://twitter.com/ChihuahuaChain)
  - Check out our [Medium](https://medium.com/@chihuahuachain)
@@ -56,11 +56,11 @@ The output should be `go version go1.21.1 linux/amd64`
 git clone https://github.com/ChihuahuaChain/chihuahua.git
 cd chihuahua
 git fetch --tags
-git checkout v7
+git checkout v7.0.2
 make install
 ```
 
-To verify the installation you can run `chihuahuad version` and it should return `v7`
+To verify the installation you can run `chihuahuad version` and it should return `v7.0.2`
 
 - #### Initialize the Chain
 Replace `$MONIKERNAME` with your choosen node name
@@ -217,6 +217,8 @@ _Make sure to join our [Discord](https://discord.gg/chihuahuachain-8782014494216
 
 # Chain Upgrades
 
+- **v7.0.1** _(using v7.0.2 binary)_ - Block 13250000 - (2024-06-17 15:11:00)
+  - [Upgrade Instruction](https://github.com/ChihuahuaChain/chihuahua/blob/main/mainnet/UPGRADES/v7.0.1)
 - **v7** _(v7)_ - Block 12900000 - (2024-05-24 10:12:00)
   - [Upgrade Instruction](https://github.com/ChihuahuaChain/chihuahua/blob/main/mainnet/UPGRADES/v7)
 - **v6** _(v6)_ - Block 10666000 - (2023-12-23 15:30:00)

app/app.go

@@ -460,7 +460,7 @@ func New(
 	app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.MsgServiceRouter(), app.AccountKeeper)
 
 	app.BankKeeper = bankkeeper.NewBaseKeeper(
-		appCodec, keys[sdkbanktypes.StoreKey], app.AccountKeeper, app.ModuleAccountAddrs(), authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		appCodec, keys[sdkbanktypes.StoreKey], app.AccountKeeper, app.BlockedModuleAccountAddrs(), authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 	app.StakingKeeper = stakingkeeper.NewKeeper(
 		appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),

mainnet/UPGRADES/v7.0.1/README.md

@@ -0,0 +1,38 @@
+# Chihuahua v7.0.1 Upgrade (USE v7.0.2 binary instead)
+
+The Upgrade is scheduled for block `13250000`. A countdown clock is [here](https://www.mintscan.io/chihuahua/blocks/13250000)
+
+This guide assumes that you use cosmovisor to manage upgrades.
+
+## If you are syncing from 0 you need to apply v7.0.2 at height 13250000
+
+```bash
+# get the new version
+cd chihuahua
+git fetch --all
+git checkout v7.0.2
+make install
+```
+
+# check the version
+
+```bash
+# should be v7.0.2
+chihuahuad version
+# Should be commit 5b818dfb534994c1dd6542665f9c7504b25a185e
+chihuahuad version --long | grep commit
+```
+
+# Make new directory and copy binary (yes, we are using v7.0.1 directory, not a typo)
+
+```bash
+mkdir -p $HOME/.chihuahuad/cosmovisor/upgrades/v7.0.1/bin
+cp $HOME/go/bin/chihuahuad $HOME/.chihuahuad/cosmovisor/upgrades/v7.0.1/bin
+```
+
+# check the version again
+
+```bash
+# should be v7.0.2
+$HOME/.chihuahuad/cosmovisor/upgrades/v7.0.1/bin/chihuahuad version
+```