Skip to content

Commit

Permalink
Merge pull request #1070 from anoma/murisi/shared-wasm
Browse files Browse the repository at this point in the history 
Murisi/shared wasm
  • Loading branch information
@murisi
murisi authored Jan 23, 2023
2 parents 8c03998 + 519085d commit 1738e80
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 24 deletions.
17 changes: 7 additions & 10 deletions Cargo.lock
View file

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

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ async-process = {git = "https://github.com/heliaxdev/async-process.git", rev = "
# borsh-schema-derive-internal = {path = "../borsh-rs/borsh-schema-derive-internal"}

# patched to a commit on the `eth-bridge-integration+consensus-timeout` branch of our fork
tendermint = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-config = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-proto = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-rpc = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-testgen = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-light-client = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint-light-client-verifier = {git = "https://github.com/heliaxdev/tendermint-rs.git", rev = "e6c684731f21bffd89886d3e91074b96aee074ba"}
tendermint = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client"}
tendermint-config = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client"}
tendermint-proto = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client"}
tendermint-rpc = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client", default-features = false}
tendermint-testgen = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client"}
tendermint-light-client = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client"}
tendermint-light-client-verifier = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client"}

# patched to a commit on the `eth-bridge-integration` branch of our fork
ibc = {git = "https://github.com/heliaxdev/ibc-rs.git", rev = "f4703dfe2c1f25cc431279ab74f10f3e0f6827e2"}
Expand Down
12 changes: 6 additions & 6 deletions shared/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ serde_json = "1.0.62"
sha2 = "0.9.3"
# We switch off "blake2b" because it cannot be compiled to wasm
tempfile = {version = "3.2.0", optional = true}
tendermint-abcipp = {package = "tendermint", git = "https://github.com/heliaxdev/tendermint-rs", rev = "95c52476bc37927218374f94ac8e2a19bd35bec9", optional = true}
tendermint-rpc-abcipp = {package = "tendermint-rpc", git = "https://github.com/heliaxdev/tendermint-rs", rev = "95c52476bc37927218374f94ac8e2a19bd35bec9", features = ["http-client"], optional = true}
tendermint-proto-abcipp = {package = "tendermint-proto", git = "https://github.com/heliaxdev/tendermint-rs", rev = "95c52476bc37927218374f94ac8e2a19bd35bec9", optional = true}
tendermint = {version = "0.23.6", optional = true}
tendermint-rpc = {version = "0.23.6", features = ["http-client"], optional = true}
tendermint-proto = {version = "0.23.6", optional = true}
tendermint-abcipp = {package = "tendermint", git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client", optional = true}
tendermint-rpc-abcipp = { package = "tendermint-rpc", git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client", features = ["trait-client"], default-features = false, optional = true }
tendermint-proto-abcipp = {package = "tendermint-proto", git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client", optional = true}
tendermint = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client", version = "0.23.6", optional = true}
tendermint-rpc = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client", version = "0.23.6", features = ["trait-client"], default-features = false, optional = true}
tendermint-proto = {git="https://github.com/heliaxdev/tendermint-rs.git", branch="murisi/trait-client", version = "0.23.6", optional = true}
thiserror = "1.0.30"
tracing = "0.1.30"
wasmer = {version = "=2.2.0", optional = true}
Expand Down
2 changes: 1 addition & 1 deletion shared/src/ledger/queries/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ pub mod tm {
}

#[async_trait::async_trait]
impl Client for crate::tendermint_rpc::HttpClient {
impl<C: crate::tendermint_rpc::Client + std::marker::Sync> Client for C {
type Error = Error;

async fn request(
Expand Down

0 comments on commit 1738e80

Please sign in to comment.