Updated Axelar Proxy Contract Features

.golangci.yml

@@ -8,7 +8,7 @@ linters:
   enable:
     - bodyclose
     - deadcode
-    - depguard
+    # - depguard
     - dogsled
     # - errcheck
     - goconst

app/app.go

@@ -98,6 +98,10 @@ import (
 	v4 "github.com/peggyjv/sommelier/v6/app/upgrades/v4"
 	v5 "github.com/peggyjv/sommelier/v6/app/upgrades/v5"
 	v6 "github.com/peggyjv/sommelier/v6/app/upgrades/v6"
+	"github.com/peggyjv/sommelier/v6/x/axelarcork"
+	axelarcorkclient "github.com/peggyjv/sommelier/v6/x/axelarcork/client"
+	axelarcorkkeeper "github.com/peggyjv/sommelier/v6/x/axelarcork/keeper"
+	axelarcorktypes "github.com/peggyjv/sommelier/v6/x/axelarcork/types"
 	"github.com/peggyjv/sommelier/v6/x/cellarfees"
 	cellarfeeskeeper "github.com/peggyjv/sommelier/v6/x/cellarfees/keeper"
 	cellarfeestypes "github.com/peggyjv/sommelier/v6/x/cellarfees/types"
@@ -150,6 +154,14 @@ var (
 			gravityclient.ProposalHandler,
 			corkclient.AddProposalHandler,
 			corkclient.RemoveProposalHandler,
+			axelarcorkclient.AddProposalHandler,
+			axelarcorkclient.RemoveProposalHandler,
+			axelarcorkclient.AddChainConfigurationHandler,
+			axelarcorkclient.RemoveChainConfigurationHandler,
+			axelarcorkclient.ScheduledCorkProposalHandler,
+			axelarcorkclient.CommunityPoolEthereumSpendProposalHandler,
+			axelarcorkclient.UpgradeAxelarProxyContractHandler,
+			axelarcorkclient.CancelAxelarProxyContractUpgradeHandler,
 		),
 		params.AppModuleBasic{},
 		crisis.AppModuleBasic{},
@@ -164,6 +176,7 @@ var (
 		authzmodule.AppModuleBasic{},
 		gravity.AppModuleBasic{},
 		cork.AppModuleBasic{},
+		axelarcork.AppModuleBasic{},
 		cellarfees.AppModuleBasic{},
 		incentives.AppModuleBasic{},
 	)
@@ -228,13 +241,15 @@ type SommelierApp struct {
 
 	// Sommelier keepers
 	CorkKeeper       corkkeeper.Keeper
+	AxelarCorkKeeper axelarcorkkeeper.Keeper
 	CellarFeesKeeper cellarfeeskeeper.Keeper
 	IncentivesKeeper incentiveskeeper.Keeper
 
 	// make capability scoped keepers public for test purposes (IBC only)
-	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
-	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
-	ScopedICAHostKeeper  capabilitykeeper.ScopedKeeper
+	ScopedAxelarCorkKeeper capabilitykeeper.ScopedKeeper
+	ScopedIBCKeeper        capabilitykeeper.ScopedKeeper
+	ScopedTransferKeeper   capabilitykeeper.ScopedKeeper
+	ScopedICAHostKeeper    capabilitykeeper.ScopedKeeper
 
 	// the module manager
 	mm *module.Manager
@@ -288,6 +303,7 @@ func NewSommelierApp(
 		feegrant.StoreKey,
 		authzkeeper.StoreKey,
 		corktypes.StoreKey,
+		axelarcorktypes.StoreKey,
 		incentivestypes.StoreKey,
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -313,6 +329,7 @@ func NewSommelierApp(
 	scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName)
 	scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
 	scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
+	scopedAxelarCorkKeeper := app.CapabilityKeeper.ScopeToModule(axelarcorktypes.ModuleName)
 	app.CapabilityKeeper.Seal()
 
 	// add keepers
@@ -370,8 +387,22 @@ func NewSommelierApp(
 		app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper,
 		app.AccountKeeper, app.BankKeeper, scopedTransferKeeper,
 	)
+
+	// create axelar cork keeper
+	app.AxelarCorkKeeper = axelarcorkkeeper.NewKeeper(
+		appCodec,
+		keys[axelarcorktypes.StoreKey],
+		app.GetSubspace(axelarcorktypes.ModuleName),
+		app.StakingKeeper,
+		app.TransferKeeper,
+		app.DistrKeeper,
+		app.IBCKeeper.ChannelKeeper,
+		app.GravityKeeper,
+	)
 	transferModule := ibctransfer.NewAppModule(app.TransferKeeper)
 	transferIBCModule := ibctransfer.NewIBCModule(app.TransferKeeper)
+	var transferStack ibcporttypes.IBCModule = transferIBCModule
+	transferStack = axelarcork.NewIBCMiddleware(app.AxelarCorkKeeper, transferStack)
 
 	// Create the ICAHost Keeper
 	app.ICAHostKeeper = icahostkeeper.NewKeeper(
@@ -422,6 +453,7 @@ func NewSommelierApp(
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
 		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
 		AddRoute(corktypes.RouterKey, cork.NewUpdateCellarIDsProposalHandler(app.CorkKeeper)).
+		AddRoute(axelarcorktypes.RouterKey, axelarcork.NewProposalHandler(app.AxelarCorkKeeper)).
 		AddRoute(gravitytypes.RouterKey, gravity.NewCommunityPoolEthereumSpendProposalHandler(app.GravityKeeper))
 	app.GovKeeper = govkeeper.NewKeeper(
 		appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
@@ -431,7 +463,7 @@ func NewSommelierApp(
 	// Create static IBC router, add transfer route, then set and seal it
 	ibcRouter := ibcporttypes.NewRouter()
 	ibcRouter.
-		AddRoute(ibctransfertypes.ModuleName, transferIBCModule).
+		AddRoute(ibctransfertypes.ModuleName, transferStack).
 		AddRoute(icahosttypes.SubModuleName, icaHostIBCModule)
 	app.IBCKeeper.SetRouter(ibcRouter)
 
@@ -475,11 +507,12 @@ func NewSommelierApp(
 		ica.NewAppModule(nil, &app.ICAHostKeeper),
 		params.NewAppModule(app.ParamsKeeper),
 		transferModule,
+		axelarcork.NewAppModule(app.AxelarCorkKeeper, appCodec),
 		gravity.NewAppModule(app.GravityKeeper, app.BankKeeper),
 		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		cork.NewAppModule(app.CorkKeeper, appCodec),
-		cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec, app.AccountKeeper, app.BankKeeper),
-		incentives.NewAppModule(app.IncentivesKeeper, app.DistrKeeper, app.BankKeeper, app.MintKeeper, appCodec),
+		cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec),
+		incentives.NewAppModule(app.IncentivesKeeper, appCodec),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -510,6 +543,7 @@ func NewSommelierApp(
 		incentivestypes.ModuleName,
 		gravitytypes.ModuleName,
 		corktypes.ModuleName,
+		axelarcorktypes.ModuleName,
 		cellarfeestypes.ModuleName,
 	)
 
@@ -537,6 +571,7 @@ func NewSommelierApp(
 		incentivestypes.ModuleName,
 		gravitytypes.ModuleName,
 		corktypes.ModuleName,
+		axelarcorktypes.ModuleName,
 		cellarfeestypes.ModuleName,
 	)
 
@@ -568,6 +603,7 @@ func NewSommelierApp(
 		gravitytypes.ModuleName,
 		incentivestypes.ModuleName,
 		corktypes.ModuleName,
+		axelarcorktypes.ModuleName,
 		cellarfeestypes.ModuleName,
 	)
 
@@ -597,8 +633,9 @@ func NewSommelierApp(
 		ibc.NewAppModule(app.IBCKeeper),
 		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		cork.NewAppModule(app.CorkKeeper, appCodec),
-		cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec, app.AccountKeeper, app.BankKeeper),
-		incentives.NewAppModule(app.IncentivesKeeper, app.DistrKeeper, app.BankKeeper, app.MintKeeper, appCodec),
+		axelarcork.NewAppModule(app.AxelarCorkKeeper, appCodec),
+		cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec),
+		incentives.NewAppModule(app.IncentivesKeeper, appCodec),
 	)
 
 	app.sm.RegisterStoreDecoders()
@@ -635,6 +672,7 @@ func NewSommelierApp(
 	app.ScopedIBCKeeper = scopedIBCKeeper
 	app.ScopedTransferKeeper = scopedTransferKeeper
 	app.ScopedICAHostKeeper = scopedICAHostKeeper
+	app.ScopedAxelarCorkKeeper = scopedAxelarCorkKeeper
 
 	return app
 }
@@ -831,6 +869,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(icahosttypes.SubModuleName)
 	paramsKeeper.Subspace(gravitytypes.ModuleName)
 	paramsKeeper.Subspace(corktypes.ModuleName)
+	paramsKeeper.Subspace(axelarcorktypes.ModuleName)
 	paramsKeeper.Subspace(cellarfeestypes.ModuleName)
 	paramsKeeper.Subspace(incentivestypes.ModuleName)