feat(auth): support accounts from auth (backport #21688)

.github/dependabot.yml

@@ -187,6 +187,15 @@ updates:
     labels:
       - "A:automerge"
       - dependencies
+  - package-ecosystem: gomod
+    directory: "x/accounts/defaults/base"
+    schedule:
+      interval: weekly
+      day: wednesday
+      time: "02:45"
+    labels:
+      - "A:automerge"
+      - dependencies
   - package-ecosystem: gomod
     directory: "x/accounts/defaults/multisig"
     schedule:

.github/pr_labeler.yml

@@ -28,6 +28,8 @@
   - indexer/postgres/**/*
 "C:x/accounts":
   - x/accounts/**/*
+"C:x/accounts/base":
+  - x/accounts/defaults/base/**/*
 "C:x/accounts/multisig":
   - x/accounts/defaults/multisig/**/*
 "C:x/accounts/lockup":

.github/workflows/test.yml

@@ -937,6 +937,29 @@ jobs:
         with:
           projectBaseDir: x/accounts/
 
+  test-x-accounts-base:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.23"
+          check-latest: true
+          cache: true
+          cache-dependency-path: x/accounts/defaults/base/go.sum
+      - uses: technote-space/get-diff-action@v6.1.2
+        id: git_diff
+        with:
+          PATTERNS: |
+            x/accounts/defaults/base/**/*.go
+            x/accounts/defaults/base/go.mod
+            x/accounts/defaults/base/go.sum
+      - name: tests
+        if: env.GIT_DIFF
+        run: |
+          cd x/accounts/defaults/base
+          go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock' ./...
+
   test-x-accounts-lockup:
     runs-on: ubuntu-latest
     steps:

go.work.example

@@ -8,6 +8,7 @@ use (
 	./tests/systemtests
 	./tools/confix
 	./x/accounts
+	./x/accounts/defaults/base
 	./x/accounts/defaults/lockup
 	./x/auth
 	./x/authz

scripts/mockgen.sh

@@ -13,7 +13,7 @@ $mockgen_cmd -source=x/nft/expected_keepers.go -package testutil -destination x/
 $mockgen_cmd -source=x/feegrant/expected_keepers.go -package testutil -destination x/feegrant/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/mint/types/expected_keepers.go -package testutil -destination x/mint/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/auth/tx/config/expected_keepers.go -package testutil -destination x/auth/tx/testutil/expected_keepers_mocks.go
-# $mockgen_cmd -source=x/auth/types/expected_keepers.go -package testutil -destination x/auth/testutil/expected_keepers_mocks.go
+$mockgen_cmd -source=x/auth/types/expected_keepers.go -package testutil -destination x/auth/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/auth/ante/expected_keepers.go -package testutil -destination x/auth/ante/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/authz/expected_keepers.go -package testutil -destination x/authz/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/bank/types/expected_keepers.go -package testutil -destination x/bank/testutil/expected_keepers_mocks.go
@@ -24,6 +24,6 @@ $mockgen_cmd -source=x/slashing/types/expected_keepers.go -package testutil -des
 $mockgen_cmd -source=x/genutil/types/expected_keepers.go -package testutil -destination x/genutil/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/gov/testutil/expected_keepers.go -package testutil -destination x/gov/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/staking/types/expected_keepers.go -package testutil -destination x/staking/testutil/expected_keepers_mocks.go
-# $mockgen_cmd -source=x/auth/vesting/types/expected_keepers.go -package testutil -destination x/auth/vesting/testutil/expected_keepers_mocks.go
+$mockgen_cmd -source=x/auth/vesting/types/expected_keepers.go -package testutil -destination x/auth/vesting/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/protocolpool/types/expected_keepers.go -package testutil -destination x/protocolpool/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/upgrade/types/expected_keepers.go -package testutil -destination x/upgrade/testutil/expected_keepers_mocks.go

server/v2/cometbft/go.mod

@@ -27,7 +27,7 @@ require (
 	cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
 	github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f
 	github.com/cometbft/cometbft/api v1.0.0-rc.1
-	github.com/cosmos/cosmos-sdk v0.53.0
+	github.com/cosmos/cosmos-sdk v0.52.0
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/spf13/cobra v1.8.1

simapp/go.mod

@@ -13,7 +13,8 @@ require (
 	cosmossdk.io/math v1.3.0
 	cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 // main
 	cosmossdk.io/tools/confix v0.0.0-20230613133644-0a778132a60f
-	cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91
+	cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e
+	cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5
 	cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
@@ -243,6 +244,7 @@ replace (
 	cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214 // main
 	cosmossdk.io/tools/confix => ../tools/confix
 	cosmossdk.io/x/accounts => ../x/accounts
+	cosmossdk.io/x/accounts/defaults/base => ../x/accounts/defaults/base
 	cosmossdk.io/x/accounts/defaults/lockup => ../x/accounts/defaults/lockup
 	cosmossdk.io/x/accounts/defaults/multisig => ../x/accounts/defaults/multisig
 	cosmossdk.io/x/authz => ../x/authz

simapp/v2/go.mod

@@ -15,7 +15,7 @@ require (
 	cosmossdk.io/server/v2/cometbft v0.0.0-00010101000000-000000000000
 	cosmossdk.io/store/v2 v2.0.0-20240916221850-7856d226038c // main
 	cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000
-	cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91
+	cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e
 	cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
 	cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f
@@ -35,7 +35,7 @@ require (
 	github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f
 	github.com/cosmos/cosmos-db v1.0.3-0.20240911104526-ddc3f09bfc22 // indirect
 	// this version is not used as it is always replaced by the latest Cosmos SDK version
-	github.com/cosmos/cosmos-sdk v0.53.0
+	github.com/cosmos/cosmos-sdk v0.52.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.19.0
@@ -59,6 +59,7 @@ require (
 	cosmossdk.io/server/v2/appmanager v0.0.0-20240916221850-7856d226038c // indirect; main
 	cosmossdk.io/server/v2/stf v0.0.0-20240916221850-7856d226038c // indirect; main
 	cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 // indirect; main
+	cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000 // indirect
 	cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5 // indirect
 	cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 // indirect
 	cosmossdk.io/x/tx v0.14.0 // indirect; main
@@ -254,6 +255,7 @@ replace (
 	cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214 // main
 	cosmossdk.io/tools/confix => ../../tools/confix
 	cosmossdk.io/x/accounts => ../../x/accounts
+	cosmossdk.io/x/accounts/defaults/base => ../../x/accounts/defaults/base
 	cosmossdk.io/x/accounts/defaults/lockup => ../../x/accounts/defaults/lockup
 	cosmossdk.io/x/accounts/defaults/multisig => ../../x/accounts/defaults/multisig
 	cosmossdk.io/x/authz => ../../x/authz

tests/go.mod

@@ -34,7 +34,8 @@ require (
 
 require (
 	cosmossdk.io/core/testing v0.0.0-20240913164418-aaf72f20c10b // main
-	cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91
+	cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e
+	cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5
 	cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000
@@ -240,6 +241,7 @@ replace (
 	// pseudo version lower than the latest tag
 	cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240913190136-3bc707a5a214 // main
 	cosmossdk.io/x/accounts => ../x/accounts
+	cosmossdk.io/x/accounts/defaults/base => ../x/accounts/defaults/base
 	cosmossdk.io/x/accounts/defaults/lockup => ../x/accounts/defaults/lockup
 	cosmossdk.io/x/accounts/defaults/multisig => ../x/accounts/defaults/multisig
 	cosmossdk.io/x/authz => ../x/authz

tests/integration/auth/keeper/accounts_retro_compatibility_test.go

@@ -0,0 +1,157 @@
+package keeper_test
+
+import (
+	"context"
+	"testing"
+
+	gogotypes "github.com/cosmos/gogoproto/types"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	"cosmossdk.io/x/accounts/accountstd"
+	basev1 "cosmossdk.io/x/accounts/defaults/base/v1"
+
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+)
+
+var _ accountstd.Interface = mockRetroCompatAccount{}
+
+type mockRetroCompatAccount struct {
+	retroCompat *authtypes.QueryLegacyAccountResponse
+	address     []byte
+}
+
+func (m mockRetroCompatAccount) RegisterInitHandler(builder *accountstd.InitBuilder) {
+	accountstd.RegisterInitHandler(builder, func(ctx context.Context, req *gogotypes.Empty) (*gogotypes.Empty, error) {
+		return &gogotypes.Empty{}, nil
+	})
+}
+
+func (m mockRetroCompatAccount) RegisterExecuteHandlers(_ *accountstd.ExecuteBuilder) {}
+
+func (m mockRetroCompatAccount) RegisterQueryHandlers(builder *accountstd.QueryBuilder) {
+	if m.retroCompat == nil {
+		return
+	}
+	accountstd.RegisterQueryHandler(builder, func(ctx context.Context, req *authtypes.QueryLegacyAccount) (*authtypes.QueryLegacyAccountResponse, error) {
+		return m.retroCompat, nil
+	})
+}
+
+func TestAuthToAccountsGRPCCompat(t *testing.T) {
+	valid := &mockRetroCompatAccount{
+		retroCompat: &authtypes.QueryLegacyAccountResponse{
+			Account: &codectypes.Any{},
+			Info: &authtypes.BaseAccount{
+				Address:       "test",
+				PubKey:        nil,
+				AccountNumber: 10,
+				Sequence:      20,
+			},
+		},
+	}
+
+	noInfo := &mockRetroCompatAccount{
+		retroCompat: &authtypes.QueryLegacyAccountResponse{
+			Account: &codectypes.Any{},
+		},
+	}
+	noImplement := &mockRetroCompatAccount{
+		retroCompat: nil,
+	}
+
+	accs := map[string]accountstd.Interface{
+		"valid":        valid,
+		"no_info":      noInfo,
+		"no_implement": noImplement,
+	}
+
+	f := initFixture(t, accs)
+
+	// init three accounts
+	for n, a := range accs {
+		_, addr, err := f.accountsKeeper.Init(f.ctx, n, []byte("me"), &gogotypes.Empty{}, nil)
+		require.NoError(t, err)
+		a.(*mockRetroCompatAccount).address = addr
+	}
+
+	qs := authkeeper.NewQueryServer(f.authKeeper)
+
+	t.Run("account supports info and account query", func(t *testing.T) {
+		infoResp, err := qs.AccountInfo(f.ctx, &authtypes.QueryAccountInfoRequest{
+			Address: f.mustAddr(valid.address),
+		})
+		require.NoError(t, err)
+		require.Equal(t, infoResp.Info, valid.retroCompat.Info)
+
+		accountResp, err := qs.Account(f.ctx, &authtypes.QueryAccountRequest{
+			Address: f.mustAddr(noInfo.address),
+		})
+		require.NoError(t, err)
+		require.Equal(t, accountResp.Account, valid.retroCompat.Account)
+	})
+
+	t.Run("account only supports account query, not info", func(t *testing.T) {
+		_, err := qs.AccountInfo(f.ctx, &authtypes.QueryAccountInfoRequest{
+			Address: f.mustAddr(noInfo.address),
+		})
+		require.Error(t, err)
+		require.Equal(t, status.Code(err), codes.NotFound)
+
+		resp, err := qs.Account(f.ctx, &authtypes.QueryAccountRequest{
+			Address: f.mustAddr(noInfo.address),
+		})
+		require.NoError(t, err)
+		require.Equal(t, resp.Account, valid.retroCompat.Account)
+	})
+
+	t.Run("account does not support any retro compat", func(t *testing.T) {
+		_, err := qs.AccountInfo(f.ctx, &authtypes.QueryAccountInfoRequest{
+			Address: f.mustAddr(noImplement.address),
+		})
+		require.Error(t, err)
+		require.Equal(t, status.Code(err), codes.NotFound)
+
+		_, err = qs.Account(f.ctx, &authtypes.QueryAccountRequest{
+			Address: f.mustAddr(noImplement.address),
+		})
+
+		require.Error(t, err)
+		require.Equal(t, status.Code(err), codes.NotFound)
+	})
+}
+
+func TestAccountsBaseAccountRetroCompat(t *testing.T) {
+	f := initFixture(t, nil)
+	// init a base acc
+	anyPk, err := codectypes.NewAnyWithValue(secp256k1.GenPrivKey().PubKey())
+	require.NoError(t, err)
+
+	// we init two accounts to have account num not be zero.
+	_, _, err = f.accountsKeeper.Init(f.ctx, "base", []byte("me"), &basev1.MsgInit{PubKey: anyPk}, nil)
+	require.NoError(t, err)
+
+	_, addr, err := f.accountsKeeper.Init(f.ctx, "base", []byte("me"), &basev1.MsgInit{PubKey: anyPk}, nil)
+	require.NoError(t, err)
+
+	// try to query it via auth
+	qs := authkeeper.NewQueryServer(f.authKeeper)
+
+	r, err := qs.Account(f.ctx, &authtypes.QueryAccountRequest{
+		Address: f.mustAddr(addr),
+	})
+	require.NoError(t, err)
+	require.NotNil(t, r.Account)
+
+	info, err := qs.AccountInfo(f.ctx, &authtypes.QueryAccountInfoRequest{
+		Address: f.mustAddr(addr),
+	})
+	require.NoError(t, err)
+	require.NotNil(t, info.Info)
+	require.Equal(t, info.Info.PubKey, anyPk)
+	require.Equal(t, info.Info.AccountNumber, uint64(1))
+}