feat: Register all contracts in IBCv2 port router

Author: kulikthebird

app/app.go

@@ -875,6 +875,10 @@ func NewWasmApp(
 		if err := app.WasmKeeper.InitializePinnedCodes(ctx); err != nil {
 			panic(fmt.Sprintf("failed initialize pinned codes %s", err))
 		}
+
+		// TODO: Remove the registration of each contract in https://github.com/CosmWasm/wasmd/issues/2278
+		//       and add IBCv2 port ID prefix before calling `SetRouterV2` during WasmKeeper creation.
+		app.WasmKeeper.RegisterContractsInIbc2Router(ctx)
 	}
 
 	return app

x/wasm/keeper/genesis_test.go

@@ -13,6 +13,7 @@ import (
 	abci "github.com/cometbft/cometbft/abci/types"
 	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	dbm "github.com/cosmos/cosmos-db"
+	ibcapi "github.com/cosmos/ibc-go/v10/modules/core/api"
 	fuzz "github.com/google/gofuzz"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -698,7 +699,7 @@ func setupKeeper(t *testing.T) (*Keeper, sdk.Context) {
 		types.VMConfig{},
 		AvailableCapabilities,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-		nil,
+		ibcapi.NewRouter(),
 	)
 	return &srcKeeper, ctx
 }

x/wasm/keeper/keeper.go

@@ -382,7 +382,7 @@ func (k Keeper) instantiate(
 	ibc2Port := PortIDForContractV2(contractAddress)
 	contractInfo.IBC2PortID = ibc2Port
 
-	// TODO: Remove AddRoute in https://github.com/CosmWasm/wasmd/issues/2144
+	// TODO: Remove the registration of each contract in https://github.com/CosmWasm/wasmd/issues/2278
 	if !k.ibcRouterV2.HasRoute(ibc2Port) {
 		k.ibcRouterV2.AddRoute(ibc2Port, NewIBC2Handler(k))
 	}
@@ -1091,6 +1091,13 @@ func (k Keeper) importContractState(ctx context.Context, contractAddress sdk.Acc
 		}
 		prefixStore.Set(model.Key, model.Value)
 	}
+
+	// TODO: Remove the registration of each contract in https://github.com/CosmWasm/wasmd/issues/2278
+	contractPortIBC2ID := PortIDForContractV2(contractAddress)
+	if !k.ibcRouterV2.HasRoute(contractPortIBC2ID) {
+		k.ibcRouterV2.AddRoute(contractPortIBC2ID, NewIBC2Handler(k))
+	}
+
 	return nil
 }
 
@@ -1132,6 +1139,24 @@ func (k Keeper) IterateCodeInfos(ctx context.Context, cb func(uint64, types.Code
 	}
 }
 
+// TODO: Remove the registration of each contract in https://github.com/CosmWasm/wasmd/issues/2278 (remove this method)
+func (k Keeper) IterateContractAddresses(ctx context.Context, cb func(sdk.AccAddress)) {
+	prefixStore := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.ContractKeyPrefix)
+	iter := prefixStore.Iterator(nil, nil)
+	defer iter.Close()
+
+	for ; iter.Valid(); iter.Next() {
+		cb(iter.Key())
+	}
+}
+
+// TODO: Remove the registration of each contract in https://github.com/CosmWasm/wasmd/issues/2278 (remove this method)
+func (k Keeper) RegisterContractsInIbc2Router(ctx context.Context) {
+	k.IterateContractAddresses(ctx, func(contractAddr sdk.AccAddress) {
+		k.ibcRouterV2.AddRoute(PortIDForContractV2(contractAddr), NewIBC2Handler(k))
+	})
+}
+
 func (k Keeper) GetByteCode(ctx context.Context, codeID uint64) ([]byte, error) {
 	store := k.storeService.OpenKVStore(ctx)
 	var codeInfo types.CodeInfo