fix!: revert to ICS v1.1.0-multiden (#2559)

* use ICS v1.1.0-multiden * multisig + distribution fix
cosmos · Jun 30, 2023 · c6fdb61 · c6fdb61
1 parent 4a1b19e
commit c6fdb61
Show file tree

Hide file tree

Showing 5 changed files with 2,413 additions and 5 deletions.
diff --git a/app/app.go b/app/app.go
@@ -42,6 +42,7 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
+	providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types"
 	"github.com/gorilla/mux"
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cast"
@@ -295,10 +296,8 @@ func (app *GaiaApp) BlockedModuleAccountAddrs(modAccAddrs map[string]bool) map[s
 	// remove module accounts that are ALLOWED to received funds
 	delete(modAccAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String())
 
-	// Remove the fee-pool from the group of blocked recipient addresses in bank
-	// this is required for the provider chain to be able to receive tokens from
-	// the consumer chain
-	delete(modAccAddrs, authtypes.NewModuleAddress(authtypes.FeeCollectorName).String())
+	// Remove the ConsumerRewardsPool from the group of blocked recipient addresses in bank
+	delete(modAccAddrs, authtypes.NewModuleAddress(providertypes.ConsumerRewardsPool).String())
 
 	return modAccAddrs
 }

diff --git a/app/app_helpers.go b/app/app_helpers.go
@@ -48,3 +48,7 @@ func (app *GaiaApp) GetTestSlashingKeeper() ics.TestSlashingKeeper { //nolint:no
 func (app *GaiaApp) GetTestDistributionKeeper() ics.TestDistributionKeeper { //nolint:nolintlint
 	return app.DistrKeeper
 }
+
+func (app *GaiaApp) GetE2eAccountKeeper() e2e.E2eAccountKeeper { //nolint:nolintlint
+	return app.AccountKeeper
+}
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -310,6 +310,8 @@ func NewAppKeeper(
 		appKeepers.SlashingKeeper,
 		appKeepers.AccountKeeper,
 		appKeepers.EvidenceKeeper,
+		appKeepers.DistrKeeper,
+		appKeepers.BankKeeper,
 		authtypes.FeeCollectorName,
 	)
 

diff --git a/app/modules.go b/app/modules.go
@@ -60,6 +60,7 @@ import (
 )
 
 var maccPerms = map[string][]string{
+<<<<<<< HEAD
 	authtypes.FeeCollectorName:     nil,
 	distrtypes.ModuleName:          nil,
 	icatypes.ModuleName:            nil,
@@ -68,6 +69,18 @@ var maccPerms = map[string][]string{
 	stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
 	govtypes.ModuleName:            {authtypes.Burner},
 	ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
+=======
+	authtypes.FeeCollectorName:        nil,
+	distrtypes.ModuleName:             nil,
+	icatypes.ModuleName:               nil,
+	minttypes.ModuleName:              {authtypes.Minter},
+	stakingtypes.BondedPoolName:       {authtypes.Burner, authtypes.Staking},
+	stakingtypes.NotBondedPoolName:    {authtypes.Burner, authtypes.Staking},
+	govtypes.ModuleName:               {authtypes.Burner},
+	liquiditytypes.ModuleName:         {authtypes.Minter, authtypes.Burner},
+	ibctransfertypes.ModuleName:       {authtypes.Minter, authtypes.Burner},
+	providertypes.ConsumerRewardsPool: nil,
+>>>>>>> 82b71bb65 (fix!: revert to ICS v1.1.0-multiden (#2559))
 }
 
 // ModuleBasics defines the module BasicManager is in charge of setting up basic,