Merge branch 'master' of github.com:desmos-labs/desmos into riccardo/…

…app-chain-links-fixes � Conflicts: � x/profiles/legacy/v4/store_test.go
desmos-labs · Mar 22, 2022 · a10355b · a10355b
2 parents 6ae1292 + 8905ecb
commit a10355b
Show file tree

Hide file tree

Showing 63 changed files with 921 additions and 918 deletions.
diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -45,7 +45,7 @@ jobs:
  run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/runsim@v1.0.0
 
  - name: Cache 💾
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3
  with:
  path: ~/go/bin
  key: ${{ runner.os }}-go-runsim-binary
@@ -71,7 +71,7 @@ jobs:
  go.sum
 
  - name: Cache 💾
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3
  with:
  path: ~/go/bin
  key: ${{ runner.os }}-go-runsim-binary
@@ -102,7 +102,7 @@ jobs:
  go.sum
 
  - name: Cache 💾
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3
  with:
  path: ~/go/bin
  key: ${{ runner.os }}-go-runsim-binary
@@ -133,7 +133,7 @@ jobs:
  go.sum
 
  - name: Cache 💾
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3
  with:
  path: ~/go/bin
  key: ${{ runner.os }}-go-runsim-binary

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,7 +32,7 @@ jobs:
  export GO111MODULE="on" && go get github.com/mfridman/tparse@v0.8.3
 
  - name: Cache 💾
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3
  with:
  path: ~/go/bin
  key: ${{ runner.os }}-go-tparse-binary
@@ -288,7 +288,7 @@ jobs:
  if: env.GIT_DIFF
 
  - name: Save cache 💾
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3
  with:
  path: ~/go/bin
  key: ${{ runner.os }}-go-tparse-binary

diff --git a/proto/desmos/profiles/v1beta1/models_chain_links.proto b/proto/desmos/profiles/v1beta1/models_chain_links.proto
@@ -6,7 +6,7 @@ import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/legacy/v1beta1";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/legacy/v4";
 
 // ChainLink contains the data representing either an inter- or cross- chain
 // link

diff --git a/proto/desmos/profiles/v1beta1/models_profile.proto b/proto/desmos/profiles/v1beta1/models_profile.proto
@@ -6,7 +6,7 @@ import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/legacy/v1beta1";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/legacy/v4";
 
 // --------------------------------------------------------------------------------------------------------------------
 

diff --git a/proto/desmos/profiles/v1beta1/models_relationships.proto b/proto/desmos/profiles/v1beta1/models_relationships.proto
@@ -6,7 +6,7 @@ import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/legacy/v1beta1";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/legacy/v4";
 
 // Relationship is the struct of a relationship.
 // It represent the concept of "follow" of traditional social networks.

diff --git a/proto/desmos/profiles/v2/client/cli.proto b/proto/desmos/profiles/v2/client/cli.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos_proto/cosmos.proto";
 import "desmos/profiles/v2/models_chain_links.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/client/utils";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/client/utils";
 
 // ChainLinkJSON contains the data required to create a ChainLink using the CLI
 // command

diff --git a/proto/desmos/profiles/v2/genesis.proto b/proto/desmos/profiles/v2/genesis.proto
@@ -8,7 +8,7 @@ import "desmos/profiles/v2/models_dtag_requests.proto";
 import "desmos/profiles/v2/models_chain_links.proto";
 import "desmos/profiles/v2/models_app_links.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // GenesisState defines the profiles module's genesis state.
 message GenesisState {

diff --git a/proto/desmos/profiles/v2/models_app_links.proto b/proto/desmos/profiles/v2/models_app_links.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package desmos.profiles.v2;
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";

diff --git a/proto/desmos/profiles/v2/models_chain_links.proto b/proto/desmos/profiles/v2/models_chain_links.proto
@@ -8,7 +8,7 @@ import "cosmos_proto/cosmos.proto";
 import "cosmos/tx/signing/v1beta1/signing.proto";
 import "cosmos/crypto/multisig/v1beta1/multisig.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // ChainLink contains the data representing either an inter- or cross- chain
 // link

diff --git a/proto/desmos/profiles/v2/models_dtag_requests.proto b/proto/desmos/profiles/v2/models_dtag_requests.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos_proto/cosmos.proto";
 import "desmos/profiles/v2/models_chain_links.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // DTagTransferRequest represent a DTag transfer request between two users
 message DTagTransferRequest {

diff --git a/proto/desmos/profiles/v2/models_packets.proto b/proto/desmos/profiles/v2/models_packets.proto
@@ -6,7 +6,7 @@ import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 import "desmos/profiles/v2/models_chain_links.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // LinkChainAccountPacketData defines the object that should be sent inside a
 // MsgSendPacket when wanting to link an external chain to a Desmos profile

diff --git a/proto/desmos/profiles/v2/models_params.proto b/proto/desmos/profiles/v2/models_params.proto
@@ -4,7 +4,7 @@ package desmos.profiles.v2;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // Params contains the parameters for the profiles module
 message Params {

diff --git a/proto/desmos/profiles/v2/models_profile.proto b/proto/desmos/profiles/v2/models_profile.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos_proto/cosmos.proto";
 import "desmos/profiles/v2/models_chain_links.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // --------------------------------------------------------------------------------------------------------------------
 

diff --git a/proto/desmos/profiles/v2/msg_server.proto b/proto/desmos/profiles/v2/msg_server.proto
@@ -11,7 +11,7 @@ import "desmos/profiles/v2/msgs_dtag_requests.proto";
 import "desmos/profiles/v2/msgs_chain_links.proto";
 import "desmos/profiles/v2/msgs_app_links.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // Msg defines the relationships Msg service.
 service Msg {

diff --git a/proto/desmos/profiles/v2/msgs_app_links.proto b/proto/desmos/profiles/v2/msgs_app_links.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package desmos.profiles.v2;
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 import "desmos/profiles/v2/models_app_links.proto";
 

diff --git a/proto/desmos/profiles/v2/msgs_chain_links.proto b/proto/desmos/profiles/v2/msgs_chain_links.proto
@@ -6,7 +6,7 @@ import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 import "desmos/profiles/v2/models_chain_links.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // MsgLinkChainAccount represents a message to link an account to a profile.
 message MsgLinkChainAccount {

diff --git a/proto/desmos/profiles/v2/msgs_dtag_requests.proto b/proto/desmos/profiles/v2/msgs_dtag_requests.proto
@@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto";
 import "desmos/profiles/v2/models_profile.proto";
 import "desmos/profiles/v2/models_dtag_requests.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // MsgRequestDTagTransfer represents the message used to request the DTag
 // transfer to another user.

diff --git a/proto/desmos/profiles/v2/msgs_profile.proto b/proto/desmos/profiles/v2/msgs_profile.proto
@@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto";
 import "desmos/profiles/v2/models_profile.proto";
 import "desmos/profiles/v2/models_dtag_requests.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // MsgSaveProfile represents a message to save a profile.
 message MsgSaveProfile {

diff --git a/proto/desmos/profiles/v2/query.proto b/proto/desmos/profiles/v2/query.proto
@@ -12,7 +12,7 @@ import "desmos/profiles/v2/query_app_links.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // Query defines the gRPC querier service.
 service Query {

diff --git a/proto/desmos/profiles/v2/query_app_links.proto b/proto/desmos/profiles/v2/query_app_links.proto
@@ -8,7 +8,7 @@ import "desmos/profiles/v2/models_app_links.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // QueryUserApplicationLinkRequest represents the request used when querying an
 // application link using an application name and username for a given user

diff --git a/proto/desmos/profiles/v2/query_chain_links.proto b/proto/desmos/profiles/v2/query_chain_links.proto
@@ -8,7 +8,7 @@ import "desmos/profiles/v2/models_chain_links.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // QueryChainLinksRequest represents the request that should be used in order
 // to retrieve the link associated with the provided user, for the given chain

diff --git a/proto/desmos/profiles/v2/query_dtag_requests.proto b/proto/desmos/profiles/v2/query_dtag_requests.proto
@@ -8,7 +8,7 @@ import "desmos/profiles/v2/models_dtag_requests.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // QueryIncomingDTagTransferRequestsRequest is the request type for the
 // Query/IncomingDTagTransferRequests RPC endpoint

diff --git a/proto/desmos/profiles/v2/query_params.proto b/proto/desmos/profiles/v2/query_params.proto
@@ -8,7 +8,7 @@ import "desmos/profiles/v2/models_params.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // QueryParamsRequest is the request type for the Query/Params RPC endpoint
 message QueryParamsRequest {}

diff --git a/proto/desmos/profiles/v2/query_profile.proto b/proto/desmos/profiles/v2/query_profile.proto
@@ -7,7 +7,7 @@ import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/profiles/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/profiles/types";
 
 // QueryProfileRequest is the request type for the Query/Profile RPC method.
 message QueryProfileRequest {

diff --git a/proto/desmos/relationships/v1/genesis.proto b/proto/desmos/relationships/v1/genesis.proto
@@ -4,7 +4,7 @@ package desmos.relationships.v1;
 import "gogoproto/gogo.proto";
 import "desmos/relationships/v1/models.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/relationships/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/relationships/types";
 
 // GenesisState defines the profiles module's genesis state.
 message GenesisState {

diff --git a/proto/desmos/relationships/v1/models.proto b/proto/desmos/relationships/v1/models.proto
@@ -6,7 +6,7 @@ import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/relationships/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/relationships/types";
 
 // Relationship is the struct of a relationship.
 // It represent the concept of "follow" of traditional social networks.

diff --git a/proto/desmos/relationships/v1/msg_server.proto b/proto/desmos/relationships/v1/msg_server.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/relationships/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/relationships/types";
 
 // Msg defines the relationships Msg service.
 service Msg {

diff --git a/proto/desmos/relationships/v1/query.proto b/proto/desmos/relationships/v1/query.proto
@@ -9,7 +9,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 
 import "desmos/relationships/v1/models.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/relationships/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/relationships/types";
 
 // Query defines the gRPC querier service.
 service Query {

diff --git a/proto/desmos/subspaces/v1/genesis.proto b/proto/desmos/subspaces/v1/genesis.proto
@@ -4,7 +4,7 @@ package desmos.subspaces.v1;
 import "gogoproto/gogo.proto";
 import "desmos/subspaces/v1/models.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/subspaces/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/subspaces/types";
 
 // GenesisState contains the data of the genesis state for the subspaces module
 message GenesisState {

diff --git a/proto/desmos/subspaces/v1/models.proto b/proto/desmos/subspaces/v1/models.proto
@@ -4,7 +4,7 @@ package desmos.subspaces.v1;
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/subspaces/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/subspaces/types";
 
 // Subspace contains all the data of a Desmos subspace
 message Subspace {

diff --git a/proto/desmos/subspaces/v1/msgs.proto b/proto/desmos/subspaces/v1/msgs.proto
@@ -4,7 +4,7 @@ package desmos.subspaces.v1;
 import "gogoproto/gogo.proto";
 import "desmos/subspaces/v1/models.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/subspaces/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/subspaces/types";
 
 // Msg defines subspaces Msg service.
 service Msg {

diff --git a/proto/desmos/subspaces/v1/query.proto b/proto/desmos/subspaces/v1/query.proto
@@ -6,7 +6,7 @@ import "google/api/annotations.proto";
 import "desmos/subspaces/v1/models.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
-option go_package = "github.com/desmos-labs/desmos/v2/x/subspaces/types";
+option go_package = "github.com/desmos-labs/desmos/v3/x/subspaces/types";
 
 // Query defines the gRPC querier service
 service Query {

diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
@@ -26,5 +26,5 @@ Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
 done
 
 # move proto files to the right places
-cp -r github.com/desmos-labs/desmos/v2/* ./
+cp -r github.com/desmos-labs/desmos/v3/* ./
 rm -rf github.com
diff --git a/x/profiles/client/utils/cli.pb.go b/x/profiles/client/utils/cli.pb.go