Skip to content

Commit

Permalink
Bump ibc deps (#3550)
Browse files Browse the repository at this point in the history
  • Loading branch information
grod220 authored Jan 2, 2024
1 parent e10e07d commit e15e021
Show file tree
Hide file tree
Showing 14 changed files with 91 additions and 45 deletions.
61 changes: 36 additions & 25 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions crates/bin/pcli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ tendermint = { version = "0.34.0", features = ["rust-crypto"] }
jmt = "0.9"

# External dependencies
ibc-types = { version = "0.10.0", features = ["std", "with_serde"] }
ibc-types = { version = "0.11.0", features = ["std", "with_serde"] }

ibc-proto = { version = "0.39.0" }
ibc-proto = { version = "0.40.0" }
ark-ff = { version = "0.4", default-features = false }
atty = "0.2"
ed25519-consensus = "2"
Expand Down
4 changes: 2 additions & 2 deletions crates/bin/pclientd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ directories = "4.0.1"
tempfile = "3.3.0"
assert_cmd = "2.0"
base64 = "0.20"
ibc-types = { version = "0.10.0" }
ibc-proto = { version = "0.39.0", default-features = false, features = ["server"] }
ibc-types = { version = "0.11.0" }
ibc-proto = { version = "0.40.0", default-features = false, features = ["server"] }
penumbra-proof-params = { path = "../../crypto/proof-params", features = [
"bundled-proving-keys",
"download-proving-keys",
Expand Down
4 changes: 2 additions & 2 deletions crates/bin/pd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ tendermint-config = "0.34.0"
tendermint-proto = "0.34.0"
tendermint = "0.34.0"
tendermint-light-client-verifier = "0.34.0"
ibc-types = { version = "0.10.0" }
ibc-types = { version = "0.11.0" }

ibc-proto = { version = "0.39.0", default-features = false, features = [
ibc-proto = { version = "0.40.0", default-features = false, features = [
"server",
] }
prost = "0.12.3"
Expand Down
4 changes: 2 additions & 2 deletions crates/cnidarium/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metrics = { version = "0.19.0", optional = true }
parking_lot = "0.12"
pin-project = "1.0.12"
smallvec = { version = "1.10", features = ["union", "const_generics"] }
ibc-types = { version = "0.10.0", default-features = false, features = ["std"] }
ibc-types = { version = "0.11.0", default-features = false, features = ["std"] }
once_cell = "1"

# Tendermint/IBC crates
Expand All @@ -39,7 +39,7 @@ tonic = { version = "0.10", optional = true }
prost = { version = "0.12.3", optional = true }
serde = { version = "1", optional = true }
pbjson = { version = "0.5", optional = true }
ibc-proto = { version = "0.39.0", default-features = false, features = ["serde"], optional = true }
ibc-proto = { version = "0.40.0", default-features = false, features = ["serde"], optional = true }
regex = "1.10.2"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions crates/core/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ parking_lot = "0.12"
tendermint = "0.34.0"
tendermint-proto = "0.34.0"
tendermint-light-client-verifier = "0.34.0"
ibc-types = { version = "0.10.0", default-features = false }
ibc-proto = { version = "0.39.0", default-features = false, features = [
ibc-types = { version = "0.11.0", default-features = false }
ibc-proto = { version = "0.40.0", default-features = false, features = [
"server",
] }

Expand Down
2 changes: 1 addition & 1 deletion crates/core/component/chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ penumbra-num = { path = "../../../core/num", default-features = false }
decaf377 = "0.5"

tendermint = "0.34.0"
ibc-types = { version = "0.10.0", default-features = false }
ibc-types = { version = "0.11.0", default-features = false }
ics23 = "0.11.0"

# Crates.io deps
Expand Down
4 changes: 2 additions & 2 deletions crates/core/component/ibc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ penumbra-keys = { path = "../../../core/keys", default-features = false }
penumbra-txhash = { path = "../../../core/txhash", default-features = false }

# Penumbra dependencies
ibc-types = { version = "0.10.0", default-features = false }
ibc-proto = { version = "0.39.0", default-features = false }
ibc-types = { version = "0.11.0", default-features = false }
ibc-proto = { version = "0.40.0", default-features = false }

# Crates.io deps
ics23 = "0.11.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/core/component/shielded-pool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ decaf377-ka = { path = "../../../crypto/decaf377-ka/" }
decaf377-fmd = { path = "../../../crypto/decaf377-fmd/" }

# Penumbra dependencies
ibc-types = { version = "0.10.0", default-features = false }
ibc-types = { version = "0.11.0", default-features = false }
decaf377-rdsa = { version = "0.7" }
decaf377 = { version = "0.5", features = ["r1cs"] }
poseidon377 = { version = "0.6", features = ["r1cs"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/core/transaction/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ penumbra-keys = { path = "../keys", default-features = false }
penumbra-txhash = { path = "../txhash", default-features = false }

# Git deps
ibc-types = { version = "0.10.0", default-features = false }
ibc-types = { version = "0.11.0", default-features = false }

# Crates.io deps
ibc-proto = { version = "0.39.0", default-features = false }
ibc-proto = { version = "0.40.0", default-features = false }
decaf377 = "0.5"
decaf377-rdsa = { version = "0.7" }
poseidon377 = { version = "0.6", features = ["r1cs"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ anyhow = "1.0"
subtle-encoding = "0.5"
bech32 = "0.8"
cnidarium = { path = "../cnidarium", optional = true }
ibc-types = { version = "0.10.0", features = ["std"] }
ibc-types = { version = "0.11.0", features = ["std"] }
pin-project = "1"
async-trait = "0.1.52"
async-stream = "0.2.0"
Expand All @@ -27,7 +27,7 @@ futures = "0.3"
pbjson = "0.6"
pbjson-types = "0.6"

ibc-proto = { version = "0.39.0", default-features = false, features = [
ibc-proto = { version = "0.40.0", default-features = false, features = [
"std",
"serde",
] }
Expand Down
2 changes: 1 addition & 1 deletion crates/view/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ penumbra-compact-block = { path = "../core/component/compact-block", default-fea
penumbra-app = { path = "../core/app" }
penumbra-transaction = { path = "../core/transaction" }

ibc-types = { version = "0.10.0", default-features = false }
ibc-types = { version = "0.11.0", default-features = false }

ark-std = { version = "0.4", default-features = false }
decaf377 = { version = "0.5", features = ["r1cs"] }
Expand Down
35 changes: 35 additions & 0 deletions crates/wasm/tests/test_deserialize.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
use penumbra_proto::core::component::ibc::v1alpha1::Ics20Withdrawal as PbIcs20Withdrawal;
use penumbra_shielded_pool::Ics20Withdrawal;

#[test]
fn height_properly_serializes_from_json() {
let data = r#"
{
"amount": {
"lo": "12000000"
},
"denom": {
"denom": "upenumbra"
},
"destinationChainAddress": "xyz",
"returnAddress": {
"inner": "by+DwROtdzWZu+W+gQ+e7pJ328aBf4Lng1dtnnkH971ebSC4O1+fQE+QmMNQ0iEg1/ARaF6yop4BurwW0Z1B7v0/o3AYchf6IEMYBxGyN18="
},
"timeoutHeight": {
"revisionNumber": "5",
"revisionHeight": "3928271"
},
"timeoutTime": "1701471437169",
"sourceChannel": "channel-0"
}
"#;

let withdrawal_proto: PbIcs20Withdrawal = serde_json::from_str(data).unwrap();
let height = withdrawal_proto.clone().timeout_height.unwrap();
assert_eq!(height.revision_number, 5u64);
assert_eq!(height.revision_height, 3928271u64);

let domain_type: Ics20Withdrawal = withdrawal_proto.try_into().unwrap();
assert_eq!(domain_type.timeout_height.revision_number, 5u64);
assert_eq!(domain_type.timeout_height.revision_height, 3928271u64);
}
2 changes: 1 addition & 1 deletion tools/proto-compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ pbjson-types = "0.6"
pbjson-build = "0.6"
tempfile = "3"

ibc-proto = { version = "0.39.0" }
ibc-proto = { version = "0.40.0" }
ics23 = "0.11.0"

0 comments on commit e15e021

Please sign in to comment.