refactor(app.go): turn off IBC modules (#2572)

* remove ibc modules * upgrade handler * generate files * lint * add documented TODO
zeta-chain · Jul 28, 2024 · 5e9068a · 5e9068a
1 parent 680cf6a
commit 5e9068a
Show file tree

Hide file tree

Showing 55 changed files with 161 additions and 2,362 deletions.
diff --git a/app/app.go b/app/app.go
diff --git a/app/init_genesis.go b/app/init_genesis.go
@@ -5,7 +5,6 @@ import (
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
@@ -17,33 +16,33 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
 
 	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 	emissionsModuleTypes "github.com/zeta-chain/zetacore/x/emissions/types"
 	fungibleModuleTypes "github.com/zeta-chain/zetacore/x/fungible/types"
-	ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types"
 	lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
 // InitGenesisModuleList returns the module list for genesis initialization
 // NOTE: Capability module must occur first so that it can initialize any capabilities
+// TODO: enable back IBC
+// all commented lines in this function are modules related to IBC
+// https://github.com/zeta-chain/node/issues/2573
 func InitGenesisModuleList() []string {
 	return []string{
-		capabilitytypes.ModuleName,
+		//capabilitytypes.ModuleName,
 		authtypes.ModuleName,
 		banktypes.ModuleName,
 		distrtypes.ModuleName,
 		stakingtypes.ModuleName,
 		slashingtypes.ModuleName,
 		govtypes.ModuleName,
-		ibcexported.ModuleName,
-		ibctransfertypes.ModuleName,
+		//ibcexported.ModuleName,
+		//ibctransfertypes.ModuleName,
 		evmtypes.ModuleName,
 		feemarkettypes.ModuleName,
 		paramstypes.ModuleName,
@@ -54,7 +53,7 @@ func InitGenesisModuleList() []string {
 		vestingtypes.ModuleName,
 		observertypes.ModuleName,
 		crosschaintypes.ModuleName,
-		ibccrosschaintypes.ModuleName,
+		//ibccrosschaintypes.ModuleName,
 		fungibleModuleTypes.ModuleName,
 		emissionsModuleTypes.ModuleName,
 		authz.ModuleName,

diff --git a/app/setup_handlers.go b/app/setup_handlers.go
@@ -9,7 +9,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
@@ -19,14 +18,11 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	"golang.org/x/exp/slices"
 
 	"github.com/zeta-chain/zetacore/pkg/constant"
 	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
 	emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types"
-	ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
@@ -102,18 +98,25 @@ func SetupHandlers(app *App) {
 					return vm, nil
 				},
 			},
-			{
-				index: 1715624665,
-				storeUpgrade: &storetypes.StoreUpgrades{
-					Added: []string{capabilitytypes.ModuleName, ibcexported.ModuleName, ibctransfertypes.ModuleName},
-				},
-			},
-			{
-				index: 1715707436,
-				storeUpgrade: &storetypes.StoreUpgrades{
-					Added: []string{ibccrosschaintypes.ModuleName},
-				},
-			},
+			// TODO: enable back IBC
+			// these commented lines allow for the IBC modules to be added to the upgrade tracker
+			// https://github.com/zeta-chain/node/issues/2573
+			//{
+			//	index: 1715624665,
+			//	storeUpgrade: &storetypes.StoreUpgrades{
+			//		Added: []string{
+			//			capabilitytypes.ModuleName,
+			//			ibcexported.ModuleName,
+			//			ibctransfertypes.ModuleName,
+			//		},
+			//	},
+			//},
+			//{
+			//	index: 1715707436,
+			//	storeUpgrade: &storetypes.StoreUpgrades{
+			//		Added: []string{ibccrosschaintypes.ModuleName},
+			//	},
+			//},
 		},
 		stateFileDir: DefaultNodeHome,
 	}

diff --git a/changelog.md b/changelog.md
@@ -68,6 +68,7 @@
 * [2515](https://github.com/zeta-chain/node/pull/2515) - replace chainName by chainID for ChainNonces indexing
 * [2541](https://github.com/zeta-chain/node/pull/2541) - deprecate ChainName field in Chain object
 * [2542](https://github.com/zeta-chain/node/pull/2542) - adjust permissions to be more restrictive
+* [2572](https://github.com/zeta-chain/node/pull/2572) - turn off IBC modules
 * [2556](https://github.com/zeta-chain/node/pull/2556) - refactor migrator length check to use consensus type
 
 ### Tests

diff --git a/docs/cli/zetacored/zetacored_query.md b/docs/cli/zetacored/zetacored_query.md
@@ -41,8 +41,6 @@ zetacored query [flags]
 * [zetacored query fungible](zetacored_query_fungible.md)	 - Querying commands for the fungible module
 * [zetacored query gov](zetacored_query_gov.md)	 - Querying commands for the governance module
 * [zetacored query group](zetacored_query_group.md)	 - Querying commands for the group module
-* [zetacored query ibc](zetacored_query_ibc.md)	 - Querying commands for the IBC module
-* [zetacored query ibc-transfer](zetacored_query_ibc-transfer.md)	 - IBC fungible token transfer query subcommands
 * [zetacored query lightclient](zetacored_query_lightclient.md)	 - Querying commands for the lightclient module
 * [zetacored query observer](zetacored_query_observer.md)	 - Querying commands for the observer module
 * [zetacored query params](zetacored_query_params.md)	 - Querying commands for the params module
@@ -52,5 +50,4 @@ zetacored query [flags]
 * [zetacored query tx](zetacored_query_tx.md)	 - Query for a transaction by hash, "[addr]/[seq]" combination or comma-separated signatures in a committed block
 * [zetacored query txs](zetacored_query_txs.md)	 - Query for paginated transactions that match a set of events
 * [zetacored query upgrade](zetacored_query_upgrade.md)	 - Querying commands for the upgrade module
-* [zetacored query zetaibccrosschain](zetacored_query_zetaibccrosschain.md)	 - Querying commands for the zetaibccrosschain module
 
diff --git a/docs/cli/zetacored/zetacored_query_ibc-transfer.md b/docs/cli/zetacored/zetacored_query_ibc-transfer.md
diff --git a/docs/cli/zetacored/zetacored_query_ibc-transfer_denom-hash.md b/docs/cli/zetacored/zetacored_query_ibc-transfer_denom-hash.md
diff --git a/docs/cli/zetacored/zetacored_query_ibc-transfer_denom-trace.md b/docs/cli/zetacored/zetacored_query_ibc-transfer_denom-trace.md
diff --git a/docs/cli/zetacored/zetacored_query_ibc-transfer_denom-traces.md b/docs/cli/zetacored/zetacored_query_ibc-transfer_denom-traces.md
diff --git a/docs/cli/zetacored/zetacored_query_ibc-transfer_escrow-address.md b/docs/cli/zetacored/zetacored_query_ibc-transfer_escrow-address.md