Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add dependencies for protobuf and remove third_party forlder #1030

Merged
merged 3 commits into from
Oct 10, 2022
Merged

Add dependencies for protobuf and remove third_party forlder #1030

merged 3 commits into from
Oct 10, 2022

Conversation

pinosu
Copy link
Contributor

@pinosu pinosu commented Oct 3, 2022

Resolves #1023

@pinosu pinosu requested a review from alpe as a code owner October 3, 2022 11:45
@pinosu pinosu mentioned this pull request Oct 3, 2022
Closed
julienrbrt
julienrbrt reviewed Oct 3, 2022
View reviewed changes
proto/buf.yaml Outdated
@@ -5,6 +5,10 @@
# the previous configuration.
version: v1
name: buf.build/cosmwasm/wasmd
deps:
- buf.build/cosmos/cosmos-proto
- buf.build/cosmos/cosmos-sdk
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which version of the Cosmos SDK are you willing to use? I think you should pin a commit here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to use v0.45.8 but it is hard to find a commit that matches a specific tag. Do you have any idea how to do it? I locally run buf build and I didn't get any error.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will maintain a table of buf commits per sdk versions: https://github.com/cosmos/cosmos-sdk/blob/main/third_party/proto/README.md. However, due to #1415 we only have for v0.46+

alpe
alpe approved these changes Oct 6, 2022
View reviewed changes
Copy link
Contributor

@alpe alpe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice to see so many files being removed! 👏

Before squash+merge, would you run make proto-all to regenerate the type files, please?

proto/buf.yaml
@@ -7,7 +7,7 @@ version: v1
name: buf.build/cosmwasm/wasmd
deps:
- buf.build/cosmos/cosmos-proto
- buf.build/cosmos/cosmos-sdk
- buf.build/cosmos/cosmos-sdk:8cb30a2c4de74dc9bd8d260b1e75e176 #v0.46.x
Copy link
Contributor

@alpe alpe Oct 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌 to use this as a temporary version

@pinosu pinosu force-pushed the 1023-add-protobuf-deps branch from 66531f4 to 88927c5 Compare October 6, 2022 14:43
@pinosu pinosu force-pushed the 1023-add-protobuf-deps branch from 88927c5 to 5aaca52 Compare October 10, 2022 10:43
@alpe alpe merged commit 5193120 into main Oct 10, 2022
@alpe alpe deleted the 1023-add-protobuf-deps branch October 10, 2022 11:07
zemyblue added a commit to zemyblue/wasmd that referenced this pull request Jan 13, 2023
@zemyblue
Merge branch 'wasmd_v0.29.1' into apply_wasmd_v0.29.1
8a8fe0d 
* wasmd_v0.29.1: (94 commits)
  fix test.
  fix test.
  update cosmos-sdk to v45.9, add dragonberry.
  Changelog updates (CosmWasm#1024)
  Validate incoming messages
  Add dependencies for protobuf and remove third_party forlder (CosmWasm#1030)
  Bump bufbuild/buf-setup-action from 1.7.0 to 1.8.0 (CosmWasm#1006)
  Add check version wasm (CosmWasm#1029)
  Make SenderPrivKey field public
  Bump actions/checkout from 3.0.2 to 3.1.0
  Revert module version to 1 as there is no migration
  Doc ante handler
  Fix: typos
  Changelog for v0.29.0-rc1 (CosmWasm#1018)
  Implement improvements to new address generation (CosmWasm#1014)
  Prune vesting accounts balances (CosmWasm#1003)
  Bump github.com/cosmos/ibc-go/v3 from 3.2.0 to 3.3.0
  Fix path to proofs in protos
  Upgrade .a files to 1.1.1
  Bump wasmvm to 1.1.1
  ...

# Conflicts:
#	.circleci/config.yml
#	.github/workflows/proto-buf-publisher.yml
#	CHANGELOG.md
#	Dockerfile
#	Makefile
#	README.md
#	app/app.go
#	app/app_test.go
#	app/export.go
#	app/sim_test.go
#	app/test_helpers.go
#	go.mod
#	go.sum
#	scripts/protocgen.sh
#	third_party/proto/cosmos/base/query/v1beta1/pagination.proto
#	third_party/proto/cosmos/base/v1beta1/coin.proto
#	third_party/proto/tendermint/blockchain/types.pb.go
#	third_party/proto/tendermint/consensus/types.pb.go
#	third_party/proto/tendermint/consensus/wal.pb.go
#	third_party/proto/tendermint/p2p/conn.pb.go
#	third_party/proto/tendermint/privval/types.pb.go
#	third_party/proto/tendermint/state/types.pb.go
#	third_party/proto/tendermint/types/types.pb.go
#	third_party/proto/tendermint/types/validator.pb.go
#	x/wasm/alias.go
#	x/wasm/client/cli/genesis_msg.go
#	x/wasm/client/cli/genesis_msg_test.go
#	x/wasm/client/cli/query.go
#	x/wasm/client/cli/tx.go
#	x/wasm/client/rest/gov.go
#	x/wasm/handler.go
#	x/wasm/ibctesting/chain.go
#	x/wasm/ibctesting/wasm.go
#	x/wasm/ioutils/ioutil_test.go
#	x/wasm/ioutils/utils_test.go
#	x/wasm/keeper/authz_policy.go
#	x/wasm/keeper/bench_test.go
#	x/wasm/keeper/contract_keeper.go
#	x/wasm/keeper/gas_register.go
#	x/wasm/keeper/gas_register_test.go
#	x/wasm/keeper/genesis_test.go
#	x/wasm/keeper/ibc_test.go
#	x/wasm/keeper/keeper.go
#	x/wasm/keeper/keeper_test.go
#	x/wasm/keeper/legacy_querier_test.go
#	x/wasm/keeper/msg_server.go
#	x/wasm/keeper/options.go
#	x/wasm/keeper/options_test.go
#	x/wasm/keeper/proposal_handler.go
#	x/wasm/keeper/proposal_integration_test.go
#	x/wasm/keeper/querier.go
#	x/wasm/keeper/querier_test.go
#	x/wasm/keeper/recurse_test.go
#	x/wasm/keeper/reflect_test.go
#	x/wasm/keeper/relay_test.go
#	x/wasm/keeper/staking_test.go
#	x/wasm/keeper/submsg_test.go
#	x/wasm/keeper/test_common.go
#	x/wasm/keeper/testdata/reflect.go
#	x/wasm/keeper/testdata/reflect.wasm
#	x/wasm/keeper/wasmtesting/coin_transferrer.go
#	x/wasm/keeper/wasmtesting/gas_register.go
#	x/wasm/module.go
#	x/wasm/module_test.go
#	x/wasm/simulation/genesis.go
#	x/wasm/simulation/operations.go
#	x/wasm/simulation/params.go
#	x/wasm/types/codec.go
#	x/wasm/types/events.go
#	x/wasm/types/exported_keepers.go
#	x/wasm/types/genesis.pb.go
#	x/wasm/types/iavl_range_test.go
#	x/wasm/types/ibc.pb.go
#	x/wasm/types/params.go
#	x/wasm/types/proposal.pb.go
#	x/wasm/types/query.pb.go
#	x/wasm/types/query.pb.gw.go
#	x/wasm/types/tx.pb.go
#	x/wasm/types/types.pb.go
Magicloud pushed a commit to fpco/wasmd that referenced this pull request Jan 13, 2023
@pinosu @Magicloud
Add dependencies for protobuf and remove third_party forlder (CosmWas…
8118708 
…m#1030)

* Add dependencies for proto files and remove third_party forlder

* Pin cosmos-sdk dependency to v0.46.x

* Run "make proto-all" and generate new types files.
conorpp pushed a commit to wormhole-foundation/wasmd that referenced this pull request Feb 1, 2023
@pinosu @conorpp
Add dependencies for protobuf and remove third_party forlder (CosmWas…
9f58e99 
…m#1030)

* Add dependencies for proto files and remove third_party forlder

* Pin cosmos-sdk dependency to v0.46.x

* Run "make proto-all" and generate new types files.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt left review comments

@alpe alpe alpe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

BSR - Failure: repository has no commits
3 participants
@pinosu @alpe @julienrbrt