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

Generate ibc proto with buf #2199

Closed
wants to merge 16 commits into from
Closed

Generate ibc proto with buf #2199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2fae5e4
Bump prost from 0.9.0 to 0.10.1
dependabot[bot] Apr 19, 2022
8db1e81
Harmonize & cleanup tonic + prost deps.
adizere Apr 21, 2022
c2ebf0c
Update tendermint to 0.23.7
mzabaluev Apr 27, 2022
02b9fa1
Regenerate proto sources
mzabaluev Apr 28, 2022
f356950
Re-hack a generated struct name
mzabaluev May 2, 2022
997c427
Patch ics23 to update to prost 0.10
mzabaluev May 2, 2022
ee67231
Fix relayer dependencies
mzabaluev May 2, 2022
ca0b583
Patch ics23 for no-std-check
mzabaluev May 2, 2022
6b8beb1
Merge branch 'master' into mikhail/prost-0.10
mzabaluev May 2, 2022
f7c2200
Update Cargo.lock after merge
mzabaluev May 2, 2022
0f4434f
Update Cargo.lock in no-std-check
mzabaluev May 2, 2022
589a037
Fix broken link-like markdown in generated code
mzabaluev May 3, 2022
8f36b6f
Remove the ics23 patch
mzabaluev May 6, 2022
0cccff4
Pin ics23 to 0.8.0-alpha
mzabaluev May 9, 2022
b7b83be
Merge branch 'master' into mikhail/generate-ibc-proto-with-buf
mzabaluev May 9, 2022
b6db04a
First attempt to change prost generation to buf
mzabaluev May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 154 additions & 49 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ exclude = [
"proto-compiler"
]

# [patch.crates-io]
[patch.crates-io]
# tendermint = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
# tendermint-rpc = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
# tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
Expand Down
29 changes: 14 additions & 15 deletions ci/no-std-check/Cargo.lock
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ci/no-std-check/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ resolver = "2"
[dependencies]
ibc = { path = "../../modules", default-features = false }
ibc-proto = { path = "../../proto", default-features = false }
tendermint = { version = "0.23.6", default-features = false }
tendermint-proto = { version = "0.23.6", default-features = false }
tendermint-light-client-verifier = { version = "0.23.6", default-features = false }
tendermint = { version = "0.23.7", default-features = false }
tendermint-proto = { version = "0.23.7", default-features = false }
tendermint-light-client-verifier = { version = "0.23.7", default-features = false }

sp-core = { version = "5.0.0", default-features = false, optional = true }
sp-io = { version = "5.0.0", default-features = false, optional = true }
Expand All @@ -31,7 +31,7 @@ substrate-std = [
"sp-std/std",
]

# [patch.crates-io]
[patch.crates-io]
# tendermint = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
# tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
# tendermint-light-client-verifier = { git = "https://github.com/informalsystems/tendermint-rs", branch = "v0.23.x" }
18 changes: 9 additions & 9 deletions modules/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ mocks = ["tendermint-testgen", "clock", "std"]
[dependencies]
# Proto definitions for all IBC-related interfaces, e.g., connections or channels.
ibc-proto = { version = "0.17.1", path = "../proto", default-features = false }
ics23 = { version = "0.7.0", default-features = false }
ics23 = { version = "=0.8.0-alpha", default-features = false }
time = { version = "0.3", default-features = false }
serde_derive = { version = "1.0.104", default-features = false }
serde = { version = "1.0", default-features = false }
serde_json = { version = "1", default-features = false }
tracing = { version = "0.1.34", default-features = false }
prost = { version = "0.9", default-features = false }
prost-types = { version = "0.9", default-features = false }
prost = { version = "0.10", default-features = false }
prost-types = { version = "0.10", default-features = false }
bytes = { version = "1.1.0", default-features = false }
safe-regex = { version = "0.2.5", default-features = false }
subtle-encoding = { version = "0.5", default-features = false }
Expand All @@ -45,19 +45,19 @@ num-traits = { version = "0.2.14", default-features = false }
derive_more = { version = "0.99.17", default-features = false, features = ["from", "display"] }

[dependencies.tendermint]
version = "=0.23.6"
version = "=0.23.7"
default-features = false

[dependencies.tendermint-proto]
version = "=0.23.6"
version = "=0.23.7"
default-features = false

[dependencies.tendermint-light-client-verifier]
version = "=0.23.6"
version = "=0.23.7"
default-features = false

[dependencies.tendermint-testgen]
version = "=0.23.6"
version = "=0.23.7"
optional = true
default-features = false

Expand All @@ -67,8 +67,8 @@ tracing-subscriber = { version = "0.3.11", features = ["fmt", "env-filter", "jso
test-log = { version = "0.2.10", features = ["trace"] }
modelator = "0.4.2"
sha2 = { version = "0.10.2" }
tendermint-rpc = { version = "=0.23.6", features = ["http-client", "websocket-client"] }
tendermint-testgen = { version = "=0.23.6" } # Needed for generating (synthetic) light blocks.
tendermint-rpc = { version = "=0.23.7", features = ["http-client", "websocket-client"] }
tendermint-testgen = { version = "=0.23.7" } # Needed for generating (synthetic) light blocks.

[[test]]
name = "mbt"
Expand Down
Loading