Fixes after review

CHANGELOG.md

@@ -65,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#678](https://github.com/allora-network/allora-chain/pull/678) Add optimistic execution + update CometBFT to v0.38.15
 * [#663](https://github.com/allora-network/allora-chain/pull/663) Add whitelists for admins, topic creators, workers, and reputers. Create x/emissions v6 migration and chain upgrade v0.7.0
 * [#654](https://github.com/allora-network/allora-chain/pull/654) Reorganize Linter Folder, add linter to check fuzzer state transition probabilities add to 100 percent. (Integrated as part of #653)
+* [#627](https://github.com/allora-network/allora-chain/pull/627) Add fee market and fee grant module
 
 ### Changed
 * [#652](https://github.com/allora-network/allora-chain/pull/652) Reduce code duplication, set local_testnet_upgrade_l1.sh using environment variables with local_testnet_l1.sh instead
@@ -93,10 +94,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-* [#627](https://github.com/allora-network/allora-chain/pull/627) Add fee market module
-
-### Added
-
 * [#624](https://github.com/allora-network/allora-chain/pull/624) Add `nurse` internal healthcheck service based on `pprof`.  See `health/README.md`.
 * [#642](https://github.com/allora-network/allora-chain/pull/642) Add release signing keys
 * [#648](https://github.com/allora-network/allora-chain/pull/648) Update emissions v5 migration to reset way more maps => complete cleanup of poisonously negative values

app/app.go

@@ -238,9 +238,6 @@ func NewAlloraApp(
 	// Register legacy modules
 	app.registerLegacyModules()
 
-	// Register Fee Market
-	app.registerFeeMarketModule()
-
 	// register streaming services
 	if err := app.RegisterStreamingServices(appOpts, app.kvStoreKeys()); err != nil {
 		return nil, err

app/app.yaml

@@ -127,3 +127,6 @@ modules:
   - name: feegrant
     config:
       "@type": cosmos.feegrant.module.v1.Module
+  - name: feemarket
+    config:
+      "@type": feemarket.feemarket.module.v1.Module

app/upgrades.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	storetypes "cosmossdk.io/store/types"
+	"cosmossdk.io/x/feegrant"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	"github.com/allora-network/allora-chain/app/upgrades"
 	"github.com/allora-network/allora-chain/app/upgrades/v0_3_0"
@@ -34,7 +35,7 @@ func (app *AlloraApp) setupUpgradeHandlers() {
 
 		if upgradeInfo.Name == v0_7_0.Upgrade.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 			storeUpgrades := storetypes.StoreUpgrades{
-				Added:   []string{feemarkettypes.ModuleName},
+				Added:   []string{feegrant.StoreKey, feemarkettypes.StoreKey},
 				Deleted: nil,
 				Renamed: nil,
 			}