fix(x/accounts/lockup): fix proto path (#22319)

(cherry picked from commit 2711ece) # Conflicts: # api/cosmos/accounts/defaults/lockup/v1/lockup.pulsar.go # api/cosmos/accounts/defaults/lockup/v1/query.pulsar.go # api/cosmos/accounts/defaults/lockup/v1/tx.pulsar.go
cosmos · Oct 21, 2024 · c9d6c16 · c9d6c16
1 parent e87562a
commit c9d6c16
Show file tree

Hide file tree

Showing 26 changed files with 10,592 additions and 194 deletions.
diff --git a/api/cosmos/accounts/defaults/lockup/v1/lockup.pulsar.go b/api/cosmos/accounts/defaults/lockup/v1/lockup.pulsar.go
diff --git a/api/cosmos/accounts/defaults/lockup/v1/query.pulsar.go b/api/cosmos/accounts/defaults/lockup/v1/query.pulsar.go
diff --git a/api/cosmos/accounts/defaults/lockup/v1/tx.pulsar.go b/api/cosmos/accounts/defaults/lockup/v1/tx.pulsar.go
diff --git 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
@@ -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
@@ -11,7 +11,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → x/accounts/defaults/lockup/v1/encoding.go b/x/accounts/defaults/lockup/types/encoding.go → x/accounts/defaults/lockup/v1/encoding.go
@@ -1,4 +1,4 @@
-package types
+package v1
 
 import (
 	"fmt"

diff --git a/...counts/defaults/lockup/types/lockup.pb.go → x/accounts/defaults/lockup/v1/lockup.pb.go b/...counts/defaults/lockup/types/lockup.pb.go → x/accounts/defaults/lockup/v1/lockup.pb.go