Merge branch 'main' into store/cachekv_par

.github/.codespellignore

@@ -3,4 +3,5 @@ pullrequest
 keypair
 pastTime
 hasTables
-Nam
+Nam
+EyT

.github/dependabot.yml

@@ -106,6 +106,24 @@ updates:
     labels:
       - "A:automerge"
       - dependencies
+  - package-ecosystem: gomod
+    directory: "/indexer/postgres"
+    schedule:
+      interval: weekly
+      day: wednesday
+      time: "01:53"
+    labels:
+      - "A:automerge"
+      - dependencies
+  - package-ecosystem: gomod
+    directory: "/indexer/postgres/tests"
+    schedule:
+      interval: weekly
+      day: wednesday
+      time: "01:53"
+    labels:
+      - "A:automerge"
+      - dependencies
   - package-ecosystem: gomod
     directory: "/schema"
     schedule:

.github/pr_labeler.yml

@@ -24,6 +24,8 @@
   - orm/**/*
 "C:schema":
   - schema/**/*
+"C:indexer/postgres":
+  - indexer/postgres/**/*
 "C:x/accounts":
   - x/accounts/**/*
 "C:x/accounts/multisig":
@@ -72,6 +74,16 @@
   - x/upgrade/**/*
 "C:x/epochs":
   - x/epochs/**/*
+"C:server/v2":
+  - server/v2/**/*
+"C:server/v2 stf":
+  - server/v2/stf/**/*
+"C:server/v2 appmanager":
+  - server/v2/appmanager/**/*
+"C:server/v2 cometbft":
+  - server/v2/cometbft/**/*
+"C:server/v2 api":
+  - server/v2/api/**/*
 "Type: ADR":
   - docs/architecture/**/*
 "Type: Build":

.github/workflows/test.yml

@@ -487,6 +487,42 @@ jobs:
         with:
           projectBaseDir: schema/
 
+  test-indexer-postgres:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          cache: true
+          cache-dependency-path: indexer/postgres/tests/go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            indexer/postgres/**/*.go
+            indexer/postgres/go.mod
+            indexer/postgres/go.sum
+            indexer/postgres/tests/go.mod
+            indexer/postgres/tests/go.sum
+      - name: tests
+        if: env.GIT_DIFF
+        run: |
+          cd indexer/postgres
+          go test -mod=readonly -timeout 30m -coverprofile=cov.out -covermode=atomic ./...
+          cd tests
+          go test -mod=readonly -timeout 30m -coverprofile=cov.out -covermode=atomic -coverpkg=cosmossdk.io/indexer/postgres ./...
+          cd ..
+          go run github.com/dylandreimerink/gocovmerge/cmd/gocovmerge@latest cov.out tests/cov.out > coverage.out
+      - name: sonarcloud
+        if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          projectBaseDir: indexer/postgres/
+
   test-simapp:
     runs-on: ubuntu-latest
     steps:

.github/workflows/v2-test.yml

@@ -14,6 +14,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  server-v2:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+          cache: true
+          cache-dependency-path: go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            server/v2/*.go
+            server/v2/go.mod
+            server/v2/go.sum
+            server/v2/testdata/*.toml
+      - name: test & coverage report creation
+        if: env.GIT_DIFF
+        run: |
+          cd server/v2 && go test -mod=readonly -race -timeout 30m -covermode=atomic -tags='ledger test_ledger_mock'
   stf:
     runs-on: ubuntu-latest
     strategy:

CHANGELOG.md

@@ -116,9 +116,14 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * [#19833](https://github.com/cosmos/cosmos-sdk/pull/19833) Fix some places in which we call Remove inside a Walk.
 * [#19851](https://github.com/cosmos/cosmos-sdk/pull/19851) Fix some places in which we call Remove inside a Walk (x/staking and x/gov).
 * [#20939](https://github.com/cosmos/cosmos-sdk/pull/20939) Fix collection reverse iterator to include `pagination.key` in the result.
+* (client/grpc) [#20969](https://github.com/cosmos/cosmos-sdk/pull/20969) Fix `node.NewQueryServer` method not setting `cfg`.
+* (testutil/integration) [#21006](https://github.com/cosmos/cosmos-sdk/pull/21006) Fix `NewIntegrationApp` method not writing default genesis to state
 
 ### API Breaking Changes
 
+* (client) [#20976](https://github.com/cosmos/cosmos-sdk/pull/20976) Simplified command initialization by removing unnecessary parameters such as `txConfig` and `addressCodec`.
+  * Remove parameter `txConfig` from `genutilcli.Commands`,`genutilcli.CommandsWithCustomMigrationMap`,`genutilcli.GenTxCmd`.
+  * Remove parameter `addressCodec` from `genutilcli.GenTxCmd`,`genutilcli.AddGenesisAccountCmd`,`stakingcli.BuildCreateValidatorMsg`.
 * (x/genutil) [#20740](https://github.com/cosmos/cosmos-sdk/pull/20740) Update `genutilcli.Commands` and `genutilcli.CommandsWithCustomMigrationMap` to take the genesis module and abstract the module manager.
 * (server) [#20422](https://github.com/cosmos/cosmos-sdk/pull/20422) Deprecated `ServerContext`. To get `cmtcfg.Config` from cmd, use `client.GetCometConfigFromCmd(cmd)` instead of `server.GetServerContextFromCmd(cmd).Config`
 * (types)[#20369](https://github.com/cosmos/cosmos-sdk/pull/20369) The signature of `HasAminoCodec` has changed to accept a `core/legacy.Amino` interface instead of `codec.LegacyAmino`.

Makefile

@@ -8,6 +8,8 @@ include scripts/build/testing.mk
 include scripts/build/documentation.mk
 include scripts/build/build.mk
 
+.DEFAULT_GOAL := help
+
 ###############################################################################
 ###                          Tools & Dependencies                           ###
 ###############################################################################

UPGRADING.md

@@ -170,7 +170,9 @@ There is no longer a need for the Cosmos SDK to host these protos for itself and
 That package containing proto v2 generated code, but the SDK now uses [buf generated go SDK instead](https://buf.build/docs/bsr/generated-sdks/go).
 If you were depending on `cosmossdk.io/api/tendermint`, please use the buf generated go SDK instead, or ask CometBFT host the generated proto v2 code.
 
-The `codectypes.Any` has moved to `github.com/cosmos/gogoproto/types/any`. Module developers can update the `buf.gen.gogo.yaml` configuration files by adjusting the corresponding `opt` option to `Mgoogle/protobuf/any.proto=github.com/cosmos/gogoproto/types/any` for directly mapping the`Any` type to its new location. This change is optional as `codectypes.Any` is aliased to `gogoproto.Any` in the SDK.
+The `codectypes.Any` has moved to `github.com/cosmos/gogoproto/types/any`. Module developers need to update the `buf.gen.gogo.yaml` configuration files by adjusting the corresponding `opt` option to `Mgoogle/protobuf/any.proto=github.com/cosmos/gogoproto/types/any` for directly mapping the`Any` type to its new location. This change is optional, but recommended, as `codectypes.Any` is aliased to `gogoproto.Any` in the SDK.
+
+Also, any usages of the interfaces `AnyUnpacker` and `UnpackInterfacesMessage` must be replaced with the interfaces of the same name in the `github.com/cosmos/gogoproto/types/any` package.
 
 ### Modules
 

baseapp/abci_utils.go

@@ -177,7 +177,7 @@ func validateExtendedCommitAgainstLastCommit(ec abci.ExtendedCommitInfo, lc come
 		}
 		return -int(vote1.Validator.Power - vote2.Validator.Power) // vp sorted in descending order
 	}) {
-		return fmt.Errorf("extended commit votes are not sorted by voting power")
+		return errors.New("extended commit votes are not sorted by voting power")
 	}
 
 	addressCache := make(map[string]struct{}, len(ec.Votes))

baseapp/oe/optimistic_execution_test.go

@@ -8,15 +8,15 @@ import (
 	abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
 	"github.com/stretchr/testify/assert"
 
-	"cosmossdk.io/core/log"
+	coretesting "cosmossdk.io/core/testing"
 )
 
 func testFinalizeBlock(_ context.Context, _ *abci.FinalizeBlockRequest) (*abci.FinalizeBlockResponse, error) {
 	return nil, errors.New("test error")
 }
 
 func TestOptimisticExecution(t *testing.T) {
-	oe := NewOptimisticExecution(log.NewNopLogger(), testFinalizeBlock)
+	oe := NewOptimisticExecution(coretesting.NewNopLogger(), testFinalizeBlock)
 	assert.True(t, oe.Enabled())
 	oe.Execute(&abci.ProcessProposalRequest{
 		Hash: []byte("test"),

client/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -68,7 +69,7 @@ func CreateClientConfig(ctx client.Context, customClientTemplate string, customC
 		}
 
 		if (customClientTemplate != "" && customConfig == nil) || (customClientTemplate == "" && customConfig != nil) {
-			return ctx, fmt.Errorf("customClientTemplate and customConfig should be both nil or not nil")
+			return ctx, errors.New("customClientTemplate and customConfig should be both nil or not nil")
 		}
 
 		if customClientTemplate != "" {

client/grpc/cmtservice/service.go

@@ -5,6 +5,7 @@ import (
 
 	abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
 	gogogrpc "github.com/cosmos/gogoproto/grpc"
+	gogoprotoany "github.com/cosmos/gogoproto/types/any"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -20,8 +21,8 @@ import (
 )
 
 var (
-	_ ServiceServer                      = queryServer{}
-	_ codectypes.UnpackInterfacesMessage = &GetLatestValidatorSetResponse{}
+	_ ServiceServer                        = queryServer{}
+	_ gogoprotoany.UnpackInterfacesMessage = &GetLatestValidatorSetResponse{}
 )
 
 type (
@@ -112,7 +113,7 @@ func (s queryServer) GetLatestValidatorSet(ctx context.Context, req *GetLatestVa
 	return ValidatorsOutput(ctx, s.clientCtx, nil, page, limit)
 }
 
-func (m *GetLatestValidatorSetResponse) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {
+func (m *GetLatestValidatorSetResponse) UnpackInterfaces(unpacker gogoprotoany.AnyUnpacker) error {
 	var pubKey cryptotypes.PubKey
 	for _, val := range m.Validators {
 		err := unpacker.UnpackAny(val.PubKey, &pubKey)

client/grpc/node/service.go

@@ -32,6 +32,7 @@ type queryServer struct {
 func NewQueryServer(clientCtx client.Context, cfg config.Config) ServiceServer {
 	return queryServer{
 		clientCtx: clientCtx,
+		cfg:       cfg,
 	}
 }
 

client/grpc/node/service_test.go

@@ -12,12 +12,17 @@ import (
 
 func TestServiceServer_Config(t *testing.T) {
 	defaultCfg := config.DefaultConfig()
+	defaultCfg.PruningKeepRecent = "2000"
+	defaultCfg.PruningInterval = "10"
+	defaultCfg.HaltHeight = 100
 	svr := NewQueryServer(client.Context{}, *defaultCfg)
 	ctx := sdk.Context{}.WithMinGasPrices(sdk.NewDecCoins(sdk.NewInt64DecCoin("stake", 15)))
 
 	resp, err := svr.Config(ctx, &ConfigRequest{})
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 	require.Equal(t, ctx.MinGasPrices().String(), resp.MinimumGasPrice)
+	require.Equal(t, defaultCfg.PruningKeepRecent, resp.PruningKeepRecent)
+	require.Equal(t, defaultCfg.PruningInterval, resp.PruningInterval)
 	require.Equal(t, defaultCfg.HaltHeight, resp.HaltHeight)
 }

client/keys/output_test.go

@@ -8,13 +8,15 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
+	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	kmultisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 )
 
 func generatePubKeys(n int) []types.PubKey {
@@ -100,3 +102,24 @@ func TestProtoMarshalJSON(t *testing.T) {
 	require.Equal(ko.Address, expectedOutput)
 	require.Equal(ko.PubKey, string(bz))
 }
+
+func TestNestedMultisigOutput(t *testing.T) {
+	cdc := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{}).Codec
+
+	sk := secp256k1.PrivKey{Key: []byte{154, 49, 3, 117, 55, 232, 249, 20, 205, 216, 102, 7, 136, 72, 177, 2, 131, 202, 234, 81, 31, 208, 46, 244, 179, 192, 167, 163, 142, 117, 246, 13}}
+	tmpKey := sk.PubKey()
+	multisigPk := kmultisig.NewLegacyAminoPubKey(1, []types.PubKey{tmpKey})
+	multisigPk2 := kmultisig.NewLegacyAminoPubKey(1, []types.PubKey{tmpKey, multisigPk})
+
+	kb, err := keyring.New(t.Name(), keyring.BackendTest, t.TempDir(), nil, cdc)
+	require.NoError(t, err)
+
+	_, err = kb.SaveMultisig("multisig", multisigPk2)
+	require.NoError(t, err)
+
+	k, err := kb.Key("multisig")
+	require.NoError(t, err)
+
+	_, err = MkAccKeyOutput(k, addresscodec.NewBech32Codec("cosmos"))
+	require.NoError(t, err)
+}