feat: interachain sudo callback refactoring

app/app.go

@@ -563,7 +563,7 @@ func New(
 		app.BankKeeper,
 		scopedTransferKeeper,
 		app.FeeKeeper,
-		app.ContractManagerKeeper,
+		contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper),
 	)
 
 	app.RouterKeeper.SetTransferKeeper(app.TransferKeeper.Keeper)
@@ -660,8 +660,10 @@ func New(
 		memKeys[interchaintxstypes.MemStoreKey],
 		app.IBCKeeper.ChannelKeeper,
 		app.ICAControllerKeeper,
-		app.ContractManagerKeeper,
+		contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper),
 		app.FeeKeeper,
+		app.BankKeeper,
+		app.FeeBurnerKeeper,
 	)
 
 	app.CronKeeper = *cronkeeper.NewKeeper(appCodec, keys[crontypes.StoreKey], keys[crontypes.MemStoreKey], app.AccountKeeper)
@@ -699,7 +701,10 @@ func New(
 	if len(enabledProposals) != 0 {
 		app.AdminmoduleKeeper.Router().AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals))
 	}
-	transferIBCModule := transferSudo.NewIBCModule(app.TransferKeeper)
+	transferIBCModule := transferSudo.NewIBCModule(
+		app.TransferKeeper,
+		contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper),
+	)
 	// receive call order: wasmHooks#OnRecvPacketOverride(transferIbcModule#OnRecvPacket())
 	ibcHooksMiddleware := ibchooks.NewIBCMiddleware(&transferIBCModule, &app.HooksICS4Wrapper)
 	app.HooksTransferIBCModule = &ibcHooksMiddleware

app/upgrades/sdk47/upgrades.go

@@ -135,7 +135,7 @@ func migrateCronParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, store
 func migrateFeeRefunderParams(ctx sdk.Context, paramsKeepers paramskeeper.Keeper, storeKey storetypes.StoreKey, codec codec.Codec) error {
 	store := ctx.KVStore(storeKey)
 	var currParams feerefundertypes.Params
-	subspace, _ := paramsKeepers.GetSubspace(crontypes.StoreKey)
+	subspace, _ := paramsKeepers.GetSubspace(feerefundertypes.StoreKey)
 	subspace.GetParamSet(ctx, &currParams)
 
 	if err := currParams.Validate(); err != nil {
@@ -197,6 +197,7 @@ func migrateInterchainTxsParams(ctx sdk.Context, paramsKeepers paramskeeper.Keep
 	var currParams interchaintxstypes.Params
 	subspace, _ := paramsKeepers.GetSubspace(interchaintxstypes.StoreKey)
 	subspace.GetParamSet(ctx, &currParams)
+	currParams.RegisterFee = interchaintxstypes.DefaultRegisterFee
 
 	if err := currParams.Validate(); err != nil {
 		return err

proto/neutron/contractmanager/failure.proto

@@ -13,10 +13,6 @@ message Failure {
   string address = 1;
   // Id of the failure under specific address
   uint64 id = 2;
-  // Acknowledgement type
-  string ack_type = 3;
-  // IBC Packet
-  ibc.core.channel.v1.Packet packet = 4;
-  // Acknowledgement
-  ibc.core.channel.v1.Acknowledgement ack = 5;
+  // Serialized MessageSudoCallback with Packet and Ack(if exists)
+  bytes sudo_payload = 3;
 }

proto/neutron/interchaintxs/v1/params.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package neutron.interchaintxs;
 
 import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types";
 
@@ -10,4 +11,6 @@ message Params {
   option (gogoproto.goproto_stringer) = false;
   // Defines maximum amount of messages to be passed in MsgSubmitTx
   uint64 msg_submit_tx_max_messages = 1;
+  // Defines a minimum fee required to register interchain account
+  repeated cosmos.base.v1beta1.Coin register_fee = 2 [ (gogoproto.nullable) = false ];
 }

proto/neutron/interchaintxs/v1/tx.proto

@@ -4,6 +4,7 @@ package neutron.interchaintxs.v1;
 option go_package = "github.com/neutron-org/neutron/x/interchaintxs/types";
 
 import "cosmos_proto/cosmos.proto";
+import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 import "google/api/http.proto";
 import "google/api/annotations.proto";
@@ -26,6 +27,10 @@ message MsgRegisterInterchainAccount {
   string connection_id = 2 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ];
   string interchain_account_id = 3
       [ (gogoproto.moretags) = "yaml:\"interchain_account_id\"" ];
+  repeated cosmos.base.v1beta1.Coin register_fee = 4 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
 }
 
 // MsgRegisterInterchainAccountResponse is the response type for

testutil/interchaintxs/keeper/interchaintxs.go

@@ -17,7 +17,14 @@ import (
 	"github.com/neutron-org/neutron/x/interchaintxs/types"
 )
 
-func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper, refunderKeeper types.FeeRefunderKeeper, icaControllerKeeper types.ICAControllerKeeper, channelKeeper types.ChannelKeeper) (*keeper.Keeper, sdk.Context, *storetypes.KVStoreKey) {
+func InterchainTxsKeeper(
+	t testing.TB,
+	managerKeeper types.WasmKeeper,
+	refunderKeeper types.FeeRefunderKeeper,
+	icaControllerKeeper types.ICAControllerKeeper,
+	channelKeeper types.ChannelKeeper,
+	bankKeeper types.BankKeeper,
+	feeburnerKeeper types.FeeBurnerKeeper) (*keeper.Keeper, sdk.Context) {
 	storeKey := sdk.NewKVStoreKey(types.StoreKey)
 	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
 
@@ -38,6 +45,8 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper
 		icaControllerKeeper,
 		managerKeeper,
 		refunderKeeper,
+		bankKeeper,
+		feeburnerKeeper,
 	)
 
 	ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger())
@@ -46,5 +55,5 @@ func InterchainTxsKeeper(t testing.TB, managerKeeper types.ContractManagerKeeper
 	err := k.SetParams(ctx, types.DefaultParams())
 	require.NoError(t, err)
 
-	return k, ctx, storeKey
+	return k, ctx
 }

testutil/interchaintxs/keeper/sudo_middleware.go

@@ -0,0 +1,27 @@
+package keeper
+
+import (
+	tmdb "github.com/cometbft/cometbft-db"
+	"github.com/cometbft/cometbft/libs/log"
+	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	"github.com/cosmos/cosmos-sdk/store"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/neutron-org/neutron/x/contractmanager"
+	"github.com/neutron-org/neutron/x/contractmanager/types"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func NewSudoLimitWrapper(t testing.TB, cmKeeper types.ContractManagerKeeper, wasmKeeper types.WasmKeeper) (types.WasmKeeper, sdk.Context, *storetypes.KVStoreKey) {
+	storeKey := sdk.NewKVStoreKey(types.StoreKey)
+	db := tmdb.NewMemDB()
+	stateStore := store.NewCommitMultiStore(db)
+	stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db)
+	require.NoError(t, stateStore.LoadLatestVersion())
+
+	limitWrapper := contractmanager.NewSudoLimitWrapper(cmKeeper, wasmKeeper)
+	ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger())
+
+	return limitWrapper, ctx, storeKey
+}