Problem: ibc 8.3.x is not used (#1068)

* Problem: ibc 8.3.x is not used * fix upgrade * fix ica * doc * update pystarport * remove icaauth * cleanup * cleanup --------- Co-authored-by: huangyi <[email protected]>
crypto-org-chain · Jul 25, 2024 · 1baff8a · 1baff8a
1 parent 5304924
commit 1baff8a
Show file tree

Hide file tree

Showing 49 changed files with 52 additions and 4,582 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - [#1044](https://github.com/crypto-org-chain/chain-main/pull/1044) Revert the protobuf package name changes introduced in #1023.
 - [#1060](https://github.com/crypto-org-chain/chain-main/pull/1060) Upgrade rocksdb to `v9.2.1` and bump versiondb.
 - [#1061](https://github.com/crypto-org-chain/chain-main/pull/1061) Integrate sdk 0.50.
+- [#1068](https://github.com/crypto-org-chain/chain-main/pull/1068) Upgrade ibc-go to `v8.3.2` and remove icaauth module.
 
 *Dec 6, 2023*
 

diff --git a/app/app.go b/app/app.go
@@ -138,9 +138,6 @@ import (
 	"github.com/crypto-org-chain/chain-main/v4/x/chainmain"
 	chainmainkeeper "github.com/crypto-org-chain/chain-main/v4/x/chainmain/keeper"
 	chainmaintypes "github.com/crypto-org-chain/chain-main/v4/x/chainmain/types"
-	icaauthmodule "github.com/crypto-org-chain/chain-main/v4/x/icaauth"
-	icaauthmodulekeeper "github.com/crypto-org-chain/chain-main/v4/x/icaauth/keeper"
-	icaauthmoduletypes "github.com/crypto-org-chain/chain-main/v4/x/icaauth/types"
 	"github.com/crypto-org-chain/chain-main/v4/x/nft"
 	nfttransfer "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer"
 	nfttransferkeeper "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/keeper"
@@ -234,7 +231,6 @@ type ChainApp struct {
 	IBCFeeKeeper          ibcfeekeeper.Keeper
 	ICAControllerKeeper   icacontrollerkeeper.Keeper
 	ICAHostKeeper         icahostkeeper.Keeper
-	ICAAuthKeeper         icaauthmodulekeeper.Keeper
 	AuthzKeeper           authzkeeper.Keeper
 	EvidenceKeeper        evidencekeeper.Keeper
 	FeeGrantKeeper        feegrantkeeper.Keeper
@@ -253,7 +249,6 @@ type ChainApp struct {
 	ScopedIBCFeeKeeper        capabilitykeeper.ScopedKeeper
 	ScopedICAControllerKeeper capabilitykeeper.ScopedKeeper
 	ScopedICAHostKeeper       capabilitykeeper.ScopedKeeper
-	ScopedICAAuthKeeper       capabilitykeeper.ScopedKeeper
 
 	// the module manager
 	ModuleManager      *module.Manager
@@ -345,7 +340,6 @@ func New(
 	scopedNFTTransferKeeper := app.CapabilityKeeper.ScopeToModule(nfttransfertypes.ModuleName)
 	scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
 	scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
-	scopedICAAuthKeeper := app.CapabilityKeeper.ScopeToModule(icaauthmoduletypes.ModuleName)
 	app.CapabilityKeeper.Seal()
 
 	// add keepers
@@ -519,17 +513,11 @@ func New(
 		app.AccountKeeper, scopedICAHostKeeper, app.MsgServiceRouter(),
 		authAddr,
 	)
+	app.ICAHostKeeper.WithQueryRouter(app.GRPCQueryRouter())
 	icaModule := ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper)
 
-	app.ICAAuthKeeper = *icaauthmodulekeeper.NewKeeper(appCodec, keys[icaauthmoduletypes.StoreKey],
-		keys[icaauthmoduletypes.MemStoreKey], app.GetSubspace(icaauthmoduletypes.ModuleName), app.ICAControllerKeeper,
-		scopedICAAuthKeeper)
-
-	icaAuthModule := icaauthmodule.NewAppModule(appCodec, app.ICAAuthKeeper)
-
 	var icaControllerStack porttypes.IBCModule
-	icaControllerStack = icaauthmodule.NewIBCModule(app.ICAAuthKeeper)
-	icaControllerStack = icacontroller.NewIBCMiddleware(icaControllerStack, app.ICAControllerKeeper)
+	icaControllerStack = icacontroller.NewIBCMiddleware(nil, app.ICAControllerKeeper)
 	icaControllerStack = ibcfee.NewIBCMiddleware(icaControllerStack, app.IBCFeeKeeper)
 
 	var icaHostStack porttypes.IBCModule
@@ -542,7 +530,6 @@ func New(
 	ibcRouter.AddRoute(icahosttypes.SubModuleName, icaHostStack)
 	ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferStack)
 	ibcRouter.AddRoute(nfttransfertypes.ModuleName, nftTransferStack)
-	ibcRouter.AddRoute(icaauthmoduletypes.ModuleName, icaControllerStack)
 	app.IBCKeeper.SetRouter(ibcRouter)
 
 	// create evidence keeper with router
@@ -593,7 +580,6 @@ func New(
 		nfttransfer.NewAppModule(app.NFTTransferKeeper),
 		feeModule,
 		icaModule,
-		icaAuthModule,
 		chainmain.NewAppModule(app.chainmainKeeper),
 		supply.NewAppModule(app.SupplyKeeper),
 		nft.NewAppModule(appCodec, app.NFTKeeper, app.AccountKeeper, app.BankKeeper),
@@ -640,7 +626,6 @@ func New(
 		paramstypes.ModuleName,
 		vestingtypes.ModuleName,
 		icatypes.ModuleName,
-		icaauthmoduletypes.ModuleName,
 		ibcfeetypes.ModuleName,
 		chainmaintypes.ModuleName,
 		nfttypes.ModuleName,
@@ -668,7 +653,6 @@ func New(
 		upgradetypes.ModuleName,
 		vestingtypes.ModuleName,
 		icatypes.ModuleName,
-		icaauthmoduletypes.ModuleName,
 		ibcfeetypes.ModuleName,
 		chainmaintypes.ModuleName,
 		nfttypes.ModuleName,
@@ -699,7 +683,6 @@ func New(
 		group.ModuleName,
 		ibctransfertypes.ModuleName,
 		icatypes.ModuleName,
-		icaauthmoduletypes.ModuleName,
 		ibcfeetypes.ModuleName,
 		chainmaintypes.ModuleName,
 		supplytypes.ModuleName,
@@ -808,7 +791,6 @@ func New(
 	app.ScopedTransferKeeper = scopedTransferKeeper
 	app.ScopedICAControllerKeeper = scopedICAControllerKeeper
 	app.ScopedICAHostKeeper = scopedICAHostKeeper
-	app.ScopedICAAuthKeeper = scopedICAAuthKeeper
 
 	return app
 }
@@ -1044,7 +1026,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName).WithKeyTable(ibctransfertypes.ParamKeyTable())
 	paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable())
 	paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable())
-	paramsKeeper.Subspace(icaauthmoduletypes.ModuleName)
 
 	return paramsKeeper
 }
@@ -1076,7 +1057,6 @@ func StoreKeys() (
 		nfttransfertypes.StoreKey,
 		group.StoreKey,
 		ibcfeetypes.StoreKey,
-		icaauthmoduletypes.StoreKey,
 		chainmaintypes.StoreKey,
 		supplytypes.StoreKey,
 		nfttypes.StoreKey,

diff --git a/app/docs/config.json b/app/docs/config.json
@@ -114,14 +114,6 @@
           "TotalSupply": "TotalSupply_"
         }
       }
-    },
-    {
-      "url": "./tmp-swagger-gen/chainmain/icaauth/v1/query.swagger.json",
-      "operationIds": {
-        "rename": {
-          "Params": "IcaauthParams"
-        }
-      }
     }
   ]
 }
diff --git a/app/docs/swagger-ui/swagger.yaml b/app/docs/swagger-ui/swagger.yaml
@@ -25036,104 +25036,6 @@ paths:
                       format: byte
       tags:
         - Query
-  /chainmain/icaauth/v1/interchain_account_address/{connectionId}/{owner}:
-    get:
-      summary: >-
-        InterchainAccountAddress queries the interchain account address for
-        given `connectionId` and `owner`
-      operationId: InterchainAccountAddress
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              interchainAccountAddress:
-                type: string
-            description: >-
-              QueryInterchainAccountAddressResponse defines the response for the
-              InterchainAccountAddress query.
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              error:
-                type: string
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    type_url:
-                      type: string
-                    value:
-                      type: string
-                      format: byte
-      parameters:
-        - name: connectionId
-          in: path
-          required: true
-          type: string
-        - name: owner
-          in: path
-          required: true
-          type: string
-      tags:
-        - Query
-  /chainmain/icaauth/v1/params:
-    get:
-      summary: Parameters queries the parameters of the module.
-      operationId: IcaauthParams
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              params:
-                description: params holds all the parameters of this module.
-                type: object
-                properties:
-                  minTimeoutDuration:
-                    type: string
-                    title: >-
-                      minTimeoutDuration defines the minimum value of packet
-                      timeout when submitting transactions to host chain on
-
-                      behalf of interchain account
-            description: >-
-              QueryParamsResponse is response type for the Query/Params RPC
-              method.
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              error:
-                type: string
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    type_url:
-                      type: string
-                    value:
-                      type: string
-                      format: byte
-      tags:
-        - Query
 definitions:
   cosmos.auth.v1beta1.AddressBytesToStringResponse:
     type: object
@@ -44867,37 +44769,3 @@ definitions:
     title: |-
       SupplyResponse is the response type for the Query/TotalSupply RPC
       method
-  chainmain.icaauth.v1.Params:
-    type: object
-    properties:
-      minTimeoutDuration:
-        type: string
-        title: >-
-          minTimeoutDuration defines the minimum value of packet timeout when
-          submitting transactions to host chain on
-
-          behalf of interchain account
-    description: Params defines the parameters for the module.
-  chainmain.icaauth.v1.QueryInterchainAccountAddressResponse:
-    type: object
-    properties:
-      interchainAccountAddress:
-        type: string
-    description: >-
-      QueryInterchainAccountAddressResponse defines the response for the
-      InterchainAccountAddress query.
-  chainmain.icaauth.v1.QueryParamsResponse:
-    type: object
-    properties:
-      params:
-        description: params holds all the parameters of this module.
-        type: object
-        properties:
-          minTimeoutDuration:
-            type: string
-            title: >-
-              minTimeoutDuration defines the minimum value of packet timeout
-              when submitting transactions to host chain on
-
-              behalf of interchain account
-    description: QueryParamsResponse is response type for the Query/Params RPC method.
diff --git a/app/upgrades.go b/app/upgrades.go
@@ -22,7 +22,10 @@ func (app *ChainApp) RegisterUpgradeHandlers(cdc codec.BinaryCodec, clientKeeper
 		panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))
 	}
 	if upgradeInfo.Name == planName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		storeUpgrades := storetypes.StoreUpgrades{
+			Deleted: []string{"icaauth"},
+		}
 		// configure store loader that checks if version == upgradeHeight and applies store upgrades
-		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storetypes.StoreUpgrades{}))
+		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
 	}
 }
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.50.8
 	github.com/cosmos/gogoproto v1.5.0
 	github.com/cosmos/ibc-go/modules/capability v1.0.0
-	github.com/cosmos/ibc-go/v8 v8.2.1
+	github.com/cosmos/ibc-go/v8 v8.3.2
 	github.com/cosmos/rosetta v0.50.3-1
 	github.com/crypto-org-chain/cronos/store v0.0.5-0.20240716081818-7f581a697f6d
 	github.com/crypto-org-chain/cronos/versiondb v0.0.0-20240716081818-7f581a697f6d

diff --git a/go.sum b/go.sum
@@ -429,8 +429,8 @@ github.com/cosmos/iavl v1.1.2 h1:zL9FK7C4L/P4IF1Dm5fIwz0WXCnn7Bp1M2FxH0ayM7Y=
 github.com/cosmos/iavl v1.1.2/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM=
 github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE=
 github.com/cosmos/ibc-go/modules/capability v1.0.0/go.mod h1:D81ZxzjZAe0ZO5ambnvn1qedsFQ8lOwtqicG6liLBco=
-github.com/cosmos/ibc-go/v8 v8.2.1 h1:MTsnZZjxvGD4Fv5pYyx5UkELafSX0rlPt6IfsE2BpTQ=
-github.com/cosmos/ibc-go/v8 v8.2.1/go.mod h1:wj3qx75iC/XNnsMqbPDCIGs0G6Y3E/lo3bdqCyoCy+8=
+github.com/cosmos/ibc-go/v8 v8.3.2 h1:8X1oHHKt2Bh9hcExWS89rntLaCKZp2EjFTUSxKlPhGI=
+github.com/cosmos/ibc-go/v8 v8.3.2/go.mod h1:WVVIsG39jGrF9Cjggjci6LzySyWGloz194sjTxiGNIE=
 github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
 github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0=
 github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=

diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -170,8 +170,8 @@ schema = 3
     version = "v1.0.0"
     hash = "sha256-xOeHJWUj6fTc2EUGiE4dgfY2WkvrqTg/FWewoUvQcvg="
   [mod."github.com/cosmos/ibc-go/v8"]
-    version = "v8.2.1"
-    hash = "sha256-FYMkZG3dYTXkqoSSyJSSe5NDd9K+3KlMWKfQKahXz3s="
+    version = "v8.3.2"
+    hash = "sha256-uqt1GlZ1sQ7k5b3vGiRxawGp53yeAv0RjOotOIY7Z0E="
   [mod."github.com/cosmos/ics23/go"]
     version = "v0.10.0"
     hash = "sha256-KYEv727BO/ht63JO02xiKFGFAddg41Ve9l2vSSZZBq0="

diff --git a/integration_tests/cosmoscli.py b/integration_tests/cosmoscli.py
@@ -31,6 +31,7 @@ def gov_propose_legacy(
         event_query_tx=True,
         **kwargs,
     ):
+        mode = kwargs.get("broadcast_mode")
         if kind == "software-upgrade":
             rsp = json.loads(
                 self.raw(
@@ -57,7 +58,7 @@ def gov_propose_legacy(
                     **kwargs,
                 )
             )
-            if rsp["code"] == 0 and event_query_tx:
+            if rsp["code"] == 0 and event_query_tx and mode == "sync":
                 rsp = self.event_query_tx_for(rsp["txhash"])
             return rsp
         elif kind == "cancel-software-upgrade":

diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock