Skip to content

Commit

Permalink
Merge remote-tracking branch 'namada/bat/ibc-version-bump' (#549)
Browse files Browse the repository at this point in the history
* namada/bat/ibc-version-bump:
  Update shared/src/ledger/ibc/handler.rs
  [fix]: Fixed some array concatenations
  Update shared/src/ledger/ibc/handler.rs
  [feat]: Moved to ics23 v0.7.0. This came with some ibc updates as well
  • Loading branch information
juped committed Oct 13, 2022
2 parents 79890b5 + 95a09b7 commit 5dc7eb8
Show file tree
Hide file tree
Showing 18 changed files with 1,210 additions and 1,479 deletions.
273 changes: 198 additions & 75 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ serde_bytes = "0.11.5"
serde_json = {version = "1.0.62", features = ["raw_value"]}
sha2 = "0.9.3"
signal-hook = "0.3.9"
sparse-merkle-tree = {git = "https://github.com/heliaxdev/sparse-merkle-tree", rev = "121c79424646cc3e917f8616e549fbddee775a0a", features = ["borsh"]}
# sysinfo with disabled multithread feature
sysinfo = {version = "=0.21.1", default-features = false}
tar = "0.4.37"
Expand Down
3 changes: 2 additions & 1 deletion apps/src/lib/client/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ use std::env;
use std::fs::File;
use std::time::Duration;

use async_std::io::{self, WriteExt};
use async_std::io::prelude::WriteExt;
use async_std::io::{self};
use borsh::BorshSerialize;
use itertools::Either::*;
use namada::ledger::governance::storage as gov_storage;
Expand Down
7 changes: 4 additions & 3 deletions shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ ferveo = {optional = true, git = "https://github.com/anoma/ferveo"}
ferveo-common = {git = "https://github.com/anoma/ferveo"}
tpke = {package = "group-threshold-cryptography", optional = true, git = "https://github.com/anoma/ferveo"}
# TODO using the same version of tendermint-rs as we do here.
ibc = {git = "https://github.com/heliaxdev/ibc-rs", rev = "30b3495ac56c6c37c99bc69ef9f2e84c3309c6cc", default-features = false}
ibc-proto = {git = "https://github.com/heliaxdev/ibc-rs", rev = "30b3495ac56c6c37c99bc69ef9f2e84c3309c6cc", default-features = false}
ics23 = "0.6.7"
ibc = {package = "ibc", git = "https://github.com/heliaxdev/ibc-rs", rev = "9fcc1c8c19db6af50806ffe5b2f6c214adcbfd5d", default-features = false}
ibc-proto = {package = "ibc-proto", git = "https://github.com/heliaxdev/ibc-rs", rev = "9fcc1c8c19db6af50806ffe5b2f6c214adcbfd5d", default-features = false}
ics23 = "0.7.0"
itertools = "0.10.0"
loupe = {version = "0.1.3", optional = true}
libsecp256k1 = {git = "https://github.com/heliaxdev/libsecp256k1", rev = "bbb3bd44a49db361f21d9db80f9a087c194c0ae9", default-features = false, features = ["std", "static-context"]}
Expand All @@ -87,6 +87,7 @@ serde = {version = "1.0.125", features = ["derive"]}
serde_json = "1.0.62"
sha2 = "0.9.3"
# We switch off "blake2b" because it cannot be compiled to wasm
sparse-merkle-tree = {git = "https://github.com/heliaxdev/sparse-merkle-tree", rev = "121c79424646cc3e917f8616e549fbddee775a0a", default-features = false, features = ["std", "borsh"]}
tempfile = {version = "3.2.0", optional = true}
# temporarily using fork work-around for https://github.com/informalsystems/tendermint-rs/issues/971
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs", rev = "95c52476bc37927218374f94ac8e2a19bd35bec9", features = ["secp256k1"]}
Expand Down
Loading

0 comments on commit 5dc7eb8

Please sign in to comment.