Merge commit 'd780d52648475e8887cacce73acec93ae59fb34b' into onboardi…

…ng-middleware-conflict-resolve

* commit 'd780d52648475e8887cacce73acec93ae59fb34b':
  chore: add branches rule for workflow
  fix: simulation seed randomness was removed to make the ci/cd result deterministic
  fix: remove recovery from storeKeysPrefixes
  add placeholder for ICS4wrapper in transferKeeper init
  remove recovery imports in app.go
  remove recovery proto
  remove x/recovery
  fix: update simulation target modules, refactor duplicated struct
  fix: removing unused keeper from handler options
  fix: simulation workflow, update sims.yml, add GOPATH on makefile
  fix: simulation errors
  fix: seperate antehandler for simulation
  feat: add workflow to build, test, codecov for ci/cd

# Conflicts:
#	app/app.go
#	app/test_helpers.go
#	proto/canto/onboarding/v1/query.proto
#	x/onboarding/client/cli/query.go
#	x/onboarding/genesis.go
#	x/onboarding/genesis_test.go
#	x/onboarding/ibc_middleware.go
#	x/onboarding/keeper/grpc_query.go
#	x/onboarding/keeper/grpc_query_test.go
#	x/onboarding/keeper/keeper.go
#	x/onboarding/keeper/keeper_test.go
#	x/onboarding/keeper/params.go
#	x/onboarding/keeper/utils_test.go
#	x/onboarding/module.go
#	x/onboarding/types/errors.go
#	x/onboarding/types/genesis.go
#	x/onboarding/types/genesis.pb.go
#	x/onboarding/types/genesis_test.go
#	x/onboarding/types/keys.go
#	x/onboarding/types/params_test.go
#	x/onboarding/types/query.pb.go
#	x/onboarding/types/query.pb.gw.go

app/app.go

@@ -747,11 +747,10 @@ func NewCanto(
 		epochs.NewAppModule(appCodec, app.EpochsKeeper),
 		inflation.NewAppModule(app.InflationKeeper, app.AccountKeeper, app.StakingKeeper),
 		feemarket.NewAppModule(app.FeeMarketKeeper),
+		coinswap.NewAppModule(appCodec, app.CoinswapKeeper, app.AccountKeeper, app.BankKeeper),
 
 		// TODO: Modules that have not yet been implemented for simulation
 		// govshuttle, csr, inflation, erc20
-
-		coinswap.NewAppModule(appCodec, app.CoinswapKeeper, app.AccountKeeper, app.BankKeeper),
 	)
 
 	app.sm.RegisterStoreDecoders()