Revert "feat: add layer2 crosschain module (#106)"

This reverts commit 179c9eb.

app/keepers/keepers.go

@@ -72,7 +72,6 @@ import (
 	fxtransfer "github.com/functionx/fx-core/v6/x/ibc/applications/transfer"
 	fxtransferkeeper "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/keeper"
 	"github.com/functionx/fx-core/v6/x/ibc/ibcrouter"
-	layer2types "github.com/functionx/fx-core/v6/x/layer2/types"
 	migratekeeper "github.com/functionx/fx-core/v6/x/migrate/keeper"
 	migratetypes "github.com/functionx/fx-core/v6/x/migrate/types"
 	optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types"
@@ -91,7 +90,6 @@ type CrossChainKeepers struct {
 	TronKeeper      tronkeeper.Keeper
 	ArbitrumKeeper  crosschainkeeper.Keeper
 	OptimismKeeper  crosschainkeeper.Keeper
-	Layer2Keeper    crosschainkeeper.Keeper
 }
 
 type AppKeepers struct {
@@ -413,19 +411,6 @@ func NewAppKeeper(
 		appKeepers.AccountKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
-	appKeepers.Layer2Keeper = crosschainkeeper.NewKeeper(
-		appCodec,
-		layer2types.ModuleName,
-		appKeepers.keys[layer2types.StoreKey],
-		appKeepers.StakingKeeper,
-		stakingkeeper.NewMsgServerImpl(appKeepers.StakingKeeper.Keeper),
-		distrkeeper.NewMsgServerImpl(appKeepers.DistrKeeper),
-		appKeepers.BankKeeper,
-		appKeepers.IBCTransferKeeper,
-		appKeepers.Erc20Keeper,
-		appKeepers.AccountKeeper,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	)
 	appKeepers.TronKeeper = tronkeeper.NewKeeper(crosschainkeeper.NewKeeper(
 		appCodec,
 		trontypes.ModuleName,
@@ -449,7 +434,6 @@ func NewAppKeeper(
 		AddRoute(ethtypes.ModuleName, crosschainkeeper.NewModuleHandler(appKeepers.EthKeeper)).
 		AddRoute(arbitrumtypes.ModuleName, crosschainkeeper.NewModuleHandler(appKeepers.ArbitrumKeeper)).
 		AddRoute(optimismtypes.ModuleName, crosschainkeeper.NewModuleHandler(appKeepers.OptimismKeeper)).
-		AddRoute(layer2types.ModuleName, crosschainkeeper.NewModuleHandler(appKeepers.Layer2Keeper)).
 		AddRoute(trontypes.ModuleName, tronkeeper.NewModuleHandler(appKeepers.TronKeeper))
 
 	appKeepers.CrosschainKeeper = crosschainkeeper.NewRouterKeeper(crosschainRouter)
@@ -501,7 +485,6 @@ func NewAppKeeper(
 		AddRoute(avalanchetypes.ModuleName, appKeepers.AvalancheKeeper).
 		AddRoute(arbitrumtypes.ModuleName, appKeepers.ArbitrumKeeper).
 		AddRoute(optimismtypes.ModuleName, appKeepers.OptimismKeeper).
-		AddRoute(layer2types.ModuleName, appKeepers.Layer2Keeper).
 		AddRoute(erc20types.ModuleName, appKeepers.Erc20Keeper)
 	appKeepers.FxTransferKeeper = appKeepers.FxTransferKeeper.SetRouter(*ibcTransferRouter)
 	appKeepers.FxTransferKeeper = appKeepers.FxTransferKeeper.SetRefundHook(appKeepers.Erc20Keeper)

app/keepers/keepers_test.go

@@ -24,7 +24,6 @@ import (
 	bsctypes "github.com/functionx/fx-core/v6/x/bsc/types"
 	erc20types "github.com/functionx/fx-core/v6/x/erc20/types"
 	ethtypes "github.com/functionx/fx-core/v6/x/eth/types"
-	layer2types "github.com/functionx/fx-core/v6/x/layer2/types"
 	optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types"
 	polygontypes "github.com/functionx/fx-core/v6/x/polygon/types"
 	trontypes "github.com/functionx/fx-core/v6/x/tron/types"
@@ -55,7 +54,6 @@ func TestNewAppKeeper(t *testing.T) {
 		trontypes.ModuleName:           {authtypes.Minter, authtypes.Burner},
 		arbitrumtypes.ModuleName:       {authtypes.Minter, authtypes.Burner},
 		optimismtypes.ModuleName:       {authtypes.Minter, authtypes.Burner},
-		layer2types.ModuleName:         {authtypes.Minter, authtypes.Burner},
 		evmtypes.ModuleName:            {authtypes.Minter, authtypes.Burner},
 		erc20types.ModuleName:          {authtypes.Minter, authtypes.Burner},
 	}

app/keepers/keys.go

@@ -31,7 +31,6 @@ import (
 	ethtypes "github.com/functionx/fx-core/v6/x/eth/types"
 	precompilescrosschain "github.com/functionx/fx-core/v6/x/evm/precompiles/crosschain"
 	precompilesstaking "github.com/functionx/fx-core/v6/x/evm/precompiles/staking"
-	layer2types "github.com/functionx/fx-core/v6/x/layer2/types"
 	migratetypes "github.com/functionx/fx-core/v6/x/migrate/types"
 	optimismtypes "github.com/functionx/fx-core/v6/x/optimism/types"
 	polygontypes "github.com/functionx/fx-core/v6/x/polygon/types"
@@ -48,7 +47,7 @@ func (appKeepers *AppKeepers) generateKeys() {
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
 		feegrant.StoreKey, authzkeeper.StoreKey,
 		bsctypes.StoreKey, polygontypes.StoreKey, avalanchetypes.StoreKey, ethtypes.StoreKey, trontypes.StoreKey,
-		arbitrumtypes.ModuleName, optimismtypes.ModuleName, layer2types.ModuleName,
+		arbitrumtypes.ModuleName, optimismtypes.ModuleName,
 		evmtypes.StoreKey, feemarkettypes.StoreKey,
 		erc20types.StoreKey, migratetypes.StoreKey,
 	)
@@ -95,8 +94,7 @@ func (appKeepers *AppKeepers) EvmPrecompiled() {
 		AddRoute(trontypes.ModuleName, appKeepers.TronKeeper).
 		AddRoute(avalanchetypes.ModuleName, appKeepers.AvalancheKeeper).
 		AddRoute(arbitrumtypes.ModuleName, appKeepers.ArbitrumKeeper).
-		AddRoute(optimismtypes.ModuleName, appKeepers.OptimismKeeper).
-		AddRoute(layer2types.ModuleName, appKeepers.Layer2Keeper)
+		AddRoute(optimismtypes.ModuleName, appKeepers.OptimismKeeper)
 	precompiled[precompilescrosschain.GetAddress()] = func(ctx sdk.Context) vm.PrecompiledContract {
 		return precompilescrosschain.NewPrecompiledContract(
 			ctx,

app/modules.go

@@ -62,8 +62,6 @@ import (
 	fxgov "github.com/functionx/fx-core/v6/x/gov"
 	fxibctransfer "github.com/functionx/fx-core/v6/x/ibc/applications/transfer"
 	fxibctransfertypes "github.com/functionx/fx-core/v6/x/ibc/applications/transfer/types"
-	"github.com/functionx/fx-core/v6/x/layer2"
-	layer2types "github.com/functionx/fx-core/v6/x/layer2/types"
 	"github.com/functionx/fx-core/v6/x/migrate"
 	migratetypes "github.com/functionx/fx-core/v6/x/migrate/types"
 	"github.com/functionx/fx-core/v6/x/optimism"
@@ -83,7 +81,6 @@ func init() {
 	crosschaintypes.RegisterValidateBasic(trontypes.ModuleName, trontypes.TronMsgValidate{})
 	crosschaintypes.RegisterValidateBasic(arbitrumtypes.ModuleName, crosschaintypes.MsgValidate{})
 	crosschaintypes.RegisterValidateBasic(optimismtypes.ModuleName, crosschaintypes.MsgValidate{})
-	crosschaintypes.RegisterValidateBasic(layer2types.ModuleName, crosschaintypes.MsgValidate{})
 }
 
 // module account permissions
@@ -102,7 +99,6 @@ var maccPerms = map[string][]string{
 	trontypes.ModuleName:           {authtypes.Minter, authtypes.Burner},
 	arbitrumtypes.ModuleName:       {authtypes.Minter, authtypes.Burner},
 	optimismtypes.ModuleName:       {authtypes.Minter, authtypes.Burner},
-	layer2types.ModuleName:         {authtypes.Minter, authtypes.Burner},
 	evmtypes.ModuleName:            {authtypes.Minter, authtypes.Burner},
 	erc20types.ModuleName:          {authtypes.Minter, authtypes.Burner},
 }
@@ -149,7 +145,6 @@ var ModuleBasics = module.NewBasicManager(
 	tron.AppModuleBasic{},
 	arbitrum.AppModule{},
 	optimism.AppModule{},
-	layer2.AppModule{},
 	fxevm.AppModuleBasic{},
 	feemarket.AppModuleBasic{},
 	erc20.AppModuleBasic{},
@@ -190,7 +185,6 @@ func appModules(
 		tron.NewAppModule(app.TronKeeper, app.GetSubspace(trontypes.ModuleName)),
 		arbitrum.NewAppModule(app.ArbitrumKeeper),
 		optimism.NewAppModule(app.OptimismKeeper),
-		layer2.NewAppModule(app.Layer2Keeper),
 		fxevm.NewAppModule(app.EvmKeeper, app.AccountKeeper, app.LegacyAmino(), app.GetKey(paramstypes.StoreKey), app.GetSubspace(evmtypes.ModuleName)),
 		feemarket.NewAppModule(app.FeeMarketKeeper, app.GetSubspace(feemarkettypes.ModuleName)),
 		erc20.NewAppModule(app.Erc20Keeper, app.GetSubspace(erc20types.ModuleName)),
@@ -229,7 +223,6 @@ func orderBeginBlockers() []string {
 		ethtypes.ModuleName,
 		arbitrumtypes.ModuleName,
 		optimismtypes.ModuleName,
-		layer2types.ModuleName,
 
 		feemarkettypes.ModuleName, // begin
 		evmtypes.ModuleName,       // begin
@@ -268,7 +261,6 @@ func orderEndBlockers() []string {
 		ethtypes.ModuleName,       // end
 		arbitrumtypes.ModuleName,  // end
 		optimismtypes.ModuleName,  // end
-		layer2types.ModuleName,    // end
 
 		evmtypes.ModuleName,       // end
 		feemarkettypes.ModuleName, // end
@@ -307,7 +299,6 @@ func orderInitBlockers() []string {
 		ethtypes.ModuleName,
 		arbitrumtypes.ModuleName,
 		optimismtypes.ModuleName,
-		layer2types.ModuleName,
 
 		feemarkettypes.ModuleName,
 		evmtypes.ModuleName,

app/upgrades/v6/constants.go

@@ -4,15 +4,12 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 
 	"github.com/functionx/fx-core/v6/app/upgrades"
-	layer2types "github.com/functionx/fx-core/v6/x/layer2/types"
 )
 
 var Upgrade = upgrades.Upgrade{
 	UpgradeName:          "v6.0.x",
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: func() *storetypes.StoreUpgrades {
-		return &storetypes.StoreUpgrades{
-			Added: []string{layer2types.ModuleName},
-		}
+		return &storetypes.StoreUpgrades{}
 	},
 }