Merge branch 'main' into docs/add-v19

MSalopek · web-flow · commit e0d15c225227 · 2024-07-23T10:04:16.000+02:00
diff --git a/.changelog/unreleased/dependencies/3227-bump-ibc-rate-limits.md b/.changelog/unreleased/dependencies/3227-bump-ibc-rate-limits.md
@@ -0,0 +1,3 @@
+- Bump [ibc-rate-limiting](https://github.com/cosmos/ibc-apps/blob/main/modules/rate-limiting) to
+    [v8](https://github.com/cosmos/ibc-apps/releases/tag/modules/rate-limiting/v8.0.0)
+    ([\#3227](https://github.com/cosmos/gaia/pull/3227))
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -21,7 +21,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v17.2.x"
+    target-branch: "release/v18.1.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:
@@ -31,8 +31,8 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v18.x"
+    target-branch: "release/v19.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:
-      - dependencies
+      - dependencies
diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -32,7 +32,7 @@ jobs:
         if: "${{ env.GITHUB_EVENT_NAME != 'schedule' }}"
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v3.2.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -46,7 +46,7 @@ jobs:
           flavor: "latest=false"
 
       - name: Build and push docker image
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.4.1
         with:
           context: .
           file: Dockerfile
diff --git a/.mergify.yml b/.mergify.yml
@@ -24,29 +24,20 @@ pull_request_rules:
           {{ title }} (#{{ number }})
           {{ body }}
 
-  - name: Backport patches to the release/v17.3.x branch
-    conditions:
-      - base=main
-      - label=A:backport/v17.3.x
-    actions:
-      backport:
-        branches:
-          - release/v17.3.x
-
-  - name: Backport patches to the release/v18.x branch
+  - name: Backport patches to the release/v18.1.x branch
     conditions:
       - base=main
-      - label=A:backport/v18.x
+      - label=A:backport/v18.1.x
     actions:
       backport:
         branches:
-          - release/v18.x
+          - release/v18.1.x
 
-  - name: Backport patches to the release/v18.1.x branch
+  - name: Backport patches to the release/v19.x branch
     conditions:
       - base=main
-      - label=A:backport/v18.1.x
+      - label=A:backport/v19.x
     actions:
       backport:
         branches:
-          - release/v18.1.x
+          - release/v19.x
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
@@ -242,7 +242,7 @@ The intention of the Stable Release Policy is to ensure that all major release s
 are maintained with the following categories of fixes:
 
 - Tooling improvements (including code formatting, linting, static analysis and updates to testing frameworks)
-- Performance enhancements for running archival and synching nodes
+- Performance enhancements for running archival and syncing nodes
 - Test and benchmarking suites, ensuring that fixes are sound and there are no performance regressions
 - Library updates including point releases for core libraries such as IBC-Go, Cosmos SDK, Tendermint and other dependencies
 - General maintenance improvements, that are deemed necessary by the stewarding team, that help align different releases and reduce the workload on the stewarding team
diff --git a/ante/gov_vote_ante.go b/ante/gov_vote_ante.go
@@ -103,7 +103,6 @@ func (g GovVoteDecorator) ValidateVoteMsgs(ctx sdk.Context, msgs []sdk.Msg) erro
 			// break the iteration if maxDelegationsChecked were already checked
 			return delegationCount >= maxDelegationsChecked
 		})
-
 		if err != nil {
 			return err
 		}
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -5,15 +5,15 @@ import (
 	"os"
 	"strings"
 
-	ratelimit "github.com/Stride-Labs/ibc-rate-limiting/ratelimit"
-	ratelimitkeeper "github.com/Stride-Labs/ibc-rate-limiting/ratelimit/keeper"
-	ratelimittypes "github.com/Stride-Labs/ibc-rate-limiting/ratelimit/types"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 
 	pfmrouter "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward"
 	pfmrouterkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper"
 	pfmroutertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"
+	ratelimit "github.com/cosmos/ibc-apps/modules/rate-limiting/v8"
+	ratelimitkeeper "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/keeper"
+	ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
 	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts"
@@ -419,9 +419,9 @@ func NewAppKeeper(
 
 	// Create RateLimit keeper
 	appKeepers.RatelimitKeeper = *ratelimitkeeper.NewKeeper(
-		appCodec,                                 // BinaryCodec
-		appKeepers.keys[ratelimittypes.StoreKey], // StoreKey
-		appKeepers.GetSubspace(ratelimittypes.ModuleName), // param Subspace
+		appCodec, // BinaryCodec
+		runtime.NewKVStoreService(appKeepers.keys[ratelimittypes.StoreKey]), // StoreKey
+		appKeepers.GetSubspace(ratelimittypes.ModuleName),                   // param Subspace
 		govAuthority, // authority
 		appKeepers.BankKeeper,
 		appKeepers.IBCKeeper.ChannelKeeper, // ChannelKeeper
diff --git a/app/keepers/keys.go b/app/keepers/keys.go
@@ -1,10 +1,10 @@
 package keepers
 
 import (
-	ratelimittypes "github.com/Stride-Labs/ibc-rate-limiting/ratelimit/types"
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 
 	routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"
+	ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types"
 	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types"
 	icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
diff --git a/app/modules.go b/app/modules.go
@@ -1,11 +1,11 @@
 package gaia
 
 import (
-	ratelimittypes "github.com/Stride-Labs/ibc-rate-limiting/ratelimit/types"
 	feemarket "github.com/skip-mev/feemarket/x/feemarket"
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 
 	pfmroutertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"
+	ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types"
 	"github.com/cosmos/ibc-go/modules/capability"
 	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types"
diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go
@@ -37,7 +37,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/cosmos/cosmos-sdk/server"
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -46,7 +45,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
-	txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
+	authtxconfig "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
@@ -86,7 +85,6 @@ func NewRootCmd() *cobra.Command {
 	initClientCtx := client.Context{}.
 		WithCodec(tempApplication.AppCodec()).
 		WithInterfaceRegistry(tempApplication.InterfaceRegistry()).
-		WithTxConfig(tempApplication.GetTxConfig()).
 		WithLegacyAmino(tempApplication.LegacyAmino()).
 		WithInput(os.Stdin).
 		WithAccountRetriever(types.AccountRetriever{}).
@@ -117,10 +115,10 @@ func NewRootCmd() *cobra.Command {
 			if !initClientCtx.Offline {
 				txConfigOpts := tx.ConfigOptions{
 					EnabledSignModes:           append(tx.DefaultSignModes, signing.SignMode_SIGN_MODE_TEXTUAL),
-					TextualCoinMetadataQueryFn: txmodule.NewGRPCCoinMetadataQueryFn(initClientCtx),
+					TextualCoinMetadataQueryFn: authtxconfig.NewGRPCCoinMetadataQueryFn(initClientCtx),
 				}
 				txConfigWithTextual, err := tx.NewTxConfigWithOptions(
-					codec.NewProtoCodec(tempApplication.InterfaceRegistry()),
+					initClientCtx.Codec,
 					txConfigOpts,
 				)
 				if err != nil {
@@ -142,36 +140,22 @@ func NewRootCmd() *cobra.Command {
 
 	initRootCmd(rootCmd, tempApplication.ModuleBasics, tempApplication.AppCodec(), tempApplication.InterfaceRegistry(), tempApplication.GetTxConfig())
 
-	autoCliOpts, err := enrichAutoCliOpts(tempApplication.AutoCliOpts(), initClientCtx)
-	if err != nil {
-		panic(err)
-	}
-
+	autoCliOpts := enrichAutoCliOpts(tempApplication.AutoCliOpts(), initClientCtx)
 	if err := autoCliOpts.EnhanceRootCommand(rootCmd); err != nil {
 		panic(err)
 	}
 
 	return rootCmd
 }
 
-func enrichAutoCliOpts(autoCliOpts autocli.AppOptions, clientCtx client.Context) (autocli.AppOptions, error) {
+func enrichAutoCliOpts(autoCliOpts autocli.AppOptions, clientCtx client.Context) autocli.AppOptions {
 	autoCliOpts.AddressCodec = addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix())
 	autoCliOpts.ValidatorAddressCodec = addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix())
 	autoCliOpts.ConsensusAddressCodec = addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix())
 
-	var err error
-	clientCtx, err = config.ReadFromClientConfig(clientCtx)
-	if err != nil {
-		return autocli.AppOptions{}, err
-	}
-
 	autoCliOpts.ClientCtx = clientCtx
-	autoCliOpts.Keyring, err = keyring.NewAutoCLIKeyring(clientCtx.Keyring)
-	if err != nil {
-		return autocli.AppOptions{}, err
-	}
 
-	return autoCliOpts, nil
+	return autoCliOpts
 }
 
 // initCometConfig helps to override default CometBFT Config values.
diff --git a/cmd/gaiad/cmd/testnet_set_local_validator.go b/cmd/gaiad/cmd/testnet_set_local_validator.go
@@ -63,7 +63,6 @@ func init() {
 }
 
 func testnetUnsafeStartLocalValidatorCmd(ac appCreator) *cobra.Command {
-
 	cmd := server.StartCmd(ac.newTestingApp, gaia.DefaultNodeHome)
 	cmd.Use = "unsafe-start-local-validator"
 	cmd.Short = "Updates chain's application and consensus state with provided validator info and starts the node"
@@ -167,7 +166,7 @@ func (a appCreator) newTestingApp(
 		panic(err)
 	}
 
-	//Update consensus state
+	// Update consensus state
 	err = updateConsensusState(logger, appOpts, gaiaApp.CommitMultiStore().LatestVersion(), args)
 	if err != nil {
 		panic(err)
diff --git a/docs/docs/architecture/adr/adr-001-interchain-accounts.md b/docs/docs/architecture/adr/adr-001-interchain-accounts.md
@@ -47,7 +47,7 @@ There are future releases of Interchain Accounts which are expected to be backwa
 ## Development
 
 - Integration requirements
-  - Development has occured in [IBC-go](https://github.com/cosmos/ibc-go) and progress tracked on the project board there.
+  - Development has occurred in [IBC-go](https://github.com/cosmos/ibc-go) and progress tracked on the project board there.
 - Testing (Simulations, Core Team Testing, Partner Testing)
   - Simulations and Core Team tested this module
 - Audits (Internal Dev review, Third-party review, Bug Bounty)
diff --git a/docs/docs/architecture/adr/adr-003-ica-controller.md b/docs/docs/architecture/adr/adr-003-ica-controller.md
@@ -18,7 +18,7 @@ Enabling the ICA Controller module on the Hub would support various use cases. O
 
 ## Decision
 
-The ICA Controller module will be included in the application, so the Hub will have both ICA Host and Controller modules. The implementation will use the Controller module's built-in authentication mechanism, since we don't have a need for custom authentication logic. According to this, users will directly use `MsgRegisterInterchainAccount` and `MsgSendTx` messages defined by the Controller module. The possibility provided by the Controller module to define underlaying application to have custom processing of IBC messages exchanged by the Controller module (e.g. `OnChanOpenInit`, `OnAcknowledgementPacket`, etc.) will not be used, since there is currently no need for this.
+The ICA Controller module will be included in the application, so the Hub will have both ICA Host and Controller modules. The implementation will use the Controller module's built-in authentication mechanism, since we don't have a need for custom authentication logic. According to this, users will directly use `MsgRegisterInterchainAccount` and `MsgSendTx` messages defined by the Controller module. The possibility provided by the Controller module to define underlying application to have custom processing of IBC messages exchanged by the Controller module (e.g. `OnChanOpenInit`, `OnAcknowledgementPacket`, etc.) will not be used, since there is currently no need for this.
 
 ```go
 // ICA Controller keeper
diff --git a/docs/docs/governance/best-practices.md b/docs/docs/governance/best-practices.md
@@ -77,7 +77,7 @@ It will be important to balance two things: being detailed and being concise. Yo
 
 Each major proposal type has a rough template available on the forum: [Text](https://forum.cosmos.network/t/about-the-signaling-text-category/5947), [community pool spend](https://forum.cosmos.network/t/about-the-community-spend-category/5949), [parameter change](https://forum.cosmos.network/t/about-the-parameter-change-category/5950), [software upgrade](https://forum.cosmos.network/t/about-the-software-upgrade-category/5951).
 
-Each proposal should contain a summmary with key details about what the proposal hopes to change. If you were viewing only the summary with no other context, it should be a good start to being able to make a decision.
+Each proposal should contain a summary with key details about what the proposal hopes to change. If you were viewing only the summary with no other context, it should be a good start to being able to make a decision.
 
 Assume that many people will stop reading at this point. However it is important to provide in-depth information. The on-chain proposal text should also include a link to an un-editable version of the text, such as an IPFS pin, and a link to where discussion about the idea is happening.
 
diff --git a/docs/docs/governance/formatting.md b/docs/docs/governance/formatting.md
@@ -93,7 +93,7 @@ You can update these CosmosHub modules using `submit-legacy-proposal`:
 * provider
 :::
 
-**Note:** The chages outlined here must be submitted using `submit-legacy-proposal`.
+**Note:** The changes outlined here must be submitted using `submit-legacy-proposal`.
 
 For `param-change` proposals, there are arguably seven (7) components, though three are nested beneath 'Changes':
 
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.22.3
 
 require (
 	cosmossdk.io/api v0.7.5
-	cosmossdk.io/client/v2 v2.0.0-beta.1.0.20240124105859-5ad1805d0e79
+	cosmossdk.io/client/v2 v2.0.0-beta.3
 	cosmossdk.io/core v0.11.0
 	cosmossdk.io/errors v1.0.1
 	cosmossdk.io/log v1.3.1
@@ -16,16 +16,16 @@ require (
 	cosmossdk.io/x/evidence v0.1.1
 	cosmossdk.io/x/feegrant v0.1.1
 	cosmossdk.io/x/tx v0.13.3
-	cosmossdk.io/x/upgrade v0.1.3
+	cosmossdk.io/x/upgrade v0.1.4
 	github.com/CosmWasm/wasmd v0.50.0
-	github.com/Stride-Labs/ibc-rate-limiting v0.0.0-20240402205850-be547630b007
 	github.com/cometbft/cometbft v0.38.9
 	github.com/cometbft/cometbft-db v0.12.0
 	github.com/cosmos/cosmos-db v1.0.2
 	github.com/cosmos/cosmos-sdk v0.50.8
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/gogoproto v1.5.0
 	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2
+	github.com/cosmos/ibc-apps/modules/rate-limiting/v8 v8.0.0
 	github.com/cosmos/ibc-go/modules/capability v1.0.0
 	github.com/cosmos/ibc-go/v8 v8.3.2
 	github.com/cosmos/interchain-security/v5 v5.1.0
@@ -34,7 +34,7 @@ require (
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/prometheus/client_golang v1.19.0
 	github.com/rakyll/statik v0.1.7
-	github.com/skip-mev/feemarket v1.0.3
+	github.com/skip-mev/feemarket v1.0.4
 	github.com/spf13/cast v1.6.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
diff --git a/go.sum b/go.sum
diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go
diff --git a/tests/e2e/e2e_exec_test.go b/tests/e2e/e2e_exec_test.go
diff --git a/tests/e2e/query.go b/tests/e2e/query.go
diff --git a/tests/e2e/scripts/hermes_bootstrap.sh b/tests/e2e/scripts/hermes_bootstrap.sh

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- Bump [ibc-rate-limiting](https://github.com/cosmos/ibc-apps/blob/main/modules/rate-limiting) to`
	`2`	`+ [v8](https://github.com/cosmos/ibc-apps/releases/tag/modules/rate-limiting/v8.0.0)`
	`3`	`+ ([\#3227](https://github.com/cosmos/gaia/pull/3227))`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ func (g GovVoteDecorator) ValidateVoteMsgs(ctx sdk.Context, msgs []sdk.Msg) erro`
`103`	`103`	`// break the iteration if maxDelegationsChecked were already checked`
`104`	`104`	`return delegationCount >= maxDelegationsChecked`
`105`	`105`	`})`
`106`		`-`
`107`	`106`	`if err != nil {`
`108`	`107`	`return err`
`109`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ func init() {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func testnetUnsafeStartLocalValidatorCmd(ac appCreator) *cobra.Command {`
`66`		`-`
`67`	`66`	`cmd := server.StartCmd(ac.newTestingApp, gaia.DefaultNodeHome)`
`68`	`67`	`cmd.Use = "unsafe-start-local-validator"`
`69`	`68`	`cmd.Short = "Updates chain's application and consensus state with provided validator info and starts the node"`
`@@ -167,7 +166,7 @@ func (a appCreator) newTestingApp(`
`167`	`166`	`panic(err)`
`168`	`167`	`}`
`169`	`168`
`170`		`- //Update consensus state`
	`169`	`+ // Update consensus state`
`171`	`170`	`err = updateConsensusState(logger, appOpts, gaiaApp.CommitMultiStore().LatestVersion(), args)`
`172`	`171`	`if err != nil {`
`173`	`172`	`panic(err)`