Skip to content

Commit

Permalink
Problem: protobuf message urls should not change
Browse files Browse the repository at this point in the history
Solution:
- revert the package name change introduced in crypto-org-chain#1023.
- don't remember why we have to change it there, but it seems not
  nesserary, revert it to keep it backward compatible.
  • Loading branch information
yihuang committed Apr 18, 2024
1 parent e77e5ce commit 678ed15
Show file tree
Hide file tree
Showing 35 changed files with 532 additions and 521 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## UNRELEASED

- [#1023](https://github.com/crypto-org-chain/chain-main/pull/1023) Integrate sdk 0.47
- [#]() Revert the protobuf package name changes introduced in #1023.

*Dec 6, 2023*

Expand Down
2 changes: 1 addition & 1 deletion proto/chainmain/v1/genesis.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package chainmain.v1;
package chainmain.chainmain.v1;

option go_package = "github.com/crypto-org-chain/chain-main/x/chainmain/types";

Expand Down
2 changes: 1 addition & 1 deletion proto/icaauth/v1/genesis.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package icaauth.v1;
package chainmain.icaauth.v1;

import "gogoproto/gogo.proto";
import "icaauth/v1/params.proto";
Expand Down
4 changes: 2 additions & 2 deletions proto/icaauth/v1/params.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package icaauth.v1;
package chainmain.icaauth.v1;

import "google/protobuf/duration.proto";
import "gogoproto/gogo.proto";
Expand All @@ -17,4 +17,4 @@ message Params {
(gogoproto.stdduration) = true,
(gogoproto.nullable) = false
];
}
}
2 changes: 1 addition & 1 deletion proto/icaauth/v1/query.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package icaauth.v1;
package chainmain.icaauth.v1;

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
Expand Down
4 changes: 2 additions & 2 deletions proto/icaauth/v1/tx.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package icaauth.v1;
package chainmain.icaauth.v1;

import "cosmos_proto/cosmos.proto";
import "google/protobuf/any.proto";
Expand Down Expand Up @@ -48,4 +48,4 @@ message MsgSubmitTx {
}

// MsgSubmitTxResponse defines the response message for MsgSubmitTx
message MsgSubmitTxResponse {}
message MsgSubmitTxResponse {}
2 changes: 1 addition & 1 deletion proto/nft/v1/genesis.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
syntax = "proto3";
package nft.v1;
package chainmain.nft.v1;

import "gogoproto/gogo.proto";
import "nft/v1/nft.proto";
Expand Down
4 changes: 2 additions & 2 deletions proto/nft/v1/nft.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
syntax = "proto3";
package nft.v1;
package chainmain.nft.v1;

import "gogoproto/gogo.proto";

Expand Down Expand Up @@ -54,4 +54,4 @@ message Collection {

Denom denom = 1 [(gogoproto.nullable) = false];
repeated BaseNFT nfts = 2 [(gogoproto.customname) = "NFTs", (gogoproto.nullable) = false];
}
}
4 changes: 2 additions & 2 deletions proto/nft/v1/query.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
syntax = "proto3";
package nft.v1;
package chainmain.nft.v1;

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
Expand Down Expand Up @@ -128,4 +128,4 @@ message QueryNFTRequest {
// QueryNFTResponse is the response type for the Query/NFT RPC method
message QueryNFTResponse {
BaseNFT nft = 1 [(gogoproto.customname) = "NFT"];
}
}
4 changes: 2 additions & 2 deletions proto/nft/v1/tx.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
syntax = "proto3";
package nft.v1;
package chainmain.nft.v1;

import "gogoproto/gogo.proto";

Expand Down Expand Up @@ -94,4 +94,4 @@ message MsgBurnNFT {
}

// MsgBurnNFTResponse defines the Msg/BurnNFT response type.
message MsgBurnNFTResponse {}
message MsgBurnNFTResponse {}
2 changes: 1 addition & 1 deletion proto/nft_transfer/v1/genesis.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package nft_transfer.v1;
package chainmain.nft_transfer.v1;

option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";

Expand Down
2 changes: 1 addition & 1 deletion proto/nft_transfer/v1/packet.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package nft_transfer.v1;
package chainmain.nft_transfer.v1;

option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";

Expand Down
2 changes: 1 addition & 1 deletion proto/nft_transfer/v1/query.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package nft_transfer.v1;
package chainmain.nft_transfer.v1;

option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";

Expand Down
2 changes: 1 addition & 1 deletion proto/nft_transfer/v1/trace.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package nft_transfer.v1;
package chainmain.nft_transfer.v1;

option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";

Expand Down
2 changes: 1 addition & 1 deletion proto/nft_transfer/v1/tx.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package nft_transfer.v1;
package chainmain.nft_transfer.v1;

option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";

Expand Down
4 changes: 2 additions & 2 deletions proto/supply/v1/accounts.proto
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
syntax = "proto3";
package supply.v1;
package chainmain.supply.v1;

option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types";

// VestingAccounts stored in keeper
message VestingAccounts {
// addresses defines addresses of all the vesting accounts at genesis
repeated string addresses = 1;
}
}
2 changes: 1 addition & 1 deletion proto/supply/v1/genesis.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package supply.v1;
package chainmain.supply.v1;

option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types";

Expand Down
4 changes: 2 additions & 2 deletions proto/supply/v1/query.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax = "proto3";
package supply.v1;
package chainmain.supply.v1;

import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";
Expand Down Expand Up @@ -32,4 +32,4 @@ message SupplyResponse {
// supply is the supply of the coins
repeated cosmos.base.v1beta1.Coin supply = 1
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
}
}
19 changes: 10 additions & 9 deletions x/chainmain/types/genesis.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 14 additions & 13 deletions x/icaauth/types/genesis.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 17 additions & 16 deletions x/icaauth/types/params.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 678ed15

Please sign in to comment.