feat: adding x/cwica module

.github/workflows/interchaintest.yaml

@@ -138,4 +138,37 @@ jobs:
           - name: Run chain conformance test
             run: |
               cd interchaintest
-              go test -v -race -run  TestGaiaConformance
+              go test -v -race -run  TestGaiaConformance
+
+    cwica_tests:
+      name: Interchain transactions test
+      needs: [build_images]
+      runs-on: ubuntu-latest
+
+      steps:
+        - name: Checkout archway-network/archway/interchaintest
+          uses: actions/checkout@v3
+          with:
+            fetch-depth: 0
+            sparse-checkout: interchaintest
+
+        - name: Setup up Golang
+          uses: actions/setup-go@v4
+          with:
+            go-version-file: 'interchaintest/go.mod'
+
+        - name: Setup Docker Buildx
+          uses: docker/setup-buildx-action@v2
+
+        - name: Download current image
+          uses: actions/download-artifact@v3
+          with:
+            name: action_image_artifact_archway_local
+
+        - name: Load current image
+          run: docker load --input archway_local
+
+        - name: Run interchain transactions test
+          run: |
+            cd interchaintest
+            go test -v -race -run  TestCWICA

CHANGELOG.md

@@ -38,6 +38,7 @@ Contains all the PRs that improved the code without changing the behaviors.
 - [#532](https://github.com/archway-network/archway/pull/532) - Adding ADR-009 for x/callback module
 - [#527](https://github.com/archway-network/archway/pull/527) - Add x/cwfees module.
 - [#541](https://github.com/archway-network/archway/pull/541) - Update the interchaintest framework to v7
+- [#542](https://github.com/archway-network/archway/pull/542) - Adding x/cwica module
 - [#543](https://github.com/archway-network/archway/pull/543) - Bumping sdk to v0.47.9
 - [#544](https://github.com/archway-network/archway/pull/544) - Bumping sdk to v0.47.10
 

Makefile

@@ -196,8 +196,8 @@ proto-gen:
 proto-format:
 	@echo "Formatting Protobuf files"
 	$(DOCKER) run --rm -v $(CURDIR):/workspace \
-	--workdir /workspace $(PROTO_FORMATTER_IMAGE) \
-	find ./ -not -path "./third_party/*" -name *.proto -exec clang-format -i {} \;
+	--workdir /workspace $(PROTO_BUILDER_IMAGE) \
+	find ./ -name *.proto -exec clang-format -i {} \;
 
 proto-swagger-gen:
 	@echo "Generating Protobuf Swagger files"

app/app.go

@@ -101,6 +101,9 @@ import (
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"
+	icacontroller "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller"
+	icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper"
+	icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
 	icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host"
 	icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper"
 	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
@@ -136,6 +139,10 @@ import (
 	trackingKeeper "github.com/archway-network/archway/x/tracking/keeper"
 	trackingTypes "github.com/archway-network/archway/x/tracking/types"
 
+	cwica "github.com/archway-network/archway/x/cwica"
+	cwicakeeper "github.com/archway-network/archway/x/cwica/keeper"
+	cwicatypes "github.com/archway-network/archway/x/cwica/types"
+
 	"github.com/CosmWasm/wasmd/x/wasm"
 
 	archwayappparams "github.com/archway-network/archway/app/params"
@@ -209,6 +216,7 @@ var (
 		genmsg.AppModule{},
 		callback.AppModuleBasic{},
 		cwfees.AppModule{},
+		cwica.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -304,7 +312,7 @@ func NewArchwayApp(
 		govtypes.StoreKey, paramstypes.StoreKey, ibcexported.StoreKey, upgradetypes.StoreKey,
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
 		feegrant.StoreKey, authzkeeper.StoreKey, wasmdTypes.StoreKey, consensusparamtypes.StoreKey,
-		icahosttypes.StoreKey, ibcfeetypes.StoreKey, crisistypes.StoreKey, group.StoreKey, nftkeeper.StoreKey,
+		icacontrollertypes.StoreKey, icahosttypes.StoreKey, ibcfeetypes.StoreKey, crisistypes.StoreKey, group.StoreKey, nftkeeper.StoreKey, cwicatypes.StoreKey,
 
 		trackingTypes.StoreKey, rewardsTypes.StoreKey, callbackTypes.StoreKey, cwfees.ModuleName,
 	)
@@ -342,6 +350,7 @@ func NewArchwayApp(
 	)
 
 	scopedIBCKeeper := app.Keepers.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName)
+	scopedICAControllerKeeper := app.Keepers.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
 	scopedICAHostKeeper := app.Keepers.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
 	scopedTransferKeeper := app.Keepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
 	scopedWasmKeeper := app.Keepers.CapabilityKeeper.ScopeToModule(wasmdTypes.ModuleName)
@@ -469,6 +478,17 @@ func NewArchwayApp(
 
 	transferModule := transfer.NewAppModule(app.Keepers.TransferKeeper)
 
+	app.Keepers.ICAControllerKeeper = icacontrollerkeeper.NewKeeper(
+		appCodec,
+		keys[icacontrollertypes.StoreKey],
+		app.getSubspace(icacontrollertypes.SubModuleName),
+		app.Keepers.IBCKeeper.ChannelKeeper,
+		app.Keepers.IBCKeeper.ChannelKeeper,
+		&app.Keepers.IBCKeeper.PortKeeper,
+		scopedICAControllerKeeper,
+		app.MsgServiceRouter(),
+	)
+
 	app.Keepers.ICAHostKeeper = icahostkeeper.NewKeeper(
 		appCodec,
 		keys[icahosttypes.StoreKey],
@@ -576,11 +596,27 @@ func NewArchwayApp(
 
 	app.Keepers.CWFeesKeeper = cwfees.NewKeeper(appCodec, keys[cwfees.ModuleName], app.Keepers.WASMKeeper)
 
+	app.Keepers.CWICAKeeper = *cwicakeeper.NewKeeper(
+		appCodec,
+		keys[cwicatypes.StoreKey],
+		app.Keepers.IBCKeeper.ChannelKeeper,
+		app.Keepers.IBCKeeper.ConnectionKeeper,
+		app.Keepers.ICAControllerKeeper,
+		app.Keepers.WASMKeeper,
+		govModuleAddr,
+	)
+
 	var transferStack porttypes.IBCModule
 	transferStack = transfer.NewIBCModule(app.Keepers.TransferKeeper)
 	transferStack = ibcfee.NewIBCMiddleware(transferStack, app.Keepers.IBCFeeKeeper)
 
 	// Create Interchain Accounts Stack
+
+	var icaControllerStack porttypes.IBCModule
+	icaControllerStack = cwica.NewIBCModule(app.Keepers.CWICAKeeper)
+	icaControllerStack = icacontroller.NewIBCMiddleware(icaControllerStack, app.Keepers.ICAControllerKeeper)
+	//icaControllerStack = ibcfee.NewIBCMiddleware(icaControllerStack, app.Keepers.IBCFeeKeeper)
+
 	// RecvPacket, message that originates from core IBC and goes down to app, the flow is:
 	// channel.RecvPacket -> fee.OnRecvPacket -> icaHost.OnRecvPacket
 	var icaHostStack porttypes.IBCModule
@@ -595,6 +631,8 @@ func NewArchwayApp(
 	ibcRouter := porttypes.NewRouter()
 	ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferStack)
 	ibcRouter.AddRoute(wasmdTypes.ModuleName, wasmStack)
+	ibcRouter.AddRoute(cwicatypes.ModuleName, icaControllerStack)
+	ibcRouter.AddRoute(icacontrollertypes.SubModuleName, icaControllerStack)
 	ibcRouter.AddRoute(icahosttypes.SubModuleName, icaHostStack)
 	app.Keepers.IBCKeeper.SetRouter(ibcRouter)
 
@@ -644,13 +682,14 @@ func NewArchwayApp(
 		params.NewAppModule(app.Keepers.ParamsKeeper),
 		transferModule,
 		ibcfee.NewAppModule(app.Keepers.IBCFeeKeeper),
-		ica.NewAppModule(nil, &app.Keepers.ICAHostKeeper),
+		ica.NewAppModule(&app.Keepers.ICAControllerKeeper, &app.Keepers.ICAHostKeeper),
 		consensus.NewAppModule(appCodec, app.Keepers.ConsensusParamsKeeper),
 		tracking.NewAppModule(app.appCodec, app.Keepers.TrackingKeeper),
 		rewards.NewAppModule(app.appCodec, app.Keepers.RewardsKeeper),
 		cwfees.NewAppModule(app.Keepers.CWFeesKeeper),
 		genmsg.NewAppModule(app.MsgServiceRouter()),
 		callback.NewAppModule(app.appCodec, app.Keepers.CallbackKeeper, app.Keepers.WASMKeeper),
+		cwica.NewAppModule(appCodec, app.Keepers.CWICAKeeper, app.Keepers.AccountKeeper),
 		crisis.NewAppModule(&app.Keepers.CrisisKeeper, skipGenesisInvariants, app.getSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them
 	)
 
@@ -691,6 +730,7 @@ func NewArchwayApp(
 		rewardsTypes.ModuleName,
 		callbackTypes.ModuleName,
 		cwfees.ModuleName, // does not have being blocker.
+		cwicatypes.ModuleName,
 	)
 
 	app.mm.SetOrderEndBlockers(
@@ -727,6 +767,7 @@ func NewArchwayApp(
 		// invariants checks are always the last to run
 		crisistypes.ModuleName,
 		cwfees.ModuleName, // does not have end blocker
+		cwicatypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -770,6 +811,7 @@ func NewArchwayApp(
 		callbackTypes.ModuleName,
 		// invariants checks are always the last to run
 		crisistypes.ModuleName,
+		cwicatypes.ModuleName,
 	)
 
 	// Uncomment if you want to set a custom migration order here.
@@ -1033,6 +1075,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(ibcexported.ModuleName)
 	paramsKeeper.Subspace(icahosttypes.SubModuleName)
+	paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable())
 	paramsKeeper.Subspace(wasmdTypes.ModuleName)
 	paramsKeeper.Subspace(rewardsTypes.ModuleName)
 

app/keepers/keepers.go

@@ -22,12 +22,14 @@ import (
 
 	"github.com/archway-network/archway/x/cwfees"
 
+	icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper"
 	icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper"
 	ibcfeekeeper "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper"
 	ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 
 	callbackKeeper "github.com/archway-network/archway/x/callback/keeper"
+	cwicaKeeper "github.com/archway-network/archway/x/cwica/keeper"
 	rewardsKeeper "github.com/archway-network/archway/x/rewards/keeper"
 	trackingKeeper "github.com/archway-network/archway/x/tracking/keeper"
 )
@@ -49,6 +51,7 @@ type ArchwayKeepers struct {
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
 	IBCKeeper             *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
 	IBCFeeKeeper          ibcfeekeeper.Keeper
+	ICAControllerKeeper   icacontrollerkeeper.Keeper
 	ICAHostKeeper         icahostkeeper.Keeper
 	EvidenceKeeper        evidencekeeper.Keeper
 	TransferKeeper        ibctransferkeeper.Keeper
@@ -61,4 +64,5 @@ type ArchwayKeepers struct {
 	RewardsKeeper  rewardsKeeper.Keeper
 	CWFeesKeeper   cwfees.Keeper
 	CallbackKeeper callbackKeeper.Keeper
+	CWICAKeeper    cwicaKeeper.Keeper
 }

app/upgrades/latest/upgrades.go

@@ -6,10 +6,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
+	icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
+
 	"github.com/archway-network/archway/app/keepers"
 	"github.com/archway-network/archway/app/upgrades"
 	callbackTypes "github.com/archway-network/archway/x/callback/types"
 	"github.com/archway-network/archway/x/cwfees"
+	cwicatypes "github.com/archway-network/archway/x/cwica/types"
 )
 
 // This upgrade handler is used for all the current changes to the protocol
@@ -34,6 +37,8 @@ var Upgrade = upgrades.Upgrade{
 		Added: []string{
 			callbackTypes.ModuleName,
 			cwfees.ModuleName,
+			icacontrollertypes.StoreKey,
+			cwicatypes.ModuleName,
 		},
 	},
 }

interchaintest/README.md

@@ -38,4 +38,15 @@ Now go to Archway repo root and run
 ```sh
 cd interchaintest
 go test -v -race -run TestChainUpgrade
-```
+```
+
+## CWICA test
+
+To run the IBC conformance test locally go to Archway repo root and
+
+```sh
+cd interchaintest
+go test -v -race -run TestCWICA
+```
+
+The contract binary used for testing is located in the artifacts folder and the source is available at https://github.com/archway-network/test-contracts