From 6e59ad0deea672a21e64fdc83939ca812dcd2b1b Mon Sep 17 00:00:00 2001
From: cool-developer <51834436+cool-develope@users.noreply.github.com>
Date: Mon, 21 Oct 2024 07:50:45 -0400
Subject: [PATCH 1/5] feat(store/v2): route to the commitment during migration
 (#22290)

---
 store/v2/commitment/iavl/tree.go      | 12 ++++
 store/v2/commitment/iavl/tree_test.go | 79 +++++++++++++++++++++++++++
 store/v2/commitment/store.go          | 63 +++++++++++++++++++--
 store/v2/commitment/tree.go           | 14 +++--
 store/v2/database.go                  |  4 --
 store/v2/root/reader.go               | 36 ++++++------
 store/v2/root/store.go                | 48 ++++++++++++----
 7 files changed, 212 insertions(+), 44 deletions(-)

diff --git a/store/v2/commitment/iavl/tree.go b/store/v2/commitment/iavl/tree.go
index 2783ba3a70af..62e6d4a5e62c 100644
--- a/store/v2/commitment/iavl/tree.go
+++ b/store/v2/commitment/iavl/tree.go
@@ -14,6 +14,7 @@ import (
 
 var (
 	_ commitment.Tree      = (*IavlTree)(nil)
+	_ commitment.Reader    = (*IavlTree)(nil)
 	_ store.PausablePruner = (*IavlTree)(nil)
 )
 
@@ -76,6 +77,7 @@ func (t *IavlTree) GetProof(version uint64, key []byte) (*ics23.CommitmentProof,
 	return immutableTree.GetProof(key)
 }
 
+// Get implements the Reader interface.
 func (t *IavlTree) Get(version uint64, key []byte) ([]byte, error) {
 	immutableTree, err := t.tree.GetImmutable(int64(version))
 	if err != nil {
@@ -85,6 +87,16 @@ func (t *IavlTree) Get(version uint64, key []byte) ([]byte, error) {
 	return immutableTree.Get(key)
 }
 
+// Iterator implements the Reader interface.
+func (t *IavlTree) Iterator(version uint64, start, end []byte, ascending bool) (corestore.Iterator, error) {
+	immutableTree, err := t.tree.GetImmutable(int64(version))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get immutable tree at version %d: %w", version, err)
+	}
+
+	return immutableTree.Iterator(start, end, ascending)
+}
+
 // GetLatestVersion returns the latest version of the tree.
 func (t *IavlTree) GetLatestVersion() (uint64, error) {
 	v, err := t.tree.GetLatestVersion()
diff --git a/store/v2/commitment/iavl/tree_test.go b/store/v2/commitment/iavl/tree_test.go
index 4ea8f0f93ff1..65503190b943 100644
--- a/store/v2/commitment/iavl/tree_test.go
+++ b/store/v2/commitment/iavl/tree_test.go
@@ -133,3 +133,82 @@ func TestIavlTree(t *testing.T) {
 	// close the db
 	require.NoError(t, tree.Close())
 }
+
+func TestIavlTreeIterator(t *testing.T) {
+	// generate a new tree
+	tree := generateTree()
+	require.NotNil(t, tree)
+
+	// write a batch of version 1
+	require.NoError(t, tree.Set([]byte("key1"), []byte("value1")))
+	require.NoError(t, tree.Set([]byte("key2"), []byte("value2")))
+	require.NoError(t, tree.Set([]byte("key3"), []byte("value3")))
+
+	// commit the batch
+	_, _, err := tree.Commit()
+	require.NoError(t, err)
+
+	// write a batch of version 2
+	require.NoError(t, tree.Set([]byte("key4"), []byte("value4")))
+	require.NoError(t, tree.Set([]byte("key5"), []byte("value5")))
+	require.NoError(t, tree.Set([]byte("key6"), []byte("value6")))
+	require.NoError(t, tree.Remove([]byte("key1"))) // delete key1
+	_, _, err = tree.Commit()
+	require.NoError(t, err)
+
+	// write a batch of version 3
+	require.NoError(t, tree.Set([]byte("key7"), []byte("value7")))
+	require.NoError(t, tree.Set([]byte("key8"), []byte("value8")))
+	_, _, err = tree.Commit()
+	require.NoError(t, err)
+
+	// iterate over all keys
+	iter, err := tree.Iterator(3, nil, nil, true)
+	require.NoError(t, err)
+	// expect all keys to be iterated over
+	expectedKeys := []string{"key2", "key3", "key4", "key5", "key6", "key7", "key8"}
+	count := 0
+	for i := 0; iter.Valid(); i++ {
+		require.Equal(t, expectedKeys[i], string(iter.Key()))
+		iter.Next()
+		count++
+	}
+	require.Equal(t, len(expectedKeys), count)
+	require.NoError(t, iter.Close())
+
+	// iterate over all keys in reverse
+	iter, err = tree.Iterator(3, nil, nil, false)
+	require.NoError(t, err)
+	expectedKeys = []string{"key8", "key7", "key6", "key5", "key4", "key3", "key2"}
+	for i := 0; iter.Valid(); i++ {
+		require.Equal(t, expectedKeys[i], string(iter.Key()))
+		iter.Next()
+	}
+	require.NoError(t, iter.Close())
+
+	// iterate over keys with version 1
+	iter, err = tree.Iterator(1, nil, nil, true)
+	require.NoError(t, err)
+	expectedKeys = []string{"key1", "key2", "key3"}
+	count = 0
+	for i := 0; iter.Valid(); i++ {
+		require.Equal(t, expectedKeys[i], string(iter.Key()))
+		iter.Next()
+		count++
+	}
+	require.Equal(t, len(expectedKeys), count)
+	require.NoError(t, iter.Close())
+
+	// iterate over keys with version 2
+	iter, err = tree.Iterator(2, nil, nil, false)
+	require.NoError(t, err)
+	expectedKeys = []string{"key6", "key5", "key4", "key3", "key2"}
+	count = 0
+	for i := 0; iter.Valid(); i++ {
+		require.Equal(t, expectedKeys[i], string(iter.Key()))
+		iter.Next()
+		count++
+	}
+	require.Equal(t, len(expectedKeys), count)
+	require.NoError(t, iter.Close())
+}
diff --git a/store/v2/commitment/store.go b/store/v2/commitment/store.go
index e1f6df9d2024..5b3c7d43fa90 100644
--- a/store/v2/commitment/store.go
+++ b/store/v2/commitment/store.go
@@ -25,6 +25,11 @@ var (
 	_ store.UpgradeableStore      = (*CommitStore)(nil)
 	_ snapshots.CommitSnapshotter = (*CommitStore)(nil)
 	_ store.PausablePruner        = (*CommitStore)(nil)
+
+	// NOTE: It is not recommended to use the CommitStore as a reader. This is only used
+	// during the migration process. Generally, the SC layer does not provide a reader
+	// in the store/v2.
+	_ store.VersionedReader = (*CommitStore)(nil)
 )
 
 // MountTreeFn is a function that mounts a tree given a store key.
@@ -275,14 +280,38 @@ func (c *CommitStore) GetProof(storeKey []byte, version uint64, key []byte) ([]p
 	return []proof.CommitmentOp{commitOp, *storeCommitmentOp}, nil
 }
 
-// Get implements store.VersionedReader.
-func (c *CommitStore) Get(storeKey []byte, version uint64, key []byte) ([]byte, error) {
-	tree, ok := c.multiTrees[conv.UnsafeBytesToStr(storeKey)]
+// getReader returns a reader for the given store key. It will return an error if the
+// store key does not exist or the tree does not implement the Reader interface.
+// WARNING: This function is only used during the migration process. The SC layer
+// generally does not provide a reader for the CommitStore.
+func (c *CommitStore) getReader(storeKey string) (Reader, error) {
+	tree, ok := c.multiTrees[storeKey]
 	if !ok {
 		return nil, fmt.Errorf("store %s not found", storeKey)
 	}
 
-	bz, err := tree.Get(version, key)
+	reader, ok := tree.(Reader)
+	if !ok {
+		return nil, fmt.Errorf("tree for store %s does not implement Reader", storeKey)
+	}
+
+	return reader, nil
+}
+
+// VersionExists implements store.VersionedReader.
+func (c *CommitStore) VersionExists(version uint64) (bool, error) {
+	ci, err := c.metadata.GetCommitInfo(version)
+	return ci != nil, err
+}
+
+// Get implements store.VersionedReader.
+func (c *CommitStore) Get(storeKey []byte, version uint64, key []byte) ([]byte, error) {
+	reader, err := c.getReader(conv.UnsafeBytesToStr(storeKey))
+	if err != nil {
+		return nil, err
+	}
+
+	bz, err := reader.Get(version, key)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get key %s from store %s: %w", key, storeKey, err)
 	}
@@ -290,6 +319,32 @@ func (c *CommitStore) Get(storeKey []byte, version uint64, key []byte) ([]byte,
 	return bz, nil
 }
 
+// Has implements store.VersionedReader.
+func (c *CommitStore) Has(storeKey []byte, version uint64, key []byte) (bool, error) {
+	val, err := c.Get(storeKey, version, key)
+	return val != nil, err
+}
+
+// Iterator implements store.VersionedReader.
+func (c *CommitStore) Iterator(storeKey []byte, version uint64, start, end []byte) (corestore.Iterator, error) {
+	reader, err := c.getReader(conv.UnsafeBytesToStr(storeKey))
+	if err != nil {
+		return nil, err
+	}
+
+	return reader.Iterator(version, start, end, true)
+}
+
+// ReverseIterator implements store.VersionedReader.
+func (c *CommitStore) ReverseIterator(storeKey []byte, version uint64, start, end []byte) (corestore.Iterator, error) {
+	reader, err := c.getReader(conv.UnsafeBytesToStr(storeKey))
+	if err != nil {
+		return nil, err
+	}
+
+	return reader.Iterator(version, start, end, false)
+}
+
 // Prune implements store.Pruner.
 func (c *CommitStore) Prune(version uint64) error {
 	// prune the metadata
diff --git a/store/v2/commitment/tree.go b/store/v2/commitment/tree.go
index 19b76b34c937..c2da72c486f0 100644
--- a/store/v2/commitment/tree.go
+++ b/store/v2/commitment/tree.go
@@ -6,6 +6,7 @@ import (
 
 	ics23 "github.com/cosmos/ics23/go"
 
+	corestore "cosmossdk.io/core/store"
 	snapshotstypes "cosmossdk.io/store/v2/snapshots/types"
 )
 
@@ -29,12 +30,6 @@ type Tree interface {
 	SetInitialVersion(version uint64) error
 	GetProof(version uint64, key []byte) (*ics23.CommitmentProof, error)
 
-	// Get attempts to retrieve a value from the tree for a given version.
-	//
-	// NOTE: This method only exists to support migration from IAVL v0/v1 to v2.
-	// Once migration is complete, this method should be removed and/or not used.
-	Get(version uint64, key []byte) ([]byte, error)
-
 	Prune(version uint64) error
 	Export(version uint64) (Exporter, error)
 	Import(version uint64) (Importer, error)
@@ -42,6 +37,13 @@ type Tree interface {
 	io.Closer
 }
 
+// Reader is the optional interface that is only used to read data from the tree
+// during the migration process.
+type Reader interface {
+	Get(version uint64, key []byte) ([]byte, error)
+	Iterator(version uint64, start, end []byte, ascending bool) (corestore.Iterator, error)
+}
+
 // Exporter is the interface that wraps the basic Export methods.
 type Exporter interface {
 	Next() (*snapshotstypes.SnapshotIAVLItem, error)
diff --git a/store/v2/database.go b/store/v2/database.go
index c4f00defe81a..ca9b993c17de 100644
--- a/store/v2/database.go
+++ b/store/v2/database.go
@@ -29,10 +29,6 @@ type VersionedReader interface {
 
 	Iterator(storeKey []byte, version uint64, start, end []byte) (corestore.Iterator, error)
 	ReverseIterator(storeKey []byte, version uint64, start, end []byte) (corestore.Iterator, error)
-
-	// Close releases associated resources. It should NOT be idempotent. It must
-	// only be called once and any call after may panic.
-	io.Closer
 }
 
 // UpgradableDatabase defines an API for a versioned database that allows pruning
diff --git a/store/v2/root/reader.go b/store/v2/root/reader.go
index b7d8c59fa27a..38b1d7f12a5a 100644
--- a/store/v2/root/reader.go
+++ b/store/v2/root/reader.go
@@ -14,38 +14,38 @@ var (
 // operations. This is useful for exposing a read-only view of the RootStore at
 // a specific version in history, which could also be the latest state.
 type ReaderMap struct {
-	rootStore store.RootStore
-	version   uint64
+	vReader store.VersionedReader
+	version uint64
 }
 
-func NewReaderMap(v uint64, rs store.RootStore) *ReaderMap {
+func NewReaderMap(v uint64, vr store.VersionedReader) *ReaderMap {
 	return &ReaderMap{
-		rootStore: rs,
-		version:   v,
+		vReader: vr,
+		version: v,
 	}
 }
 
-func (roa *ReaderMap) GetReader(actor []byte) (corestore.Reader, error) {
-	return NewReader(roa.version, roa.rootStore, actor), nil
+func (rm *ReaderMap) GetReader(actor []byte) (corestore.Reader, error) {
+	return NewReader(rm.version, rm.vReader, actor), nil
 }
 
 // Reader represents a read-only adapter for accessing data from the root store.
 type Reader struct {
-	version   uint64          // The version of the data.
-	rootStore store.RootStore // The root store to read data from.
-	actor     []byte          // The actor associated with the data.
+	version uint64                // The version of the data.
+	vReader store.VersionedReader // The root store to read data from.
+	actor   []byte                // The actor associated with the data.
 }
 
-func NewReader(v uint64, rs store.RootStore, actor []byte) *Reader {
+func NewReader(v uint64, vr store.VersionedReader, actor []byte) *Reader {
 	return &Reader{
-		version:   v,
-		rootStore: rs,
-		actor:     actor,
+		version: v,
+		vReader: vr,
+		actor:   actor,
 	}
 }
 
 func (roa *Reader) Has(key []byte) (bool, error) {
-	val, err := roa.rootStore.GetStateStorage().Has(roa.actor, roa.version, key)
+	val, err := roa.vReader.Has(roa.actor, roa.version, key)
 	if err != nil {
 		return false, err
 	}
@@ -54,13 +54,13 @@ func (roa *Reader) Has(key []byte) (bool, error) {
 }
 
 func (roa *Reader) Get(key []byte) ([]byte, error) {
-	return roa.rootStore.GetStateStorage().Get(roa.actor, roa.version, key)
+	return roa.vReader.Get(roa.actor, roa.version, key)
 }
 
 func (roa *Reader) Iterator(start, end []byte) (corestore.Iterator, error) {
-	return roa.rootStore.GetStateStorage().Iterator(roa.actor, roa.version, start, end)
+	return roa.vReader.Iterator(roa.actor, roa.version, start, end)
 }
 
 func (roa *Reader) ReverseIterator(start, end []byte) (corestore.Iterator, error) {
-	return roa.rootStore.GetStateStorage().ReverseIterator(roa.actor, roa.version, start, end)
+	return roa.vReader.ReverseIterator(roa.actor, roa.version, start, end)
 }
diff --git a/store/v2/root/store.go b/store/v2/root/store.go
index a96c65bafe18..378cfafa3fdf 100644
--- a/store/v2/root/store.go
+++ b/store/v2/root/store.go
@@ -118,27 +118,51 @@ func (s *Store) SetInitialVersion(v uint64) error {
 	return s.stateCommitment.SetInitialVersion(v)
 }
 
-func (s *Store) StateLatest() (uint64, corestore.ReaderMap, error) {
-	v, err := s.GetLatestVersion()
+// getVersionedReader returns a VersionedReader based on the given version. If the
+// version exists in the state storage, it returns the state storage.
+// If not, it checks if the state commitment implements the VersionedReader interface
+// and the version exists in the state commitment, since the state storage will be
+// synced during migration.
+func (s *Store) getVersionedReader(version uint64) (store.VersionedReader, error) {
+	isExist, err := s.stateStorage.VersionExists(version)
 	if err != nil {
-		return 0, nil, err
+		return nil, err
+	}
+	if isExist {
+		return s.stateStorage, nil
 	}
 
-	return v, NewReaderMap(v, s), nil
+	if vReader, ok := s.stateCommitment.(store.VersionedReader); ok {
+		isExist, err := vReader.VersionExists(version)
+		if err != nil {
+			return nil, err
+		}
+		if isExist {
+			return vReader, nil
+		}
+	}
+
+	return nil, fmt.Errorf("version %d does not exist", version)
 }
 
-// StateAt checks if the requested version is present in ss.
-func (s *Store) StateAt(v uint64) (corestore.ReaderMap, error) {
-	// check if version is present in state storage
-	isExist, err := s.stateStorage.VersionExists(v)
+func (s *Store) StateLatest() (uint64, corestore.ReaderMap, error) {
+	v, err := s.GetLatestVersion()
 	if err != nil {
-		return nil, err
+		return 0, nil, err
 	}
-	if !isExist {
-		return nil, fmt.Errorf("version %d does not exist", v)
+
+	vReader, err := s.getVersionedReader(v)
+	if err != nil {
+		return 0, nil, err
 	}
 
-	return NewReaderMap(v, s), nil
+	return v, NewReaderMap(v, vReader), nil
+}
+
+// StateAt returns a read-only view of the state at a given version.
+func (s *Store) StateAt(v uint64) (corestore.ReaderMap, error) {
+	vReader, err := s.getVersionedReader(v)
+	return NewReaderMap(v, vReader), err
 }
 
 func (s *Store) GetStateStorage() store.VersionedWriter {

From 97d37ae2432a42f9c6097c2bdd4d5e6279301bf0 Mon Sep 17 00:00:00 2001
From: cool-developer <51834436+cool-develope@users.noreply.github.com>
Date: Mon, 21 Oct 2024 09:09:58 -0400
Subject: [PATCH 2/5] feat(store): add new api LatestVersion (#22305)

---
 baseapp/baseapp.go           | 2 +-
 store/CHANGELOG.md           | 4 ++++
 store/iavl/store.go          | 5 +++++
 store/mem/store.go           | 2 ++
 store/rootmulti/dbadapter.go | 4 ++++
 store/rootmulti/store.go     | 6 +++++-
 store/transient/store.go     | 5 +++++
 store/types/store.go         | 1 +
 8 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index 2ef933c205c3..4d51fea669b7 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -397,7 +397,7 @@ func (app *BaseApp) LastCommitID() storetypes.CommitID {
 
 // LastBlockHeight returns the last committed block height.
 func (app *BaseApp) LastBlockHeight() int64 {
-	return app.cms.LastCommitID().Version
+	return app.cms.LatestVersion()
 }
 
 // ChainID returns the chainID of the app.
diff --git a/store/CHANGELOG.md b/store/CHANGELOG.md
index 6cf411505792..12e6c613d2ca 100644
--- a/store/CHANGELOG.md
+++ b/store/CHANGELOG.md
@@ -25,6 +25,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+### Improvements
+
+* (store) [#22305](https://github.com/cosmos/cosmos-sdk/pull/22305) Add `LatestVersion` to the `Committer` interface to get the latest version of the store.
+
 ### Bug Fixes
 
 * (store) [#20425](https://github.com/cosmos/cosmos-sdk/pull/20425) Fix nil pointer panic when query historical state where a new store don't exist.
diff --git a/store/iavl/store.go b/store/iavl/store.go
index ae6b0b56ff70..42f8fed7c910 100644
--- a/store/iavl/store.go
+++ b/store/iavl/store.go
@@ -146,6 +146,11 @@ func (st *Store) LastCommitID() types.CommitID {
 	}
 }
 
+// LatestVersion implements Committer.
+func (st *Store) LatestVersion() int64 {
+	return st.tree.Version()
+}
+
 // PausePruning implements CommitKVStore interface.
 func (st *Store) PausePruning(pause bool) {
 	if pause {
diff --git a/store/mem/store.go b/store/mem/store.go
index e1f2998ce201..feff6ee27192 100644
--- a/store/mem/store.go
+++ b/store/mem/store.go
@@ -59,4 +59,6 @@ func (s *Store) GetPruning() pruningtypes.PruningOptions {
 
 func (s Store) LastCommitID() (id types.CommitID) { return }
 
+func (s Store) LatestVersion() (version int64) { return }
+
 func (s Store) WorkingHash() (hash []byte) { return }
diff --git a/store/rootmulti/dbadapter.go b/store/rootmulti/dbadapter.go
index c0954e8532ab..5228859c2752 100644
--- a/store/rootmulti/dbadapter.go
+++ b/store/rootmulti/dbadapter.go
@@ -36,6 +36,10 @@ func (cdsa commitDBStoreAdapter) LastCommitID() types.CommitID {
 	}
 }
 
+func (cdsa commitDBStoreAdapter) LatestVersion() int64 {
+	return -1
+}
+
 func (cdsa commitDBStoreAdapter) WorkingHash() []byte {
 	return commithash
 }
diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go
index d23bcc57b090..486fffebeba9 100644
--- a/store/rootmulti/store.go
+++ b/store/rootmulti/store.go
@@ -434,7 +434,11 @@ func (rs *Store) PopStateCache() []*types.StoreKVPair {
 
 // LatestVersion returns the latest version in the store
 func (rs *Store) LatestVersion() int64 {
-	return rs.LastCommitID().Version
+	if rs.lastCommitInfo == nil {
+		return GetLatestVersion(rs.db)
+	}
+
+	return rs.lastCommitInfo.Version
 }
 
 // LastCommitID implements Committer/CommitStore.
diff --git a/store/transient/store.go b/store/transient/store.go
index b3d1fd4bb0fd..c309c03044ec 100644
--- a/store/transient/store.go
+++ b/store/transient/store.go
@@ -42,6 +42,11 @@ func (ts *Store) LastCommitID() types.CommitID {
 	return types.CommitID{}
 }
 
+// LatestVersion implements Committer
+func (ts *Store) LatestVersion() int64 {
+	return 0
+}
+
 func (ts *Store) WorkingHash() []byte {
 	return []byte{}
 }
diff --git a/store/types/store.go b/store/types/store.go
index de77e2c548aa..8aab76a170b0 100644
--- a/store/types/store.go
+++ b/store/types/store.go
@@ -21,6 +21,7 @@ type Store interface {
 type Committer interface {
 	Commit() CommitID
 	LastCommitID() CommitID
+	LatestVersion() int64
 
 	// WorkingHash returns the hash of the KVStore's state before commit.
 	WorkingHash() []byte

From 681366e3469ccc1b28e2ef7e2d26ab50fe4418a6 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Mon, 21 Oct 2024 15:45:28 +0200
Subject: [PATCH 3/5] refactor(runtime/v2): simplify app manager (#22300)

---
 runtime/v2/app.go                          |  43 +++----
 runtime/v2/builder.go                      | 127 ++++++++++-----------
 runtime/v2/manager.go                      |   4 +-
 runtime/v2/module.go                       |   2 +-
 server/v2/api/grpc/server.go               |   6 +-
 server/v2/api/rest/handler.go              |   4 +-
 server/v2/api/rest/server.go               |   2 +-
 server/v2/appmanager/appmanager.go         |  88 +++++++++++---
 server/v2/appmanager/appmanager_builder.go |  40 -------
 server/v2/appmanager/config.go             |   1 -
 server/v2/appmanager/genesis.go            |   6 +-
 server/v2/appmanager/{types.go => stf.go}  |   0
 server/v2/cometbft/abci.go                 |   4 +-
 server/v2/cometbft/abci_test.go            |  17 ++-
 server/v2/cometbft/server.go               |   8 +-
 server/v2/server_test.go                   |   9 +-
 server/v2/stf/stf.go                       |   4 +-
 server/v2/store/server.go                  |   2 +-
 server/v2/types.go                         |   9 +-
 simapp/v2/app_di.go                        |   4 +-
 simapp/v2/app_test.go                      |   4 +-
 simapp/v2/export.go                        |   2 +-
 22 files changed, 194 insertions(+), 192 deletions(-)
 delete mode 100644 server/v2/appmanager/appmanager_builder.go
 rename server/v2/appmanager/{types.go => stf.go} (100%)

diff --git a/runtime/v2/app.go b/runtime/v2/app.go
index e52ea26c6e9f..b7887ab77f54 100644
--- a/runtime/v2/app.go
+++ b/runtime/v2/app.go
@@ -23,26 +23,24 @@ import (
 // done declaratively with an app config and the rest of it is done the old way.
 // See simapp/app_v2.go for an example of this setup.
 type App[T transaction.Tx] struct {
-	*appmanager.AppManager[T]
+	appmanager.AppManager[T]
 
-	// app manager dependencies
+	// app configuration
+	logger log.Logger
+	config *runtimev2.Module
+
+	// state
 	stf                *stf.STF[T]
 	msgRouterBuilder   *stf.MsgRouterBuilder
 	queryRouterBuilder *stf.MsgRouterBuilder
 	db                 Store
+	storeLoader        StoreLoader
 
-	// app configuration
-	logger log.Logger
-	config *runtimev2.Module
-
+	// modules
 	interfaceRegistrar registry.InterfaceRegistrar
 	amino              registry.AminoRegistrar
 	moduleManager      *MM[T]
-
-	// QueryHandlers defines the query handlers
-	QueryHandlers map[string]appmodulev2.Handler
-
-	storeLoader StoreLoader
+	queryHandlers      map[string]appmodulev2.Handler // queryHandlers defines the query handlers
 }
 
 // Name returns the app name.
@@ -85,24 +83,21 @@ func (a *App[T]) LoadLatestHeight() (uint64, error) {
 	return a.db.GetLatestVersion()
 }
 
-// Close is called in start cmd to gracefully cleanup resources.
-func (a *App[T]) Close() error {
-	return nil
-}
-
-func (a *App[T]) GetAppManager() *appmanager.AppManager[T] {
-	return a.AppManager
-}
-
-func (a *App[T]) GetQueryHandlers() map[string]appmodulev2.Handler {
-	return a.QueryHandlers
+// GetQueryHandlers returns the query handlers.
+func (a *App[T]) QueryHandlers() map[string]appmodulev2.Handler {
+	return a.queryHandlers
 }
 
-// GetSchemaDecoderResolver returns the module schema resolver.
-func (a *App[T]) GetSchemaDecoderResolver() decoding.DecoderResolver {
+// SchemaDecoderResolver returns the module schema resolver.
+func (a *App[T]) SchemaDecoderResolver() decoding.DecoderResolver {
 	moduleSet := map[string]any{}
 	for moduleName, module := range a.moduleManager.Modules() {
 		moduleSet[moduleName] = module
 	}
 	return decoding.ModuleSetDecoderResolver(moduleSet)
 }
+
+// Close is called in start cmd to gracefully cleanup resources.
+func (a *App[T]) Close() error {
+	return nil
+}
diff --git a/runtime/v2/builder.go b/runtime/v2/builder.go
index adb177d41eb0..8556e35745a8 100644
--- a/runtime/v2/builder.go
+++ b/runtime/v2/builder.go
@@ -31,11 +31,6 @@ type AppBuilder[T transaction.Tx] struct {
 	postTxExec  func(ctx context.Context, tx T, success bool) error
 }
 
-// DefaultGenesis returns a default genesis from the registered AppModule's.
-func (a *AppBuilder[T]) DefaultGenesis() map[string]json.RawMessage {
-	return a.app.moduleManager.DefaultGenesis()
-}
-
 // RegisterModules registers the provided modules with the module manager.
 // This is the primary hook for integrating with modules which are not registered using the app config.
 func (a *AppBuilder[T]) RegisterModules(modules map[string]appmodulev2.AppModule) error {
@@ -98,7 +93,7 @@ func (a *AppBuilder[T]) Build(opts ...AppBuilderOption[T]) (*App[T], error) {
 
 	endBlocker, valUpdate := a.app.moduleManager.EndBlock()
 
-	stf, err := stf.NewSTF[T](
+	stf, err := stf.New[T](
 		a.app.logger.With("module", "stf"),
 		a.app.msgRouterBuilder,
 		a.app.queryRouterBuilder,
@@ -115,77 +110,75 @@ func (a *AppBuilder[T]) Build(opts ...AppBuilderOption[T]) (*App[T], error) {
 	}
 	a.app.stf = stf
 
-	appManagerBuilder := appmanager.Builder[T]{
-		STF:                a.app.stf,
-		DB:                 a.app.db,
-		ValidateTxGasLimit: a.app.config.GasConfig.ValidateTxGasLimit,
-		QueryGasLimit:      a.app.config.GasConfig.QueryGasLimit,
-		SimulationGasLimit: a.app.config.GasConfig.SimulationGasLimit,
-		InitGenesis: func(
-			ctx context.Context,
-			src io.Reader,
-			txHandler func(json.RawMessage) error,
-		) (store.WriterMap, error) {
-			// this implementation assumes that the state is a JSON object
-			bz, err := io.ReadAll(src)
-			if err != nil {
-				return nil, fmt.Errorf("failed to read import state: %w", err)
-			}
-			var genesisJSON map[string]json.RawMessage
-			if err = json.Unmarshal(bz, &genesisJSON); err != nil {
-				return nil, err
-			}
-
-			v, zeroState, err := a.app.db.StateLatest()
-			if err != nil {
-				return nil, fmt.Errorf("unable to get latest state: %w", err)
-			}
-			if v != 0 { // TODO: genesis state may be > 0, we need to set version on store
-				return nil, errors.New("cannot init genesis on non-zero state")
-			}
-			genesisCtx := services.NewGenesisContext(a.branch(zeroState))
-			genesisState, err := genesisCtx.Mutate(ctx, func(ctx context.Context) error {
-				err = a.app.moduleManager.InitGenesisJSON(ctx, genesisJSON, txHandler)
-				if err != nil {
-					return fmt.Errorf("failed to init genesis: %w", err)
-				}
-				return nil
-			})
-
-			return genesisState, err
+	a.app.AppManager = appmanager.New[T](
+		appmanager.Config{
+			ValidateTxGasLimit: a.app.config.GasConfig.ValidateTxGasLimit,
+			QueryGasLimit:      a.app.config.GasConfig.QueryGasLimit,
+			SimulationGasLimit: a.app.config.GasConfig.SimulationGasLimit,
 		},
-		ExportGenesis: func(ctx context.Context, version uint64) ([]byte, error) {
-			state, err := a.app.db.StateAt(version)
-			if err != nil {
-				return nil, fmt.Errorf("unable to get state at given version: %w", err)
-			}
+		a.app.db,
+		a.app.stf,
+		a.initGenesis,
+		a.exportGenesis,
+	)
 
-			genesisJson, err := a.app.moduleManager.ExportGenesisForModules(
-				ctx,
-				func() store.WriterMap {
-					return a.branch(state)
-				},
-			)
-			if err != nil {
-				return nil, fmt.Errorf("failed to export genesis: %w", err)
-			}
+	return a.app, nil
+}
 
-			bz, err := json.Marshal(genesisJson)
-			if err != nil {
-				return nil, fmt.Errorf("failed to marshal genesis: %w", err)
-			}
+// initGenesis returns the app initialization genesis for modules
+func (a *AppBuilder[T]) initGenesis(ctx context.Context, src io.Reader, txHandler func(json.RawMessage) error) (store.WriterMap, error) {
+	// this implementation assumes that the state is a JSON object
+	bz, err := io.ReadAll(src)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read import state: %w", err)
+	}
+	var genesisJSON map[string]json.RawMessage
+	if err = json.Unmarshal(bz, &genesisJSON); err != nil {
+		return nil, err
+	}
+
+	v, zeroState, err := a.app.db.StateLatest()
+	if err != nil {
+		return nil, fmt.Errorf("unable to get latest state: %w", err)
+	}
+	if v != 0 { // TODO: genesis state may be > 0, we need to set version on store
+		return nil, errors.New("cannot init genesis on non-zero state")
+	}
+	genesisCtx := services.NewGenesisContext(a.branch(zeroState))
+	genesisState, err := genesisCtx.Mutate(ctx, func(ctx context.Context) error {
+		err = a.app.moduleManager.InitGenesisJSON(ctx, genesisJSON, txHandler)
+		if err != nil {
+			return fmt.Errorf("failed to init genesis: %w", err)
+		}
+		return nil
+	})
 
-			return bz, nil
+	return genesisState, err
+}
+
+// exportGenesis returns the app export genesis logic for modules
+func (a *AppBuilder[T]) exportGenesis(ctx context.Context, version uint64) ([]byte, error) {
+	state, err := a.app.db.StateAt(version)
+	if err != nil {
+		return nil, fmt.Errorf("unable to get state at given version: %w", err)
+	}
+
+	genesisJson, err := a.app.moduleManager.ExportGenesisForModules(
+		ctx,
+		func() store.WriterMap {
+			return a.branch(state)
 		},
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to export genesis: %w", err)
 	}
 
-	appManager, err := appManagerBuilder.Build()
+	bz, err := json.Marshal(genesisJson)
 	if err != nil {
-		return nil, fmt.Errorf("failed to build app manager: %w", err)
+		return nil, fmt.Errorf("failed to marshal genesis: %w", err)
 	}
-	a.app.AppManager = appManager
 
-	return a.app, nil
+	return bz, nil
 }
 
 // AppBuilderOption is a function that can be passed to AppBuilder.Build to customize the resulting app.
diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go
index 2d6515b81225..e2e90c27f808 100644
--- a/runtime/v2/manager.go
+++ b/runtime/v2/manager.go
@@ -636,7 +636,7 @@ func registerServices[T transaction.Tx](s appmodulev2.AppModule, app *App[T], re
 
 		// merge maps
 		for path, decoder := range c.queryHandlers {
-			app.QueryHandlers[path] = decoder
+			app.queryHandlers[path] = decoder
 		}
 	}
 
@@ -655,7 +655,7 @@ func registerServices[T transaction.Tx](s appmodulev2.AppModule, app *App[T], re
 		module.RegisterQueryHandlers(&wrapper)
 
 		for path, handler := range wrapper.handlers {
-			app.QueryHandlers[path] = handler
+			app.queryHandlers[path] = handler
 		}
 	}
 
diff --git a/runtime/v2/module.go b/runtime/v2/module.go
index dcde5ae48772..54d77dc2742f 100644
--- a/runtime/v2/module.go
+++ b/runtime/v2/module.go
@@ -131,7 +131,7 @@ func ProvideAppBuilder[T transaction.Tx](
 		amino:              amino,
 		msgRouterBuilder:   msgRouterBuilder,
 		queryRouterBuilder: stf.NewMsgRouterBuilder(), // TODO dedicated query router
-		QueryHandlers:      map[string]appmodulev2.Handler{},
+		queryHandlers:      map[string]appmodulev2.Handler{},
 		storeLoader:        DefaultStoreLoader,
 	}
 	appBuilder := &AppBuilder[T]{app: app, storeBuilder: storeBuilder}
diff --git a/server/v2/api/grpc/server.go b/server/v2/api/grpc/server.go
index 7b70363f6f16..10e22a514a1e 100644
--- a/server/v2/api/grpc/server.go
+++ b/server/v2/api/grpc/server.go
@@ -57,14 +57,14 @@ func (s *Server[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logger log.L
 			return fmt.Errorf("failed to unmarshal config: %w", err)
 		}
 	}
-	methodsMap := appI.GetQueryHandlers()
+	methodsMap := appI.QueryHandlers()
 
 	grpcSrv := grpc.NewServer(
 		grpc.ForceServerCodec(newProtoCodec(appI.InterfaceRegistry()).GRPCCodec()),
 		grpc.MaxSendMsgSize(serverCfg.MaxSendMsgSize),
 		grpc.MaxRecvMsgSize(serverCfg.MaxRecvMsgSize),
 		grpc.UnknownServiceHandler(
-			makeUnknownServiceHandler(methodsMap, appI.GetAppManager()),
+			makeUnknownServiceHandler(methodsMap, appI),
 		),
 	)
 
@@ -85,7 +85,7 @@ func (s *Server[T]) StartCmdFlags() *pflag.FlagSet {
 }
 
 func makeUnknownServiceHandler(handlers map[string]appmodulev2.Handler, querier interface {
-	Query(ctx context.Context, version uint64, msg gogoproto.Message) (gogoproto.Message, error)
+	Query(ctx context.Context, version uint64, msg transaction.Msg) (transaction.Msg, error)
 },
 ) grpc.StreamHandler {
 	getRegistry := sync.OnceValues(gogoproto.MergedRegistry)
diff --git a/server/v2/api/rest/handler.go b/server/v2/api/rest/handler.go
index a5338f35cf31..8159e23ba3bb 100644
--- a/server/v2/api/rest/handler.go
+++ b/server/v2/api/rest/handler.go
@@ -20,12 +20,12 @@ const (
 	MaxBodySize     = 1 << 20 // 1 MB
 )
 
-func NewDefaultHandler[T transaction.Tx](appManager *appmanager.AppManager[T]) http.Handler {
+func NewDefaultHandler[T transaction.Tx](appManager appmanager.AppManager[T]) http.Handler {
 	return &DefaultHandler[T]{appManager: appManager}
 }
 
 type DefaultHandler[T transaction.Tx] struct {
-	appManager *appmanager.AppManager[T]
+	appManager appmanager.AppManager[T]
 }
 
 func (h *DefaultHandler[T]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
diff --git a/server/v2/api/rest/server.go b/server/v2/api/rest/server.go
index 993501c710eb..0f2b1777973a 100644
--- a/server/v2/api/rest/server.go
+++ b/server/v2/api/rest/server.go
@@ -45,7 +45,7 @@ func (s *Server[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logger log.L
 	}
 
 	s.router = http.NewServeMux()
-	s.router.Handle("/", NewDefaultHandler(appI.GetAppManager()))
+	s.router.Handle("/", NewDefaultHandler(appI))
 	s.config = serverCfg
 
 	return nil
diff --git a/server/v2/appmanager/appmanager.go b/server/v2/appmanager/appmanager.go
index 6a5f96ec5fa9..af54936ebf03 100644
--- a/server/v2/appmanager/appmanager.go
+++ b/server/v2/appmanager/appmanager.go
@@ -12,6 +12,45 @@ import (
 	"cosmossdk.io/core/transaction"
 )
 
+// AppManager is a coordinator for all things related to an application
+// It is responsible for interacting with stf and store.
+// Runtime/v2 is an extension of this interface.
+type AppManager[T transaction.Tx] interface {
+	// InitGenesis initializes the genesis state of the application.
+	InitGenesis(
+		ctx context.Context,
+		blockRequest *server.BlockRequest[T],
+		initGenesisJSON []byte,
+		txDecoder transaction.Codec[T],
+	) (*server.BlockResponse, corestore.WriterMap, error)
+
+	// ExportGenesis exports the genesis state of the application.
+	ExportGenesis(ctx context.Context, version uint64) ([]byte, error)
+
+	// DeliverBlock executes a block of transactions.
+	DeliverBlock(
+		ctx context.Context,
+		block *server.BlockRequest[T],
+	) (*server.BlockResponse, corestore.WriterMap, error)
+
+	// ValidateTx will validate the tx against the latest storage state. This means that
+	// only the stateful validation will be run, not the execution portion of the tx.
+	// If full execution is needed, Simulate must be used.
+	ValidateTx(ctx context.Context, tx T) (server.TxResult, error)
+
+	// Simulate runs validation and execution flow of a Tx.
+	Simulate(ctx context.Context, tx T) (server.TxResult, corestore.WriterMap, error)
+
+	// Query queries the application at the provided version.
+	// CONTRACT: Version must always be provided, if 0, get latest
+	Query(ctx context.Context, version uint64, request transaction.Msg) (transaction.Msg, error)
+
+	// QueryWithState executes a query with the provided state. This allows to process a query
+	// independently of the db state. For example, it can be used to process a query with temporary
+	// and uncommitted state
+	QueryWithState(ctx context.Context, state corestore.ReaderMap, request transaction.Msg) (transaction.Msg, error)
+}
+
 // Store defines the underlying storage behavior needed by AppManager.
 type Store interface {
 	// StateLatest returns a readonly view over the latest
@@ -24,20 +63,40 @@ type Store interface {
 	StateAt(version uint64) (corestore.ReaderMap, error)
 }
 
-// AppManager is a coordinator for all things related to an application
-type AppManager[T transaction.Tx] struct {
+// appManager is a coordinator for all things related to an application
+type appManager[T transaction.Tx] struct {
+	// Gas limits for validating, querying, and simulating transactions.
 	config Config
-
-	db Store
-
-	initGenesis   InitGenesis
+	// InitGenesis is a function that initializes the application state from a genesis file.
+	// It takes a context, a source reader for the genesis file, and a transaction handler function.
+	initGenesis InitGenesis
+	// ExportGenesis is a function that exports the application state to a genesis file.
+	// It takes a context and a version number for the genesis file.
 	exportGenesis ExportGenesis
-
+	// The database for storing application data.
+	db Store
+	// The state transition function for processing transactions.
 	stf StateTransitionFunction[T]
 }
 
+func New[T transaction.Tx](
+	config Config,
+	db Store,
+	stf StateTransitionFunction[T],
+	initGenesisImpl InitGenesis,
+	exportGenesisImpl ExportGenesis,
+) AppManager[T] {
+	return &appManager[T]{
+		config:        config,
+		db:            db,
+		stf:           stf,
+		initGenesis:   initGenesisImpl,
+		exportGenesis: exportGenesisImpl,
+	}
+}
+
 // InitGenesis initializes the genesis state of the application.
-func (a AppManager[T]) InitGenesis(
+func (a appManager[T]) InitGenesis(
 	ctx context.Context,
 	blockRequest *server.BlockRequest[T],
 	initGenesisJSON []byte,
@@ -82,7 +141,7 @@ func (a AppManager[T]) InitGenesis(
 }
 
 // ExportGenesis exports the genesis state of the application.
-func (a AppManager[T]) ExportGenesis(ctx context.Context, version uint64) ([]byte, error) {
+func (a appManager[T]) ExportGenesis(ctx context.Context, version uint64) ([]byte, error) {
 	if a.exportGenesis == nil {
 		return nil, errors.New("export genesis function not set")
 	}
@@ -90,7 +149,8 @@ func (a AppManager[T]) ExportGenesis(ctx context.Context, version uint64) ([]byt
 	return a.exportGenesis(ctx, version)
 }
 
-func (a AppManager[T]) DeliverBlock(
+// DeliverBlock executes a block of transactions.
+func (a appManager[T]) DeliverBlock(
 	ctx context.Context,
 	block *server.BlockRequest[T],
 ) (*server.BlockResponse, corestore.WriterMap, error) {
@@ -114,7 +174,7 @@ func (a AppManager[T]) DeliverBlock(
 // ValidateTx will validate the tx against the latest storage state. This means that
 // only the stateful validation will be run, not the execution portion of the tx.
 // If full execution is needed, Simulate must be used.
-func (a AppManager[T]) ValidateTx(ctx context.Context, tx T) (server.TxResult, error) {
+func (a appManager[T]) ValidateTx(ctx context.Context, tx T) (server.TxResult, error) {
 	_, latestState, err := a.db.StateLatest()
 	if err != nil {
 		return server.TxResult{}, err
@@ -124,7 +184,7 @@ func (a AppManager[T]) ValidateTx(ctx context.Context, tx T) (server.TxResult, e
 }
 
 // Simulate runs validation and execution flow of a Tx.
-func (a AppManager[T]) Simulate(ctx context.Context, tx T) (server.TxResult, corestore.WriterMap, error) {
+func (a appManager[T]) Simulate(ctx context.Context, tx T) (server.TxResult, corestore.WriterMap, error) {
 	_, state, err := a.db.StateLatest()
 	if err != nil {
 		return server.TxResult{}, nil, err
@@ -135,7 +195,7 @@ func (a AppManager[T]) Simulate(ctx context.Context, tx T) (server.TxResult, cor
 
 // Query queries the application at the provided version.
 // CONTRACT: Version must always be provided, if 0, get latest
-func (a AppManager[T]) Query(ctx context.Context, version uint64, request transaction.Msg) (transaction.Msg, error) {
+func (a appManager[T]) Query(ctx context.Context, version uint64, request transaction.Msg) (transaction.Msg, error) {
 	// if version is provided attempt to do a height query.
 	if version != 0 {
 		queryState, err := a.db.StateAt(version)
@@ -156,6 +216,6 @@ func (a AppManager[T]) Query(ctx context.Context, version uint64, request transa
 // QueryWithState executes a query with the provided state. This allows to process a query
 // independently of the db state. For example, it can be used to process a query with temporary
 // and uncommitted state
-func (a AppManager[T]) QueryWithState(ctx context.Context, state corestore.ReaderMap, request transaction.Msg) (transaction.Msg, error) {
+func (a appManager[T]) QueryWithState(ctx context.Context, state corestore.ReaderMap, request transaction.Msg) (transaction.Msg, error) {
 	return a.stf.Query(ctx, state, a.config.QueryGasLimit, request)
 }
diff --git a/server/v2/appmanager/appmanager_builder.go b/server/v2/appmanager/appmanager_builder.go
deleted file mode 100644
index b3671706c7f2..000000000000
--- a/server/v2/appmanager/appmanager_builder.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package appmanager
-
-import (
-	"cosmossdk.io/core/transaction"
-)
-
-// Builder is a struct that represents the application builder for managing transactions.
-// It contains various fields and methods for initializing the application and handling transactions.
-type Builder[T transaction.Tx] struct {
-	STF StateTransitionFunction[T] // The state transition function for processing transactions.
-	DB  Store                      // The database for storing application data.
-
-	// Gas limits for validating, querying, and simulating transactions.
-	ValidateTxGasLimit uint64
-	QueryGasLimit      uint64
-	SimulationGasLimit uint64
-
-	// InitGenesis is a function that initializes the application state from a genesis file.
-	// It takes a context, a source reader for the genesis file, and a transaction handler function.
-	InitGenesis InitGenesis
-	// ExportGenesis is a function that exports the application state to a genesis file.
-	// It takes a context and a version number for the genesis file.
-	ExportGenesis ExportGenesis
-}
-
-// Build creates a new instance of AppManager with the provided configuration and returns it.
-// It initializes the AppManager with the given database, export state, import state, initGenesis function, and state transition function.
-func (b Builder[T]) Build() (*AppManager[T], error) {
-	return &AppManager[T]{
-		config: Config{
-			ValidateTxGasLimit: b.ValidateTxGasLimit,
-			QueryGasLimit:      b.QueryGasLimit,
-			SimulationGasLimit: b.SimulationGasLimit,
-		},
-		db:            b.DB,
-		initGenesis:   b.InitGenesis,
-		exportGenesis: b.ExportGenesis,
-		stf:           b.STF,
-	}, nil
-}
diff --git a/server/v2/appmanager/config.go b/server/v2/appmanager/config.go
index ae52849bf297..fb3c20341f35 100644
--- a/server/v2/appmanager/config.go
+++ b/server/v2/appmanager/config.go
@@ -1,7 +1,6 @@
 package appmanager
 
 // Config represents the configuration options for the app manager.
-// TODO: implement comments for toml
 type Config struct {
 	ValidateTxGasLimit uint64 `mapstructure:"validate-tx-gas-limit"` // TODO: check how this works on app mempool
 	QueryGasLimit      uint64 `mapstructure:"query-gas-limit"`
diff --git a/server/v2/appmanager/genesis.go b/server/v2/appmanager/genesis.go
index 989ae442a9b9..347d0f30e07b 100644
--- a/server/v2/appmanager/genesis.go
+++ b/server/v2/appmanager/genesis.go
@@ -9,9 +9,6 @@ import (
 )
 
 type (
-	// ExportGenesis is a function type that represents the export of the genesis state.
-	ExportGenesis func(ctx context.Context, version uint64) ([]byte, error)
-
 	// InitGenesis is a function that will run at application genesis, it will be called with
 	// the following arguments:
 	// - ctx: the context of the genesis operation
@@ -25,4 +22,7 @@ type (
 		src io.Reader,
 		txHandler func(json.RawMessage) error,
 	) (store.WriterMap, error)
+
+	// ExportGenesis is a function type that represents the export of the genesis state.
+	ExportGenesis func(ctx context.Context, version uint64) ([]byte, error)
 )
diff --git a/server/v2/appmanager/types.go b/server/v2/appmanager/stf.go
similarity index 100%
rename from server/v2/appmanager/types.go
rename to server/v2/appmanager/stf.go
diff --git a/server/v2/cometbft/abci.go b/server/v2/cometbft/abci.go
index d9e20a8ebe65..5daf0c103038 100644
--- a/server/v2/cometbft/abci.go
+++ b/server/v2/cometbft/abci.go
@@ -42,7 +42,7 @@ var _ abci.Application = (*Consensus[transaction.Tx])(nil)
 type Consensus[T transaction.Tx] struct {
 	logger           log.Logger
 	appName, version string
-	app              *appmanager.AppManager[T]
+	app              appmanager.AppManager[T]
 	appCloser        func() error
 	txCodec          transaction.Codec[T]
 	store            types.Store
@@ -77,7 +77,7 @@ type Consensus[T transaction.Tx] struct {
 func NewConsensus[T transaction.Tx](
 	logger log.Logger,
 	appName string,
-	app *appmanager.AppManager[T],
+	app appmanager.AppManager[T],
 	appCloser func() error,
 	mp mempool.Mempool[T],
 	indexedEvents map[string]struct{},
diff --git a/server/v2/cometbft/abci_test.go b/server/v2/cometbft/abci_test.go
index 9a42948c6c61..d58e87aa9ef9 100644
--- a/server/v2/cometbft/abci_test.go
+++ b/server/v2/cometbft/abci_test.go
@@ -646,7 +646,7 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock.
 		}, nil
 	})
 
-	s, err := stf.NewSTF(
+	s, err := stf.New(
 		log.NewNopLogger().With("module", "stf"),
 		msgRouterBuilder,
 		queryRouterBuilder,
@@ -672,21 +672,20 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock.
 	sc := cometmock.NewMockCommiter(log.NewNopLogger(), string(actorName), "stf")
 	mockStore := cometmock.NewMockStore(ss, sc)
 
-	b := appmanager.Builder[mock.Tx]{
-		STF:                s,
-		DB:                 mockStore,
+	am := appmanager.New(appmanager.Config{
 		ValidateTxGasLimit: gasLimit,
 		QueryGasLimit:      gasLimit,
 		SimulationGasLimit: gasLimit,
-		InitGenesis: func(ctx context.Context, src io.Reader, txHandler func(json.RawMessage) error) (store.WriterMap, error) {
+	},
+		mockStore,
+		s,
+		func(ctx context.Context, src io.Reader, txHandler func(json.RawMessage) error) (store.WriterMap, error) {
 			_, st, err := mockStore.StateLatest()
 			require.NoError(t, err)
 			return branch.DefaultNewWriterMap(st), nil
 		},
-	}
-
-	am, err := b.Build()
-	require.NoError(t, err)
+		nil,
+	)
 
 	return NewConsensus[mock.Tx](log.NewNopLogger(), "testing-app", am, func() error { return nil }, mempool, map[string]struct{}{}, nil, mockStore, Config{AppTomlConfig: DefaultAppTomlConfig()}, mock.TxCodec{}, "test")
 }
diff --git a/server/v2/cometbft/server.go b/server/v2/cometbft/server.go
index 20cd63d07ca4..1ad285bb99e7 100644
--- a/server/v2/cometbft/server.go
+++ b/server/v2/cometbft/server.go
@@ -102,15 +102,15 @@ func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logg
 	}
 
 	s.logger = logger.With(log.ModuleKey, s.Name())
-	rs := appI.GetStore()
+	rs := appI.Store()
 	consensus := NewConsensus(
 		s.logger,
 		appI.Name(),
-		appI.GetAppManager(),
+		appI,
 		appI.Close,
 		s.serverOptions.Mempool(cfg),
 		indexEvents,
-		appI.GetQueryHandlers(),
+		appI.QueryHandlers(),
 		rs,
 		s.config,
 		s.initTxCodec,
@@ -137,7 +137,7 @@ func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logg
 	if indexerCfg := s.config.AppTomlConfig.Indexer; len(indexerCfg.Target) > 0 {
 		listener, err := indexer.StartIndexing(indexer.IndexingOptions{
 			Config:   indexerCfg,
-			Resolver: appI.GetSchemaDecoderResolver(),
+			Resolver: appI.SchemaDecoderResolver(),
 			Logger:   s.logger.With(log.ModuleKey, "indexer"),
 		})
 		if err != nil {
diff --git a/server/v2/server_test.go b/server/v2/server_test.go
index c35dea1fc627..a53b71fc35b9 100644
--- a/server/v2/server_test.go
+++ b/server/v2/server_test.go
@@ -17,7 +17,6 @@ import (
 	"cosmossdk.io/log"
 	serverv2 "cosmossdk.io/server/v2"
 	grpc "cosmossdk.io/server/v2/api/grpc"
-	"cosmossdk.io/server/v2/appmanager"
 	"cosmossdk.io/server/v2/store"
 	storev2 "cosmossdk.io/store/v2"
 )
@@ -37,19 +36,15 @@ type mockApp[T transaction.Tx] struct {
 	serverv2.AppI[T]
 }
 
-func (*mockApp[T]) GetQueryHandlers() map[string]appmodulev2.Handler {
+func (*mockApp[T]) QueryHandlers() map[string]appmodulev2.Handler {
 	return map[string]appmodulev2.Handler{}
 }
 
-func (*mockApp[T]) GetAppManager() *appmanager.AppManager[T] {
-	return nil
-}
-
 func (*mockApp[T]) InterfaceRegistry() coreserver.InterfaceRegistry {
 	return &mockInterfaceRegistry{}
 }
 
-func (*mockApp[T]) GetStore() storev2.RootStore {
+func (*mockApp[T]) Store() storev2.RootStore {
 	return nil
 }
 
diff --git a/server/v2/stf/stf.go b/server/v2/stf/stf.go
index f665aaf3c6e9..6b6f6b2c53da 100644
--- a/server/v2/stf/stf.go
+++ b/server/v2/stf/stf.go
@@ -44,8 +44,8 @@ type STF[T transaction.Tx] struct {
 	makeGasMeteredState makeGasMeteredStateFn
 }
 
-// NewSTF returns a new STF instance.
-func NewSTF[T transaction.Tx](
+// New returns a new STF instance.
+func New[T transaction.Tx](
 	logger log.Logger,
 	msgRouterBuilder *MsgRouterBuilder,
 	queryRouterBuilder *MsgRouterBuilder,
diff --git a/server/v2/store/server.go b/server/v2/store/server.go
index 20ed3b15b0ea..1fafe4e25d53 100644
--- a/server/v2/store/server.go
+++ b/server/v2/store/server.go
@@ -32,7 +32,7 @@ func New[T transaction.Tx]() *Server[T] {
 }
 
 func (s *Server[T]) Init(app serverv2.AppI[T], v map[string]any, _ log.Logger) (err error) {
-	s.backend = app.GetStore()
+	s.backend = app.Store()
 	s.config, err = UnmarshalConfig(v)
 	return err
 }
diff --git a/server/v2/types.go b/server/v2/types.go
index 5406313b080e..40d51e42375c 100644
--- a/server/v2/types.go
+++ b/server/v2/types.go
@@ -15,11 +15,12 @@ import (
 type AppCreator[T transaction.Tx] func(log.Logger, *viper.Viper) AppI[T]
 
 type AppI[T transaction.Tx] interface {
+	appmanager.AppManager[T]
+
 	Name() string
 	InterfaceRegistry() server.InterfaceRegistry
-	GetAppManager() *appmanager.AppManager[T]
-	GetQueryHandlers() map[string]appmodulev2.Handler
-	GetStore() store.RootStore
-	GetSchemaDecoderResolver() decoding.DecoderResolver
+	QueryHandlers() map[string]appmodulev2.Handler
+	Store() store.RootStore
+	SchemaDecoderResolver() decoding.DecoderResolver
 	Close() error
 }
diff --git a/simapp/v2/app_di.go b/simapp/v2/app_di.go
index 3c9933721f12..593c8d0c275f 100644
--- a/simapp/v2/app_di.go
+++ b/simapp/v2/app_di.go
@@ -218,8 +218,8 @@ func (app *SimApp[T]) TxConfig() client.TxConfig {
 	return app.txConfig
 }
 
-// GetStore returns the root store.
-func (app *SimApp[T]) GetStore() store.RootStore {
+// Store returns the root store.
+func (app *SimApp[T]) Store() store.RootStore {
 	return app.store
 }
 
diff --git a/simapp/v2/app_test.go b/simapp/v2/app_test.go
index a5d7f352b4d9..61ace5e4ef29 100644
--- a/simapp/v2/app_test.go
+++ b/simapp/v2/app_test.go
@@ -72,7 +72,7 @@ func NewTestApp(t *testing.T) (*SimApp[transaction.Tx], context.Context) {
 	genesisBytes, err := json.Marshal(genesis)
 	require.NoError(t, err)
 
-	st := app.GetStore()
+	st := app.Store()
 	ci, err := st.LastCommitID()
 	require.NoError(t, err)
 
@@ -108,7 +108,7 @@ func MoveNextBlock(t *testing.T, app *SimApp[transaction.Tx], ctx context.Contex
 
 	bz := sha256.Sum256([]byte{})
 
-	st := app.GetStore()
+	st := app.Store()
 	ci, err := st.LastCommitID()
 	require.NoError(t, err)
 
diff --git a/simapp/v2/export.go b/simapp/v2/export.go
index 50f4a898bb37..61175f41607f 100644
--- a/simapp/v2/export.go
+++ b/simapp/v2/export.go
@@ -29,7 +29,7 @@ func (app *SimApp[T]) ExportAppStateAndValidators(
 		return exportedApp, err
 	}
 
-	readerMap, err := app.GetStore().StateAt(latestHeight)
+	readerMap, err := app.Store().StateAt(latestHeight)
 	if err != nil {
 		return exportedApp, err
 	}

From 2711ecefc11041c4beb06412a2d1071a0997f303 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Mon, 21 Oct 2024 17:33:47 +0200
Subject: [PATCH 4/5] fix(x/accounts/lockup): fix proto path (#22319)

---
 .../defaults/lockup/{ => v1}/lockup.pulsar.go |  199 +--
 .../defaults/lockup/{ => v1}/query.pulsar.go  |  512 ++++----
 .../defaults/lockup/{ => v1}/tx.pulsar.go     | 1132 +++++++++--------
 .../lockup/continous_lockup_test_suite.go     |    2 +-
 .../lockup/delayed_lockup_test_suite.go       |    2 +-
 .../lockup/periodic_lockup_test_suite.go      |    2 +-
 .../lockup/permanent_lockup_test_suite.go     |    2 +-
 tests/e2e/accounts/lockup/utils.go            |    2 +-
 x/accounts/README.md                          |   34 +-
 .../lockup/continuous_locking_account.go      |    2 +-
 .../lockup/continuous_locking_account_test.go |    2 +-
 .../lockup/delayed_locking_account.go         |    2 +-
 .../lockup/delayed_locking_account_test.go    |    2 +-
 x/accounts/defaults/lockup/lockup.go          |    2 +-
 x/accounts/defaults/lockup/lockup_test.go     |    2 +-
 .../lockup/periodic_locking_account.go        |    2 +-
 .../lockup/periodic_locking_account_test.go   |    2 +-
 .../lockup/permanent_locking_account.go       |    2 +-
 .../lockup/permanent_locking_account_test.go  |    2 +-
 .../defaults/lockup/{types => v1}/encoding.go |    2 +-
 .../lockup/{types => v1}/lockup.pb.go         |   56 +-
 .../defaults/lockup/{types => v1}/query.pb.go |   90 +-
 .../defaults/lockup/{types => v1}/tx.pb.go    |  161 +--
 .../defaults/lockup/{ => v1}/lockup.proto     |    4 +-
 .../defaults/lockup/{ => v1}/query.proto      |    6 +-
 .../defaults/lockup/{ => v1}/tx.proto         |    6 +-
 26 files changed, 1120 insertions(+), 1112 deletions(-)
 rename api/cosmos/accounts/defaults/lockup/{ => v1}/lockup.pulsar.go (72%)
 rename api/cosmos/accounts/defaults/lockup/{ => v1}/query.pulsar.go (80%)
 rename api/cosmos/accounts/defaults/lockup/{ => v1}/tx.pulsar.go (82%)
 rename x/accounts/defaults/lockup/{types => v1}/encoding.go (97%)
 rename x/accounts/defaults/lockup/{types => v1}/lockup.pb.go (79%)
 rename x/accounts/defaults/lockup/{types => v1}/query.pb.go (88%)
 rename x/accounts/defaults/lockup/{types => v1}/tx.pb.go (91%)
 rename x/accounts/proto/cosmos/accounts/defaults/lockup/{ => v1}/lockup.proto (85%)
 rename x/accounts/proto/cosmos/accounts/defaults/lockup/{ => v1}/query.proto (93%)
 rename x/accounts/proto/cosmos/accounts/defaults/lockup/{ => v1}/tx.proto (96%)

diff --git a/api/cosmos/accounts/defaults/lockup/lockup.pulsar.go b/api/cosmos/accounts/defaults/lockup/v1/lockup.pulsar.go
similarity index 72%
rename from api/cosmos/accounts/defaults/lockup/lockup.pulsar.go
rename to api/cosmos/accounts/defaults/lockup/v1/lockup.pulsar.go
index 78b5cfce1568..2855e41a1825 100644
--- a/api/cosmos/accounts/defaults/lockup/lockup.pulsar.go
+++ b/api/cosmos/accounts/defaults/lockup/v1/lockup.pulsar.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-pulsar. DO NOT EDIT.
-package lockup
+package lockupv1
 
 import (
 	_ "cosmossdk.io/api/amino"
@@ -74,8 +74,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_lockup_proto_init()
-	md_Period = File_cosmos_accounts_defaults_lockup_lockup_proto.Messages().ByName("Period")
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_init()
+	md_Period = File_cosmos_accounts_defaults_lockup_v1_lockup_proto.Messages().ByName("Period")
 	fd_Period_length = md_Period.Fields().ByName("length")
 	fd_Period_amount = md_Period.Fields().ByName("amount")
 }
@@ -89,7 +89,7 @@ func (x *Period) ProtoReflect() protoreflect.Message {
 }
 
 func (x *Period) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_lockup_proto_msgTypes[0]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_lockup_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -172,15 +172,15 @@ func (x *fastReflection_Period) Range(f func(protoreflect.FieldDescriptor, proto
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_Period) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.Period.length":
+	case "cosmos.accounts.defaults.lockup.v1.Period.length":
 		return x.Length != nil
-	case "cosmos.accounts.defaults.lockup.Period.amount":
+	case "cosmos.accounts.defaults.lockup.v1.Period.amount":
 		return len(x.Amount) != 0
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.Period"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.Period"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.Period does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.Period does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -192,15 +192,15 @@ func (x *fastReflection_Period) Has(fd protoreflect.FieldDescriptor) bool {
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Period) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.Period.length":
+	case "cosmos.accounts.defaults.lockup.v1.Period.length":
 		x.Length = nil
-	case "cosmos.accounts.defaults.lockup.Period.amount":
+	case "cosmos.accounts.defaults.lockup.v1.Period.amount":
 		x.Amount = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.Period"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.Period"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.Period does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.Period does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -212,10 +212,10 @@ func (x *fastReflection_Period) Clear(fd protoreflect.FieldDescriptor) {
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_Period) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.Period.length":
+	case "cosmos.accounts.defaults.lockup.v1.Period.length":
 		value := x.Length
 		return protoreflect.ValueOfMessage(value.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.Period.amount":
+	case "cosmos.accounts.defaults.lockup.v1.Period.amount":
 		if len(x.Amount) == 0 {
 			return protoreflect.ValueOfList(&_Period_2_list{})
 		}
@@ -223,9 +223,9 @@ func (x *fastReflection_Period) Get(descriptor protoreflect.FieldDescriptor) pro
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.Period"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.Period"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.Period does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.Period does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -241,17 +241,17 @@ func (x *fastReflection_Period) Get(descriptor protoreflect.FieldDescriptor) pro
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Period) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.Period.length":
+	case "cosmos.accounts.defaults.lockup.v1.Period.length":
 		x.Length = value.Message().Interface().(*durationpb.Duration)
-	case "cosmos.accounts.defaults.lockup.Period.amount":
+	case "cosmos.accounts.defaults.lockup.v1.Period.amount":
 		lv := value.List()
 		clv := lv.(*_Period_2_list)
 		x.Amount = *clv.list
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.Period"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.Period"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.Period does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.Period does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -267,12 +267,12 @@ func (x *fastReflection_Period) Set(fd protoreflect.FieldDescriptor, value proto
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_Period) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.Period.length":
+	case "cosmos.accounts.defaults.lockup.v1.Period.length":
 		if x.Length == nil {
 			x.Length = new(durationpb.Duration)
 		}
 		return protoreflect.ValueOfMessage(x.Length.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.Period.amount":
+	case "cosmos.accounts.defaults.lockup.v1.Period.amount":
 		if x.Amount == nil {
 			x.Amount = []*v1beta1.Coin{}
 		}
@@ -280,9 +280,9 @@ func (x *fastReflection_Period) Mutable(fd protoreflect.FieldDescriptor) protore
 		return protoreflect.ValueOfList(value)
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.Period"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.Period"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.Period does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.Period does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -291,17 +291,17 @@ func (x *fastReflection_Period) Mutable(fd protoreflect.FieldDescriptor) protore
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_Period) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.Period.length":
+	case "cosmos.accounts.defaults.lockup.v1.Period.length":
 		m := new(durationpb.Duration)
 		return protoreflect.ValueOfMessage(m.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.Period.amount":
+	case "cosmos.accounts.defaults.lockup.v1.Period.amount":
 		list := []*v1beta1.Coin{}
 		return protoreflect.ValueOfList(&_Period_2_list{list: &list})
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.Period"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.Period"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.Period does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.Period does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -311,7 +311,7 @@ func (x *fastReflection_Period) NewField(fd protoreflect.FieldDescriptor) protor
 func (x *fastReflection_Period) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.Period", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.Period", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -593,7 +593,7 @@ func (x *fastReflection_Period) ProtoMethods() *protoiface.Methods {
 // versions:
 // 	protoc-gen-go v1.27.0
 // 	protoc        (unknown)
-// source: cosmos/accounts/defaults/lockup/lockup.proto
+// source: cosmos/accounts/defaults/lockup/v1/lockup.proto
 
 const (
 	// Verify that this generated code is sufficiently up-to-date.
@@ -616,7 +616,7 @@ type Period struct {
 func (x *Period) Reset() {
 	*x = Period{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_lockup_proto_msgTypes[0]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_lockup_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -630,7 +630,7 @@ func (*Period) ProtoMessage() {}
 
 // Deprecated: Use Period.ProtoReflect.Descriptor instead.
 func (*Period) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_lockup_proto_rawDescGZIP(), []int{0}
+	return file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Period) GetLength() *durationpb.Duration {
@@ -647,73 +647,76 @@ func (x *Period) GetAmount() []*v1beta1.Coin {
 	return nil
 }
 
-var File_cosmos_accounts_defaults_lockup_lockup_proto protoreflect.FileDescriptor
+var File_cosmos_accounts_defaults_lockup_v1_lockup_proto protoreflect.FileDescriptor
 
-var file_cosmos_accounts_defaults_lockup_lockup_proto_rawDesc = []byte{
-	0x0a, 0x2c, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+var file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDesc = []byte{
+	0x0a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
 	0x73, 0x2f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75,
-	0x70, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f,
-	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x1a,
-	0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2f,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f,
-	0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc5, 0x01, 0x0a, 0x06, 0x50, 0x65, 0x72,
-	0x69, 0x6f, 0x64, 0x12, 0x40, 0x0a, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0d,
-	0xc8, 0xde, 0x1f, 0x00, 0x98, 0xdf, 0x1f, 0x01, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x6c,
-	0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x79, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62,
-	0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e,
-	0x42, 0x46, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d,
-	0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69,
-	0x6e, 0x73, 0x9a, 0xe7, 0xb0, 0x2a, 0x0c, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x63, 0x6f,
-	0x69, 0x6e, 0x73, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x42, 0x84, 0x02, 0x0a, 0x23, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e,
-	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x42, 0x0b, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73,
-	0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
-	0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0xa2, 0x02, 0x04, 0x43, 0x41, 0x44, 0x4c,
-	0xaa, 0x02, 0x1f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x73, 0x2e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x4c, 0x6f, 0x63, 0x6b,
-	0x75, 0x70, 0xca, 0x02, 0x1f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x5c, 0x4c, 0x6f,
-	0x63, 0x6b, 0x75, 0x70, 0xe2, 0x02, 0x2b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x5c,
-	0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x22, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x63, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x3a,
-	0x3a, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x22, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x73, 0x2e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b,
+	0x75, 0x70, 0x2e, 0x76, 0x31, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69,
+	0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
+	0x2f, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f,
+	0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
+	0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc5,
+	0x01, 0x0a, 0x06, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x40, 0x0a, 0x06, 0x6c, 0x65, 0x6e,
+	0x67, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0d, 0xc8, 0xde, 0x1f, 0x00, 0x98, 0xdf, 0x1f, 0x01, 0xa8, 0xe7,
+	0xb0, 0x2a, 0x01, 0x52, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x79, 0x0a, 0x06, 0x61,
+	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f,
+	0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
+	0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x46, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f,
+	0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70,
+	0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x9a, 0xe7, 0xb0, 0x2a, 0x0c, 0x6c, 0x65, 0x67,
+	0x61, 0x63, 0x79, 0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06,
+	0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0xa0, 0x02, 0x0a, 0x26, 0x63, 0x6f, 0x6d, 0x2e, 0x63,
+	0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x76,
+	0x31, 0x42, 0x0b, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x3c, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x73, 0x2f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b,
+	0x75, 0x70, 0x2f, 0x76, 0x31, 0x3b, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x76, 0x31, 0xa2, 0x02,
+	0x04, 0x43, 0x41, 0x44, 0x4c, 0xaa, 0x02, 0x22, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73,
+	0x2e, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x22, 0x43, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66,
+	0x61, 0x75, 0x6c, 0x74, 0x73, 0x5c, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5c, 0x56, 0x31, 0xe2,
+	0x02, 0x2e, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x5c, 0x4c, 0x6f, 0x63, 0x6b, 0x75,
+	0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0xea, 0x02, 0x26, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x63, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x3a, 0x3a, 0x4c,
+	0x6f, 0x63, 0x6b, 0x75, 0x70, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
-	file_cosmos_accounts_defaults_lockup_lockup_proto_rawDescOnce sync.Once
-	file_cosmos_accounts_defaults_lockup_lockup_proto_rawDescData = file_cosmos_accounts_defaults_lockup_lockup_proto_rawDesc
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDescOnce sync.Once
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDescData = file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDesc
 )
 
-func file_cosmos_accounts_defaults_lockup_lockup_proto_rawDescGZIP() []byte {
-	file_cosmos_accounts_defaults_lockup_lockup_proto_rawDescOnce.Do(func() {
-		file_cosmos_accounts_defaults_lockup_lockup_proto_rawDescData = protoimpl.X.CompressGZIP(file_cosmos_accounts_defaults_lockup_lockup_proto_rawDescData)
+func file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDescGZIP() []byte {
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDescOnce.Do(func() {
+		file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDescData = protoimpl.X.CompressGZIP(file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDescData)
 	})
-	return file_cosmos_accounts_defaults_lockup_lockup_proto_rawDescData
+	return file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDescData
 }
 
-var file_cosmos_accounts_defaults_lockup_lockup_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_cosmos_accounts_defaults_lockup_lockup_proto_goTypes = []interface{}{
-	(*Period)(nil),              // 0: cosmos.accounts.defaults.lockup.Period
+var file_cosmos_accounts_defaults_lockup_v1_lockup_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_cosmos_accounts_defaults_lockup_v1_lockup_proto_goTypes = []interface{}{
+	(*Period)(nil),              // 0: cosmos.accounts.defaults.lockup.v1.Period
 	(*durationpb.Duration)(nil), // 1: google.protobuf.Duration
 	(*v1beta1.Coin)(nil),        // 2: cosmos.base.v1beta1.Coin
 }
-var file_cosmos_accounts_defaults_lockup_lockup_proto_depIdxs = []int32{
-	1, // 0: cosmos.accounts.defaults.lockup.Period.length:type_name -> google.protobuf.Duration
-	2, // 1: cosmos.accounts.defaults.lockup.Period.amount:type_name -> cosmos.base.v1beta1.Coin
+var file_cosmos_accounts_defaults_lockup_v1_lockup_proto_depIdxs = []int32{
+	1, // 0: cosmos.accounts.defaults.lockup.v1.Period.length:type_name -> google.protobuf.Duration
+	2, // 1: cosmos.accounts.defaults.lockup.v1.Period.amount:type_name -> cosmos.base.v1beta1.Coin
 	2, // [2:2] is the sub-list for method output_type
 	2, // [2:2] is the sub-list for method input_type
 	2, // [2:2] is the sub-list for extension type_name
@@ -721,13 +724,13 @@ var file_cosmos_accounts_defaults_lockup_lockup_proto_depIdxs = []int32{
 	0, // [0:2] is the sub-list for field type_name
 }
 
-func init() { file_cosmos_accounts_defaults_lockup_lockup_proto_init() }
-func file_cosmos_accounts_defaults_lockup_lockup_proto_init() {
-	if File_cosmos_accounts_defaults_lockup_lockup_proto != nil {
+func init() { file_cosmos_accounts_defaults_lockup_v1_lockup_proto_init() }
+func file_cosmos_accounts_defaults_lockup_v1_lockup_proto_init() {
+	if File_cosmos_accounts_defaults_lockup_v1_lockup_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_cosmos_accounts_defaults_lockup_lockup_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_lockup_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Period); i {
 			case 0:
 				return &v.state
@@ -744,18 +747,18 @@ func file_cosmos_accounts_defaults_lockup_lockup_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_cosmos_accounts_defaults_lockup_lockup_proto_rawDesc,
+			RawDescriptor: file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_cosmos_accounts_defaults_lockup_lockup_proto_goTypes,
-		DependencyIndexes: file_cosmos_accounts_defaults_lockup_lockup_proto_depIdxs,
-		MessageInfos:      file_cosmos_accounts_defaults_lockup_lockup_proto_msgTypes,
+		GoTypes:           file_cosmos_accounts_defaults_lockup_v1_lockup_proto_goTypes,
+		DependencyIndexes: file_cosmos_accounts_defaults_lockup_v1_lockup_proto_depIdxs,
+		MessageInfos:      file_cosmos_accounts_defaults_lockup_v1_lockup_proto_msgTypes,
 	}.Build()
-	File_cosmos_accounts_defaults_lockup_lockup_proto = out.File
-	file_cosmos_accounts_defaults_lockup_lockup_proto_rawDesc = nil
-	file_cosmos_accounts_defaults_lockup_lockup_proto_goTypes = nil
-	file_cosmos_accounts_defaults_lockup_lockup_proto_depIdxs = nil
+	File_cosmos_accounts_defaults_lockup_v1_lockup_proto = out.File
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_rawDesc = nil
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_goTypes = nil
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_depIdxs = nil
 }
diff --git a/api/cosmos/accounts/defaults/lockup/query.pulsar.go b/api/cosmos/accounts/defaults/lockup/v1/query.pulsar.go
similarity index 80%
rename from api/cosmos/accounts/defaults/lockup/query.pulsar.go
rename to api/cosmos/accounts/defaults/lockup/v1/query.pulsar.go
index 8499b9274554..7294b9bc871e 100644
--- a/api/cosmos/accounts/defaults/lockup/query.pulsar.go
+++ b/api/cosmos/accounts/defaults/lockup/v1/query.pulsar.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-pulsar. DO NOT EDIT.
-package lockup
+package lockupv1
 
 import (
 	v1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
@@ -20,8 +20,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_query_proto_init()
-	md_QueryLockupAccountInfoRequest = File_cosmos_accounts_defaults_lockup_query_proto.Messages().ByName("QueryLockupAccountInfoRequest")
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_init()
+	md_QueryLockupAccountInfoRequest = File_cosmos_accounts_defaults_lockup_v1_query_proto.Messages().ByName("QueryLockupAccountInfoRequest")
 }
 
 var _ protoreflect.Message = (*fastReflection_QueryLockupAccountInfoRequest)(nil)
@@ -33,7 +33,7 @@ func (x *QueryLockupAccountInfoRequest) ProtoReflect() protoreflect.Message {
 }
 
 func (x *QueryLockupAccountInfoRequest) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[0]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -106,9 +106,9 @@ func (x *fastReflection_QueryLockupAccountInfoRequest) Has(fd protoreflect.Field
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -122,9 +122,9 @@ func (x *fastReflection_QueryLockupAccountInfoRequest) Clear(fd protoreflect.Fie
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -138,9 +138,9 @@ func (x *fastReflection_QueryLockupAccountInfoRequest) Get(descriptor protorefle
 	switch descriptor.FullName() {
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -158,9 +158,9 @@ func (x *fastReflection_QueryLockupAccountInfoRequest) Set(fd protoreflect.Field
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -178,9 +178,9 @@ func (x *fastReflection_QueryLockupAccountInfoRequest) Mutable(fd protoreflect.F
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -191,9 +191,9 @@ func (x *fastReflection_QueryLockupAccountInfoRequest) NewField(fd protoreflect.
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -203,7 +203,7 @@ func (x *fastReflection_QueryLockupAccountInfoRequest) NewField(fd protoreflect.
 func (x *fastReflection_QueryLockupAccountInfoRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -639,8 +639,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_query_proto_init()
-	md_QueryLockupAccountInfoResponse = File_cosmos_accounts_defaults_lockup_query_proto.Messages().ByName("QueryLockupAccountInfoResponse")
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_init()
+	md_QueryLockupAccountInfoResponse = File_cosmos_accounts_defaults_lockup_v1_query_proto.Messages().ByName("QueryLockupAccountInfoResponse")
 	fd_QueryLockupAccountInfoResponse_original_locking = md_QueryLockupAccountInfoResponse.Fields().ByName("original_locking")
 	fd_QueryLockupAccountInfoResponse_delegated_free = md_QueryLockupAccountInfoResponse.Fields().ByName("delegated_free")
 	fd_QueryLockupAccountInfoResponse_delegated_locking = md_QueryLockupAccountInfoResponse.Fields().ByName("delegated_locking")
@@ -660,7 +660,7 @@ func (x *QueryLockupAccountInfoResponse) ProtoReflect() protoreflect.Message {
 }
 
 func (x *QueryLockupAccountInfoResponse) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[1]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -779,27 +779,27 @@ func (x *fastReflection_QueryLockupAccountInfoResponse) Range(f func(protoreflec
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_QueryLockupAccountInfoResponse) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.original_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.original_locking":
 		return len(x.OriginalLocking) != 0
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_free":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_free":
 		return len(x.DelegatedFree) != 0
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_locking":
 		return len(x.DelegatedLocking) != 0
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.start_time":
 		return x.StartTime != nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.end_time":
 		return x.EndTime != nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.locked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.locked_coins":
 		return len(x.LockedCoins) != 0
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.unlocked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.unlocked_coins":
 		return len(x.UnlockedCoins) != 0
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.owner":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.owner":
 		return x.Owner != ""
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -811,27 +811,27 @@ func (x *fastReflection_QueryLockupAccountInfoResponse) Has(fd protoreflect.Fiel
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_QueryLockupAccountInfoResponse) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.original_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.original_locking":
 		x.OriginalLocking = nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_free":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_free":
 		x.DelegatedFree = nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_locking":
 		x.DelegatedLocking = nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.start_time":
 		x.StartTime = nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.end_time":
 		x.EndTime = nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.locked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.locked_coins":
 		x.LockedCoins = nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.unlocked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.unlocked_coins":
 		x.UnlockedCoins = nil
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.owner":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.owner":
 		x.Owner = ""
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -843,50 +843,50 @@ func (x *fastReflection_QueryLockupAccountInfoResponse) Clear(fd protoreflect.Fi
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_QueryLockupAccountInfoResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.original_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.original_locking":
 		if len(x.OriginalLocking) == 0 {
 			return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_1_list{})
 		}
 		listValue := &_QueryLockupAccountInfoResponse_1_list{list: &x.OriginalLocking}
 		return protoreflect.ValueOfList(listValue)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_free":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_free":
 		if len(x.DelegatedFree) == 0 {
 			return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_2_list{})
 		}
 		listValue := &_QueryLockupAccountInfoResponse_2_list{list: &x.DelegatedFree}
 		return protoreflect.ValueOfList(listValue)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_locking":
 		if len(x.DelegatedLocking) == 0 {
 			return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_3_list{})
 		}
 		listValue := &_QueryLockupAccountInfoResponse_3_list{list: &x.DelegatedLocking}
 		return protoreflect.ValueOfList(listValue)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.start_time":
 		value := x.StartTime
 		return protoreflect.ValueOfMessage(value.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.end_time":
 		value := x.EndTime
 		return protoreflect.ValueOfMessage(value.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.locked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.locked_coins":
 		if len(x.LockedCoins) == 0 {
 			return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_6_list{})
 		}
 		listValue := &_QueryLockupAccountInfoResponse_6_list{list: &x.LockedCoins}
 		return protoreflect.ValueOfList(listValue)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.unlocked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.unlocked_coins":
 		if len(x.UnlockedCoins) == 0 {
 			return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_7_list{})
 		}
 		listValue := &_QueryLockupAccountInfoResponse_7_list{list: &x.UnlockedCoins}
 		return protoreflect.ValueOfList(listValue)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.owner":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.owner":
 		value := x.Owner
 		return protoreflect.ValueOfString(value)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -902,37 +902,37 @@ func (x *fastReflection_QueryLockupAccountInfoResponse) Get(descriptor protorefl
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_QueryLockupAccountInfoResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.original_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.original_locking":
 		lv := value.List()
 		clv := lv.(*_QueryLockupAccountInfoResponse_1_list)
 		x.OriginalLocking = *clv.list
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_free":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_free":
 		lv := value.List()
 		clv := lv.(*_QueryLockupAccountInfoResponse_2_list)
 		x.DelegatedFree = *clv.list
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_locking":
 		lv := value.List()
 		clv := lv.(*_QueryLockupAccountInfoResponse_3_list)
 		x.DelegatedLocking = *clv.list
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.start_time":
 		x.StartTime = value.Message().Interface().(*timestamppb.Timestamp)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.end_time":
 		x.EndTime = value.Message().Interface().(*timestamppb.Timestamp)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.locked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.locked_coins":
 		lv := value.List()
 		clv := lv.(*_QueryLockupAccountInfoResponse_6_list)
 		x.LockedCoins = *clv.list
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.unlocked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.unlocked_coins":
 		lv := value.List()
 		clv := lv.(*_QueryLockupAccountInfoResponse_7_list)
 		x.UnlockedCoins = *clv.list
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.owner":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.owner":
 		x.Owner = value.Interface().(string)
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -948,53 +948,53 @@ func (x *fastReflection_QueryLockupAccountInfoResponse) Set(fd protoreflect.Fiel
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_QueryLockupAccountInfoResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.original_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.original_locking":
 		if x.OriginalLocking == nil {
 			x.OriginalLocking = []*v1beta1.Coin{}
 		}
 		value := &_QueryLockupAccountInfoResponse_1_list{list: &x.OriginalLocking}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_free":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_free":
 		if x.DelegatedFree == nil {
 			x.DelegatedFree = []*v1beta1.Coin{}
 		}
 		value := &_QueryLockupAccountInfoResponse_2_list{list: &x.DelegatedFree}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_locking":
 		if x.DelegatedLocking == nil {
 			x.DelegatedLocking = []*v1beta1.Coin{}
 		}
 		value := &_QueryLockupAccountInfoResponse_3_list{list: &x.DelegatedLocking}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.start_time":
 		if x.StartTime == nil {
 			x.StartTime = new(timestamppb.Timestamp)
 		}
 		return protoreflect.ValueOfMessage(x.StartTime.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.end_time":
 		if x.EndTime == nil {
 			x.EndTime = new(timestamppb.Timestamp)
 		}
 		return protoreflect.ValueOfMessage(x.EndTime.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.locked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.locked_coins":
 		if x.LockedCoins == nil {
 			x.LockedCoins = []*v1beta1.Coin{}
 		}
 		value := &_QueryLockupAccountInfoResponse_6_list{list: &x.LockedCoins}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.unlocked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.unlocked_coins":
 		if x.UnlockedCoins == nil {
 			x.UnlockedCoins = []*v1beta1.Coin{}
 		}
 		value := &_QueryLockupAccountInfoResponse_7_list{list: &x.UnlockedCoins}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.owner":
-		panic(fmt.Errorf("field owner of message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.owner":
+		panic(fmt.Errorf("field owner of message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1003,34 +1003,34 @@ func (x *fastReflection_QueryLockupAccountInfoResponse) Mutable(fd protoreflect.
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_QueryLockupAccountInfoResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.original_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.original_locking":
 		list := []*v1beta1.Coin{}
 		return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_1_list{list: &list})
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_free":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_free":
 		list := []*v1beta1.Coin{}
 		return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_2_list{list: &list})
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_locking":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_locking":
 		list := []*v1beta1.Coin{}
 		return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_3_list{list: &list})
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.start_time":
 		m := new(timestamppb.Timestamp)
 		return protoreflect.ValueOfMessage(m.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.end_time":
 		m := new(timestamppb.Timestamp)
 		return protoreflect.ValueOfMessage(m.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.locked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.locked_coins":
 		list := []*v1beta1.Coin{}
 		return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_6_list{list: &list})
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.unlocked_coins":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.unlocked_coins":
 		list := []*v1beta1.Coin{}
 		return protoreflect.ValueOfList(&_QueryLockupAccountInfoResponse_7_list{list: &list})
-	case "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.owner":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.owner":
 		return protoreflect.ValueOfString("")
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1040,7 +1040,7 @@ func (x *fastReflection_QueryLockupAccountInfoResponse) NewField(fd protoreflect
 func (x *fastReflection_QueryLockupAccountInfoResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -1644,8 +1644,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_query_proto_init()
-	md_QueryLockingPeriodsRequest = File_cosmos_accounts_defaults_lockup_query_proto.Messages().ByName("QueryLockingPeriodsRequest")
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_init()
+	md_QueryLockingPeriodsRequest = File_cosmos_accounts_defaults_lockup_v1_query_proto.Messages().ByName("QueryLockingPeriodsRequest")
 }
 
 var _ protoreflect.Message = (*fastReflection_QueryLockingPeriodsRequest)(nil)
@@ -1657,7 +1657,7 @@ func (x *QueryLockingPeriodsRequest) ProtoReflect() protoreflect.Message {
 }
 
 func (x *QueryLockingPeriodsRequest) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[2]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1730,9 +1730,9 @@ func (x *fastReflection_QueryLockingPeriodsRequest) Has(fd protoreflect.FieldDes
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1746,9 +1746,9 @@ func (x *fastReflection_QueryLockingPeriodsRequest) Clear(fd protoreflect.FieldD
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1762,9 +1762,9 @@ func (x *fastReflection_QueryLockingPeriodsRequest) Get(descriptor protoreflect.
 	switch descriptor.FullName() {
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -1782,9 +1782,9 @@ func (x *fastReflection_QueryLockingPeriodsRequest) Set(fd protoreflect.FieldDes
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1802,9 +1802,9 @@ func (x *fastReflection_QueryLockingPeriodsRequest) Mutable(fd protoreflect.Fiel
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1815,9 +1815,9 @@ func (x *fastReflection_QueryLockingPeriodsRequest) NewField(fd protoreflect.Fie
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1827,7 +1827,7 @@ func (x *fastReflection_QueryLockingPeriodsRequest) NewField(fd protoreflect.Fie
 func (x *fastReflection_QueryLockingPeriodsRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -2052,8 +2052,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_query_proto_init()
-	md_QueryLockingPeriodsResponse = File_cosmos_accounts_defaults_lockup_query_proto.Messages().ByName("QueryLockingPeriodsResponse")
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_init()
+	md_QueryLockingPeriodsResponse = File_cosmos_accounts_defaults_lockup_v1_query_proto.Messages().ByName("QueryLockingPeriodsResponse")
 	fd_QueryLockingPeriodsResponse_locking_periods = md_QueryLockingPeriodsResponse.Fields().ByName("locking_periods")
 }
 
@@ -2066,7 +2066,7 @@ func (x *QueryLockingPeriodsResponse) ProtoReflect() protoreflect.Message {
 }
 
 func (x *QueryLockingPeriodsResponse) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[3]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2143,13 +2143,13 @@ func (x *fastReflection_QueryLockingPeriodsResponse) Range(f func(protoreflect.F
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_QueryLockingPeriodsResponse) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse.locking_periods":
 		return len(x.LockingPeriods) != 0
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2161,13 +2161,13 @@ func (x *fastReflection_QueryLockingPeriodsResponse) Has(fd protoreflect.FieldDe
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_QueryLockingPeriodsResponse) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse.locking_periods":
 		x.LockingPeriods = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2179,7 +2179,7 @@ func (x *fastReflection_QueryLockingPeriodsResponse) Clear(fd protoreflect.Field
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_QueryLockingPeriodsResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse.locking_periods":
 		if len(x.LockingPeriods) == 0 {
 			return protoreflect.ValueOfList(&_QueryLockingPeriodsResponse_1_list{})
 		}
@@ -2187,9 +2187,9 @@ func (x *fastReflection_QueryLockingPeriodsResponse) Get(descriptor protoreflect
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -2205,15 +2205,15 @@ func (x *fastReflection_QueryLockingPeriodsResponse) Get(descriptor protoreflect
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_QueryLockingPeriodsResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse.locking_periods":
 		lv := value.List()
 		clv := lv.(*_QueryLockingPeriodsResponse_1_list)
 		x.LockingPeriods = *clv.list
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2229,7 +2229,7 @@ func (x *fastReflection_QueryLockingPeriodsResponse) Set(fd protoreflect.FieldDe
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_QueryLockingPeriodsResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse.locking_periods":
 		if x.LockingPeriods == nil {
 			x.LockingPeriods = []*Period{}
 		}
@@ -2237,9 +2237,9 @@ func (x *fastReflection_QueryLockingPeriodsResponse) Mutable(fd protoreflect.Fie
 		return protoreflect.ValueOfList(value)
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2248,14 +2248,14 @@ func (x *fastReflection_QueryLockingPeriodsResponse) Mutable(fd protoreflect.Fie
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_QueryLockingPeriodsResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse.locking_periods":
 		list := []*Period{}
 		return protoreflect.ValueOfList(&_QueryLockingPeriodsResponse_1_list{list: &list})
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2265,7 +2265,7 @@ func (x *fastReflection_QueryLockingPeriodsResponse) NewField(fd protoreflect.Fi
 func (x *fastReflection_QueryLockingPeriodsResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -2493,7 +2493,7 @@ func (x *fastReflection_QueryLockingPeriodsResponse) ProtoMethods() *protoiface.
 // versions:
 // 	protoc-gen-go v1.27.0
 // 	protoc        (unknown)
-// source: cosmos/accounts/defaults/lockup/query.proto
+// source: cosmos/accounts/defaults/lockup/v1/query.proto
 
 const (
 	// Verify that this generated code is sufficiently up-to-date.
@@ -2512,7 +2512,7 @@ type QueryLockupAccountInfoRequest struct {
 func (x *QueryLockupAccountInfoRequest) Reset() {
 	*x = QueryLockupAccountInfoRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[0]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2526,7 +2526,7 @@ func (*QueryLockupAccountInfoRequest) ProtoMessage() {}
 
 // Deprecated: Use QueryLockupAccountInfoRequest.ProtoReflect.Descriptor instead.
 func (*QueryLockupAccountInfoRequest) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_query_proto_rawDescGZIP(), []int{0}
+	return file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescGZIP(), []int{0}
 }
 
 // QueryLockupAccountInfoResponse return lockup account info
@@ -2556,7 +2556,7 @@ type QueryLockupAccountInfoResponse struct {
 func (x *QueryLockupAccountInfoResponse) Reset() {
 	*x = QueryLockupAccountInfoResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[1]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2570,7 +2570,7 @@ func (*QueryLockupAccountInfoResponse) ProtoMessage() {}
 
 // Deprecated: Use QueryLockupAccountInfoResponse.ProtoReflect.Descriptor instead.
 func (*QueryLockupAccountInfoResponse) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_query_proto_rawDescGZIP(), []int{1}
+	return file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *QueryLockupAccountInfoResponse) GetOriginalLocking() []*v1beta1.Coin {
@@ -2639,7 +2639,7 @@ type QueryLockingPeriodsRequest struct {
 func (x *QueryLockingPeriodsRequest) Reset() {
 	*x = QueryLockingPeriodsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[2]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2653,7 +2653,7 @@ func (*QueryLockingPeriodsRequest) ProtoMessage() {}
 
 // Deprecated: Use QueryLockingPeriodsRequest.ProtoReflect.Descriptor instead.
 func (*QueryLockingPeriodsRequest) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_query_proto_rawDescGZIP(), []int{2}
+	return file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescGZIP(), []int{2}
 }
 
 // QueryLockingPeriodsResponse returns the periodic lockup account locking periods.
@@ -2669,7 +2669,7 @@ type QueryLockingPeriodsResponse struct {
 func (x *QueryLockingPeriodsResponse) Reset() {
 	*x = QueryLockingPeriodsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[3]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2683,7 +2683,7 @@ func (*QueryLockingPeriodsResponse) ProtoMessage() {}
 
 // Deprecated: Use QueryLockingPeriodsResponse.ProtoReflect.Descriptor instead.
 func (*QueryLockingPeriodsResponse) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_query_proto_rawDescGZIP(), []int{3}
+	return file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *QueryLockingPeriodsResponse) GetLockingPeriods() []*Period {
@@ -2693,132 +2693,134 @@ func (x *QueryLockingPeriodsResponse) GetLockingPeriods() []*Period {
 	return nil
 }
 
-var File_cosmos_accounts_defaults_lockup_query_proto protoreflect.FileDescriptor
+var File_cosmos_accounts_defaults_lockup_v1_query_proto protoreflect.FileDescriptor
 
-var file_cosmos_accounts_defaults_lockup_query_proto_rawDesc = []byte{
-	0x0a, 0x2b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+var file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDesc = []byte{
+	0x0a, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
 	0x73, 0x2f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75,
-	0x70, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f, 0x63,
-	0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x1a, 0x2c,
-	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2f,
-	0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f,
-	0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f,
-	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0x1f, 0x0a, 0x1d, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x63, 0x6b,
-	0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x22, 0xfe, 0x05, 0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x6f,
-	0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x76, 0x0a, 0x10, 0x6f, 0x72, 0x69, 0x67, 0x69,
-	0x6e, 0x61, 0x6c, 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde,
-	0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73,
-	0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x0f,
-	0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x4c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x12,
-	0x72, 0x0a, 0x0e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x72, 0x65,
-	0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
+	0x70, 0x2f, 0x76, 0x31, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x12, 0x22, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x73, 0x2e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75,
+	0x70, 0x2e, 0x76, 0x31, 0x1a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c,
+	0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x62, 0x61,
+	0x73, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x1f, 0x0a, 0x1d,
+	0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xfe, 0x05,
+	0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x76, 0x0a, 0x10, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x5f, 0x6c, 0x6f, 0x63,
+	0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31,
+	0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
+	0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65,
+	0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x0f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
+	0x6c, 0x4c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x72, 0x0a, 0x0e, 0x64, 0x65, 0x6c, 0x65,
+	0x67, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x72, 0x65, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76,
+	0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, 0x1f,
+	0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64,
+	0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x0d, 0x64,
+	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x46, 0x72, 0x65, 0x65, 0x12, 0x78, 0x0a, 0x11,
+	0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x69, 0x6e,
+	0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
 	0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f,
 	0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68,
 	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f,
 	0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43,
-	0x6f, 0x69, 0x6e, 0x73, 0x52, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x46,
-	0x72, 0x65, 0x65, 0x12, 0x78, 0x0a, 0x11, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64,
-	0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, 0x1f, 0x00, 0xaa,
-	0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f,
-	0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f,
-	0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x10, 0x64, 0x65, 0x6c,
-	0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x4c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x3f, 0x0a,
-	0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0x90,
-	0xdf, 0x1f, 0x01, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x3b,
-	0x0a, 0x08, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0x90, 0xdf,
-	0x1f, 0x01, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x6e, 0x0a, 0x0c, 0x6c,
-	0x6f, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e,
-	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde,
-	0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73,
-	0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x0b,
-	0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x12, 0x72, 0x0a, 0x0e, 0x75,
-	0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x18, 0x07, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73,
-	0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30,
-	0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
-	0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73,
-	0x52, 0x0d, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x12,
-	0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22, 0x1c, 0x0a, 0x1a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x6f,
-	0x63, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x22, 0x6f, 0x0a, 0x1b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x63, 0x6b,
-	0x69, 0x6e, 0x67, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x50, 0x0a, 0x0f, 0x6c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x65,
-	0x72, 0x69, 0x6f, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f,
-	0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x50, 0x65,
-	0x72, 0x69, 0x6f, 0x64, 0x52, 0x0e, 0x6c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x65, 0x72,
-	0x69, 0x6f, 0x64, 0x73, 0x42, 0x83, 0x02, 0x0a, 0x23, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73,
-	0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x42, 0x0a, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x63, 0x6f, 0x73, 0x6d,
-	0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73,
-	0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0xa2, 0x02, 0x04, 0x43,
-	0x41, 0x44, 0x4c, 0xaa, 0x02, 0x1f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x63, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x4c,
-	0x6f, 0x63, 0x6b, 0x75, 0x70, 0xca, 0x02, 0x1f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41,
-	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73,
-	0x5c, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0xe2, 0x02, 0x2b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
-	0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x73, 0x5c, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x22, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a,
-	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x73, 0x3a, 0x3a, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x6f, 0x69, 0x6e, 0x73, 0x52, 0x10, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x4c,
+	0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x3f, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f,
+	0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x09, 0x73, 0x74,
+	0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x3b, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x5f, 0x74,
+	0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x07, 0x65, 0x6e, 0x64,
+	0x54, 0x69, 0x6d, 0x65, 0x12, 0x6e, 0x0a, 0x0c, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63,
+	0x6f, 0x69, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31,
+	0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
+	0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65,
+	0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x0b, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x43,
+	0x6f, 0x69, 0x6e, 0x73, 0x12, 0x72, 0x0a, 0x0e, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64,
+	0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63,
+	0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f,
+	0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d,
+	0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79,
+	0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x0d, 0x75, 0x6e, 0x6c, 0x6f, 0x63,
+	0x6b, 0x65, 0x64, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65,
+	0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22, 0x1c,
+	0x0a, 0x1a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x65,
+	0x72, 0x69, 0x6f, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x72, 0x0a, 0x1b,
+	0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x65, 0x72, 0x69,
+	0x6f, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x0f, 0x6c,
+	0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e,
+	0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64,
+	0x52, 0x0e, 0x6c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73,
+	0x42, 0x9f, 0x02, 0x0a, 0x26, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e,
+	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+	0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x51, 0x75, 0x65,
+	0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x63, 0x6f, 0x73, 0x6d, 0x6f,
+	0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d,
+	0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x64, 0x65, 0x66, 0x61,
+	0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2f, 0x76, 0x31, 0x3b, 0x6c,
+	0x6f, 0x63, 0x6b, 0x75, 0x70, 0x76, 0x31, 0xa2, 0x02, 0x04, 0x43, 0x41, 0x44, 0x4c, 0xaa, 0x02,
+	0x22, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73,
+	0x2e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70,
+	0x2e, 0x56, 0x31, 0xca, 0x02, 0x22, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x5c, 0x4c,
+	0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x2e, 0x43, 0x6f, 0x73, 0x6d, 0x6f,
+	0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x73, 0x5c, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50,
+	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x26, 0x43, 0x6f, 0x73, 0x6d,
+	0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x44, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x3a, 0x3a, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x3a, 0x3a,
+	0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_cosmos_accounts_defaults_lockup_query_proto_rawDescOnce sync.Once
-	file_cosmos_accounts_defaults_lockup_query_proto_rawDescData = file_cosmos_accounts_defaults_lockup_query_proto_rawDesc
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescOnce sync.Once
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescData = file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDesc
 )
 
-func file_cosmos_accounts_defaults_lockup_query_proto_rawDescGZIP() []byte {
-	file_cosmos_accounts_defaults_lockup_query_proto_rawDescOnce.Do(func() {
-		file_cosmos_accounts_defaults_lockup_query_proto_rawDescData = protoimpl.X.CompressGZIP(file_cosmos_accounts_defaults_lockup_query_proto_rawDescData)
+func file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescGZIP() []byte {
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescOnce.Do(func() {
+		file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescData = protoimpl.X.CompressGZIP(file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescData)
 	})
-	return file_cosmos_accounts_defaults_lockup_query_proto_rawDescData
+	return file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDescData
 }
 
-var file_cosmos_accounts_defaults_lockup_query_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_cosmos_accounts_defaults_lockup_query_proto_goTypes = []interface{}{
-	(*QueryLockupAccountInfoRequest)(nil),  // 0: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest
-	(*QueryLockupAccountInfoResponse)(nil), // 1: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse
-	(*QueryLockingPeriodsRequest)(nil),     // 2: cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest
-	(*QueryLockingPeriodsResponse)(nil),    // 3: cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse
+var file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_cosmos_accounts_defaults_lockup_v1_query_proto_goTypes = []interface{}{
+	(*QueryLockupAccountInfoRequest)(nil),  // 0: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest
+	(*QueryLockupAccountInfoResponse)(nil), // 1: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse
+	(*QueryLockingPeriodsRequest)(nil),     // 2: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest
+	(*QueryLockingPeriodsResponse)(nil),    // 3: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse
 	(*v1beta1.Coin)(nil),                   // 4: cosmos.base.v1beta1.Coin
 	(*timestamppb.Timestamp)(nil),          // 5: google.protobuf.Timestamp
-	(*Period)(nil),                         // 6: cosmos.accounts.defaults.lockup.Period
-}
-var file_cosmos_accounts_defaults_lockup_query_proto_depIdxs = []int32{
-	4, // 0: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.original_locking:type_name -> cosmos.base.v1beta1.Coin
-	4, // 1: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_free:type_name -> cosmos.base.v1beta1.Coin
-	4, // 2: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.delegated_locking:type_name -> cosmos.base.v1beta1.Coin
-	5, // 3: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.start_time:type_name -> google.protobuf.Timestamp
-	5, // 4: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.end_time:type_name -> google.protobuf.Timestamp
-	4, // 5: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.locked_coins:type_name -> cosmos.base.v1beta1.Coin
-	4, // 6: cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse.unlocked_coins:type_name -> cosmos.base.v1beta1.Coin
-	6, // 7: cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse.locking_periods:type_name -> cosmos.accounts.defaults.lockup.Period
+	(*Period)(nil),                         // 6: cosmos.accounts.defaults.lockup.v1.Period
+}
+var file_cosmos_accounts_defaults_lockup_v1_query_proto_depIdxs = []int32{
+	4, // 0: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.original_locking:type_name -> cosmos.base.v1beta1.Coin
+	4, // 1: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_free:type_name -> cosmos.base.v1beta1.Coin
+	4, // 2: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.delegated_locking:type_name -> cosmos.base.v1beta1.Coin
+	5, // 3: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.start_time:type_name -> google.protobuf.Timestamp
+	5, // 4: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.end_time:type_name -> google.protobuf.Timestamp
+	4, // 5: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.locked_coins:type_name -> cosmos.base.v1beta1.Coin
+	4, // 6: cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse.unlocked_coins:type_name -> cosmos.base.v1beta1.Coin
+	6, // 7: cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse.locking_periods:type_name -> cosmos.accounts.defaults.lockup.v1.Period
 	8, // [8:8] is the sub-list for method output_type
 	8, // [8:8] is the sub-list for method input_type
 	8, // [8:8] is the sub-list for extension type_name
@@ -2826,14 +2828,14 @@ var file_cosmos_accounts_defaults_lockup_query_proto_depIdxs = []int32{
 	0, // [0:8] is the sub-list for field type_name
 }
 
-func init() { file_cosmos_accounts_defaults_lockup_query_proto_init() }
-func file_cosmos_accounts_defaults_lockup_query_proto_init() {
-	if File_cosmos_accounts_defaults_lockup_query_proto != nil {
+func init() { file_cosmos_accounts_defaults_lockup_v1_query_proto_init() }
+func file_cosmos_accounts_defaults_lockup_v1_query_proto_init() {
+	if File_cosmos_accounts_defaults_lockup_v1_query_proto != nil {
 		return
 	}
-	file_cosmos_accounts_defaults_lockup_lockup_proto_init()
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QueryLockupAccountInfoRequest); i {
 			case 0:
 				return &v.state
@@ -2845,7 +2847,7 @@ func file_cosmos_accounts_defaults_lockup_query_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QueryLockupAccountInfoResponse); i {
 			case 0:
 				return &v.state
@@ -2857,7 +2859,7 @@ func file_cosmos_accounts_defaults_lockup_query_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QueryLockingPeriodsRequest); i {
 			case 0:
 				return &v.state
@@ -2869,7 +2871,7 @@ func file_cosmos_accounts_defaults_lockup_query_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_query_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QueryLockingPeriodsResponse); i {
 			case 0:
 				return &v.state
@@ -2886,18 +2888,18 @@ func file_cosmos_accounts_defaults_lockup_query_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_cosmos_accounts_defaults_lockup_query_proto_rawDesc,
+			RawDescriptor: file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_cosmos_accounts_defaults_lockup_query_proto_goTypes,
-		DependencyIndexes: file_cosmos_accounts_defaults_lockup_query_proto_depIdxs,
-		MessageInfos:      file_cosmos_accounts_defaults_lockup_query_proto_msgTypes,
+		GoTypes:           file_cosmos_accounts_defaults_lockup_v1_query_proto_goTypes,
+		DependencyIndexes: file_cosmos_accounts_defaults_lockup_v1_query_proto_depIdxs,
+		MessageInfos:      file_cosmos_accounts_defaults_lockup_v1_query_proto_msgTypes,
 	}.Build()
-	File_cosmos_accounts_defaults_lockup_query_proto = out.File
-	file_cosmos_accounts_defaults_lockup_query_proto_rawDesc = nil
-	file_cosmos_accounts_defaults_lockup_query_proto_goTypes = nil
-	file_cosmos_accounts_defaults_lockup_query_proto_depIdxs = nil
+	File_cosmos_accounts_defaults_lockup_v1_query_proto = out.File
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_rawDesc = nil
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_goTypes = nil
+	file_cosmos_accounts_defaults_lockup_v1_query_proto_depIdxs = nil
 }
diff --git a/api/cosmos/accounts/defaults/lockup/tx.pulsar.go b/api/cosmos/accounts/defaults/lockup/v1/tx.pulsar.go
similarity index 82%
rename from api/cosmos/accounts/defaults/lockup/tx.pulsar.go
rename to api/cosmos/accounts/defaults/lockup/v1/tx.pulsar.go
index 5483fe9c096b..3283320c925b 100644
--- a/api/cosmos/accounts/defaults/lockup/tx.pulsar.go
+++ b/api/cosmos/accounts/defaults/lockup/v1/tx.pulsar.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-pulsar. DO NOT EDIT.
-package lockup
+package lockupv1
 
 import (
 	_ "cosmossdk.io/api/amino"
@@ -27,8 +27,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgInitLockupAccount = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgInitLockupAccount")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgInitLockupAccount = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgInitLockupAccount")
 	fd_MsgInitLockupAccount_owner = md_MsgInitLockupAccount.Fields().ByName("owner")
 	fd_MsgInitLockupAccount_end_time = md_MsgInitLockupAccount.Fields().ByName("end_time")
 	fd_MsgInitLockupAccount_start_time = md_MsgInitLockupAccount.Fields().ByName("start_time")
@@ -43,7 +43,7 @@ func (x *MsgInitLockupAccount) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgInitLockupAccount) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[0]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -132,17 +132,17 @@ func (x *fastReflection_MsgInitLockupAccount) Range(f func(protoreflect.FieldDes
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgInitLockupAccount) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.owner":
 		return x.Owner != ""
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.end_time":
 		return x.EndTime != nil
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.start_time":
 		return x.StartTime != nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -154,17 +154,17 @@ func (x *fastReflection_MsgInitLockupAccount) Has(fd protoreflect.FieldDescripto
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgInitLockupAccount) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.owner":
 		x.Owner = ""
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.end_time":
 		x.EndTime = nil
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.start_time":
 		x.StartTime = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -176,20 +176,20 @@ func (x *fastReflection_MsgInitLockupAccount) Clear(fd protoreflect.FieldDescrip
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgInitLockupAccount) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.owner":
 		value := x.Owner
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.end_time":
 		value := x.EndTime
 		return protoreflect.ValueOfMessage(value.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.start_time":
 		value := x.StartTime
 		return protoreflect.ValueOfMessage(value.ProtoReflect())
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccount does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -205,17 +205,17 @@ func (x *fastReflection_MsgInitLockupAccount) Get(descriptor protoreflect.FieldD
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgInitLockupAccount) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.owner":
 		x.Owner = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.end_time":
 		x.EndTime = value.Message().Interface().(*timestamppb.Timestamp)
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.start_time":
 		x.StartTime = value.Message().Interface().(*timestamppb.Timestamp)
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -231,23 +231,23 @@ func (x *fastReflection_MsgInitLockupAccount) Set(fd protoreflect.FieldDescripto
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgInitLockupAccount) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.end_time":
 		if x.EndTime == nil {
 			x.EndTime = new(timestamppb.Timestamp)
 		}
 		return protoreflect.ValueOfMessage(x.EndTime.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.start_time":
 		if x.StartTime == nil {
 			x.StartTime = new(timestamppb.Timestamp)
 		}
 		return protoreflect.ValueOfMessage(x.StartTime.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.owner":
-		panic(fmt.Errorf("field owner of message cosmos.accounts.defaults.lockup.MsgInitLockupAccount is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.owner":
+		panic(fmt.Errorf("field owner of message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -256,19 +256,19 @@ func (x *fastReflection_MsgInitLockupAccount) Mutable(fd protoreflect.FieldDescr
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgInitLockupAccount) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.owner":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.end_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.end_time":
 		m := new(timestamppb.Timestamp)
 		return protoreflect.ValueOfMessage(m.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgInitLockupAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.start_time":
 		m := new(timestamppb.Timestamp)
 		return protoreflect.ValueOfMessage(m.ProtoReflect())
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -278,7 +278,7 @@ func (x *fastReflection_MsgInitLockupAccount) NewField(fd protoreflect.FieldDesc
 func (x *fastReflection_MsgInitLockupAccount) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgInitLockupAccount", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -602,8 +602,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgInitLockupAccountResponse = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgInitLockupAccountResponse")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgInitLockupAccountResponse = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgInitLockupAccountResponse")
 }
 
 var _ protoreflect.Message = (*fastReflection_MsgInitLockupAccountResponse)(nil)
@@ -615,7 +615,7 @@ func (x *MsgInitLockupAccountResponse) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgInitLockupAccountResponse) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[1]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -688,9 +688,9 @@ func (x *fastReflection_MsgInitLockupAccountResponse) Has(fd protoreflect.FieldD
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -704,9 +704,9 @@ func (x *fastReflection_MsgInitLockupAccountResponse) Clear(fd protoreflect.Fiel
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -720,9 +720,9 @@ func (x *fastReflection_MsgInitLockupAccountResponse) Get(descriptor protoreflec
 	switch descriptor.FullName() {
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -740,9 +740,9 @@ func (x *fastReflection_MsgInitLockupAccountResponse) Set(fd protoreflect.FieldD
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -760,9 +760,9 @@ func (x *fastReflection_MsgInitLockupAccountResponse) Mutable(fd protoreflect.Fi
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -773,9 +773,9 @@ func (x *fastReflection_MsgInitLockupAccountResponse) NewField(fd protoreflect.F
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -785,7 +785,7 @@ func (x *fastReflection_MsgInitLockupAccountResponse) NewField(fd protoreflect.F
 func (x *fastReflection_MsgInitLockupAccountResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -1012,8 +1012,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgInitPeriodicLockingAccount = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgInitPeriodicLockingAccount")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgInitPeriodicLockingAccount = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgInitPeriodicLockingAccount")
 	fd_MsgInitPeriodicLockingAccount_owner = md_MsgInitPeriodicLockingAccount.Fields().ByName("owner")
 	fd_MsgInitPeriodicLockingAccount_start_time = md_MsgInitPeriodicLockingAccount.Fields().ByName("start_time")
 	fd_MsgInitPeriodicLockingAccount_locking_periods = md_MsgInitPeriodicLockingAccount.Fields().ByName("locking_periods")
@@ -1028,7 +1028,7 @@ func (x *MsgInitPeriodicLockingAccount) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgInitPeriodicLockingAccount) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[2]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1117,17 +1117,17 @@ func (x *fastReflection_MsgInitPeriodicLockingAccount) Range(f func(protoreflect
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgInitPeriodicLockingAccount) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.owner":
 		return x.Owner != ""
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.start_time":
 		return x.StartTime != nil
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.locking_periods":
 		return len(x.LockingPeriods) != 0
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1139,17 +1139,17 @@ func (x *fastReflection_MsgInitPeriodicLockingAccount) Has(fd protoreflect.Field
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgInitPeriodicLockingAccount) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.owner":
 		x.Owner = ""
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.start_time":
 		x.StartTime = nil
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.locking_periods":
 		x.LockingPeriods = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1161,13 +1161,13 @@ func (x *fastReflection_MsgInitPeriodicLockingAccount) Clear(fd protoreflect.Fie
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgInitPeriodicLockingAccount) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.owner":
 		value := x.Owner
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.start_time":
 		value := x.StartTime
 		return protoreflect.ValueOfMessage(value.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.locking_periods":
 		if len(x.LockingPeriods) == 0 {
 			return protoreflect.ValueOfList(&_MsgInitPeriodicLockingAccount_3_list{})
 		}
@@ -1175,9 +1175,9 @@ func (x *fastReflection_MsgInitPeriodicLockingAccount) Get(descriptor protorefle
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -1193,19 +1193,19 @@ func (x *fastReflection_MsgInitPeriodicLockingAccount) Get(descriptor protorefle
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgInitPeriodicLockingAccount) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.owner":
 		x.Owner = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.start_time":
 		x.StartTime = value.Message().Interface().(*timestamppb.Timestamp)
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.locking_periods":
 		lv := value.List()
 		clv := lv.(*_MsgInitPeriodicLockingAccount_3_list)
 		x.LockingPeriods = *clv.list
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1221,24 +1221,24 @@ func (x *fastReflection_MsgInitPeriodicLockingAccount) Set(fd protoreflect.Field
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgInitPeriodicLockingAccount) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.start_time":
 		if x.StartTime == nil {
 			x.StartTime = new(timestamppb.Timestamp)
 		}
 		return protoreflect.ValueOfMessage(x.StartTime.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.locking_periods":
 		if x.LockingPeriods == nil {
 			x.LockingPeriods = []*Period{}
 		}
 		value := &_MsgInitPeriodicLockingAccount_3_list{list: &x.LockingPeriods}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.owner":
-		panic(fmt.Errorf("field owner of message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.owner":
+		panic(fmt.Errorf("field owner of message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1247,19 +1247,19 @@ func (x *fastReflection_MsgInitPeriodicLockingAccount) Mutable(fd protoreflect.F
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgInitPeriodicLockingAccount) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.owner":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.owner":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.start_time":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.start_time":
 		m := new(timestamppb.Timestamp)
 		return protoreflect.ValueOfMessage(m.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.locking_periods":
+	case "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.locking_periods":
 		list := []*Period{}
 		return protoreflect.ValueOfList(&_MsgInitPeriodicLockingAccount_3_list{list: &list})
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1269,7 +1269,7 @@ func (x *fastReflection_MsgInitPeriodicLockingAccount) NewField(fd protoreflect.
 func (x *fastReflection_MsgInitPeriodicLockingAccount) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -1595,8 +1595,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgInitPeriodicLockingAccountResponse = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgInitPeriodicLockingAccountResponse")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgInitPeriodicLockingAccountResponse = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgInitPeriodicLockingAccountResponse")
 }
 
 var _ protoreflect.Message = (*fastReflection_MsgInitPeriodicLockingAccountResponse)(nil)
@@ -1608,7 +1608,7 @@ func (x *MsgInitPeriodicLockingAccountResponse) ProtoReflect() protoreflect.Mess
 }
 
 func (x *MsgInitPeriodicLockingAccountResponse) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[3]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1681,9 +1681,9 @@ func (x *fastReflection_MsgInitPeriodicLockingAccountResponse) Has(fd protorefle
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1697,9 +1697,9 @@ func (x *fastReflection_MsgInitPeriodicLockingAccountResponse) Clear(fd protoref
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1713,9 +1713,9 @@ func (x *fastReflection_MsgInitPeriodicLockingAccountResponse) Get(descriptor pr
 	switch descriptor.FullName() {
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -1733,9 +1733,9 @@ func (x *fastReflection_MsgInitPeriodicLockingAccountResponse) Set(fd protorefle
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1753,9 +1753,9 @@ func (x *fastReflection_MsgInitPeriodicLockingAccountResponse) Mutable(fd protor
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1766,9 +1766,9 @@ func (x *fastReflection_MsgInitPeriodicLockingAccountResponse) NewField(fd proto
 	switch fd.FullName() {
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -1778,7 +1778,7 @@ func (x *fastReflection_MsgInitPeriodicLockingAccountResponse) NewField(fd proto
 func (x *fastReflection_MsgInitPeriodicLockingAccountResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -1954,8 +1954,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgDelegate = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgDelegate")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgDelegate = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgDelegate")
 	fd_MsgDelegate_sender = md_MsgDelegate.Fields().ByName("sender")
 	fd_MsgDelegate_validator_address = md_MsgDelegate.Fields().ByName("validator_address")
 	fd_MsgDelegate_amount = md_MsgDelegate.Fields().ByName("amount")
@@ -1970,7 +1970,7 @@ func (x *MsgDelegate) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgDelegate) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[4]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2059,17 +2059,17 @@ func (x *fastReflection_MsgDelegate) Range(f func(protoreflect.FieldDescriptor,
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgDelegate) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.sender":
 		return x.Sender != ""
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.validator_address":
 		return x.ValidatorAddress != ""
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.amount":
 		return x.Amount != nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgDelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgDelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgDelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgDelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2081,17 +2081,17 @@ func (x *fastReflection_MsgDelegate) Has(fd protoreflect.FieldDescriptor) bool {
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgDelegate) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.sender":
 		x.Sender = ""
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.validator_address":
 		x.ValidatorAddress = ""
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.amount":
 		x.Amount = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgDelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgDelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgDelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgDelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2103,20 +2103,20 @@ func (x *fastReflection_MsgDelegate) Clear(fd protoreflect.FieldDescriptor) {
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgDelegate) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.sender":
 		value := x.Sender
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.validator_address":
 		value := x.ValidatorAddress
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.amount":
 		value := x.Amount
 		return protoreflect.ValueOfMessage(value.ProtoReflect())
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgDelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgDelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgDelegate does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgDelegate does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -2132,17 +2132,17 @@ func (x *fastReflection_MsgDelegate) Get(descriptor protoreflect.FieldDescriptor
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgDelegate) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.sender":
 		x.Sender = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.validator_address":
 		x.ValidatorAddress = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.amount":
 		x.Amount = value.Message().Interface().(*v1beta1.Coin)
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgDelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgDelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgDelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgDelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2158,20 +2158,20 @@ func (x *fastReflection_MsgDelegate) Set(fd protoreflect.FieldDescriptor, value
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgDelegate) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.amount":
 		if x.Amount == nil {
 			x.Amount = new(v1beta1.Coin)
 		}
 		return protoreflect.ValueOfMessage(x.Amount.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.sender":
-		panic(fmt.Errorf("field sender of message cosmos.accounts.defaults.lockup.MsgDelegate is not mutable"))
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.validator_address":
-		panic(fmt.Errorf("field validator_address of message cosmos.accounts.defaults.lockup.MsgDelegate is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.sender":
+		panic(fmt.Errorf("field sender of message cosmos.accounts.defaults.lockup.v1.MsgDelegate is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.validator_address":
+		panic(fmt.Errorf("field validator_address of message cosmos.accounts.defaults.lockup.v1.MsgDelegate is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgDelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgDelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgDelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgDelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2180,18 +2180,18 @@ func (x *fastReflection_MsgDelegate) Mutable(fd protoreflect.FieldDescriptor) pr
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgDelegate) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.sender":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.validator_address":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgDelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgDelegate.amount":
 		m := new(v1beta1.Coin)
 		return protoreflect.ValueOfMessage(m.ProtoReflect())
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgDelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgDelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgDelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgDelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2201,7 +2201,7 @@ func (x *fastReflection_MsgDelegate) NewField(fd protoreflect.FieldDescriptor) p
 func (x *fastReflection_MsgDelegate) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgDelegate", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgDelegate", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -2517,8 +2517,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgUndelegate = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgUndelegate")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgUndelegate = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgUndelegate")
 	fd_MsgUndelegate_sender = md_MsgUndelegate.Fields().ByName("sender")
 	fd_MsgUndelegate_validator_address = md_MsgUndelegate.Fields().ByName("validator_address")
 	fd_MsgUndelegate_amount = md_MsgUndelegate.Fields().ByName("amount")
@@ -2533,7 +2533,7 @@ func (x *MsgUndelegate) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgUndelegate) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[5]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2622,17 +2622,17 @@ func (x *fastReflection_MsgUndelegate) Range(f func(protoreflect.FieldDescriptor
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgUndelegate) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.sender":
 		return x.Sender != ""
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.validator_address":
 		return x.ValidatorAddress != ""
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.amount":
 		return x.Amount != nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgUndelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgUndelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgUndelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgUndelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2644,17 +2644,17 @@ func (x *fastReflection_MsgUndelegate) Has(fd protoreflect.FieldDescriptor) bool
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgUndelegate) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.sender":
 		x.Sender = ""
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.validator_address":
 		x.ValidatorAddress = ""
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.amount":
 		x.Amount = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgUndelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgUndelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgUndelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgUndelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2666,20 +2666,20 @@ func (x *fastReflection_MsgUndelegate) Clear(fd protoreflect.FieldDescriptor) {
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgUndelegate) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.sender":
 		value := x.Sender
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.validator_address":
 		value := x.ValidatorAddress
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.amount":
 		value := x.Amount
 		return protoreflect.ValueOfMessage(value.ProtoReflect())
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgUndelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgUndelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgUndelegate does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgUndelegate does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -2695,17 +2695,17 @@ func (x *fastReflection_MsgUndelegate) Get(descriptor protoreflect.FieldDescript
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgUndelegate) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.sender":
 		x.Sender = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.validator_address":
 		x.ValidatorAddress = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.amount":
 		x.Amount = value.Message().Interface().(*v1beta1.Coin)
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgUndelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgUndelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgUndelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgUndelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2721,20 +2721,20 @@ func (x *fastReflection_MsgUndelegate) Set(fd protoreflect.FieldDescriptor, valu
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgUndelegate) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.amount":
 		if x.Amount == nil {
 			x.Amount = new(v1beta1.Coin)
 		}
 		return protoreflect.ValueOfMessage(x.Amount.ProtoReflect())
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.sender":
-		panic(fmt.Errorf("field sender of message cosmos.accounts.defaults.lockup.MsgUndelegate is not mutable"))
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.validator_address":
-		panic(fmt.Errorf("field validator_address of message cosmos.accounts.defaults.lockup.MsgUndelegate is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.sender":
+		panic(fmt.Errorf("field sender of message cosmos.accounts.defaults.lockup.v1.MsgUndelegate is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.validator_address":
+		panic(fmt.Errorf("field validator_address of message cosmos.accounts.defaults.lockup.v1.MsgUndelegate is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgUndelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgUndelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgUndelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgUndelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2743,18 +2743,18 @@ func (x *fastReflection_MsgUndelegate) Mutable(fd protoreflect.FieldDescriptor)
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgUndelegate) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.sender":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.validator_address":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgUndelegate.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgUndelegate.amount":
 		m := new(v1beta1.Coin)
 		return protoreflect.ValueOfMessage(m.ProtoReflect())
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgUndelegate"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgUndelegate"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgUndelegate does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgUndelegate does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -2764,7 +2764,7 @@ func (x *fastReflection_MsgUndelegate) NewField(fd protoreflect.FieldDescriptor)
 func (x *fastReflection_MsgUndelegate) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgUndelegate", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgUndelegate", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -3079,8 +3079,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgWithdrawReward = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgWithdrawReward")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgWithdrawReward = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgWithdrawReward")
 	fd_MsgWithdrawReward_sender = md_MsgWithdrawReward.Fields().ByName("sender")
 	fd_MsgWithdrawReward_validator_address = md_MsgWithdrawReward.Fields().ByName("validator_address")
 }
@@ -3094,7 +3094,7 @@ func (x *MsgWithdrawReward) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgWithdrawReward) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[6]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3177,15 +3177,15 @@ func (x *fastReflection_MsgWithdrawReward) Range(f func(protoreflect.FieldDescri
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgWithdrawReward) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.sender":
 		return x.Sender != ""
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.validator_address":
 		return x.ValidatorAddress != ""
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawReward"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawReward does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3197,15 +3197,15 @@ func (x *fastReflection_MsgWithdrawReward) Has(fd protoreflect.FieldDescriptor)
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdrawReward) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.sender":
 		x.Sender = ""
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.validator_address":
 		x.ValidatorAddress = ""
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawReward"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawReward does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3217,17 +3217,17 @@ func (x *fastReflection_MsgWithdrawReward) Clear(fd protoreflect.FieldDescriptor
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgWithdrawReward) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.sender":
 		value := x.Sender
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.validator_address":
 		value := x.ValidatorAddress
 		return protoreflect.ValueOfString(value)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawReward"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawReward does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -3243,15 +3243,15 @@ func (x *fastReflection_MsgWithdrawReward) Get(descriptor protoreflect.FieldDesc
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdrawReward) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.sender":
 		x.Sender = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.validator_address":
 		x.ValidatorAddress = value.Interface().(string)
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawReward"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawReward does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3267,15 +3267,15 @@ func (x *fastReflection_MsgWithdrawReward) Set(fd protoreflect.FieldDescriptor,
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdrawReward) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.sender":
-		panic(fmt.Errorf("field sender of message cosmos.accounts.defaults.lockup.MsgWithdrawReward is not mutable"))
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.validator_address":
-		panic(fmt.Errorf("field validator_address of message cosmos.accounts.defaults.lockup.MsgWithdrawReward is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.sender":
+		panic(fmt.Errorf("field sender of message cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.validator_address":
+		panic(fmt.Errorf("field validator_address of message cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawReward"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawReward does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3284,15 +3284,15 @@ func (x *fastReflection_MsgWithdrawReward) Mutable(fd protoreflect.FieldDescript
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgWithdrawReward) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.sender":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawReward.validator_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward.validator_address":
 		return protoreflect.ValueOfString("")
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawReward"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawReward does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3302,7 +3302,7 @@ func (x *fastReflection_MsgWithdrawReward) NewField(fd protoreflect.FieldDescrip
 func (x *fastReflection_MsgWithdrawReward) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgWithdrawReward", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -3615,8 +3615,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgSend = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgSend")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgSend = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgSend")
 	fd_MsgSend_sender = md_MsgSend.Fields().ByName("sender")
 	fd_MsgSend_to_address = md_MsgSend.Fields().ByName("to_address")
 	fd_MsgSend_amount = md_MsgSend.Fields().ByName("amount")
@@ -3631,7 +3631,7 @@ func (x *MsgSend) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgSend) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[7]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3720,17 +3720,17 @@ func (x *fastReflection_MsgSend) Range(f func(protoreflect.FieldDescriptor, prot
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgSend) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgSend.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.sender":
 		return x.Sender != ""
-	case "cosmos.accounts.defaults.lockup.MsgSend.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.to_address":
 		return x.ToAddress != ""
-	case "cosmos.accounts.defaults.lockup.MsgSend.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.amount":
 		return len(x.Amount) != 0
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgSend"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgSend"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgSend does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgSend does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3742,17 +3742,17 @@ func (x *fastReflection_MsgSend) Has(fd protoreflect.FieldDescriptor) bool {
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgSend) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgSend.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.sender":
 		x.Sender = ""
-	case "cosmos.accounts.defaults.lockup.MsgSend.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.to_address":
 		x.ToAddress = ""
-	case "cosmos.accounts.defaults.lockup.MsgSend.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.amount":
 		x.Amount = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgSend"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgSend"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgSend does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgSend does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3764,13 +3764,13 @@ func (x *fastReflection_MsgSend) Clear(fd protoreflect.FieldDescriptor) {
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgSend) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgSend.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.sender":
 		value := x.Sender
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgSend.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.to_address":
 		value := x.ToAddress
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgSend.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.amount":
 		if len(x.Amount) == 0 {
 			return protoreflect.ValueOfList(&_MsgSend_3_list{})
 		}
@@ -3778,9 +3778,9 @@ func (x *fastReflection_MsgSend) Get(descriptor protoreflect.FieldDescriptor) pr
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgSend"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgSend"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgSend does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgSend does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -3796,19 +3796,19 @@ func (x *fastReflection_MsgSend) Get(descriptor protoreflect.FieldDescriptor) pr
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgSend) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgSend.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.sender":
 		x.Sender = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgSend.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.to_address":
 		x.ToAddress = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgSend.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.amount":
 		lv := value.List()
 		clv := lv.(*_MsgSend_3_list)
 		x.Amount = *clv.list
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgSend"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgSend"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgSend does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgSend does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3824,21 +3824,21 @@ func (x *fastReflection_MsgSend) Set(fd protoreflect.FieldDescriptor, value prot
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgSend) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgSend.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.amount":
 		if x.Amount == nil {
 			x.Amount = []*v1beta1.Coin{}
 		}
 		value := &_MsgSend_3_list{list: &x.Amount}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.MsgSend.sender":
-		panic(fmt.Errorf("field sender of message cosmos.accounts.defaults.lockup.MsgSend is not mutable"))
-	case "cosmos.accounts.defaults.lockup.MsgSend.to_address":
-		panic(fmt.Errorf("field to_address of message cosmos.accounts.defaults.lockup.MsgSend is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.sender":
+		panic(fmt.Errorf("field sender of message cosmos.accounts.defaults.lockup.v1.MsgSend is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.to_address":
+		panic(fmt.Errorf("field to_address of message cosmos.accounts.defaults.lockup.v1.MsgSend is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgSend"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgSend"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgSend does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgSend does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3847,18 +3847,18 @@ func (x *fastReflection_MsgSend) Mutable(fd protoreflect.FieldDescriptor) protor
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgSend) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgSend.sender":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.sender":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgSend.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.to_address":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgSend.amount":
+	case "cosmos.accounts.defaults.lockup.v1.MsgSend.amount":
 		list := []*v1beta1.Coin{}
 		return protoreflect.ValueOfList(&_MsgSend_3_list{list: &list})
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgSend"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgSend"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgSend does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgSend does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -3868,7 +3868,7 @@ func (x *fastReflection_MsgSend) NewField(fd protoreflect.FieldDescriptor) proto
 func (x *fastReflection_MsgSend) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgSend", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgSend", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -4235,8 +4235,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgExecuteMessagesResponse = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgExecuteMessagesResponse")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgExecuteMessagesResponse = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgExecuteMessagesResponse")
 	fd_MsgExecuteMessagesResponse_responses = md_MsgExecuteMessagesResponse.Fields().ByName("responses")
 }
 
@@ -4249,7 +4249,7 @@ func (x *MsgExecuteMessagesResponse) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgExecuteMessagesResponse) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[8]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4326,13 +4326,13 @@ func (x *fastReflection_MsgExecuteMessagesResponse) Range(f func(protoreflect.Fi
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgExecuteMessagesResponse) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse.responses":
+	case "cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse.responses":
 		return len(x.Responses) != 0
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4344,13 +4344,13 @@ func (x *fastReflection_MsgExecuteMessagesResponse) Has(fd protoreflect.FieldDes
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgExecuteMessagesResponse) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse.responses":
+	case "cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse.responses":
 		x.Responses = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4362,7 +4362,7 @@ func (x *fastReflection_MsgExecuteMessagesResponse) Clear(fd protoreflect.FieldD
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgExecuteMessagesResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse.responses":
+	case "cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse.responses":
 		if len(x.Responses) == 0 {
 			return protoreflect.ValueOfList(&_MsgExecuteMessagesResponse_1_list{})
 		}
@@ -4370,9 +4370,9 @@ func (x *fastReflection_MsgExecuteMessagesResponse) Get(descriptor protoreflect.
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -4388,15 +4388,15 @@ func (x *fastReflection_MsgExecuteMessagesResponse) Get(descriptor protoreflect.
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgExecuteMessagesResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse.responses":
+	case "cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse.responses":
 		lv := value.List()
 		clv := lv.(*_MsgExecuteMessagesResponse_1_list)
 		x.Responses = *clv.list
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4412,7 +4412,7 @@ func (x *fastReflection_MsgExecuteMessagesResponse) Set(fd protoreflect.FieldDes
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgExecuteMessagesResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse.responses":
+	case "cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse.responses":
 		if x.Responses == nil {
 			x.Responses = []*anypb.Any{}
 		}
@@ -4420,9 +4420,9 @@ func (x *fastReflection_MsgExecuteMessagesResponse) Mutable(fd protoreflect.Fiel
 		return protoreflect.ValueOfList(value)
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4431,14 +4431,14 @@ func (x *fastReflection_MsgExecuteMessagesResponse) Mutable(fd protoreflect.Fiel
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgExecuteMessagesResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse.responses":
+	case "cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse.responses":
 		list := []*anypb.Any{}
 		return protoreflect.ValueOfList(&_MsgExecuteMessagesResponse_1_list{list: &list})
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4448,7 +4448,7 @@ func (x *fastReflection_MsgExecuteMessagesResponse) NewField(fd protoreflect.Fie
 func (x *fastReflection_MsgExecuteMessagesResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -4726,8 +4726,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgWithdraw = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgWithdraw")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgWithdraw = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgWithdraw")
 	fd_MsgWithdraw_withdrawer = md_MsgWithdraw.Fields().ByName("withdrawer")
 	fd_MsgWithdraw_to_address = md_MsgWithdraw.Fields().ByName("to_address")
 	fd_MsgWithdraw_denoms = md_MsgWithdraw.Fields().ByName("denoms")
@@ -4742,7 +4742,7 @@ func (x *MsgWithdraw) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgWithdraw) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[9]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4831,17 +4831,17 @@ func (x *fastReflection_MsgWithdraw) Range(f func(protoreflect.FieldDescriptor,
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgWithdraw) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.withdrawer":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.withdrawer":
 		return x.Withdrawer != ""
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.to_address":
 		return x.ToAddress != ""
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.denoms":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.denoms":
 		return len(x.Denoms) != 0
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdraw"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdraw"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdraw does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdraw does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4853,17 +4853,17 @@ func (x *fastReflection_MsgWithdraw) Has(fd protoreflect.FieldDescriptor) bool {
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdraw) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.withdrawer":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.withdrawer":
 		x.Withdrawer = ""
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.to_address":
 		x.ToAddress = ""
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.denoms":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.denoms":
 		x.Denoms = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdraw"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdraw"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdraw does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdraw does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4875,13 +4875,13 @@ func (x *fastReflection_MsgWithdraw) Clear(fd protoreflect.FieldDescriptor) {
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgWithdraw) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.withdrawer":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.withdrawer":
 		value := x.Withdrawer
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.to_address":
 		value := x.ToAddress
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.denoms":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.denoms":
 		if len(x.Denoms) == 0 {
 			return protoreflect.ValueOfList(&_MsgWithdraw_3_list{})
 		}
@@ -4889,9 +4889,9 @@ func (x *fastReflection_MsgWithdraw) Get(descriptor protoreflect.FieldDescriptor
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdraw"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdraw"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdraw does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdraw does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -4907,19 +4907,19 @@ func (x *fastReflection_MsgWithdraw) Get(descriptor protoreflect.FieldDescriptor
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdraw) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.withdrawer":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.withdrawer":
 		x.Withdrawer = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.to_address":
 		x.ToAddress = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.denoms":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.denoms":
 		lv := value.List()
 		clv := lv.(*_MsgWithdraw_3_list)
 		x.Denoms = *clv.list
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdraw"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdraw"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdraw does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdraw does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4935,21 +4935,21 @@ func (x *fastReflection_MsgWithdraw) Set(fd protoreflect.FieldDescriptor, value
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdraw) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.denoms":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.denoms":
 		if x.Denoms == nil {
 			x.Denoms = []string{}
 		}
 		value := &_MsgWithdraw_3_list{list: &x.Denoms}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.withdrawer":
-		panic(fmt.Errorf("field withdrawer of message cosmos.accounts.defaults.lockup.MsgWithdraw is not mutable"))
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.to_address":
-		panic(fmt.Errorf("field to_address of message cosmos.accounts.defaults.lockup.MsgWithdraw is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.withdrawer":
+		panic(fmt.Errorf("field withdrawer of message cosmos.accounts.defaults.lockup.v1.MsgWithdraw is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.to_address":
+		panic(fmt.Errorf("field to_address of message cosmos.accounts.defaults.lockup.v1.MsgWithdraw is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdraw"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdraw"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdraw does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdraw does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4958,18 +4958,18 @@ func (x *fastReflection_MsgWithdraw) Mutable(fd protoreflect.FieldDescriptor) pr
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgWithdraw) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.withdrawer":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.withdrawer":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.to_address":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.to_address":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgWithdraw.denoms":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdraw.denoms":
 		list := []string{}
 		return protoreflect.ValueOfList(&_MsgWithdraw_3_list{list: &list})
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdraw"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdraw"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdraw does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdraw does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -4979,7 +4979,7 @@ func (x *fastReflection_MsgWithdraw) NewField(fd protoreflect.FieldDescriptor) p
 func (x *fastReflection_MsgWithdraw) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgWithdraw", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgWithdraw", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -5338,8 +5338,8 @@ var (
 )
 
 func init() {
-	file_cosmos_accounts_defaults_lockup_tx_proto_init()
-	md_MsgWithdrawResponse = File_cosmos_accounts_defaults_lockup_tx_proto.Messages().ByName("MsgWithdrawResponse")
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_init()
+	md_MsgWithdrawResponse = File_cosmos_accounts_defaults_lockup_v1_tx_proto.Messages().ByName("MsgWithdrawResponse")
 	fd_MsgWithdrawResponse_receiver = md_MsgWithdrawResponse.Fields().ByName("receiver")
 	fd_MsgWithdrawResponse_amount_received = md_MsgWithdrawResponse.Fields().ByName("amount_received")
 }
@@ -5353,7 +5353,7 @@ func (x *MsgWithdrawResponse) ProtoReflect() protoreflect.Message {
 }
 
 func (x *MsgWithdrawResponse) slowProtoReflect() protoreflect.Message {
-	mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[10]
+	mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5436,15 +5436,15 @@ func (x *fastReflection_MsgWithdrawResponse) Range(f func(protoreflect.FieldDesc
 // a repeated field is populated if it is non-empty.
 func (x *fastReflection_MsgWithdrawResponse) Has(fd protoreflect.FieldDescriptor) bool {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.receiver":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.receiver":
 		return x.Receiver != ""
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.amount_received":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.amount_received":
 		return len(x.AmountReceived) != 0
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -5456,15 +5456,15 @@ func (x *fastReflection_MsgWithdrawResponse) Has(fd protoreflect.FieldDescriptor
 // Clear is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdrawResponse) Clear(fd protoreflect.FieldDescriptor) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.receiver":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.receiver":
 		x.Receiver = ""
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.amount_received":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.amount_received":
 		x.AmountReceived = nil
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -5476,10 +5476,10 @@ func (x *fastReflection_MsgWithdrawResponse) Clear(fd protoreflect.FieldDescript
 // of the value; to obtain a mutable reference, use Mutable.
 func (x *fastReflection_MsgWithdrawResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value {
 	switch descriptor.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.receiver":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.receiver":
 		value := x.Receiver
 		return protoreflect.ValueOfString(value)
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.amount_received":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.amount_received":
 		if len(x.AmountReceived) == 0 {
 			return protoreflect.ValueOfList(&_MsgWithdrawResponse_2_list{})
 		}
@@ -5487,9 +5487,9 @@ func (x *fastReflection_MsgWithdrawResponse) Get(descriptor protoreflect.FieldDe
 		return protoreflect.ValueOfList(listValue)
 	default:
 		if descriptor.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawResponse does not contain field %s", descriptor.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse does not contain field %s", descriptor.FullName()))
 	}
 }
 
@@ -5505,17 +5505,17 @@ func (x *fastReflection_MsgWithdrawResponse) Get(descriptor protoreflect.FieldDe
 // Set is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdrawResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.receiver":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.receiver":
 		x.Receiver = value.Interface().(string)
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.amount_received":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.amount_received":
 		lv := value.List()
 		clv := lv.(*_MsgWithdrawResponse_2_list)
 		x.AmountReceived = *clv.list
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -5531,19 +5531,19 @@ func (x *fastReflection_MsgWithdrawResponse) Set(fd protoreflect.FieldDescriptor
 // Mutable is a mutating operation and unsafe for concurrent use.
 func (x *fastReflection_MsgWithdrawResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.amount_received":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.amount_received":
 		if x.AmountReceived == nil {
 			x.AmountReceived = []*v1beta1.Coin{}
 		}
 		value := &_MsgWithdrawResponse_2_list{list: &x.AmountReceived}
 		return protoreflect.ValueOfList(value)
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.receiver":
-		panic(fmt.Errorf("field receiver of message cosmos.accounts.defaults.lockup.MsgWithdrawResponse is not mutable"))
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.receiver":
+		panic(fmt.Errorf("field receiver of message cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse is not mutable"))
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -5552,16 +5552,16 @@ func (x *fastReflection_MsgWithdrawResponse) Mutable(fd protoreflect.FieldDescri
 // For lists, maps, and messages, this returns a new, empty, mutable value.
 func (x *fastReflection_MsgWithdrawResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value {
 	switch fd.FullName() {
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.receiver":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.receiver":
 		return protoreflect.ValueOfString("")
-	case "cosmos.accounts.defaults.lockup.MsgWithdrawResponse.amount_received":
+	case "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.amount_received":
 		list := []*v1beta1.Coin{}
 		return protoreflect.ValueOfList(&_MsgWithdrawResponse_2_list{list: &list})
 	default:
 		if fd.IsExtension() {
-			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.MsgWithdrawResponse"))
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse"))
 		}
-		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.MsgWithdrawResponse does not contain field %s", fd.FullName()))
+		panic(fmt.Errorf("message cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse does not contain field %s", fd.FullName()))
 	}
 }
 
@@ -5571,7 +5571,7 @@ func (x *fastReflection_MsgWithdrawResponse) NewField(fd protoreflect.FieldDescr
 func (x *fastReflection_MsgWithdrawResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor {
 	switch d.FullName() {
 	default:
-		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.MsgWithdrawResponse", d.FullName()))
+		panic(fmt.Errorf("%s is not a oneof field in cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse", d.FullName()))
 	}
 	panic("unreachable")
 }
@@ -5842,7 +5842,7 @@ func (x *fastReflection_MsgWithdrawResponse) ProtoMethods() *protoiface.Methods
 // versions:
 // 	protoc-gen-go v1.27.0
 // 	protoc        (unknown)
-// source: cosmos/accounts/defaults/lockup/tx.proto
+// source: cosmos/accounts/defaults/lockup/v1/tx.proto
 
 const (
 	// Verify that this generated code is sufficiently up-to-date.
@@ -5869,7 +5869,7 @@ type MsgInitLockupAccount struct {
 func (x *MsgInitLockupAccount) Reset() {
 	*x = MsgInitLockupAccount{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[0]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5883,7 +5883,7 @@ func (*MsgInitLockupAccount) ProtoMessage() {}
 
 // Deprecated: Use MsgInitLockupAccount.ProtoReflect.Descriptor instead.
 func (*MsgInitLockupAccount) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{0}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *MsgInitLockupAccount) GetOwner() string {
@@ -5917,7 +5917,7 @@ type MsgInitLockupAccountResponse struct {
 func (x *MsgInitLockupAccountResponse) Reset() {
 	*x = MsgInitLockupAccountResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[1]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5931,7 +5931,7 @@ func (*MsgInitLockupAccountResponse) ProtoMessage() {}
 
 // Deprecated: Use MsgInitLockupAccountResponse.ProtoReflect.Descriptor instead.
 func (*MsgInitLockupAccountResponse) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{1}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{1}
 }
 
 // MsgInitPeriodicLockingAccount defines a message that enables creating a periodic locking
@@ -5951,7 +5951,7 @@ type MsgInitPeriodicLockingAccount struct {
 func (x *MsgInitPeriodicLockingAccount) Reset() {
 	*x = MsgInitPeriodicLockingAccount{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[2]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5965,7 +5965,7 @@ func (*MsgInitPeriodicLockingAccount) ProtoMessage() {}
 
 // Deprecated: Use MsgInitPeriodicLockingAccount.ProtoReflect.Descriptor instead.
 func (*MsgInitPeriodicLockingAccount) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{2}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *MsgInitPeriodicLockingAccount) GetOwner() string {
@@ -6000,7 +6000,7 @@ type MsgInitPeriodicLockingAccountResponse struct {
 func (x *MsgInitPeriodicLockingAccountResponse) Reset() {
 	*x = MsgInitPeriodicLockingAccountResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[3]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6014,7 +6014,7 @@ func (*MsgInitPeriodicLockingAccountResponse) ProtoMessage() {}
 
 // Deprecated: Use MsgInitPeriodicLockingAccountResponse.ProtoReflect.Descriptor instead.
 func (*MsgInitPeriodicLockingAccountResponse) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{3}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{3}
 }
 
 // MsgDelegate defines a message that enable lockup account to execute delegate message
@@ -6032,7 +6032,7 @@ type MsgDelegate struct {
 func (x *MsgDelegate) Reset() {
 	*x = MsgDelegate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[4]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6046,7 +6046,7 @@ func (*MsgDelegate) ProtoMessage() {}
 
 // Deprecated: Use MsgDelegate.ProtoReflect.Descriptor instead.
 func (*MsgDelegate) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{4}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *MsgDelegate) GetSender() string {
@@ -6084,7 +6084,7 @@ type MsgUndelegate struct {
 func (x *MsgUndelegate) Reset() {
 	*x = MsgUndelegate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[5]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6098,7 +6098,7 @@ func (*MsgUndelegate) ProtoMessage() {}
 
 // Deprecated: Use MsgUndelegate.ProtoReflect.Descriptor instead.
 func (*MsgUndelegate) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{5}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *MsgUndelegate) GetSender() string {
@@ -6135,7 +6135,7 @@ type MsgWithdrawReward struct {
 func (x *MsgWithdrawReward) Reset() {
 	*x = MsgWithdrawReward{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[6]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6149,7 +6149,7 @@ func (*MsgWithdrawReward) ProtoMessage() {}
 
 // Deprecated: Use MsgWithdrawReward.ProtoReflect.Descriptor instead.
 func (*MsgWithdrawReward) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{6}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *MsgWithdrawReward) GetSender() string {
@@ -6180,7 +6180,7 @@ type MsgSend struct {
 func (x *MsgSend) Reset() {
 	*x = MsgSend{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[7]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6194,7 +6194,7 @@ func (*MsgSend) ProtoMessage() {}
 
 // Deprecated: Use MsgSend.ProtoReflect.Descriptor instead.
 func (*MsgSend) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{7}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *MsgSend) GetSender() string {
@@ -6230,7 +6230,7 @@ type MsgExecuteMessagesResponse struct {
 func (x *MsgExecuteMessagesResponse) Reset() {
 	*x = MsgExecuteMessagesResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[8]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6244,7 +6244,7 @@ func (*MsgExecuteMessagesResponse) ProtoMessage() {}
 
 // Deprecated: Use MsgExecuteMessagesResponse.ProtoReflect.Descriptor instead.
 func (*MsgExecuteMessagesResponse) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{8}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *MsgExecuteMessagesResponse) GetResponses() []*anypb.Any {
@@ -6269,7 +6269,7 @@ type MsgWithdraw struct {
 func (x *MsgWithdraw) Reset() {
 	*x = MsgWithdraw{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[9]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6283,7 +6283,7 @@ func (*MsgWithdraw) ProtoMessage() {}
 
 // Deprecated: Use MsgWithdraw.ProtoReflect.Descriptor instead.
 func (*MsgWithdraw) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{9}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *MsgWithdraw) GetWithdrawer() string {
@@ -6320,7 +6320,7 @@ type MsgWithdrawResponse struct {
 func (x *MsgWithdrawResponse) Reset() {
 	*x = MsgWithdrawResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[10]
+		mi := &file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6334,7 +6334,7 @@ func (*MsgWithdrawResponse) ProtoMessage() {}
 
 // Deprecated: Use MsgWithdrawResponse.ProtoReflect.Descriptor instead.
 func (*MsgWithdrawResponse) Descriptor() ([]byte, []int) {
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP(), []int{10}
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *MsgWithdrawResponse) GetReceiver() string {
@@ -6351,213 +6351,215 @@ func (x *MsgWithdrawResponse) GetAmountReceived() []*v1beta1.Coin {
 	return nil
 }
 
-var File_cosmos_accounts_defaults_lockup_tx_proto protoreflect.FileDescriptor
+var File_cosmos_accounts_defaults_lockup_v1_tx_proto protoreflect.FileDescriptor
 
-var file_cosmos_accounts_defaults_lockup_tx_proto_rawDesc = []byte{
-	0x0a, 0x28, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+var file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDesc = []byte{
+	0x0a, 0x2b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
 	0x73, 0x2f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75,
-	0x70, 0x2f, 0x74, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f, 0x63, 0x6f, 0x73, 0x6d,
-	0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x1a, 0x11, 0x61, 0x6d, 0x69,
-	0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e,
-	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2c,
-	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2f,
-	0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x6f,
-	0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x73, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x73, 0x67, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0x80, 0x02, 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x4c, 0x6f,
-	0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x6f,
-	0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14,
+	0x70, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x22, 0x63,
+	0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x76,
+	0x31, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x62, 0x61, 0x73,
+	0x65, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c,
+	0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x73,
+	0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19,
+	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x80, 0x02, 0x0a, 0x14,
+	0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x05, 0x6f,
+	0x77, 0x6e, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+	0x6d, 0x70, 0x42, 0x0d, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0xa8, 0xe7, 0xb0, 0x2a,
+	0x01, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x48, 0x0a, 0x0a, 0x73, 0x74,
+	0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x0d, 0xc8, 0xde, 0x1f, 0x00,
+	0x90, 0xdf, 0x1f, 0x01, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74,
+	0x54, 0x69, 0x6d, 0x65, 0x3a, 0x28, 0xe8, 0xa0, 0x1f, 0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x1f, 0x63,
+	0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69,
+	0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x1e,
+	0x0a, 0x1c, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa9,
+	0x02, 0x0a, 0x1d, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64,
+	0x69, 0x63, 0x4c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x2e, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72,
+	0x12, 0x48, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+	0x42, 0x0d, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52,
+	0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x5e, 0x0a, 0x0f, 0x6c, 0x6f,
+	0x63, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c,
+	0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x42,
+	0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0e, 0x6c, 0x6f, 0x63, 0x6b,
+	0x69, 0x6e, 0x67, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x3a, 0x2e, 0xe8, 0xa0, 0x1f, 0x00,
+	0x8a, 0xe7, 0xb0, 0x2a, 0x25, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f,
+	0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x4c, 0x6f, 0x63,
+	0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x27, 0x0a, 0x25, 0x4d, 0x73,
+	0x67, 0x49, 0x6e, 0x69, 0x74, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x69, 0x63, 0x4c, 0x6f, 0x63,
+	0x6b, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0xe2, 0x01, 0x0a, 0x0b, 0x4d, 0x73, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x67,
+	0x61, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73,
+	0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+	0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x21, 0xd2, 0xb4, 0x2d, 0x1d, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x56, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72,
+	0x69, 0x6e, 0x67, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3c, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62,
+	0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e,
+	0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f,
+	0x75, 0x6e, 0x74, 0x3a, 0x13, 0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x00, 0x82, 0xe7, 0xb0,
+	0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0xe4, 0x01, 0x0a, 0x0d, 0x4d, 0x73, 0x67,
+	0x55, 0x6e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65,
+	0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14,
 	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x08, 0x65,
-	0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x0d, 0xc8, 0xde, 0x1f, 0x00, 0x90,
-	0xdf, 0x1f, 0x01, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d,
-	0x65, 0x12, 0x48, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x70, 0x42, 0x0d, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0xa8, 0xe7, 0xb0, 0x2a, 0x01,
-	0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x28, 0xe8, 0xa0, 0x1f,
-	0x01, 0x8a, 0xe7, 0xb0, 0x2a, 0x1f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b,
-	0x2f, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x1e, 0x0a, 0x1c, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74,
-	0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa6, 0x02, 0x0a, 0x1d, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69,
-	0x74, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x69, 0x63, 0x4c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67,
-	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d,
-	0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x48, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74,
-	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69,
-	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x0d, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f,
-	0x01, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d,
-	0x65, 0x12, 0x5b, 0x0a, 0x0f, 0x6c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x65, 0x72,
-	0x69, 0x6f, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x73,
-	0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x50, 0x65, 0x72,
-	0x69, 0x6f, 0x64, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0e,
-	0x6c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x3a, 0x2e,
-	0xe8, 0xa0, 0x1f, 0x00, 0x8a, 0xe7, 0xb0, 0x2a, 0x25, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d,
-	0x73, 0x64, 0x6b, 0x2f, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x50, 0x65, 0x72, 0x69, 0x6f,
-	0x64, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x27,
-	0x0a, 0x25, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x69,
-	0x63, 0x4c, 0x6f, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xe2, 0x01, 0x0a, 0x0b, 0x4d, 0x73, 0x67, 0x44,
-	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65,
-	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73,
-	0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x11, 0x76, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x21, 0xd2, 0xb4, 0x2d, 0x1d, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
-	0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
-	0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3c, 0x0a, 0x06, 0x61, 0x6d, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d,
-	0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x43, 0x6f, 0x69, 0x6e, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52,
-	0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x3a, 0x13, 0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f,
-	0x00, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0xe4, 0x01, 0x0a,
-	0x0d, 0x4d, 0x73, 0x67, 0x55, 0x6e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x30,
-	0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18,
+	0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x11,
+	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x21, 0xd2, 0xb4, 0x2d, 0x1d, 0x63, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3c, 0x0a, 0x06,
+	0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63,
+	0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74,
+	0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0,
+	0x2a, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x3a, 0x13, 0x88, 0xa0, 0x1f, 0x00,
+	0xe8, 0xa0, 0x1f, 0x00, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22,
+	0xaa, 0x01, 0x0a, 0x11, 0x4d, 0x73, 0x67, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x52,
+	0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f,
+	0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52,
+	0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x21, 0xd2, 0xb4, 0x2d, 0x1d, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x56,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53,
+	0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x3a, 0x13, 0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f,
+	0x00, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x84, 0x02, 0x0a,
+	0x07, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6e, 0x64, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64,
+	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f,
+	0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69,
+	0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x74, 0x6f,
+	0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18,
 	0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72,
-	0x12, 0x4e, 0x0a, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x21, 0xd2, 0xb4, 0x2d,
-	0x1d, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f,
-	0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x10,
-	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x12, 0x3c, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x09, 0xc8, 0xde, 0x1f,
-	0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x3a, 0x13,
+	0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x74, 0x6f, 0x41, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x12, 0x79, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73,
+	0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x46,
+	0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
+	0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73,
+	0x9a, 0xe7, 0xb0, 0x2a, 0x0c, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x63, 0x6f, 0x69, 0x6e,
+	0x73, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x3a, 0x13,
 	0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x00, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e,
-	0x64, 0x65, 0x72, 0x22, 0xaa, 0x01, 0x0a, 0x11, 0x4d, 0x73, 0x67, 0x57, 0x69, 0x74, 0x68, 0x64,
-	0x72, 0x61, 0x77, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e,
-	0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63,
+	0x64, 0x65, 0x72, 0x22, 0x50, 0x0a, 0x1a, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74,
+	0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x32, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x09, 0x72, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x73, 0x22, 0xb1, 0x01, 0x0a, 0x0b, 0x4d, 0x73, 0x67, 0x57, 0x69, 0x74,
+	0x68, 0x64, 0x72, 0x61, 0x77, 0x12, 0x38, 0x0a, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61,
+	0x77, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63,
 	0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x11, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x21, 0xd2, 0xb4, 0x2d, 0x1d, 0x63, 0x6f, 0x73, 0x6d,
-	0x6f, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x3a, 0x13, 0x88, 0xa0, 0x1f,
-	0x00, 0xe8, 0xa0, 0x1f, 0x00, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72,
-	0x22, 0x84, 0x02, 0x0a, 0x07, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6e, 0x64, 0x12, 0x30, 0x0a, 0x06,
-	0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4,
-	0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x37,
-	0x0a, 0x0a, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x74, 0x6f,
-	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x79, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73,
-	0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f,
-	0x69, 0x6e, 0x42, 0x46, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f,
-	0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43,
-	0x6f, 0x69, 0x6e, 0x73, 0x9a, 0xe7, 0xb0, 0x2a, 0x0c, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f,
-	0x63, 0x6f, 0x69, 0x6e, 0x73, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x6e, 0x74, 0x3a, 0x13, 0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x00, 0x82, 0xe7, 0xb0, 0x2a,
-	0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x50, 0x0a, 0x1a, 0x4d, 0x73, 0x67, 0x45, 0x78,
-	0x65, 0x63, 0x75, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x09,
-	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x22, 0xb1, 0x01, 0x0a, 0x0b, 0x4d, 0x73,
-	0x67, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x12, 0x38, 0x0a, 0x0a, 0x77, 0x69, 0x74,
-	0x68, 0x64, 0x72, 0x61, 0x77, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2,
-	0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61,
-	0x77, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73,
-	0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x52, 0x09, 0x74, 0x6f, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06,
-	0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65,
-	0x6e, 0x6f, 0x6d, 0x73, 0x3a, 0x17, 0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x00, 0x82, 0xe7,
-	0xb0, 0x2a, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x65, 0x72, 0x22, 0xd8, 0x01,
-	0x0a, 0x13, 0x4d, 0x73, 0x67, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x34, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
-	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73,
-	0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x8a, 0x01, 0x0a, 0x0f,
-	0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62,
-	0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e,
-	0x42, 0x46, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d,
-	0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69,
-	0x6e, 0x73, 0x9a, 0xe7, 0xb0, 0x2a, 0x0c, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x63, 0x6f,
-	0x69, 0x6e, 0x73, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0e, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x42, 0x80, 0x02, 0x0a, 0x23, 0x63, 0x6f, 0x6d,
-	0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73,
-	0x2e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70,
-	0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x63, 0x6f, 0x73,
-	0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f,
-	0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x64, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0xa2, 0x02, 0x04,
-	0x43, 0x41, 0x44, 0x4c, 0xaa, 0x02, 0x1f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x63,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e,
-	0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0xca, 0x02, 0x1f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c,
-	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x73, 0x5c, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0xe2, 0x02, 0x2b, 0x43, 0x6f, 0x73, 0x6d, 0x6f,
-	0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x73, 0x5c, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x22, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a,
-	0x3a, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x44, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x73, 0x3a, 0x3a, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x69, 0x6e, 0x67, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x65, 0x72, 0x12,
+	0x37, 0x0a, 0x0a, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x74,
+	0x6f, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x6e, 0x6f,
+	0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73,
+	0x3a, 0x17, 0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x00, 0x82, 0xe7, 0xb0, 0x2a, 0x0a, 0x77,
+	0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x65, 0x72, 0x22, 0xd8, 0x01, 0x0a, 0x13, 0x4d, 0x73,
+	0x67, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x34, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x08, 0x72,
+	0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x8a, 0x01, 0x0a, 0x0f, 0x61, 0x6d, 0x6f, 0x75,
+	0x6e, 0x74, 0x5f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e,
+	0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x46, 0xc8, 0xde,
+	0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73,
+	0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x9a, 0xe7,
+	0xb0, 0x2a, 0x0c, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0xa8,
+	0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0e, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x63, 0x65,
+	0x69, 0x76, 0x65, 0x64, 0x42, 0x9c, 0x02, 0x0a, 0x26, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x64, 0x65, 0x66,
+	0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x76, 0x31, 0x42,
+	0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x63, 0x6f, 0x73, 0x6d,
+	0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x64, 0x65, 0x66,
+	0x61, 0x75, 0x6c, 0x74, 0x73, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2f, 0x76, 0x31, 0x3b,
+	0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x76, 0x31, 0xa2, 0x02, 0x04, 0x43, 0x41, 0x44, 0x4c, 0xaa,
+	0x02, 0x22, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x73, 0x2e, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x4c, 0x6f, 0x63, 0x6b, 0x75,
+	0x70, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x22, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x5c,
+	0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x2e, 0x43, 0x6f, 0x73, 0x6d,
+	0x6f, 0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x44, 0x65, 0x66, 0x61,
+	0x75, 0x6c, 0x74, 0x73, 0x5c, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47,
+	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x26, 0x43, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x44,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x3a, 0x3a, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x3a,
+	0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_cosmos_accounts_defaults_lockup_tx_proto_rawDescOnce sync.Once
-	file_cosmos_accounts_defaults_lockup_tx_proto_rawDescData = file_cosmos_accounts_defaults_lockup_tx_proto_rawDesc
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescOnce sync.Once
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescData = file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDesc
 )
 
-func file_cosmos_accounts_defaults_lockup_tx_proto_rawDescGZIP() []byte {
-	file_cosmos_accounts_defaults_lockup_tx_proto_rawDescOnce.Do(func() {
-		file_cosmos_accounts_defaults_lockup_tx_proto_rawDescData = protoimpl.X.CompressGZIP(file_cosmos_accounts_defaults_lockup_tx_proto_rawDescData)
+func file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescGZIP() []byte {
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescOnce.Do(func() {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescData = protoimpl.X.CompressGZIP(file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescData)
 	})
-	return file_cosmos_accounts_defaults_lockup_tx_proto_rawDescData
-}
-
-var file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
-var file_cosmos_accounts_defaults_lockup_tx_proto_goTypes = []interface{}{
-	(*MsgInitLockupAccount)(nil),                  // 0: cosmos.accounts.defaults.lockup.MsgInitLockupAccount
-	(*MsgInitLockupAccountResponse)(nil),          // 1: cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse
-	(*MsgInitPeriodicLockingAccount)(nil),         // 2: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount
-	(*MsgInitPeriodicLockingAccountResponse)(nil), // 3: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse
-	(*MsgDelegate)(nil),                           // 4: cosmos.accounts.defaults.lockup.MsgDelegate
-	(*MsgUndelegate)(nil),                         // 5: cosmos.accounts.defaults.lockup.MsgUndelegate
-	(*MsgWithdrawReward)(nil),                     // 6: cosmos.accounts.defaults.lockup.MsgWithdrawReward
-	(*MsgSend)(nil),                               // 7: cosmos.accounts.defaults.lockup.MsgSend
-	(*MsgExecuteMessagesResponse)(nil),            // 8: cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse
-	(*MsgWithdraw)(nil),                           // 9: cosmos.accounts.defaults.lockup.MsgWithdraw
-	(*MsgWithdrawResponse)(nil),                   // 10: cosmos.accounts.defaults.lockup.MsgWithdrawResponse
+	return file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDescData
+}
+
+var file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_cosmos_accounts_defaults_lockup_v1_tx_proto_goTypes = []interface{}{
+	(*MsgInitLockupAccount)(nil),                  // 0: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount
+	(*MsgInitLockupAccountResponse)(nil),          // 1: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse
+	(*MsgInitPeriodicLockingAccount)(nil),         // 2: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount
+	(*MsgInitPeriodicLockingAccountResponse)(nil), // 3: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse
+	(*MsgDelegate)(nil),                           // 4: cosmos.accounts.defaults.lockup.v1.MsgDelegate
+	(*MsgUndelegate)(nil),                         // 5: cosmos.accounts.defaults.lockup.v1.MsgUndelegate
+	(*MsgWithdrawReward)(nil),                     // 6: cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward
+	(*MsgSend)(nil),                               // 7: cosmos.accounts.defaults.lockup.v1.MsgSend
+	(*MsgExecuteMessagesResponse)(nil),            // 8: cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse
+	(*MsgWithdraw)(nil),                           // 9: cosmos.accounts.defaults.lockup.v1.MsgWithdraw
+	(*MsgWithdrawResponse)(nil),                   // 10: cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse
 	(*timestamppb.Timestamp)(nil),                 // 11: google.protobuf.Timestamp
-	(*Period)(nil),                                // 12: cosmos.accounts.defaults.lockup.Period
+	(*Period)(nil),                                // 12: cosmos.accounts.defaults.lockup.v1.Period
 	(*v1beta1.Coin)(nil),                          // 13: cosmos.base.v1beta1.Coin
 	(*anypb.Any)(nil),                             // 14: google.protobuf.Any
 }
-var file_cosmos_accounts_defaults_lockup_tx_proto_depIdxs = []int32{
-	11, // 0: cosmos.accounts.defaults.lockup.MsgInitLockupAccount.end_time:type_name -> google.protobuf.Timestamp
-	11, // 1: cosmos.accounts.defaults.lockup.MsgInitLockupAccount.start_time:type_name -> google.protobuf.Timestamp
-	11, // 2: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.start_time:type_name -> google.protobuf.Timestamp
-	12, // 3: cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount.locking_periods:type_name -> cosmos.accounts.defaults.lockup.Period
-	13, // 4: cosmos.accounts.defaults.lockup.MsgDelegate.amount:type_name -> cosmos.base.v1beta1.Coin
-	13, // 5: cosmos.accounts.defaults.lockup.MsgUndelegate.amount:type_name -> cosmos.base.v1beta1.Coin
-	13, // 6: cosmos.accounts.defaults.lockup.MsgSend.amount:type_name -> cosmos.base.v1beta1.Coin
-	14, // 7: cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse.responses:type_name -> google.protobuf.Any
-	13, // 8: cosmos.accounts.defaults.lockup.MsgWithdrawResponse.amount_received:type_name -> cosmos.base.v1beta1.Coin
+var file_cosmos_accounts_defaults_lockup_v1_tx_proto_depIdxs = []int32{
+	11, // 0: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.end_time:type_name -> google.protobuf.Timestamp
+	11, // 1: cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount.start_time:type_name -> google.protobuf.Timestamp
+	11, // 2: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.start_time:type_name -> google.protobuf.Timestamp
+	12, // 3: cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount.locking_periods:type_name -> cosmos.accounts.defaults.lockup.v1.Period
+	13, // 4: cosmos.accounts.defaults.lockup.v1.MsgDelegate.amount:type_name -> cosmos.base.v1beta1.Coin
+	13, // 5: cosmos.accounts.defaults.lockup.v1.MsgUndelegate.amount:type_name -> cosmos.base.v1beta1.Coin
+	13, // 6: cosmos.accounts.defaults.lockup.v1.MsgSend.amount:type_name -> cosmos.base.v1beta1.Coin
+	14, // 7: cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse.responses:type_name -> google.protobuf.Any
+	13, // 8: cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse.amount_received:type_name -> cosmos.base.v1beta1.Coin
 	9,  // [9:9] is the sub-list for method output_type
 	9,  // [9:9] is the sub-list for method input_type
 	9,  // [9:9] is the sub-list for extension type_name
@@ -6565,14 +6567,14 @@ var file_cosmos_accounts_defaults_lockup_tx_proto_depIdxs = []int32{
 	0,  // [0:9] is the sub-list for field type_name
 }
 
-func init() { file_cosmos_accounts_defaults_lockup_tx_proto_init() }
-func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
-	if File_cosmos_accounts_defaults_lockup_tx_proto != nil {
+func init() { file_cosmos_accounts_defaults_lockup_v1_tx_proto_init() }
+func file_cosmos_accounts_defaults_lockup_v1_tx_proto_init() {
+	if File_cosmos_accounts_defaults_lockup_v1_tx_proto != nil {
 		return
 	}
-	file_cosmos_accounts_defaults_lockup_lockup_proto_init()
+	file_cosmos_accounts_defaults_lockup_v1_lockup_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgInitLockupAccount); i {
 			case 0:
 				return &v.state
@@ -6584,7 +6586,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgInitLockupAccountResponse); i {
 			case 0:
 				return &v.state
@@ -6596,7 +6598,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgInitPeriodicLockingAccount); i {
 			case 0:
 				return &v.state
@@ -6608,7 +6610,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgInitPeriodicLockingAccountResponse); i {
 			case 0:
 				return &v.state
@@ -6620,7 +6622,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgDelegate); i {
 			case 0:
 				return &v.state
@@ -6632,7 +6634,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgUndelegate); i {
 			case 0:
 				return &v.state
@@ -6644,7 +6646,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgWithdrawReward); i {
 			case 0:
 				return &v.state
@@ -6656,7 +6658,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgSend); i {
 			case 0:
 				return &v.state
@@ -6668,7 +6670,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgExecuteMessagesResponse); i {
 			case 0:
 				return &v.state
@@ -6680,7 +6682,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgWithdraw); i {
 			case 0:
 				return &v.state
@@ -6692,7 +6694,7 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 				return nil
 			}
 		}
-		file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MsgWithdrawResponse); i {
 			case 0:
 				return &v.state
@@ -6709,18 +6711,18 @@ func file_cosmos_accounts_defaults_lockup_tx_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_cosmos_accounts_defaults_lockup_tx_proto_rawDesc,
+			RawDescriptor: file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_cosmos_accounts_defaults_lockup_tx_proto_goTypes,
-		DependencyIndexes: file_cosmos_accounts_defaults_lockup_tx_proto_depIdxs,
-		MessageInfos:      file_cosmos_accounts_defaults_lockup_tx_proto_msgTypes,
+		GoTypes:           file_cosmos_accounts_defaults_lockup_v1_tx_proto_goTypes,
+		DependencyIndexes: file_cosmos_accounts_defaults_lockup_v1_tx_proto_depIdxs,
+		MessageInfos:      file_cosmos_accounts_defaults_lockup_v1_tx_proto_msgTypes,
 	}.Build()
-	File_cosmos_accounts_defaults_lockup_tx_proto = out.File
-	file_cosmos_accounts_defaults_lockup_tx_proto_rawDesc = nil
-	file_cosmos_accounts_defaults_lockup_tx_proto_goTypes = nil
-	file_cosmos_accounts_defaults_lockup_tx_proto_depIdxs = nil
+	File_cosmos_accounts_defaults_lockup_v1_tx_proto = out.File
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_rawDesc = nil
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_goTypes = nil
+	file_cosmos_accounts_defaults_lockup_v1_tx_proto_depIdxs = nil
 }
diff --git a/tests/e2e/accounts/lockup/continous_lockup_test_suite.go b/tests/e2e/accounts/lockup/continous_lockup_test_suite.go
index dfb7ed1c76d8..654cb055f7f1 100644
--- a/tests/e2e/accounts/lockup/continous_lockup_test_suite.go
+++ b/tests/e2e/accounts/lockup/continous_lockup_test_suite.go
@@ -10,7 +10,7 @@ import (
 	"cosmossdk.io/core/header"
 	"cosmossdk.io/math"
 	lockupaccount "cosmossdk.io/x/accounts/defaults/lockup"
-	"cosmossdk.io/x/accounts/defaults/lockup/types"
+	types "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/tests/e2e/accounts/lockup/delayed_lockup_test_suite.go b/tests/e2e/accounts/lockup/delayed_lockup_test_suite.go
index 4de723a49869..27f7c9202e63 100644
--- a/tests/e2e/accounts/lockup/delayed_lockup_test_suite.go
+++ b/tests/e2e/accounts/lockup/delayed_lockup_test_suite.go
@@ -10,7 +10,7 @@ import (
 	"cosmossdk.io/core/header"
 	"cosmossdk.io/math"
 	lockupaccount "cosmossdk.io/x/accounts/defaults/lockup"
-	"cosmossdk.io/x/accounts/defaults/lockup/types"
+	types "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/tests/e2e/accounts/lockup/periodic_lockup_test_suite.go b/tests/e2e/accounts/lockup/periodic_lockup_test_suite.go
index 948f5eb8a30b..0bce9a267558 100644
--- a/tests/e2e/accounts/lockup/periodic_lockup_test_suite.go
+++ b/tests/e2e/accounts/lockup/periodic_lockup_test_suite.go
@@ -10,7 +10,7 @@ import (
 	"cosmossdk.io/core/header"
 	"cosmossdk.io/math"
 	lockupaccount "cosmossdk.io/x/accounts/defaults/lockup"
-	"cosmossdk.io/x/accounts/defaults/lockup/types"
+	types "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/tests/e2e/accounts/lockup/permanent_lockup_test_suite.go b/tests/e2e/accounts/lockup/permanent_lockup_test_suite.go
index 225bc13caf98..f1d4b33f3bd5 100644
--- a/tests/e2e/accounts/lockup/permanent_lockup_test_suite.go
+++ b/tests/e2e/accounts/lockup/permanent_lockup_test_suite.go
@@ -10,7 +10,7 @@ import (
 	"cosmossdk.io/core/header"
 	"cosmossdk.io/math"
 	lockupaccount "cosmossdk.io/x/accounts/defaults/lockup"
-	"cosmossdk.io/x/accounts/defaults/lockup/types"
+	types "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/tests/e2e/accounts/lockup/utils.go b/tests/e2e/accounts/lockup/utils.go
index 69606d58d743..79658d236036 100644
--- a/tests/e2e/accounts/lockup/utils.go
+++ b/tests/e2e/accounts/lockup/utils.go
@@ -8,7 +8,7 @@ import (
 
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/simapp"
-	"cosmossdk.io/x/accounts/defaults/lockup/types"
+	types "cosmossdk.io/x/accounts/defaults/lockup/v1"
 	"cosmossdk.io/x/bank/testutil"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
diff --git a/x/accounts/README.md b/x/accounts/README.md
index 9d14fd808b74..48daac8acb2a 100644
--- a/x/accounts/README.md
+++ b/x/accounts/README.md
@@ -34,8 +34,8 @@ It's crucial to understand that an account's state is isolated. This means:
 
 For example, consider two accounts of type Counter:
 
-- One located at address "cosmos123"
-- Another at address "cosmos456"
+* One located at address "cosmos123"
+* Another at address "cosmos456"
 
 These accounts do not share the same collections.Item instance. Instead, each maintains its own separate state.
 
@@ -51,10 +51,10 @@ type Account struct {
 
 Creating an account begins with defining its init message. This message is processed when an account is created, similar to:
 
-- The `instantiate` method in a CosmWasm contract
-- The `constructor` in an EVM contract
+* The `instantiate` method in a CosmWasm contract
+* The `constructor` in an EVM contract
 
-For an account to be a valid `x/account` implementer, it must define both:
+For an account to be a valid `x/accounts` implementer, it must define both:
 
 1. An `Init` method
 2. An init message
@@ -106,8 +106,8 @@ func (a Account) RegisterInitHandler(builder *accountstd.InitBuilder) {
 
 Execute handlers are methods that an account can execute, defined as messages. These executions can be triggered:
 
-- During block execution (not queries) through transactions
-- During begin or end block
+* During block execution (not queries) through transactions
+* During begin or end block
 
 To define an execute handler, we start by creating its proto message:
 
@@ -176,8 +176,8 @@ value and returning the new value in the response.
 
 Query Handlers are read-only methods implemented by an account to expose information about itself. This information can be accessed by:
 
-- External clients (e.g., CLI, wallets)
-- Other modules and accounts within the system
+* External clients (e.g., CLI, wallets)
+* Other modules and accounts within the system
 
 Query handlers can be invoked:
 
@@ -315,9 +315,9 @@ accountsKeeper, err := accounts.NewKeeper(
 
 Choose the method that best fits your application structure.
 
-### The accountsstd Package
+### The accountstd Package
 
-The `accountsstd` package provides utility functions for use within account init, execution, or query handlers. Key functions include:
+The `accountstd` package provides utility functions for use within account init, execution, or query handlers. Key functions include:
 
 1. `Whoami()`: Retrieves the address of the current account.
 2. `Sender()`: Gets the address of the transaction sender (not available in queries).
@@ -340,9 +340,9 @@ This flexibility enables defining interfaces as common sets of messages and/or q
 
 Example: Transaction Authentication
 
-- We define a `MsgAuthenticate` message.
-- Any account capable of handling `MsgAuthenticate` is considered to implement the `Authentication` interface.
-- This approach allows for standardized interaction patterns across different account types.
+* We define a `MsgAuthenticate` message.
+* Any account capable of handling `MsgAuthenticate` is considered to implement the `Authentication` interface.
+* This approach allows for standardized interaction patterns across different account types.
 
 (Note: More details on the `Authentication` interface will be provided later.)
 
@@ -431,7 +431,7 @@ func (a Account) RegisterExecuteHandlers(builder *accountstd.ExecuteBuilder) {
 
 1. **Sender Verification**: Always verify that the sender is the x/accounts module. This prevents unauthorized accounts from triggering authentication.
 2. **Authentication Safety**: Ensure your authentication mechanism is secure:
-   - Prevent replay attacks by making it impossible to reuse the same action with the same signature.
+   * Prevent replay attacks by making it impossible to reuse the same action with the same signature.
 
 ##### Implementation example
 
@@ -491,8 +491,8 @@ func (a Account) AuthRetroCompatibility(ctx context.Context, _ *authtypes.QueryL
 
 ### Usage Notes
 
-- Implement this handler only for account types you want to expose via x/auth gRPC methods.
-- The `info` field in the response can be nil if your account doesn't fit the `BaseAccount` structure.
+* Implement this handler only for account types you want to expose via x/auth gRPC methods.
+* The `info` field in the response can be nil if your account doesn't fit the `BaseAccount` structure.
 
 ## Genesis
 
diff --git a/x/accounts/defaults/lockup/continuous_locking_account.go b/x/accounts/defaults/lockup/continuous_locking_account.go
index c90b909cf6cf..4cf4600eb3d3 100644
--- a/x/accounts/defaults/lockup/continuous_locking_account.go
+++ b/x/accounts/defaults/lockup/continuous_locking_account.go
@@ -8,7 +8,7 @@ import (
 	collcodec "cosmossdk.io/collections/codec"
 	"cosmossdk.io/math"
 	"cosmossdk.io/x/accounts/accountstd"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
diff --git a/x/accounts/defaults/lockup/continuous_locking_account_test.go b/x/accounts/defaults/lockup/continuous_locking_account_test.go
index cbccbb224ec5..9add06fefd8f 100644
--- a/x/accounts/defaults/lockup/continuous_locking_account_test.go
+++ b/x/accounts/defaults/lockup/continuous_locking_account_test.go
@@ -11,7 +11,7 @@ import (
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/math"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/accounts/defaults/lockup/delayed_locking_account.go b/x/accounts/defaults/lockup/delayed_locking_account.go
index 057a99001448..cf078be95739 100644
--- a/x/accounts/defaults/lockup/delayed_locking_account.go
+++ b/x/accounts/defaults/lockup/delayed_locking_account.go
@@ -6,7 +6,7 @@ import (
 
 	"cosmossdk.io/math"
 	"cosmossdk.io/x/accounts/accountstd"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
diff --git a/x/accounts/defaults/lockup/delayed_locking_account_test.go b/x/accounts/defaults/lockup/delayed_locking_account_test.go
index 9a5f2cc4ae2f..5bb722168f24 100644
--- a/x/accounts/defaults/lockup/delayed_locking_account_test.go
+++ b/x/accounts/defaults/lockup/delayed_locking_account_test.go
@@ -11,7 +11,7 @@ import (
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/math"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/accounts/defaults/lockup/lockup.go b/x/accounts/defaults/lockup/lockup.go
index 3ac17fea6133..aecdfd29b265 100644
--- a/x/accounts/defaults/lockup/lockup.go
+++ b/x/accounts/defaults/lockup/lockup.go
@@ -17,7 +17,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 	"cosmossdk.io/x/accounts/accountstd"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 	banktypes "cosmossdk.io/x/bank/types"
 	distrtypes "cosmossdk.io/x/distribution/types"
 	stakingtypes "cosmossdk.io/x/staking/types"
diff --git a/x/accounts/defaults/lockup/lockup_test.go b/x/accounts/defaults/lockup/lockup_test.go
index 31c3fda141a3..3a704d791796 100644
--- a/x/accounts/defaults/lockup/lockup_test.go
+++ b/x/accounts/defaults/lockup/lockup_test.go
@@ -9,7 +9,7 @@ import (
 
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/math"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
diff --git a/x/accounts/defaults/lockup/periodic_locking_account.go b/x/accounts/defaults/lockup/periodic_locking_account.go
index 71013980d9d7..61f7190f635d 100644
--- a/x/accounts/defaults/lockup/periodic_locking_account.go
+++ b/x/accounts/defaults/lockup/periodic_locking_account.go
@@ -9,7 +9,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 	"cosmossdk.io/x/accounts/accountstd"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/accounts/defaults/lockup/periodic_locking_account_test.go b/x/accounts/defaults/lockup/periodic_locking_account_test.go
index 8ff7ee001461..52478cea076f 100644
--- a/x/accounts/defaults/lockup/periodic_locking_account_test.go
+++ b/x/accounts/defaults/lockup/periodic_locking_account_test.go
@@ -11,7 +11,7 @@ import (
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/math"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/accounts/defaults/lockup/permanent_locking_account.go b/x/accounts/defaults/lockup/permanent_locking_account.go
index 5e5d0dab98da..8c1d633215e3 100644
--- a/x/accounts/defaults/lockup/permanent_locking_account.go
+++ b/x/accounts/defaults/lockup/permanent_locking_account.go
@@ -6,7 +6,7 @@ import (
 
 	"cosmossdk.io/math"
 	"cosmossdk.io/x/accounts/accountstd"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/accounts/defaults/lockup/permanent_locking_account_test.go b/x/accounts/defaults/lockup/permanent_locking_account_test.go
index 057bc95689c0..ce0fd54fee04 100644
--- a/x/accounts/defaults/lockup/permanent_locking_account_test.go
+++ b/x/accounts/defaults/lockup/permanent_locking_account_test.go
@@ -11,7 +11,7 @@ import (
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/math"
-	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
+	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/v1"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/accounts/defaults/lockup/types/encoding.go b/x/accounts/defaults/lockup/v1/encoding.go
similarity index 97%
rename from x/accounts/defaults/lockup/types/encoding.go
rename to x/accounts/defaults/lockup/v1/encoding.go
index c32dba4b5f60..217f75a9e646 100644
--- a/x/accounts/defaults/lockup/types/encoding.go
+++ b/x/accounts/defaults/lockup/v1/encoding.go
@@ -1,4 +1,4 @@
-package types
+package v1
 
 import (
 	"fmt"
diff --git a/x/accounts/defaults/lockup/types/lockup.pb.go b/x/accounts/defaults/lockup/v1/lockup.pb.go
similarity index 79%
rename from x/accounts/defaults/lockup/types/lockup.pb.go
rename to x/accounts/defaults/lockup/v1/lockup.pb.go
index c88e65501d34..c6c9ac175a3a 100644
--- a/x/accounts/defaults/lockup/types/lockup.pb.go
+++ b/x/accounts/defaults/lockup/v1/lockup.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmos/accounts/defaults/lockup/lockup.proto
+// source: cosmos/accounts/defaults/lockup/v1/lockup.proto
 
-package types
+package v1
 
 import (
 	fmt "fmt"
@@ -41,7 +41,7 @@ func (m *Period) Reset()         { *m = Period{} }
 func (m *Period) String() string { return proto.CompactTextString(m) }
 func (*Period) ProtoMessage()    {}
 func (*Period) Descriptor() ([]byte, []int) {
-	return fileDescriptor_79b466256e1a079c, []int{0}
+	return fileDescriptor_6b9783f5e2b76d96, []int{0}
 }
 func (m *Period) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -85,36 +85,36 @@ func (m *Period) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins {
 }
 
 func init() {
-	proto.RegisterType((*Period)(nil), "cosmos.accounts.defaults.lockup.Period")
+	proto.RegisterType((*Period)(nil), "cosmos.accounts.defaults.lockup.v1.Period")
 }
 
 func init() {
-	proto.RegisterFile("cosmos/accounts/defaults/lockup/lockup.proto", fileDescriptor_79b466256e1a079c)
+	proto.RegisterFile("cosmos/accounts/defaults/lockup/v1/lockup.proto", fileDescriptor_6b9783f5e2b76d96)
 }
 
-var fileDescriptor_79b466256e1a079c = []byte{
-	// 326 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x31, 0x4e, 0xc3, 0x30,
-	0x14, 0x86, 0x63, 0x90, 0x32, 0x04, 0x18, 0xa8, 0x18, 0x4a, 0x07, 0xa7, 0x62, 0xaa, 0x2a, 0x6a,
-	0xab, 0x70, 0x01, 0x54, 0x10, 0xac, 0x88, 0x91, 0x05, 0x39, 0x8e, 0xeb, 0x5a, 0x4d, 0xf2, 0xaa,
-	0xda, 0x41, 0xf4, 0x16, 0x8c, 0x88, 0x13, 0x20, 0xa6, 0x5e, 0x02, 0xa9, 0x63, 0x47, 0x26, 0x8a,
-	0x9a, 0xa1, 0xd7, 0x40, 0xb1, 0x9d, 0x91, 0xc5, 0xef, 0x59, 0xfe, 0xbf, 0xf7, 0xbf, 0x5f, 0x8e,
-	0xce, 0x39, 0xe8, 0x1c, 0x34, 0x65, 0x9c, 0x43, 0x59, 0x18, 0x4d, 0x53, 0x31, 0x66, 0x65, 0x66,
-	0x34, 0xcd, 0x80, 0x4f, 0xcb, 0x99, 0x2f, 0x64, 0x36, 0x07, 0x03, 0xad, 0xd8, 0xa9, 0x49, 0xa3,
-	0x26, 0x8d, 0x9a, 0x38, 0x59, 0xe7, 0x98, 0xe5, 0xaa, 0x00, 0x6a, 0x4f, 0xc7, 0x74, 0xb0, 0x77,
-	0x48, 0x98, 0x16, 0xf4, 0x79, 0x98, 0x08, 0xc3, 0x86, 0x94, 0x83, 0x2a, 0xfc, 0xfb, 0x89, 0x04,
-	0x09, 0xb6, 0xa5, 0x75, 0xd7, 0x50, 0x12, 0x40, 0x66, 0x82, 0xda, 0x5b, 0x52, 0x8e, 0x69, 0x5a,
-	0xce, 0x99, 0x51, 0xe0, 0xa9, 0xb3, 0x2f, 0x14, 0x85, 0xf7, 0x62, 0xae, 0x20, 0x6d, 0x5d, 0x45,
-	0x61, 0x26, 0x0a, 0x69, 0x26, 0x6d, 0xd4, 0x45, 0xbd, 0x83, 0x8b, 0x53, 0xe2, 0x58, 0xd2, 0xb0,
-	0xe4, 0xc6, 0xb3, 0xa3, 0xa3, 0xd5, 0x4f, 0x1c, 0xbc, 0x6d, 0x62, 0xf4, 0xb1, 0x5b, 0xf6, 0xd1,
-	0x83, 0xe7, 0x5a, 0x8b, 0x28, 0x64, 0x79, 0x1d, 0xa8, 0xbd, 0xd7, 0xdd, 0xb7, 0x13, 0x7c, 0xce,
-	0x7a, 0x67, 0xe2, 0x77, 0x26, 0xd7, 0xa0, 0x8a, 0xd1, 0x6d, 0x3d, 0xe1, 0x73, 0x13, 0xf7, 0xa4,
-	0x32, 0x93, 0x32, 0x21, 0x1c, 0x72, 0xea, 0x03, 0xba, 0x32, 0xd0, 0xe9, 0x94, 0x9a, 0xc5, 0x4c,
-	0x68, 0x0b, 0xe8, 0xf7, 0xdd, 0xb2, 0x7f, 0x98, 0x09, 0xc9, 0xf8, 0xe2, 0xa9, 0x4e, 0xad, 0xbd,
-	0xb5, 0x33, 0x1c, 0xdd, 0xad, 0xb6, 0x18, 0xad, 0xb7, 0x18, 0xfd, 0x6e, 0x31, 0x7a, 0xad, 0x70,
-	0xb0, 0xae, 0x70, 0xf0, 0x5d, 0xe1, 0xe0, 0x71, 0xe0, 0xe6, 0xe9, 0x74, 0x4a, 0x14, 0xd0, 0x97,
-	0xff, 0x7f, 0xc8, 0x9a, 0x25, 0xa1, 0x4d, 0x7b, 0xf9, 0x17, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xa5,
-	0x33, 0xd0, 0xd1, 0x01, 0x00, 0x00,
+var fileDescriptor_6b9783f5e2b76d96 = []byte{
+	// 327 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x31, 0x4e, 0xc3, 0x30,
+	0x18, 0x85, 0x63, 0x90, 0x32, 0x04, 0x18, 0xa8, 0x18, 0x4a, 0x07, 0xb7, 0xea, 0x54, 0x55, 0xc2,
+	0xbf, 0x02, 0x17, 0x40, 0xa5, 0x62, 0x46, 0x8c, 0x2c, 0xc8, 0x71, 0x5c, 0xd7, 0x6a, 0x92, 0xbf,
+	0xaa, 0x9d, 0x8a, 0xde, 0x82, 0x11, 0x71, 0x02, 0xc4, 0xd4, 0x4b, 0x20, 0x75, 0xec, 0xc8, 0x44,
+	0x51, 0x33, 0xf4, 0x1a, 0x28, 0x89, 0xb3, 0xb2, 0x24, 0xcf, 0xb2, 0xbf, 0xf7, 0xfe, 0x67, 0x07,
+	0x20, 0xd0, 0xa4, 0x68, 0x80, 0x0b, 0x81, 0x79, 0x66, 0x0d, 0xc4, 0x72, 0xc2, 0xf3, 0xc4, 0x1a,
+	0x48, 0x50, 0xcc, 0xf2, 0x39, 0x2c, 0x43, 0xa7, 0xd8, 0x7c, 0x81, 0x16, 0x5b, 0xfd, 0x1a, 0x60,
+	0x0d, 0xc0, 0x1a, 0x80, 0xb9, 0x63, 0xcb, 0xb0, 0x73, 0xce, 0x53, 0x9d, 0x21, 0x54, 0xdf, 0x1a,
+	0xeb, 0x50, 0x97, 0x13, 0x71, 0x23, 0x61, 0x19, 0x46, 0xd2, 0xf2, 0x10, 0x04, 0xea, 0xcc, 0xed,
+	0x5f, 0x28, 0x54, 0x58, 0x49, 0x28, 0x55, 0x43, 0x29, 0x44, 0x95, 0x48, 0xa8, 0x56, 0x51, 0x3e,
+	0x81, 0x38, 0x5f, 0x70, 0xab, 0xd1, 0x51, 0xfd, 0x2f, 0x12, 0xf8, 0x0f, 0x72, 0xa1, 0x31, 0x6e,
+	0xdd, 0x06, 0x7e, 0x22, 0x33, 0x65, 0xa7, 0x6d, 0xd2, 0x23, 0x83, 0x93, 0xeb, 0x4b, 0x56, 0xb3,
+	0xac, 0x61, 0xd9, 0xd8, 0xb1, 0xa3, 0xb3, 0xcd, 0x4f, 0xd7, 0x7b, 0xdb, 0x75, 0xc9, 0xc7, 0x61,
+	0x3d, 0x24, 0x8f, 0x8e, 0x6b, 0xad, 0x02, 0x9f, 0xa7, 0x65, 0xa7, 0xf6, 0x51, 0xef, 0xb8, 0x72,
+	0x70, 0x55, 0xcb, 0x99, 0x99, 0x9b, 0x99, 0xdd, 0xa1, 0xce, 0x46, 0xf7, 0xa5, 0xc3, 0xe7, 0xae,
+	0x3b, 0x50, 0xda, 0x4e, 0xf3, 0x88, 0x09, 0x4c, 0x9b, 0x8b, 0xac, 0x7f, 0x57, 0x26, 0x9e, 0x81,
+	0x5d, 0xcd, 0xa5, 0xa9, 0x00, 0xf3, 0x7e, 0x58, 0x0f, 0x4f, 0x13, 0xa9, 0xb8, 0x58, 0x3d, 0x97,
+	0xad, 0x8d, 0x8b, 0xae, 0x03, 0x47, 0xe3, 0xcd, 0x9e, 0x92, 0xed, 0x9e, 0x92, 0xdf, 0x3d, 0x25,
+	0xaf, 0x05, 0xf5, 0xb6, 0x05, 0xf5, 0xbe, 0x0b, 0xea, 0x3d, 0x0d, 0x6b, 0x3f, 0x13, 0xcf, 0x98,
+	0x46, 0x78, 0xf9, 0xef, 0x9d, 0x22, 0xbf, 0xaa, 0x7a, 0xf3, 0x17, 0x00, 0x00, 0xff, 0xff, 0xf4,
+	0xa4, 0x0b, 0x08, 0xd4, 0x01, 0x00, 0x00,
 }
 
 func (m *Period) Marshal() (dAtA []byte, err error) {
diff --git a/x/accounts/defaults/lockup/types/query.pb.go b/x/accounts/defaults/lockup/v1/query.pb.go
similarity index 88%
rename from x/accounts/defaults/lockup/types/query.pb.go
rename to x/accounts/defaults/lockup/v1/query.pb.go
index ecd984b438f5..c3b9a75d07db 100644
--- a/x/accounts/defaults/lockup/types/query.pb.go
+++ b/x/accounts/defaults/lockup/v1/query.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmos/accounts/defaults/lockup/query.proto
+// source: cosmos/accounts/defaults/lockup/v1/query.proto
 
-package types
+package v1
 
 import (
 	fmt "fmt"
@@ -37,7 +37,7 @@ func (m *QueryLockupAccountInfoRequest) Reset()         { *m = QueryLockupAccoun
 func (m *QueryLockupAccountInfoRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryLockupAccountInfoRequest) ProtoMessage()    {}
 func (*QueryLockupAccountInfoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f06fad50e16c8e9b, []int{0}
+	return fileDescriptor_f2c1403191515490, []int{0}
 }
 func (m *QueryLockupAccountInfoRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -90,7 +90,7 @@ func (m *QueryLockupAccountInfoResponse) Reset()         { *m = QueryLockupAccou
 func (m *QueryLockupAccountInfoResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryLockupAccountInfoResponse) ProtoMessage()    {}
 func (*QueryLockupAccountInfoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f06fad50e16c8e9b, []int{1}
+	return fileDescriptor_f2c1403191515490, []int{1}
 }
 func (m *QueryLockupAccountInfoResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -183,7 +183,7 @@ func (m *QueryLockingPeriodsRequest) Reset()         { *m = QueryLockingPeriodsR
 func (m *QueryLockingPeriodsRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryLockingPeriodsRequest) ProtoMessage()    {}
 func (*QueryLockingPeriodsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f06fad50e16c8e9b, []int{2}
+	return fileDescriptor_f2c1403191515490, []int{2}
 }
 func (m *QueryLockingPeriodsRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -222,7 +222,7 @@ func (m *QueryLockingPeriodsResponse) Reset()         { *m = QueryLockingPeriods
 func (m *QueryLockingPeriodsResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryLockingPeriodsResponse) ProtoMessage()    {}
 func (*QueryLockingPeriodsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f06fad50e16c8e9b, []int{3}
+	return fileDescriptor_f2c1403191515490, []int{3}
 }
 func (m *QueryLockingPeriodsResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -259,50 +259,50 @@ func (m *QueryLockingPeriodsResponse) GetLockingPeriods() []*Period {
 }
 
 func init() {
-	proto.RegisterType((*QueryLockupAccountInfoRequest)(nil), "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoRequest")
-	proto.RegisterType((*QueryLockupAccountInfoResponse)(nil), "cosmos.accounts.defaults.lockup.QueryLockupAccountInfoResponse")
-	proto.RegisterType((*QueryLockingPeriodsRequest)(nil), "cosmos.accounts.defaults.lockup.QueryLockingPeriodsRequest")
-	proto.RegisterType((*QueryLockingPeriodsResponse)(nil), "cosmos.accounts.defaults.lockup.QueryLockingPeriodsResponse")
+	proto.RegisterType((*QueryLockupAccountInfoRequest)(nil), "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoRequest")
+	proto.RegisterType((*QueryLockupAccountInfoResponse)(nil), "cosmos.accounts.defaults.lockup.v1.QueryLockupAccountInfoResponse")
+	proto.RegisterType((*QueryLockingPeriodsRequest)(nil), "cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsRequest")
+	proto.RegisterType((*QueryLockingPeriodsResponse)(nil), "cosmos.accounts.defaults.lockup.v1.QueryLockingPeriodsResponse")
 }
 
 func init() {
-	proto.RegisterFile("cosmos/accounts/defaults/lockup/query.proto", fileDescriptor_f06fad50e16c8e9b)
+	proto.RegisterFile("cosmos/accounts/defaults/lockup/v1/query.proto", fileDescriptor_f2c1403191515490)
 }
 
-var fileDescriptor_f06fad50e16c8e9b = []byte{
-	// 507 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0xc7, 0x63, 0xda, 0xf4, 0x63, 0x03, 0x6d, 0x89, 0x7a, 0x30, 0x01, 0xec, 0x28, 0x17, 0x22,
-	0x41, 0x77, 0x69, 0x39, 0x72, 0x40, 0x04, 0x09, 0x84, 0xd4, 0x43, 0xb1, 0x38, 0x71, 0xb1, 0xfc,
-	0x31, 0x31, 0xab, 0x38, 0x3b, 0xae, 0x77, 0x5d, 0xda, 0xb7, 0xe8, 0x73, 0xf0, 0x24, 0x3d, 0xf6,
-	0xc8, 0x89, 0xa2, 0xe4, 0x3d, 0x10, 0xb2, 0x77, 0x37, 0xa8, 0x12, 0x55, 0x39, 0xa4, 0xa7, 0xfd,
-	0x9a, 0x99, 0xdf, 0xcc, 0xfe, 0x77, 0x96, 0x3c, 0x4f, 0x50, 0x4e, 0x51, 0xb2, 0x28, 0x49, 0xb0,
-	0x12, 0x4a, 0xb2, 0x14, 0xc6, 0x51, 0x95, 0x2b, 0xc9, 0x72, 0x4c, 0x26, 0x55, 0xc1, 0x8e, 0x2b,
-	0x28, 0xcf, 0x68, 0x51, 0xa2, 0xc2, 0xae, 0xaf, 0x8d, 0xa9, 0x35, 0xa6, 0xd6, 0x98, 0x6a, 0xe3,
-	0xde, 0x8b, 0xdb, 0xa2, 0xe9, 0x41, 0x87, 0xeb, 0x79, 0xc6, 0x3a, 0x8e, 0x24, 0xb0, 0x93, 0xfd,
-	0x18, 0x54, 0xb4, 0xcf, 0x12, 0xe4, 0xc2, 0x9c, 0xef, 0x66, 0x98, 0x61, 0x33, 0x65, 0xf5, 0xcc,
-	0xec, 0xfa, 0x19, 0x62, 0x96, 0x03, 0x6b, 0x56, 0x71, 0x35, 0x66, 0x8a, 0x4f, 0x41, 0xaa, 0x68,
-	0x6a, 0xc2, 0x0e, 0x7c, 0xf2, 0xf4, 0x53, 0x9d, 0xf4, 0x61, 0xc3, 0x7a, 0xab, 0x53, 0xf9, 0x28,
-	0xc6, 0x18, 0xc0, 0x71, 0x05, 0x52, 0x0d, 0x7e, 0xb7, 0x89, 0x77, 0x93, 0x85, 0x2c, 0x50, 0x48,
-	0xe8, 0x9e, 0x90, 0x1d, 0x2c, 0x79, 0xc6, 0x45, 0x94, 0x87, 0x75, 0xce, 0x5c, 0x64, 0xae, 0xd3,
-	0x5f, 0x19, 0x76, 0x0e, 0x1e, 0x51, 0x73, 0x09, 0x75, 0xd6, 0xd4, 0x64, 0x4d, 0xdf, 0x21, 0x17,
-	0xa3, 0x97, 0x17, 0x3f, 0xfd, 0xd6, 0xf7, 0x2b, 0x7f, 0x98, 0x71, 0xf5, 0xb5, 0x8a, 0x69, 0x82,
-	0x53, 0x66, 0x4a, 0xd4, 0xc3, 0x9e, 0x4c, 0x27, 0x4c, 0x9d, 0x15, 0x20, 0x1b, 0x07, 0x19, 0x6c,
-	0x5b, 0xc8, 0xa1, 0x66, 0x74, 0x4b, 0xb2, 0x95, 0x42, 0x0e, 0x59, 0xa4, 0x20, 0x0d, 0xc7, 0x25,
-	0x80, 0x7b, 0x6f, 0xf9, 0xd4, 0x07, 0x0b, 0xc4, 0xfb, 0x12, 0xa0, 0x7b, 0x4a, 0x1e, 0xfe, 0x65,
-	0xda, 0x62, 0x57, 0x96, 0x8f, 0xdd, 0x59, 0x50, 0x6c, 0xb5, 0x6f, 0x08, 0x91, 0x2a, 0x2a, 0x55,
-	0x58, 0x4b, 0xe8, 0xae, 0xf6, 0x9d, 0x61, 0xe7, 0xa0, 0x47, 0xb5, 0xbe, 0xd4, 0xea, 0x4b, 0x3f,
-	0x5b, 0x7d, 0x47, 0xab, 0xe7, 0x57, 0xbe, 0x13, 0x6c, 0x36, 0x3e, 0xf5, 0x6e, 0xf7, 0x35, 0xd9,
-	0x00, 0x91, 0x6a, 0xf7, 0xf6, 0x7f, 0xba, 0xaf, 0x83, 0x48, 0x1b, 0x67, 0x41, 0xee, 0xd7, 0xd5,
-	0x42, 0x1a, 0xd6, 0x6f, 0x4e, 0xba, 0x6b, 0xcb, 0x2f, 0xb9, 0xa3, 0x01, 0xcd, 0xa2, 0xd6, 0xb6,
-	0x12, 0xd7, 0x88, 0xeb, 0x77, 0xa0, 0xad, 0x45, 0x68, 0xe6, 0x2e, 0x69, 0xe3, 0x37, 0x01, 0xa5,
-	0xbb, 0xd1, 0x77, 0x86, 0x9b, 0x81, 0x5e, 0x0c, 0x9e, 0x90, 0xde, 0xe2, 0xfd, 0x73, 0x91, 0x1d,
-	0x41, 0xc9, 0x31, 0x95, 0xb6, 0x3d, 0x90, 0x3c, 0xfe, 0xe7, 0xa9, 0x69, 0x8d, 0x23, 0xb2, 0x6d,
-	0x1e, 0x49, 0x58, 0xe8, 0x23, 0xd3, 0x19, 0xcf, 0xe8, 0x2d, 0xdf, 0x03, 0xd5, 0xa1, 0x82, 0xad,
-	0xfc, 0x5a, 0xe4, 0xd1, 0x87, 0x8b, 0x99, 0xe7, 0x5c, 0xce, 0x3c, 0xe7, 0xd7, 0xcc, 0x73, 0xce,
-	0xe7, 0x5e, 0xeb, 0x72, 0xee, 0xb5, 0x7e, 0xcc, 0xbd, 0xd6, 0x97, 0x3d, 0x1d, 0x51, 0xa6, 0x13,
-	0xca, 0x91, 0x9d, 0xde, 0xfc, 0xaf, 0x34, 0x57, 0x10, 0xaf, 0x35, 0xa2, 0xbf, 0xfa, 0x13, 0x00,
-	0x00, 0xff, 0xff, 0x8d, 0xa3, 0x8b, 0xf7, 0xd5, 0x04, 0x00, 0x00,
+var fileDescriptor_f2c1403191515490 = []byte{
+	// 510 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x4d, 0x6f, 0xd3, 0x30,
+	0x18, 0xc7, 0x1b, 0xb6, 0xee, 0xc5, 0x85, 0x6d, 0x44, 0x3b, 0x84, 0x02, 0x49, 0xd5, 0x53, 0x35,
+	0x09, 0x9b, 0x8e, 0x23, 0x07, 0x44, 0x41, 0x48, 0x48, 0x3b, 0x40, 0xe0, 0xc4, 0x25, 0xca, 0xcb,
+	0xd3, 0x60, 0x35, 0xb5, 0x33, 0xdb, 0x29, 0xdb, 0xb7, 0xd8, 0xe7, 0xe0, 0x93, 0xec, 0xb8, 0x23,
+	0x27, 0x86, 0xda, 0xef, 0x81, 0x50, 0x62, 0xbb, 0x68, 0x12, 0x2f, 0x3d, 0x74, 0xa7, 0xc4, 0xf6,
+	0xf3, 0xfc, 0x7f, 0xcf, 0xe3, 0xbf, 0x6d, 0x84, 0x53, 0x2e, 0xa7, 0x5c, 0x92, 0x38, 0x4d, 0x79,
+	0xc5, 0x94, 0x24, 0x19, 0x8c, 0xe3, 0xaa, 0x50, 0x92, 0x14, 0x3c, 0x9d, 0x54, 0x25, 0x99, 0x0d,
+	0xc9, 0x69, 0x05, 0xe2, 0x1c, 0x97, 0x82, 0x2b, 0xee, 0xf6, 0x75, 0x3c, 0xb6, 0xf1, 0xd8, 0xc6,
+	0x63, 0x1d, 0x8f, 0x67, 0xc3, 0x2e, 0x59, 0x41, 0xd3, 0x44, 0x37, 0xa2, 0x5d, 0xdf, 0x24, 0x24,
+	0xb1, 0x04, 0x32, 0x1b, 0x26, 0xa0, 0xe2, 0x21, 0x49, 0x39, 0x65, 0x66, 0xfd, 0x30, 0xe7, 0x39,
+	0x6f, 0x7e, 0x49, 0xfd, 0x67, 0x66, 0x83, 0x9c, 0xf3, 0xbc, 0x00, 0xd2, 0x8c, 0x92, 0x6a, 0x4c,
+	0x14, 0x9d, 0x82, 0x54, 0xf1, 0xd4, 0xc8, 0xf6, 0x03, 0xf4, 0xf8, 0x7d, 0x5d, 0xfa, 0x49, 0xc3,
+	0x7a, 0xa9, 0xab, 0x79, 0xcb, 0xc6, 0x3c, 0x84, 0xd3, 0x0a, 0xa4, 0xea, 0xff, 0x6c, 0x23, 0xff,
+	0x6f, 0x11, 0xb2, 0xe4, 0x4c, 0x82, 0x3b, 0x43, 0x07, 0x5c, 0xd0, 0x9c, 0xb2, 0xb8, 0x88, 0xea,
+	0x9a, 0x29, 0xcb, 0x3d, 0xa7, 0xb7, 0x31, 0xe8, 0x1c, 0x3f, 0x30, 0x5b, 0x87, 0xeb, 0xaa, 0xb1,
+	0xa9, 0x1a, 0xbf, 0xe2, 0x94, 0x8d, 0x9e, 0x5e, 0x7e, 0x0f, 0x5a, 0x5f, 0xaf, 0x83, 0x41, 0x4e,
+	0xd5, 0xe7, 0x2a, 0xc1, 0x29, 0x9f, 0xda, 0x3d, 0xd1, 0x9f, 0x27, 0x32, 0x9b, 0x10, 0x75, 0x5e,
+	0x82, 0x6c, 0x12, 0x64, 0xb8, 0x6f, 0x21, 0x27, 0x9a, 0xe1, 0x0a, 0xb4, 0x97, 0x41, 0x01, 0x79,
+	0xac, 0x20, 0x8b, 0xc6, 0x02, 0xc0, 0xbb, 0xb3, 0x7e, 0xea, 0xbd, 0x25, 0xe2, 0x8d, 0x00, 0x70,
+	0xcf, 0xd0, 0xfd, 0xdf, 0x4c, 0xdb, 0xec, 0xc6, 0xfa, 0xb1, 0x07, 0x4b, 0x8a, 0xed, 0xf6, 0x05,
+	0x42, 0x52, 0xc5, 0x42, 0x45, 0xb5, 0x85, 0xde, 0x66, 0xcf, 0x19, 0x74, 0x8e, 0xbb, 0x58, 0xfb,
+	0x8b, 0xad, 0xbf, 0xf8, 0xa3, 0xf5, 0x77, 0xb4, 0x79, 0x71, 0x1d, 0x38, 0xe1, 0x6e, 0x93, 0x53,
+	0xcf, 0xba, 0xcf, 0xd1, 0x0e, 0xb0, 0x4c, 0xa7, 0xb7, 0x57, 0x4c, 0xdf, 0x06, 0x96, 0x35, 0xc9,
+	0x0c, 0xdd, 0xad, 0xbb, 0x85, 0x2c, 0xaa, 0xcf, 0x9c, 0xf4, 0xb6, 0xd6, 0xdf, 0x72, 0x47, 0x03,
+	0x9a, 0x41, 0xed, 0x6d, 0xc5, 0x6e, 0x10, 0xb7, 0x6f, 0xc1, 0x5b, 0x8b, 0xd0, 0xcc, 0x43, 0xd4,
+	0xe6, 0x5f, 0x18, 0x08, 0x6f, 0xa7, 0xe7, 0x0c, 0x76, 0x43, 0x3d, 0xe8, 0x3f, 0x42, 0xdd, 0xe5,
+	0xf9, 0xa7, 0x2c, 0x7f, 0x07, 0x82, 0xf2, 0x4c, 0xda, 0xeb, 0x21, 0xd0, 0xc3, 0x3f, 0xae, 0x9a,
+	0xab, 0xf1, 0x01, 0xed, 0x9b, 0x43, 0x12, 0x95, 0x7a, 0xc9, 0xdc, 0x8c, 0x23, 0xfc, 0xff, 0x47,
+	0x02, 0x6b, 0xb5, 0x70, 0xaf, 0xb8, 0x21, 0x3e, 0x7a, 0x7d, 0x39, 0xf7, 0x9d, 0xab, 0xb9, 0xef,
+	0xfc, 0x98, 0xfb, 0xce, 0xc5, 0xc2, 0x6f, 0x5d, 0x2d, 0xfc, 0xd6, 0xb7, 0x85, 0xdf, 0xfa, 0x74,
+	0xa4, 0x45, 0x65, 0x36, 0xc1, 0x94, 0x93, 0xb3, 0x7f, 0xbd, 0x2e, 0xc9, 0x56, 0x63, 0xfa, 0xb3,
+	0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x78, 0xc7, 0xe4, 0x56, 0xde, 0x04, 0x00, 0x00,
 }
 
 func (m *QueryLockupAccountInfoRequest) Marshal() (dAtA []byte, err error) {
diff --git a/x/accounts/defaults/lockup/types/tx.pb.go b/x/accounts/defaults/lockup/v1/tx.pb.go
similarity index 91%
rename from x/accounts/defaults/lockup/types/tx.pb.go
rename to x/accounts/defaults/lockup/v1/tx.pb.go
index 6a4383e31c77..3ce47aa3b924 100644
--- a/x/accounts/defaults/lockup/types/tx.pb.go
+++ b/x/accounts/defaults/lockup/v1/tx.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmos/accounts/defaults/lockup/tx.proto
+// source: cosmos/accounts/defaults/lockup/v1/tx.proto
 
-package types
+package v1
 
 import (
 	fmt "fmt"
@@ -48,7 +48,7 @@ func (m *MsgInitLockupAccount) Reset()         { *m = MsgInitLockupAccount{} }
 func (m *MsgInitLockupAccount) String() string { return proto.CompactTextString(m) }
 func (*MsgInitLockupAccount) ProtoMessage()    {}
 func (*MsgInitLockupAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{0}
+	return fileDescriptor_84e5f410632b9d39, []int{0}
 }
 func (m *MsgInitLockupAccount) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -106,7 +106,7 @@ func (m *MsgInitLockupAccountResponse) Reset()         { *m = MsgInitLockupAccou
 func (m *MsgInitLockupAccountResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgInitLockupAccountResponse) ProtoMessage()    {}
 func (*MsgInitLockupAccountResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{1}
+	return fileDescriptor_84e5f410632b9d39, []int{1}
 }
 func (m *MsgInitLockupAccountResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -149,7 +149,7 @@ func (m *MsgInitPeriodicLockingAccount) Reset()         { *m = MsgInitPeriodicLo
 func (m *MsgInitPeriodicLockingAccount) String() string { return proto.CompactTextString(m) }
 func (*MsgInitPeriodicLockingAccount) ProtoMessage()    {}
 func (*MsgInitPeriodicLockingAccount) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{2}
+	return fileDescriptor_84e5f410632b9d39, []int{2}
 }
 func (m *MsgInitPeriodicLockingAccount) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -208,7 +208,7 @@ func (m *MsgInitPeriodicLockingAccountResponse) Reset()         { *m = MsgInitPe
 func (m *MsgInitPeriodicLockingAccountResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgInitPeriodicLockingAccountResponse) ProtoMessage()    {}
 func (*MsgInitPeriodicLockingAccountResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{3}
+	return fileDescriptor_84e5f410632b9d39, []int{3}
 }
 func (m *MsgInitPeriodicLockingAccountResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -249,7 +249,7 @@ func (m *MsgDelegate) Reset()         { *m = MsgDelegate{} }
 func (m *MsgDelegate) String() string { return proto.CompactTextString(m) }
 func (*MsgDelegate) ProtoMessage()    {}
 func (*MsgDelegate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{4}
+	return fileDescriptor_84e5f410632b9d39, []int{4}
 }
 func (m *MsgDelegate) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -289,7 +289,7 @@ func (m *MsgUndelegate) Reset()         { *m = MsgUndelegate{} }
 func (m *MsgUndelegate) String() string { return proto.CompactTextString(m) }
 func (*MsgUndelegate) ProtoMessage()    {}
 func (*MsgUndelegate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{5}
+	return fileDescriptor_84e5f410632b9d39, []int{5}
 }
 func (m *MsgUndelegate) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -328,7 +328,7 @@ func (m *MsgWithdrawReward) Reset()         { *m = MsgWithdrawReward{} }
 func (m *MsgWithdrawReward) String() string { return proto.CompactTextString(m) }
 func (*MsgWithdrawReward) ProtoMessage()    {}
 func (*MsgWithdrawReward) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{6}
+	return fileDescriptor_84e5f410632b9d39, []int{6}
 }
 func (m *MsgWithdrawReward) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -368,7 +368,7 @@ func (m *MsgSend) Reset()         { *m = MsgSend{} }
 func (m *MsgSend) String() string { return proto.CompactTextString(m) }
 func (*MsgSend) ProtoMessage()    {}
 func (*MsgSend) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{7}
+	return fileDescriptor_84e5f410632b9d39, []int{7}
 }
 func (m *MsgSend) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -406,7 +406,7 @@ func (m *MsgExecuteMessagesResponse) Reset()         { *m = MsgExecuteMessagesRe
 func (m *MsgExecuteMessagesResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgExecuteMessagesResponse) ProtoMessage()    {}
 func (*MsgExecuteMessagesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{8}
+	return fileDescriptor_84e5f410632b9d39, []int{8}
 }
 func (m *MsgExecuteMessagesResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -454,7 +454,7 @@ func (m *MsgWithdraw) Reset()         { *m = MsgWithdraw{} }
 func (m *MsgWithdraw) String() string { return proto.CompactTextString(m) }
 func (*MsgWithdraw) ProtoMessage()    {}
 func (*MsgWithdraw) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{9}
+	return fileDescriptor_84e5f410632b9d39, []int{9}
 }
 func (m *MsgWithdraw) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -493,7 +493,7 @@ func (m *MsgWithdrawResponse) Reset()         { *m = MsgWithdrawResponse{} }
 func (m *MsgWithdrawResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgWithdrawResponse) ProtoMessage()    {}
 func (*MsgWithdrawResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e5f39108a4d67f92, []int{10}
+	return fileDescriptor_84e5f410632b9d39, []int{10}
 }
 func (m *MsgWithdrawResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -537,76 +537,77 @@ func (m *MsgWithdrawResponse) GetAmountReceived() github_com_cosmos_cosmos_sdk_t
 }
 
 func init() {
-	proto.RegisterType((*MsgInitLockupAccount)(nil), "cosmos.accounts.defaults.lockup.MsgInitLockupAccount")
-	proto.RegisterType((*MsgInitLockupAccountResponse)(nil), "cosmos.accounts.defaults.lockup.MsgInitLockupAccountResponse")
-	proto.RegisterType((*MsgInitPeriodicLockingAccount)(nil), "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccount")
-	proto.RegisterType((*MsgInitPeriodicLockingAccountResponse)(nil), "cosmos.accounts.defaults.lockup.MsgInitPeriodicLockingAccountResponse")
-	proto.RegisterType((*MsgDelegate)(nil), "cosmos.accounts.defaults.lockup.MsgDelegate")
-	proto.RegisterType((*MsgUndelegate)(nil), "cosmos.accounts.defaults.lockup.MsgUndelegate")
-	proto.RegisterType((*MsgWithdrawReward)(nil), "cosmos.accounts.defaults.lockup.MsgWithdrawReward")
-	proto.RegisterType((*MsgSend)(nil), "cosmos.accounts.defaults.lockup.MsgSend")
-	proto.RegisterType((*MsgExecuteMessagesResponse)(nil), "cosmos.accounts.defaults.lockup.MsgExecuteMessagesResponse")
-	proto.RegisterType((*MsgWithdraw)(nil), "cosmos.accounts.defaults.lockup.MsgWithdraw")
-	proto.RegisterType((*MsgWithdrawResponse)(nil), "cosmos.accounts.defaults.lockup.MsgWithdrawResponse")
+	proto.RegisterType((*MsgInitLockupAccount)(nil), "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccount")
+	proto.RegisterType((*MsgInitLockupAccountResponse)(nil), "cosmos.accounts.defaults.lockup.v1.MsgInitLockupAccountResponse")
+	proto.RegisterType((*MsgInitPeriodicLockingAccount)(nil), "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccount")
+	proto.RegisterType((*MsgInitPeriodicLockingAccountResponse)(nil), "cosmos.accounts.defaults.lockup.v1.MsgInitPeriodicLockingAccountResponse")
+	proto.RegisterType((*MsgDelegate)(nil), "cosmos.accounts.defaults.lockup.v1.MsgDelegate")
+	proto.RegisterType((*MsgUndelegate)(nil), "cosmos.accounts.defaults.lockup.v1.MsgUndelegate")
+	proto.RegisterType((*MsgWithdrawReward)(nil), "cosmos.accounts.defaults.lockup.v1.MsgWithdrawReward")
+	proto.RegisterType((*MsgSend)(nil), "cosmos.accounts.defaults.lockup.v1.MsgSend")
+	proto.RegisterType((*MsgExecuteMessagesResponse)(nil), "cosmos.accounts.defaults.lockup.v1.MsgExecuteMessagesResponse")
+	proto.RegisterType((*MsgWithdraw)(nil), "cosmos.accounts.defaults.lockup.v1.MsgWithdraw")
+	proto.RegisterType((*MsgWithdrawResponse)(nil), "cosmos.accounts.defaults.lockup.v1.MsgWithdrawResponse")
 }
 
 func init() {
-	proto.RegisterFile("cosmos/accounts/defaults/lockup/tx.proto", fileDescriptor_e5f39108a4d67f92)
-}
-
-var fileDescriptor_e5f39108a4d67f92 = []byte{
-	// 816 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xcf, 0x4f, 0x1b, 0x47,
-	0x14, 0xf6, 0xda, 0xaa, 0xc1, 0x43, 0x81, 0xb2, 0x58, 0xc5, 0x58, 0x65, 0x97, 0x5a, 0x42, 0x58,
-	0x56, 0xbd, 0x5b, 0x68, 0xa5, 0x56, 0x56, 0x2f, 0xb8, 0xf4, 0x97, 0x54, 0x57, 0xc8, 0xf4, 0x87,
-	0xd4, 0x1c, 0xac, 0xf1, 0xee, 0x30, 0xac, 0xf0, 0xce, 0x58, 0x3b, 0x63, 0x1b, 0xdf, 0xa2, 0x28,
-	0x87, 0x88, 0x13, 0xe7, 0x9c, 0x38, 0x45, 0x11, 0x27, 0x47, 0xe2, 0x8f, 0xe0, 0x88, 0x38, 0x71,
-	0x0a, 0x91, 0x89, 0x64, 0xfe, 0x8c, 0x68, 0x77, 0x66, 0x89, 0x0d, 0x04, 0x1c, 0x1f, 0x12, 0x29,
-	0x17, 0xef, 0xcc, 0xbc, 0xef, 0xbd, 0xf7, 0xbd, 0x6f, 0xde, 0xdb, 0x35, 0xc8, 0x5a, 0x94, 0xb9,
-	0x94, 0x99, 0xd0, 0xb2, 0x68, 0x83, 0x70, 0x66, 0xda, 0x68, 0x0b, 0x36, 0x6a, 0x9c, 0x99, 0x35,
-	0x6a, 0xed, 0x34, 0xea, 0x26, 0xdf, 0x35, 0xea, 0x1e, 0xe5, 0x54, 0xd5, 0x05, 0xd2, 0x08, 0x91,
-	0x46, 0x88, 0x34, 0x04, 0x32, 0x3d, 0x03, 0x5d, 0x87, 0x50, 0x33, 0xf8, 0x15, 0x3e, 0x69, 0x4d,
-	0x46, 0xaf, 0x42, 0x86, 0xcc, 0xe6, 0x4a, 0x15, 0x71, 0xb8, 0x62, 0x5a, 0xd4, 0x21, 0xd2, 0xfe,
-	0xcd, 0x7d, 0xd9, 0xc5, 0x43, 0xa2, 0xe7, 0x24, 0xda, 0x65, 0xd8, 0x6c, 0xae, 0xf8, 0x0f, 0x69,
-	0x98, 0x17, 0x86, 0x4a, 0xb0, 0x33, 0x25, 0x4f, 0x61, 0x4a, 0x62, 0x8a, 0xa9, 0x38, 0xf7, 0x57,
-	0xa1, 0x03, 0xa6, 0x14, 0xd7, 0x90, 0x19, 0xec, 0xaa, 0x8d, 0x2d, 0x13, 0x92, 0xb6, 0x34, 0xe9,
-	0xd7, 0x4d, 0xdc, 0x71, 0x11, 0xe3, 0xd0, 0x95, 0x2c, 0x32, 0x0f, 0xa3, 0x20, 0x59, 0x62, 0xf8,
-	0x0f, 0xe2, 0xf0, 0x3f, 0x03, 0x76, 0x6b, 0x82, 0xbc, 0x6a, 0x80, 0xcf, 0x68, 0x8b, 0x20, 0x2f,
-	0xa5, 0x2c, 0x2a, 0xd9, 0x44, 0x31, 0x75, 0x7a, 0x94, 0x4f, 0x4a, 0x2e, 0x6b, 0xb6, 0xed, 0x21,
-	0xc6, 0x36, 0xb9, 0xe7, 0x10, 0x5c, 0x16, 0x30, 0x75, 0x1d, 0x8c, 0x23, 0x62, 0x57, 0xfc, 0xf8,
-	0xa9, 0xe8, 0xa2, 0x92, 0x9d, 0x58, 0x4d, 0x1b, 0x22, 0xb9, 0x11, 0x26, 0x37, 0xfe, 0x0e, 0x93,
-	0x17, 0x27, 0x8f, 0x5f, 0xea, 0x91, 0xfd, 0x73, 0x5d, 0x79, 0xde, 0xeb, 0xe4, 0x94, 0xf2, 0x18,
-	0x22, 0xb6, 0x6f, 0x54, 0x7f, 0x07, 0x80, 0x71, 0xe8, 0x71, 0x11, 0x27, 0xf6, 0xbe, 0x71, 0x12,
-	0x81, 0xb3, 0x6f, 0x2e, 0x64, 0x2f, 0x0f, 0x74, 0x65, 0xaf, 0xd7, 0xc9, 0xc9, 0x9b, 0xce, 0x33,
-	0x7b, 0xc7, 0xbc, 0xad, 0xd2, 0x8c, 0x06, 0xbe, 0xba, 0xed, 0xbc, 0x8c, 0x58, 0x9d, 0x12, 0x86,
-	0x32, 0xcf, 0xa2, 0x60, 0x41, 0x02, 0x36, 0x90, 0xe7, 0x50, 0xdb, 0xb1, 0x7c, 0xa0, 0x43, 0xf0,
-	0xa8, 0x5a, 0x0d, 0x56, 0x19, 0x1d, 0xbd, 0x4a, 0xf5, 0x01, 0x98, 0xae, 0x09, 0x2e, 0x95, 0x7a,
-	0xc0, 0x8d, 0xa5, 0x62, 0x8b, 0xb1, 0xec, 0xc4, 0xea, 0xb2, 0x71, 0x4f, 0x83, 0x1b, 0xa2, 0x96,
-	0x62, 0xc2, 0x8f, 0x2d, 0xe2, 0x4e, 0xc9, 0x50, 0xc2, 0xc2, 0x0a, 0xc6, 0xe5, 0x81, 0x1e, 0xf1,
-	0x25, 0x5c, 0xba, 0x29, 0xa1, 0xc0, 0x0c, 0x0a, 0xb9, 0x0c, 0x96, 0xee, 0xd4, 0xe9, 0x4a, 0xd1,
-	0xae, 0x02, 0x26, 0x4a, 0x0c, 0xaf, 0xa3, 0x1a, 0xc2, 0x90, 0x23, 0xf5, 0x5b, 0x10, 0x67, 0x88,
-	0xd8, 0x43, 0x08, 0x28, 0x71, 0xea, 0x5f, 0x60, 0xa6, 0x09, 0x6b, 0x8e, 0x0d, 0x39, 0xf5, 0x2a,
-	0x50, 0x40, 0x02, 0x21, 0x13, 0xc5, 0xaf, 0x4f, 0x8f, 0xf2, 0x0b, 0xd2, 0xf9, 0xdf, 0x10, 0x33,
-	0x18, 0xe5, 0x8b, 0xe6, 0xb5, 0x73, 0xf5, 0x27, 0x10, 0x87, 0xae, 0xcf, 0x51, 0xf6, 0xdc, 0x7c,
-	0x28, 0x9f, 0x3f, 0xeb, 0x86, 0x9c, 0x75, 0xe3, 0x67, 0xea, 0x90, 0x7e, 0xc1, 0xa4, 0x4f, 0x61,
-	0xf6, 0xc9, 0x81, 0x1e, 0xf1, 0xc5, 0x7a, 0xd4, 0xeb, 0xe4, 0x24, 0xc5, 0xcc, 0x6b, 0x05, 0x4c,
-	0x96, 0x18, 0xfe, 0x87, 0xd8, 0x9f, 0x74, 0x99, 0x87, 0x0a, 0x98, 0x29, 0x31, 0xfc, 0x9f, 0xc3,
-	0xb7, 0x6d, 0x0f, 0xb6, 0xca, 0xa8, 0x05, 0x3d, 0xfb, 0xe3, 0x97, 0x7a, 0x3b, 0xd9, 0xc7, 0x51,
-	0x30, 0x56, 0x62, 0x78, 0x13, 0x91, 0x51, 0x28, 0xfe, 0x00, 0x00, 0xa7, 0xd7, 0xb8, 0xbd, 0xdb,
-	0x2b, 0xc1, 0x69, 0x28, 0x7b, 0xbb, 0x4f, 0xf6, 0xd8, 0xdd, 0xb2, 0xff, 0xea, 0xcb, 0x7e, 0x78,
-	0xae, 0x67, 0xb1, 0xc3, 0xb7, 0x1b, 0x55, 0xc3, 0xa2, 0xae, 0xfc, 0x04, 0x98, 0x7d, 0x43, 0xc8,
-	0xdb, 0x75, 0xc4, 0x02, 0x07, 0xf6, 0xb4, 0xd7, 0xc9, 0x7d, 0xee, 0x37, 0x98, 0xd5, 0xae, 0xf8,
-	0xdf, 0x22, 0x36, 0xc4, 0x9d, 0x6d, 0x80, 0x74, 0x89, 0xe1, 0x5f, 0x76, 0x91, 0xd5, 0xe0, 0xa8,
-	0x84, 0x18, 0x83, 0x18, 0xb1, 0x70, 0x3a, 0xd5, 0x55, 0x90, 0xf0, 0xe4, 0x9a, 0xa5, 0x94, 0x80,
-	0x70, 0xf2, 0xc6, 0xcb, 0x69, 0x8d, 0xb4, 0xcb, 0x6f, 0x61, 0x99, 0x17, 0x62, 0xa2, 0xc3, 0x2e,
-	0x50, 0x7f, 0x04, 0xa0, 0x25, 0xd7, 0x43, 0x08, 0xdc, 0x87, 0x1d, 0x5d, 0xe4, 0x2f, 0x41, 0xdc,
-	0x46, 0x84, 0xba, 0xe2, 0x0d, 0x98, 0x28, 0xcb, 0x5d, 0x61, 0xae, 0x5f, 0x81, 0xbe, 0x4c, 0x99,
-	0x33, 0x05, 0xcc, 0x0e, 0x74, 0xae, 0xac, 0xff, 0x7b, 0x30, 0xee, 0x21, 0x0b, 0x39, 0xcd, 0x21,
-	0x98, 0x5f, 0x21, 0xd5, 0x3d, 0x05, 0x4c, 0x0b, 0xcd, 0x2b, 0xf2, 0xcc, 0x4e, 0x45, 0x3f, 0xd4,
-	0x6d, 0x4f, 0x89, 0xcc, 0x65, 0x99, 0xb8, 0xf8, 0xdb, 0x71, 0x57, 0x53, 0x4e, 0xba, 0x9a, 0xf2,
-	0xaa, 0xab, 0x29, 0xfb, 0x17, 0x5a, 0xe4, 0xe4, 0x42, 0x8b, 0x9c, 0x5d, 0x68, 0x91, 0xff, 0xf3,
-	0x22, 0x2e, 0xb3, 0x77, 0x0c, 0x87, 0x9a, 0xbb, 0x77, 0xfc, 0x53, 0xf2, 0x93, 0x56, 0xe3, 0xc1,
-	0x85, 0x7f, 0xf7, 0x26, 0x00, 0x00, 0xff, 0xff, 0x4e, 0xb6, 0xac, 0x3d, 0x59, 0x09, 0x00, 0x00,
+	proto.RegisterFile("cosmos/accounts/defaults/lockup/v1/tx.proto", fileDescriptor_84e5f410632b9d39)
+}
+
+var fileDescriptor_84e5f410632b9d39 = []byte{
+	// 817 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xcf, 0x4f, 0xe3, 0x46,
+	0x14, 0x8e, 0x13, 0x35, 0x90, 0xa1, 0x40, 0x31, 0x51, 0x09, 0x51, 0xb1, 0x69, 0x24, 0xd4, 0x28,
+	0x15, 0xe3, 0x86, 0x56, 0x6a, 0x15, 0xf5, 0x42, 0x4a, 0xab, 0x56, 0x6a, 0x2a, 0x14, 0xfa, 0x43,
+	0xea, 0xa1, 0xd1, 0xc4, 0x1e, 0x06, 0x8b, 0x78, 0x26, 0xf2, 0x4c, 0x12, 0x72, 0xab, 0xaa, 0x1e,
+	0x2a, 0x4e, 0x9c, 0x7b, 0xe2, 0xd8, 0x72, 0x4a, 0x25, 0xfe, 0x08, 0x8e, 0x88, 0x13, 0xa7, 0xb2,
+	0x0a, 0x2b, 0x85, 0x3f, 0x63, 0x65, 0xcf, 0x98, 0x4d, 0x80, 0x65, 0xb3, 0x39, 0xec, 0x4a, 0x7b,
+	0x89, 0x3c, 0xf3, 0x7d, 0xef, 0xbd, 0xef, 0x7d, 0x33, 0xcf, 0x0e, 0xf8, 0xd8, 0x66, 0xdc, 0x63,
+	0xdc, 0x42, 0xb6, 0xcd, 0x5a, 0x54, 0x70, 0xcb, 0xc1, 0xbb, 0xa8, 0xd5, 0x10, 0xdc, 0x6a, 0x30,
+	0x7b, 0xbf, 0xd5, 0xb4, 0xda, 0x45, 0x4b, 0x1c, 0xc0, 0xa6, 0xcf, 0x04, 0xd3, 0x73, 0x92, 0x0c,
+	0x23, 0x32, 0x8c, 0xc8, 0x50, 0x92, 0x61, 0xbb, 0x98, 0x5d, 0x40, 0x9e, 0x4b, 0x99, 0x15, 0xfe,
+	0xca, 0xb0, 0xac, 0xa1, 0x6a, 0xd4, 0x11, 0xc7, 0x56, 0xbb, 0x58, 0xc7, 0x02, 0x15, 0x2d, 0x9b,
+	0xb9, 0x54, 0xe1, 0xd6, 0x18, 0x1a, 0x54, 0x01, 0x19, 0xb0, 0xa4, 0x02, 0x3c, 0x4e, 0x02, 0xcc,
+	0xe3, 0x44, 0x01, 0xcb, 0x12, 0xa8, 0x85, 0x2b, 0x95, 0x56, 0x41, 0x69, 0xc2, 0x08, 0x93, 0xfb,
+	0xc1, 0x53, 0x14, 0x40, 0x18, 0x23, 0x0d, 0x6c, 0x85, 0xab, 0x7a, 0x6b, 0xd7, 0x42, 0xb4, 0xab,
+	0x20, 0xf3, 0x2e, 0x24, 0x5c, 0x0f, 0x73, 0x81, 0x3c, 0xa5, 0x22, 0xf7, 0x7b, 0x1c, 0xa4, 0x2b,
+	0x9c, 0x7c, 0x47, 0x5d, 0xf1, 0x7d, 0xa8, 0x6e, 0x53, 0xea, 0xd7, 0x21, 0x78, 0x87, 0x75, 0x28,
+	0xf6, 0x33, 0xda, 0xaa, 0x96, 0x4f, 0x95, 0x33, 0x17, 0xa7, 0xeb, 0x69, 0xa5, 0x65, 0xd3, 0x71,
+	0x7c, 0xcc, 0xf9, 0x8e, 0xf0, 0x5d, 0x4a, 0xaa, 0x92, 0xa6, 0x6f, 0x81, 0x69, 0x4c, 0x9d, 0x5a,
+	0x90, 0x3f, 0x13, 0x5f, 0xd5, 0xf2, 0x33, 0x1b, 0x59, 0x28, 0x8b, 0xc3, 0xa8, 0x38, 0xfc, 0x31,
+	0x2a, 0x5e, 0x9e, 0x3d, 0xfb, 0xdf, 0x8c, 0x1d, 0x5d, 0x99, 0xda, 0x3f, 0x83, 0x5e, 0x41, 0xab,
+	0x4e, 0x61, 0xea, 0x04, 0xa0, 0xfe, 0x2d, 0x00, 0x5c, 0x20, 0x5f, 0xc8, 0x3c, 0x89, 0x57, 0xcd,
+	0x93, 0x0a, 0x83, 0x03, 0xb8, 0x94, 0xbf, 0x39, 0x36, 0xb5, 0xc3, 0x41, 0xaf, 0x60, 0x4a, 0xd5,
+	0xeb, 0xdc, 0xd9, 0xb7, 0x1e, 0xea, 0x34, 0x67, 0x80, 0x0f, 0x1e, 0xda, 0xaf, 0x62, 0xde, 0x64,
+	0x94, 0xe3, 0xdc, 0xbf, 0x71, 0xb0, 0xa2, 0x08, 0xdb, 0xd8, 0x77, 0x99, 0xe3, 0xda, 0x01, 0xd1,
+	0xa5, 0x64, 0x52, 0xaf, 0x46, 0xbb, 0x8c, 0x4f, 0xde, 0xa5, 0xfe, 0x1b, 0x98, 0x6f, 0x48, 0x2d,
+	0xb5, 0x66, 0xa8, 0x8d, 0x67, 0x12, 0xab, 0x89, 0xfc, 0xcc, 0x46, 0x01, 0xbe, 0xfc, 0x9a, 0x43,
+	0xd9, 0x4e, 0x39, 0x15, 0xa4, 0x97, 0xa9, 0xe7, 0x54, 0x36, 0x89, 0xf0, 0x12, 0xbc, 0x39, 0x36,
+	0x63, 0x81, 0x8b, 0x6b, 0xf7, 0x5d, 0x94, 0x9c, 0x51, 0x2f, 0x3f, 0x02, 0x6b, 0x8f, 0x5a, 0x75,
+	0x6b, 0x6a, 0x5f, 0x03, 0x33, 0x15, 0x4e, 0xb6, 0x70, 0x03, 0x13, 0x24, 0xb0, 0xfe, 0x09, 0x48,
+	0x72, 0x4c, 0x9d, 0x31, 0x3c, 0x54, 0x3c, 0xfd, 0x07, 0xb0, 0xd0, 0x46, 0x0d, 0xd7, 0x41, 0x82,
+	0xf9, 0x35, 0x24, 0x29, 0xa1, 0x97, 0xa9, 0xf2, 0x87, 0x17, 0xa7, 0xeb, 0x2b, 0x2a, 0xf8, 0xe7,
+	0x88, 0x33, 0x9a, 0xe5, 0xbd, 0xf6, 0x9d, 0x7d, 0xfd, 0x4b, 0x90, 0x44, 0x5e, 0xa0, 0x51, 0x5d,
+	0xbb, 0xe5, 0xc8, 0xc1, 0x60, 0xe2, 0xa1, 0x9a, 0x78, 0xf8, 0x15, 0x73, 0xe9, 0xb0, 0x61, 0x2a,
+	0xa6, 0xb4, 0xf8, 0xd7, 0xb1, 0x19, 0x0b, 0xcc, 0xfa, 0x63, 0xd0, 0x2b, 0x28, 0x89, 0xb9, 0xa7,
+	0x1a, 0x98, 0xad, 0x70, 0xf2, 0x13, 0x75, 0xde, 0xea, 0x36, 0x4f, 0x34, 0xb0, 0x50, 0xe1, 0xe4,
+	0x17, 0x57, 0xec, 0x39, 0x3e, 0xea, 0x54, 0x71, 0x07, 0xf9, 0xce, 0x9b, 0x6f, 0xf5, 0x61, 0xb1,
+	0x7f, 0xc6, 0xc1, 0x54, 0x85, 0x93, 0x1d, 0x4c, 0x27, 0x91, 0xf8, 0x39, 0x00, 0x82, 0xdd, 0xd1,
+	0xf6, 0xe2, 0xa8, 0x94, 0x60, 0x91, 0xed, 0xdd, 0x21, 0xdb, 0x13, 0x8f, 0xdb, 0xfe, 0x4d, 0x60,
+	0xfb, 0xc9, 0x95, 0x99, 0x27, 0xae, 0xd8, 0x6b, 0xd5, 0xa1, 0xcd, 0xbc, 0xe8, 0xe3, 0x32, 0x34,
+	0x84, 0xa2, 0xdb, 0xc4, 0x3c, 0x0c, 0xe0, 0x7f, 0x0f, 0x7a, 0x85, 0x77, 0x83, 0x0b, 0x66, 0x77,
+	0x6b, 0xc1, 0x17, 0x89, 0x8f, 0x71, 0x66, 0xdb, 0x20, 0x5b, 0xe1, 0xe4, 0xeb, 0x03, 0x6c, 0xb7,
+	0x04, 0xae, 0x60, 0xce, 0x11, 0xc1, 0x3c, 0x9a, 0x4e, 0x7d, 0x03, 0xa4, 0x7c, 0xf5, 0xcc, 0x33,
+	0x5a, 0x28, 0x38, 0x7d, 0xef, 0xfd, 0xb4, 0x49, 0xbb, 0xd5, 0xe7, 0xb4, 0xdc, 0x7f, 0x72, 0xa2,
+	0xa3, 0x5b, 0xa0, 0x7f, 0x01, 0x40, 0x47, 0x3d, 0x8f, 0x61, 0xf0, 0x10, 0x77, 0x72, 0x93, 0xdf,
+	0x07, 0x49, 0x07, 0x53, 0xe6, 0xc9, 0x97, 0x60, 0xaa, 0xaa, 0x56, 0xa5, 0xa5, 0x61, 0x07, 0x86,
+	0x2a, 0xe5, 0x2e, 0x35, 0xb0, 0x38, 0x72, 0x73, 0x55, 0xff, 0x9f, 0x81, 0x69, 0x1f, 0xdb, 0xd8,
+	0x6d, 0x8f, 0xa1, 0xfc, 0x96, 0xa9, 0x1f, 0x6a, 0x60, 0x5e, 0x7a, 0x5e, 0x53, 0x7b, 0x4e, 0x26,
+	0xfe, 0xba, 0x4e, 0x7b, 0x4e, 0x56, 0xae, 0xaa, 0xc2, 0xe5, 0xad, 0xb3, 0xbe, 0xa1, 0x9d, 0xf7,
+	0x0d, 0xed, 0x49, 0xdf, 0xd0, 0x8e, 0xae, 0x8d, 0xd8, 0xf9, 0xb5, 0x11, 0xbb, 0xbc, 0x36, 0x62,
+	0xbf, 0x16, 0x64, 0x5e, 0xee, 0xec, 0x43, 0x97, 0x59, 0x07, 0x8f, 0xfd, 0x63, 0xa9, 0x27, 0xc3,
+	0xd3, 0xfe, 0xf4, 0x59, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x35, 0x67, 0x40, 0x62, 0x09, 0x00,
+	0x00,
 }
 
 func (this *MsgInitLockupAccount) Equal(that interface{}) bool {
diff --git a/x/accounts/proto/cosmos/accounts/defaults/lockup/lockup.proto b/x/accounts/proto/cosmos/accounts/defaults/lockup/v1/lockup.proto
similarity index 85%
rename from x/accounts/proto/cosmos/accounts/defaults/lockup/lockup.proto
rename to x/accounts/proto/cosmos/accounts/defaults/lockup/v1/lockup.proto
index 86d9efb8efae..b8be23c4ae95 100644
--- a/x/accounts/proto/cosmos/accounts/defaults/lockup/lockup.proto
+++ b/x/accounts/proto/cosmos/accounts/defaults/lockup/v1/lockup.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
-package cosmos.accounts.defaults.lockup;
+package cosmos.accounts.defaults.lockup.v1;
 
 import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "cosmossdk.io/x/accounts/defaults/lockup/types";
+option go_package = "cosmossdk.io/x/accounts/defaults/lockup/v1";
 
 // Period defines a length of time and amount of coins that will be lock.
 message Period {
diff --git a/x/accounts/proto/cosmos/accounts/defaults/lockup/query.proto b/x/accounts/proto/cosmos/accounts/defaults/lockup/v1/query.proto
similarity index 93%
rename from x/accounts/proto/cosmos/accounts/defaults/lockup/query.proto
rename to x/accounts/proto/cosmos/accounts/defaults/lockup/v1/query.proto
index 625163a22bca..e2bd5b607306 100644
--- a/x/accounts/proto/cosmos/accounts/defaults/lockup/query.proto
+++ b/x/accounts/proto/cosmos/accounts/defaults/lockup/v1/query.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
-package cosmos.accounts.defaults.lockup;
+package cosmos.accounts.defaults.lockup.v1;
 
-import "cosmos/accounts/defaults/lockup/lockup.proto";
+import "cosmos/accounts/defaults/lockup/v1/lockup.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "cosmossdk.io/x/accounts/defaults/lockup/types";
+option go_package = "cosmossdk.io/x/accounts/defaults/lockup/v1";
 
 // QueryLockupAccountInfoRequest get lockup account info
 message QueryLockupAccountInfoRequest {}
diff --git a/x/accounts/proto/cosmos/accounts/defaults/lockup/tx.proto b/x/accounts/proto/cosmos/accounts/defaults/lockup/v1/tx.proto
similarity index 96%
rename from x/accounts/proto/cosmos/accounts/defaults/lockup/tx.proto
rename to x/accounts/proto/cosmos/accounts/defaults/lockup/v1/tx.proto
index c13cec55b16f..e76b0e1e2c46 100644
--- a/x/accounts/proto/cosmos/accounts/defaults/lockup/tx.proto
+++ b/x/accounts/proto/cosmos/accounts/defaults/lockup/v1/tx.proto
@@ -1,16 +1,16 @@
 syntax = "proto3";
-package cosmos.accounts.defaults.lockup;
+package cosmos.accounts.defaults.lockup.v1;
 
 import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
-import "cosmos/accounts/defaults/lockup/lockup.proto";
+import "cosmos/accounts/defaults/lockup/v1/lockup.proto";
 import "cosmos/msg/v1/msg.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "cosmossdk.io/x/accounts/defaults/lockup/types";
+option go_package = "cosmossdk.io/x/accounts/defaults/lockup/v1";
 
 //-------------------------------------- INIT --------------------------------------
 

From 3e65a610bd6c0136bda30ec63dd352b16c96f4b8 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 22 Oct 2024 12:27:51 +0200
Subject: [PATCH 5/5] build(deps): bump x/tx (#22327)

---
 client/v2/go.mod                    | 2 +-
 go.mod                              | 2 +-
 runtime/v2/go.mod                   | 2 +-
 server/v2/cometbft/go.mod           | 2 +-
 simapp/go.mod                       | 2 +-
 simapp/v2/go.mod                    | 2 +-
 tests/go.mod                        | 2 +-
 x/accounts/defaults/base/go.mod     | 2 +-
 x/accounts/defaults/lockup/go.mod   | 2 +-
 x/accounts/defaults/multisig/go.mod | 2 +-
 x/accounts/go.mod                   | 2 +-
 x/authz/go.mod                      | 2 +-
 x/bank/go.mod                       | 2 +-
 x/circuit/go.mod                    | 2 +-
 x/consensus/go.mod                  | 2 +-
 x/distribution/go.mod               | 2 +-
 x/epochs/go.mod                     | 2 +-
 x/evidence/go.mod                   | 2 +-
 x/feegrant/go.mod                   | 2 +-
 x/gov/go.mod                        | 2 +-
 x/group/go.mod                      | 2 +-
 x/mint/go.mod                       | 2 +-
 x/nft/go.mod                        | 2 +-
 x/params/go.mod                     | 2 +-
 x/protocolpool/go.mod               | 2 +-
 x/slashing/go.mod                   | 2 +-
 x/staking/go.mod                    | 2 +-
 x/upgrade/go.mod                    | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/client/v2/go.mod b/client/v2/go.mod
index a9d75f6d8a38..6a895d059fb8 100644
--- a/client/v2/go.mod
+++ b/client/v2/go.mod
@@ -8,7 +8,7 @@ require (
 	cosmossdk.io/depinject v1.0.0
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
 	cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a
-	cosmossdk.io/x/tx v0.13.3
+	cosmossdk.io/x/tx v1.0.0-alpha.1
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	github.com/cosmos/cosmos-sdk v0.53.0
 	github.com/spf13/cobra v1.8.1
diff --git a/go.mod b/go.mod
index f6286b7dc3e4..7c3cc9d9bf3d 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
-	cosmossdk.io/x/tx v0.13.3
+	cosmossdk.io/x/tx v1.0.0-alpha.1
 	github.com/99designs/keyring v1.2.2
 	github.com/bgentry/speakeasy v0.2.0
 	github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f
diff --git a/runtime/v2/go.mod b/runtime/v2/go.mod
index 27ed971add6a..df78675400c7 100644
--- a/runtime/v2/go.mod
+++ b/runtime/v2/go.mod
@@ -20,7 +20,7 @@ require (
 	cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000
 	cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000
 	cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000
-	cosmossdk.io/x/tx v0.13.3
+	cosmossdk.io/x/tx v1.0.0-alpha.1
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/stretchr/testify v1.9.0
 	google.golang.org/grpc v1.67.1
diff --git a/server/v2/cometbft/go.mod b/server/v2/cometbft/go.mod
index b4e2905a546d..77f1a90f5b2d 100644
--- a/server/v2/cometbft/go.mod
+++ b/server/v2/cometbft/go.mod
@@ -50,7 +50,7 @@ require (
 	cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/simapp/go.mod b/simapp/go.mod
index 0988fe2f7f78..71a725de5120 100644
--- a/simapp/go.mod
+++ b/simapp/go.mod
@@ -30,7 +30,7 @@ require (
 	cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190
 	cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/staking v0.0.0-20240226161501-23359a0b6d91
-	cosmossdk.io/x/tx v0.13.5
+	cosmossdk.io/x/tx v1.0.0-alpha.1
 	cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
 	github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f
 	github.com/cometbft/cometbft/api v1.0.0-rc.1
diff --git a/simapp/v2/go.mod b/simapp/v2/go.mod
index 5059906225c3..b493b093a765 100644
--- a/simapp/v2/go.mod
+++ b/simapp/v2/go.mod
@@ -65,7 +65,7 @@ require (
 	cosmossdk.io/server/v2/appmanager v0.0.0-20240802110823-cffeedff643d // indirect
 	cosmossdk.io/server/v2/stf v0.0.0-20240708142107-25e99c54bac1 // indirect
 	cosmossdk.io/store v1.1.1 // indirect
-	cosmossdk.io/x/tx v0.13.5 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/tests/go.mod b/tests/go.mod
index a01b8a1de45d..a8b828b0512e 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -15,7 +15,7 @@ require (
 	cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f
 	cosmossdk.io/x/nft v0.0.0-20230613133644-0a778132a60f // indirect
 	cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190
-	cosmossdk.io/x/tx v0.13.5
+	cosmossdk.io/x/tx v1.0.0-alpha.1
 	cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
 	github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
diff --git a/x/accounts/defaults/base/go.mod b/x/accounts/defaults/base/go.mod
index 69957b5dd4b2..8019839d405a 100644
--- a/x/accounts/defaults/base/go.mod
+++ b/x/accounts/defaults/base/go.mod
@@ -8,7 +8,7 @@ require (
 	cosmossdk.io/core v1.0.0-alpha.4
 	cosmossdk.io/depinject v1.0.0
 	cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e
-	cosmossdk.io/x/tx v0.13.3
+	cosmossdk.io/x/tx v1.0.0-alpha.1
 	github.com/cosmos/cosmos-sdk v0.53.0
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
diff --git a/x/accounts/defaults/lockup/go.mod b/x/accounts/defaults/lockup/go.mod
index 315965d73c53..c2d044aee831 100644
--- a/x/accounts/defaults/lockup/go.mod
+++ b/x/accounts/defaults/lockup/go.mod
@@ -24,7 +24,7 @@ require (
 	cosmossdk.io/math v1.3.0
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/accounts/defaults/multisig/go.mod b/x/accounts/defaults/multisig/go.mod
index 5601d2011c46..5a3151771995 100644
--- a/x/accounts/defaults/multisig/go.mod
+++ b/x/accounts/defaults/multisig/go.mod
@@ -26,7 +26,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/accounts/go.mod b/x/accounts/go.mod
index 0420c3db5591..4239be9a2ffa 100644
--- a/x/accounts/go.mod
+++ b/x/accounts/go.mod
@@ -9,7 +9,7 @@ require (
 	cosmossdk.io/core/testing v0.0.0-20240923163230-04da382a9f29
 	cosmossdk.io/depinject v1.0.0
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
-	cosmossdk.io/x/tx v0.13.3
+	cosmossdk.io/x/tx v1.0.0-alpha.1
 	github.com/cosmos/cosmos-sdk v0.53.0
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/spf13/cobra v1.8.1
diff --git a/x/authz/go.mod b/x/authz/go.mod
index b75000dc56ee..8f2324c6f906 100644
--- a/x/authz/go.mod
+++ b/x/authz/go.mod
@@ -12,7 +12,7 @@ require (
 	cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
-	cosmossdk.io/x/tx v0.13.3
+	cosmossdk.io/x/tx v1.0.0-alpha.1
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	github.com/cosmos/cosmos-sdk v0.53.0
 	github.com/cosmos/gogoproto v1.7.0
diff --git a/x/bank/go.mod b/x/bank/go.mod
index 57885f75d54b..b273bff86cd5 100644
--- a/x/bank/go.mod
+++ b/x/bank/go.mod
@@ -32,7 +32,7 @@ require (
 	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.1-20240130113600-88ef6483f90f.1 // indirect
 	cosmossdk.io/core/testing v0.0.0-20240923163230-04da382a9f29
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/circuit/go.mod b/x/circuit/go.mod
index 8b62a92892a3..cc7bbefe172e 100644
--- a/x/circuit/go.mod
+++ b/x/circuit/go.mod
@@ -27,7 +27,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/consensus/go.mod b/x/consensus/go.mod
index d7d18f611e58..d8dd49174c58 100644
--- a/x/consensus/go.mod
+++ b/x/consensus/go.mod
@@ -30,7 +30,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/distribution/go.mod b/x/distribution/go.mod
index ed454d5c31b3..fb69978f928f 100644
--- a/x/distribution/go.mod
+++ b/x/distribution/go.mod
@@ -31,7 +31,7 @@ require (
 	cosmossdk.io/log v1.4.1 // indirect
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/epochs/go.mod b/x/epochs/go.mod
index 7fc714002adb..5fbb1647d68d 100644
--- a/x/epochs/go.mod
+++ b/x/epochs/go.mod
@@ -29,7 +29,7 @@ require (
 	cosmossdk.io/math v1.3.0 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/evidence/go.mod b/x/evidence/go.mod
index 25e2d8221dea..2db9245de044 100644
--- a/x/evidence/go.mod
+++ b/x/evidence/go.mod
@@ -31,7 +31,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod
index 3871cf57139b..4f1975c00166 100644
--- a/x/feegrant/go.mod
+++ b/x/feegrant/go.mod
@@ -40,7 +40,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/gov/go.mod b/x/gov/go.mod
index 05115ce30964..9d37de53be7a 100644
--- a/x/gov/go.mod
+++ b/x/gov/go.mod
@@ -36,7 +36,7 @@ require (
 	buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.35.1-20240701160653-fedbb9acfd2f.1 // indirect
 	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.1-20240130113600-88ef6483f90f.1 // indirect
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/group/go.mod b/x/group/go.mod
index 8883eefcc238..8e48243d5ec9 100644
--- a/x/group/go.mod
+++ b/x/group/go.mod
@@ -40,7 +40,7 @@ require (
 	cosmossdk.io/collections v0.4.0 // indirect
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/mint/go.mod b/x/mint/go.mod
index 72eb389ca4b0..1cad7f554413 100644
--- a/x/mint/go.mod
+++ b/x/mint/go.mod
@@ -32,7 +32,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/nft/go.mod b/x/nft/go.mod
index a7850b4196a1..77536d1b8a3d 100644
--- a/x/nft/go.mod
+++ b/x/nft/go.mod
@@ -29,7 +29,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/params/go.mod b/x/params/go.mod
index f80ffacf7580..8357b46db57b 100644
--- a/x/params/go.mod
+++ b/x/params/go.mod
@@ -30,7 +30,7 @@ require (
 	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.1-20240130113600-88ef6483f90f.1 // indirect
 	cosmossdk.io/collections v0.4.0 // indirect
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/protocolpool/go.mod b/x/protocolpool/go.mod
index 386dc1672dbc..e3ef7efb1957 100644
--- a/x/protocolpool/go.mod
+++ b/x/protocolpool/go.mod
@@ -30,7 +30,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/slashing/go.mod b/x/slashing/go.mod
index aa7ff1650254..ff10738fdf0f 100644
--- a/x/slashing/go.mod
+++ b/x/slashing/go.mod
@@ -32,7 +32,7 @@ require (
 	cosmossdk.io/log v1.4.1 // indirect
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/staking/go.mod b/x/staking/go.mod
index 902634281cd4..f93e1618ee9c 100644
--- a/x/staking/go.mod
+++ b/x/staking/go.mod
@@ -31,7 +31,7 @@ require (
 require (
 	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.1-20240130113600-88ef6483f90f.1 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod
index e775340906f8..21bde3f38dec 100644
--- a/x/upgrade/go.mod
+++ b/x/upgrade/go.mod
@@ -45,7 +45,7 @@ require (
 	cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 // indirect
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 // indirect
-	cosmossdk.io/x/tx v0.13.3 // indirect
+	cosmossdk.io/x/tx v1.0.0-alpha.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect