refactor: merge confirm handler (#695)

app/encoding_test.go

@@ -36,14 +36,14 @@ func TestRegisterInterfaces(t *testing.T) {
 	for interfaceImpls.Next() {
 		count1++
 	}
-	assert.Equal(t, 31, count1)
+	assert.Equal(t, 32, count1)
 
 	implInterfaces := interfaceRegistry.FieldByName("implInterfaces").MapRange()
 	var count2 int
 	for implInterfaces.Next() {
 		count2++
 	}
-	assert.Equal(t, 305, count2)
+	assert.Equal(t, 307, count2)
 
 	typeURLMap := interfaceRegistry.FieldByName("typeURLMap").MapRange()
 	for typeURLMap.Next() {

app/interface_registry.json

@@ -17,6 +17,7 @@
     "cosmos.vesting.v1beta1.VestingAccount",
     "ethermint.evm.v1.TxData",
     "fx.ibc.applications.transfer.v1.MemoPacket",
+    "gravity.v1beta1.Confirm",
     "gravity.v1beta1.ExternalClaim",
     "ibc.core.channel.v1.ChannelI",
     "ibc.core.channel.v1.CounterpartyChannelI",
@@ -225,8 +226,10 @@
     "/fx.gravity.crosschain.v1.MsgCancelSendToExternalResponse",
     "/fx.gravity.crosschain.v1.MsgClaim",
     "/fx.gravity.crosschain.v1.MsgClaimResponse",
+    "/fx.gravity.crosschain.v1.MsgConfirm",
     "/fx.gravity.crosschain.v1.MsgConfirmBatch",
     "/fx.gravity.crosschain.v1.MsgConfirmBatchResponse",
+    "/fx.gravity.crosschain.v1.MsgConfirmResponse",
     "/fx.gravity.crosschain.v1.MsgEditBridger",
     "/fx.gravity.crosschain.v1.MsgEditBridgerResponse",
     "/fx.gravity.crosschain.v1.MsgIncreaseBridgeFee",
@@ -431,6 +434,7 @@
     "/fx.gravity.crosschain.v1.MsgCancelPendingBridgeCall",
     "/fx.gravity.crosschain.v1.MsgCancelSendToExternal",
     "/fx.gravity.crosschain.v1.MsgClaim",
+    "/fx.gravity.crosschain.v1.MsgConfirm",
     "/fx.gravity.crosschain.v1.MsgConfirmBatch",
     "/fx.gravity.crosschain.v1.MsgEditBridger",
     "/fx.gravity.crosschain.v1.MsgIncreaseBridgeFee",

app/keepers/keepers.go

@@ -83,7 +83,6 @@ import (
 	polygontypes "github.com/functionx/fx-core/v8/x/polygon/types"
 	fxstakingkeeper "github.com/functionx/fx-core/v8/x/staking/keeper"
 	stakingprecompile "github.com/functionx/fx-core/v8/x/staking/precompile"
-	tronkeeper "github.com/functionx/fx-core/v8/x/tron/keeper"
 	trontypes "github.com/functionx/fx-core/v8/x/tron/types"
 )
 
@@ -92,7 +91,7 @@ type CrossChainKeepers struct {
 	PolygonKeeper   crosschainkeeper.Keeper
 	AvalancheKeeper crosschainkeeper.Keeper
 	EthKeeper       crosschainkeeper.Keeper
-	TronKeeper      tronkeeper.Keeper
+	TronKeeper      crosschainkeeper.Keeper
 	ArbitrumKeeper  crosschainkeeper.Keeper
 	OptimismKeeper  crosschainkeeper.Keeper
 	Layer2Keeper    crosschainkeeper.Keeper
@@ -466,7 +465,7 @@ func NewAppKeeper(
 		appKeepers.EvmKeeper,
 		authAddr,
 	)
-	appKeepers.TronKeeper = tronkeeper.NewKeeper(crosschainkeeper.NewKeeper(
+	appKeepers.TronKeeper = crosschainkeeper.NewKeeper(
 		appCodec,
 		trontypes.ModuleName,
 		appKeepers.keys[trontypes.StoreKey],
@@ -479,7 +478,7 @@ func NewAppKeeper(
 		appKeepers.AccountKeeper,
 		appKeepers.EvmKeeper,
 		authAddr,
-	))
+	)
 
 	// add cross-chain router
 	crosschainRouter := crosschainkeeper.NewRouter()
@@ -491,7 +490,7 @@ func NewAppKeeper(
 		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))
+		AddRoute(trontypes.ModuleName, crosschainkeeper.NewModuleHandler(appKeepers.TronKeeper))
 
 	appKeepers.CrosschainRouterKeeper = crosschainkeeper.NewRouterKeeper(crosschainRouter)
 
@@ -504,7 +503,7 @@ func NewAppKeeper(
 		AddRoute(arbitrumtypes.ModuleName, appKeepers.ArbitrumKeeper).
 		AddRoute(optimismtypes.ModuleName, appKeepers.OptimismKeeper).
 		AddRoute(layer2types.ModuleName, appKeepers.Layer2Keeper).
-		AddRoute(trontypes.ModuleName, appKeepers.TronKeeper.Keeper)
+		AddRoute(trontypes.ModuleName, appKeepers.TronKeeper)
 
 	// register the proposal types
 	govRouter := govv1beta1.NewRouter()