Update the disabled alliance

.github/workflows/lint.yml

@@ -18,9 +18,9 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: 1.20.0
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: latest
+          version: v1.52.2

Makefile

@@ -99,7 +99,10 @@ test-e2e:
 test-benchmark:
 	@VERSION=$(VERSION) go test -v -mod=readonly -tags='ledger test_ledger_mock' github.com/terra-money/alliance/x/alliance/tests/benchmark
 
-.PHONY: test test-unit test-e2e test-benchmark
+test-simulate:
+	@VERSION=$(VERSION) go test -v -run=TestFullAppSimulation ./app -NumBlocks 200 -BlockSize 10 -Commit -Enabled -Period 1
+
+.PHONY: test test-unit test-e2e test-benchmark test-simulate
 ###############################################################################
 ###                                Linting                                  ###
 ###############################################################################
@@ -115,7 +118,7 @@ lint: format-tools
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "*.pb.go" -not -path "*pb.gw.go" | xargs gofumpt -d
 
 lint-docker:
-	docker run --rm -v $(PWD):/app -w /app golangci/golangci-lint:v1.52.2-alpine golangci-lint run
+	docker run --rm -v $(PWD):/app -w /app golangci/golangci-lint:v1.52.2-alpine golangci-lint run --timeout 10m
 
 format: format-tools
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "*.pb.go" -not -path "*pb.gw.go" | xargs gofumpt -w
@@ -131,6 +134,10 @@ proto-gen:
 	@echo "Generating Protobuf files"
 	$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(PROTO_BUILDER_IMAGE) sh ./scripts/protocgen.sh
 
+buf-push:
+	@echo "Pushing protobuf files to buf registry"
+	cd proto && buf push
+
 ###############################################################################
 ###                                Local Testnet (docker)                   ###
 ###############################################################################

README.md

@@ -2,12 +2,11 @@
 <h1 align="center"> 🤝 Alliance</h1>
 
 <p align="center">
-  <a href="https://alliance.terra.money/">Technical Documentation</a>
+  <a href="https://docs.alliance.terra.money/">Technical Documentation</a>
   ·
-  <a href="https://alliance.terra.money/guides/get-started">Integration Guide</a>
+  <a href="https://docs.alliance.terra.money/guides/get-started">Integration Guide</a>
   ·
-    <a href="https://alliance.terra.money/alliance-audit.pdf">Code Audit</a>
-
+  <a href="https://github.com/terra-money/alliance/blob/main/audit/alliance-audit-v1.0.pdf">Code Audit</a>
 </p>
 
 <br/>
@@ -20,35 +19,35 @@ Alliance is an open-source Cosmos SDK module that leverages interchain staking t
 
 ### Here’s how it works:
 
-- Two chains [integrate the Alliance module](https://alliance.terra.money/guides/get-started) and decide through governance which assets can be staked on their chain. These are known as [Alliance assets](https://alliance.terra.money/alliance#what-are-alliance-assets). 
-- Each Alliance asset is assigned a [Take Rate](https://alliance.terra.money/alliance#the-take-rate) (the percentage of staked Alliance assets the chain redistributes to native chain stakers) and a [Reward Weight](https://alliance.terra.money/alliance#rewards) (the percentage of native staking rewards the chain distributes to Alliance asset stakers).
-- Users of each chain can then [bridge their assets via IBC](https://alliance.terra.money/alliance#what-are-alliance-assets) to the other chain and stake them to earn the Reward Weight. 
+- Two chains [integrate the Alliance module](https://docs.alliance.terra.money/guides/get-started) and decide through governance which assets can be staked on their chain. These are known as [Alliance assets](https://docs.alliance.terra.money/alliance#what-are-alliance-assets). 
+- Each Alliance asset is assigned a [Take Rate](https://docs.alliance.terra.money/alliance#the-take-rate) (the percentage of staked Alliance assets the chain redistributes to native chain stakers) and a [Reward Weight](https://docs.alliance.terra.money/alliance#rewards) (the percentage of native staking rewards the chain distributes to Alliance asset stakers).
+- Users of each chain can then [bridge their assets via IBC](https://docs.alliance.terra.money/alliance#what-are-alliance-assets) to the other chain and stake them to earn the Reward Weight. 
 
 ## Tech Specs
 
-[The Alliance Docs](https://alliance.terra.money/) contain detailed information about Alliance. Familiarize yourself with the following concepts before integrating the Alliance module. 
+[The Alliance Docs](https://docs.alliance.terra.money/) contain detailed information about Alliance. Familiarize yourself with the following concepts before integrating the Alliance module. 
 
 - About Alliance
-    - [Overview](https://alliance.terra.money/overview)
-    - [How Alliance works](https://alliance.terra.money/alliance)
-    - [Alliance staking](https://alliance.terra.money/concepts/staking)
-    - [Reward distribution](https://alliance.terra.money/concepts/rewards)
-    - [Validator shares](https://alliance.terra.money/concepts/delegation)
+    - [Overview](https://docs.alliance.terra.money/overview)
+    - [How Alliance works](https://docs.alliance.terra.money/alliance)
+    - [Alliance staking](https://docs.alliance.terra.money/concepts/staking)
+    - [Reward distribution](https://docs.alliance.terra.money/concepts/rewards)
+    - [Validator shares](https://docs.alliance.terra.money/concepts/delegation)
 - Guides
-    - [Integrate the Alliance module](https://alliance.terra.money/guides/get-started)
-    - [Create, update, or delete an Alliance](https://alliance.terra.money/guides/create)
-    - [Interact with an Alliance](https://alliance.terra.money/guides/how-to)
+    - [Integrate the Alliance module](https://docs.alliance.terra.money/guides/get-started)
+    - [Create, update, or delete an Alliance](https://docs.alliance.terra.money/guides/create)
+    - [Interact with an Alliance](https://docs.alliance.terra.money/guides/how-to)
 - Technical specifications:
-    - [Module parameters](https://alliance.terra.money/tech/parameters) and [Alliance asset properties](https://alliance.terra.money/tech/asset)
-    - [Txs and queries](https://alliance.terra.money/tech/tx-queries)
-    - [Data structures](https://alliance.terra.money/tech/data)
-    - [State transitions](https://alliance.terra.money/tech/transitions)
-    - [Invariants](https://alliance.terra.money/tech/invariants)
-    - [Benchmarks](https://alliance.terra.money/tech/benchmarks)
+    - [Module parameters](https://docs.alliance.terra.money/tech/parameters) and [Alliance asset properties](https://alliance.terra.money/tech/asset)
+    - [Txs and queries](https://docs.alliance.terra.money/tech/tx-queries)
+    - [Data structures](https://docs.alliance.terra.money/tech/data)
+    - [State transitions](https://docs.alliance.terra.money/tech/transitions)
+    - [Invariants](https://docs.alliance.terra.money/tech/invariants)
+    - [Benchmarks](https://docs.alliance.terra.money/tech/benchmarks)
 
 ## Integrate the `x/alliance` module
 
-The Alliance module can be [added to any compatible Cosmos chain](https://alliance.terra.money/guides/get-started) and does not require any changes to consensus or major changes to common core modules. This module wraps around a chain’s native staking module, allowing whitelisted assets to be staked and earn rewards. Alliance assets can be staked with the Alliance module, and the chain's native staking module is used for native stakers. 
+The Alliance module can be [added to any compatible Cosmos chain](https://docs.alliance.terra.money/guides/get-started) and does not require any changes to consensus or major changes to common core modules. This module wraps around a chain’s native staking module, allowing whitelisted assets to be staked and earn rewards. Alliance assets can be staked with the Alliance module, and the chain's native staking module is used for native stakers. 
 
 Chains that want to add `x/alliance` must enable the following modules:
 
@@ -59,7 +58,14 @@ Chains that want to add `x/alliance` must enable the following modules:
 - [x/distribution](https://github.com/cosmos/cosmos-sdk/blob/main/x/distribution/README.md)
 - [x/gov](https://github.com/cosmos/cosmos-sdk/blob/main/x/gov/README.md)
 
-For an in-depth guide on integrating `x/alliance`, visit the [Alliance Module Integration Guide](https://alliance.terra.money/guides/get-started). 
+Compatibility matrix:
+
+| Release | Branch         | CosmosSDK |
+|---------|----------------|-----------|
+| v0.2.0  | release/v0.2.x | 0.47      |
+| v0.1.0  | release/v0.1.x | 0.46      |
+
+For an in-depth guide on integrating `x/alliance`, visit the [Alliance Module Integration Guide](https://docs.alliance.terra.money/guides/get-started). 
 
 ## Development environment
 

app/app.go

@@ -156,8 +156,8 @@ var (
 	// and genesis verification.
 	ModuleBasics = module.NewBasicManager(
 		auth.AppModuleBasic{},
+		genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator),
 		authzmodule.AppModuleBasic{},
-		genutil.AppModuleBasic{},
 		bank.AppModuleBasic{},
 		capability.AppModuleBasic{},
 		staking.AppModuleBasic{},
@@ -436,11 +436,12 @@ func New(
 	app.AllianceKeeper = alliancemodulekeeper.NewKeeper(
 		appCodec,
 		keys[alliancemoduletypes.StoreKey],
-		app.GetSubspace(alliancemoduletypes.ModuleName),
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.StakingKeeper,
 		app.DistrKeeper,
+		authtypes.FeeCollectorName,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
 	app.BankKeeper.RegisterKeepers(app.AllianceKeeper, app.StakingKeeper)
@@ -573,7 +574,7 @@ func New(
 		params.NewAppModule(app.ParamsKeeper),
 		transferModule,
 		icaModule,
-		alliancemodule.NewAppModule(appCodec, app.AllianceKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
+		alliancemodule.NewAppModule(appCodec, app.AllianceKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry, app.GetSubspace(alliancemoduletypes.ModuleName)),
 		// this line is used by starport scaffolding # stargate/app/appModule
 	)
 
@@ -880,21 +881,23 @@ func GetMaccPerms() map[string][]string {
 }
 
 // initParamsKeeper init params keeper and its subspaces
+//
+//nolint:staticcheck // ParamsKeyTable is deprecated but used here for migration
 func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper {
 	paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey)
 
-	paramsKeeper.Subspace(authtypes.ModuleName)
-	paramsKeeper.Subspace(banktypes.ModuleName)
-	paramsKeeper.Subspace(stakingtypes.ModuleName)
-	paramsKeeper.Subspace(minttypes.ModuleName)
-	paramsKeeper.Subspace(distrtypes.ModuleName)
-	paramsKeeper.Subspace(slashingtypes.ModuleName)
-	paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) //nolint:staticcheck
-	paramsKeeper.Subspace(crisistypes.ModuleName)
+	paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable())
+	paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable())
+	paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable())
+	paramsKeeper.Subspace(minttypes.ModuleName).WithKeyTable(minttypes.ParamKeyTable())
+	paramsKeeper.Subspace(distrtypes.ModuleName).WithKeyTable(distrtypes.ParamKeyTable())
+	paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable())
+	paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable())
+	paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable())
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(ibcexported.ModuleName)
 	paramsKeeper.Subspace(icahosttypes.SubModuleName)
-	paramsKeeper.Subspace(alliancemoduletypes.ModuleName)
+	paramsKeeper.Subspace(alliancemoduletypes.ModuleName).WithKeyTable(alliancemoduletypes.ParamKeyTable())
 	// this line is used by starport scaffolding # stargate/app/paramSubspace
 
 	return paramsKeeper

app/simulation_test.go

@@ -4,38 +4,86 @@ import (
 	"os"
 	"testing"
 
-	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	"github.com/cosmos/cosmos-sdk/codec"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
-	simulationtypes "github.com/cosmos/cosmos-sdk/types/simulation"
+	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/terra-money/alliance/app"
 )
 
-// SimAppChainID hardcoded chainID for simulation
-const SimAppChainID = "simulation-app"
+// Hardcoded chainID for simulation.
+const (
+	simulationAppChainID = "simulation-app"
+	simulationDirPrefix  = "leveldb-app-sim"
+	simulationDBName     = "Simulation"
+)
 
 func init() {
 	simcli.GetSimulatorFlags()
 }
 
-type SimApp interface {
-	app.App
-	GetBaseApp() *baseapp.BaseApp
-	AppCodec() codec.Codec
-	SimulationManager() *module.SimulationManager
-	ModuleAccountAddrs() map[string]bool
-	Name() string
-	LegacyAmino() *codec.LegacyAmino
-	BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock
-	EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock
-	InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain
+// Running as a go test:
+//
+// go test -v -run=TestFullAppSimulation ./app -NumBlocks 200 -BlockSize 10 -Commit -Enabled -Period 1
+func TestFullAppSimulation(t *testing.T) {
+	config := simcli.NewConfigFromFlags()
+	config.ChainID = simulationAppChainID
+
+	if !simcli.FlagEnabledValue {
+		t.Skip("skipping application simulation")
+	}
+
+	db, dir, logger, _, err := simtestutil.SetupSimulation(
+		config,
+		simulationDirPrefix,
+		simulationDBName,
+		simcli.FlagVerboseValue,
+		true, // Don't use this as it is confusing
+	)
+	require.NoError(t, err, "simulation setup failed")
+
+	defer func() {
+		require.NoError(t, db.Close())
+		require.NoError(t, os.RemoveAll(dir))
+	}()
+
+	app := app.New(logger,
+		db,
+		nil,
+		true,
+		map[int64]bool{},
+		app.DefaultNodeHome,
+		simcli.FlagPeriodValue,
+		app.MakeTestEncodingConfig(),
+		simtestutil.EmptyAppOptions{},
+		baseapp.SetChainID(simulationAppChainID),
+	)
+
+	// run randomized simulation
+	_, simParams, simErr := simulation.SimulateFromSeed(
+		t,
+		os.Stdout,
+		app.BaseApp,
+		simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager(), app.DefaultGenesis()),
+		simtypes.RandomAccounts,
+		simtestutil.SimulationOperations(app, app.AppCodec(), config),
+		app.BankKeeper.GetBlockedAddresses(),
+		config,
+		app.AppCodec(),
+	)
+
+	// export state and simParams before the simulatino error is checked
+	err = simtestutil.CheckExportSimulation(app, config, simParams)
+	require.NoError(t, err)
+	require.NoError(t, simErr)
+
+	if config.Commit {
+		simtestutil.PrintStats(db)
+	}
 }
 
 // BenchmarkSimulation run the chain simulation
@@ -61,8 +109,7 @@ func BenchmarkSimulation(b *testing.B) {
 
 	encoding := app.MakeTestEncodingConfig()
 
-	simApp := app.New(
-		logger,
+	app := app.New(logger,
 		db,
 		nil,
 		true,
@@ -77,17 +124,17 @@ func BenchmarkSimulation(b *testing.B) {
 	_, simParams, simErr := simulation.SimulateFromSeed(
 		b,
 		os.Stdout,
-		simApp.GetBaseApp(),
-		simtestutil.AppStateFn(simApp.AppCodec(), simApp.SimulationManager(), simApp.DefaultGenesis()),
-		simulationtypes.RandomAccounts,
-		simtestutil.SimulationOperations(simApp, simApp.AppCodec(), config),
-		simApp.ModuleAccountAddrs(),
+		app.GetBaseApp(),
+		simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager(), app.DefaultGenesis()),
+		simtypes.RandomAccounts,
+		simtestutil.SimulationOperations(app, app.AppCodec(), config),
+		app.ModuleAccountAddrs(),
 		config,
-		simApp.AppCodec(),
+		app.AppCodec(),
 	)
 
 	// export state and simParams before the simulation error is checked
-	err = simtestutil.CheckExportSimulation(simApp, config, simParams)
+	err = simtestutil.CheckExportSimulation(app, config, simParams)
 	require.NoError(b, err)
 	require.NoError(b, simErr)