pick up the new nexus Coin and remove axelarnet Coin

axelarnetwork · Sep 23, 2024 · 501f5c3 · 501f5c3
1 parent 1562207
commit 501f5c3
Show file tree

Hide file tree

Showing 10 changed files with 1,299 additions and 516 deletions.
diff --git a/app/app.go b/app/app.go
@@ -310,7 +310,6 @@ func NewAxelarApp(
 			*GetKeeper[axelarnetKeeper.IBCKeeper](keepers),
 			GetKeeper[nexusKeeper.Keeper](keepers),
 			axelarbankkeeper.NewBankKeeper(GetKeeper[bankkeeper.BaseKeeper](keepers)),
-			GetKeeper[authkeeper.AccountKeeper](keepers),
 			logger,
 		),
 	)
@@ -446,12 +445,10 @@ func initMessageRouter(keepers *KeeperCache) nexusTypes.MessageRouter {
 	messageRouter := nexusTypes.NewMessageRouter().
 		AddRoute(evmTypes.ModuleName, evmKeeper.NewMessageRoute()).
 		AddRoute(axelarnetTypes.ModuleName, axelarnetKeeper.NewMessageRoute(
-			*GetKeeper[axelarnetKeeper.Keeper](keepers),
 			GetKeeper[axelarnetKeeper.IBCKeeper](keepers),
 			GetKeeper[feegrantkeeper.Keeper](keepers),
 			axelarbankkeeper.NewBankKeeper(GetKeeper[bankkeeper.BaseKeeper](keepers)),
 			GetKeeper[nexusKeeper.Keeper](keepers),
-			GetKeeper[authkeeper.AccountKeeper](keepers),
 			GetKeeper[stakingkeeper.Keeper](keepers),
 		))
 

diff --git a/x/axelarnet/handler.go b/x/axelarnet/handler.go
@@ -20,8 +20,8 @@ import (
 )
 
 // NewHandler returns the handler of the Cosmos module
-func NewHandler(k keeper.Keeper, n types.Nexus, b types.BankKeeper, a types.AccountKeeper, ibcK keeper.IBCKeeper) sdk.Handler {
-	server := keeper.NewMsgServerImpl(k, n, b, a, ibcK)
+func NewHandler(k keeper.Keeper, n types.Nexus, b types.BankKeeper, ibcK keeper.IBCKeeper) sdk.Handler {
+	server := keeper.NewMsgServerImpl(k, n, b, ibcK)
 	h := func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 		ctx = ctx.WithEventManager(sdk.NewEventManager())
 		switch msg := msg.(type) {

diff --git a/x/axelarnet/keeper/coin.go b/x/axelarnet/keeper/coin.go