Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,544 changes: 795 additions & 749 deletions Cargo.lock

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ k256 = { version = "0.13.2", default-features = false, features = [
log = { version = "0.4.25", default-features = false }
num-bigint = { version = "0.4.4", default-features = false }
p256 = { version = "0.13.2", default-features = false }
prost = { version = "0.13.1", default-features = false }
prost = { version = "0.13.5", default-features = false }
rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }
reqwest = { version = "0.12.2", default-features = false, features = [
"json",
Expand All @@ -69,16 +69,17 @@ tokio = { version = "1.39.2", default-features = false, features = [
"macros",
"rt",
] }
tonic = { version = "0.12.1", default-features = false, features = [
tonic = { version = "0.13.1", default-features = false, features = [
"codegen",
"prost",
"router",
"transport",
] }
tonic-build = { version = "0.12.1", default-features = false, features = [
tonic-build = { version = "0.13.1", default-features = false, features = [
"prost",
"transport",
] }
tonic-health = { version = "0.12.1", default-features = false, features = ["transport"] }
tonic-health = { version = "0.13.1", default-features = false }
tracing = { version = "0.1.39", default-features = false }
tracing-subscriber = { version = "0.3.17", default-features = false, features = [
"fmt",
Expand All @@ -90,8 +91,8 @@ x509-parser = { version = "0.16.0", default-features = false, features = [
] }

# cosmos
cosmos-sdk-proto = { version = "0.23.0", default-features = false }
cosmrs = { version = "0.18.0", default-features = false }
cosmos-sdk-proto = { version = "0.27.0", default-features = false }
cosmrs = { version = "0.22.0", default-features = false }
cosmwasm-schema = { version = "2.1.1", default-features = false }
cosmwasm-std = { version = "2.1.1", default-features = false, features = [
"std",
Expand All @@ -102,12 +103,12 @@ cw2 = { version = "2.0.0", default-features = false }
ics23 = { version = "0.12.0", default-features = false, features = [
"host-functions",
] }
tendermint = { version = "=0.38.1", default-features = false }
tendermint-light-client = { version = "=0.38.1", default-features = false, features = [
tendermint = { version = "=0.40.4", default-features = false }
tendermint-light-client = { version = "=0.40.4", default-features = false, features = [
"rust-crypto",
] }
tendermint-light-client-detector = { version = "=0.38.1", default-features = false }
tendermint-rpc = { version = "=0.38.1", default-features = false, features = [
tendermint-light-client-detector = { version = "=0.40.4", default-features = false }
tendermint-rpc = { version = "=0.40.4", default-features = false, features = [
"http-client",
] }

Expand Down
2 changes: 1 addition & 1 deletion crates/enclave/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ reqwest = { workspace = true, features = ["blocking"] }
serde.workspace = true
serde_json.workspace = true
serde_with.workspace = true
tokio = { workspace = true, features = ["fs"] }
tonic.workspace = true
tonic-health.workspace = true
tokio.workspace = true
urlencoding.workspace = true

# mobilecoin
Expand Down
2 changes: 1 addition & 1 deletion crates/enclave/core/src/host.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ where
rpc_addr: SocketAddr,
query: Option<Query>,
) -> Result<(), Self::Error> {
let (mut health_reporter, health_service) = health_reporter();
let (health_reporter, health_service) = health_reporter();
health_reporter.set_not_serving::<CoreServer<E>>().await;

// start core grpc service
Expand Down
14 changes: 8 additions & 6 deletions crates/enclave/proto/src/prost/quartz.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub mod core_client {
}
impl<T> CoreClient<T>
where
T: tonic::client::GrpcService<tonic::body::BoxBody>,
T: tonic::client::GrpcService<tonic::body::Body>,
T::Error: Into<StdError>,
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
Expand All @@ -75,13 +75,13 @@ pub mod core_client {
F: tonic::service::Interceptor,
T::ResponseBody: Default,
T: tonic::codegen::Service<
http::Request<tonic::body::BoxBody>,
http::Request<tonic::body::Body>,
Response = http::Response<
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
>,
>,
<T as tonic::codegen::Service<
http::Request<tonic::body::BoxBody>,
http::Request<tonic::body::Body>,
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
{
CoreClient::new(InterceptedService::new(inner, interceptor))
Expand Down Expand Up @@ -287,7 +287,7 @@ pub mod core_server {
B: Body + std::marker::Send + 'static,
B::Error: Into<StdError> + std::marker::Send + 'static,
{
type Response = http::Response<tonic::body::BoxBody>;
type Response = http::Response<tonic::body::Body>;
type Error = std::convert::Infallible;
type Future = BoxFuture<Self::Response, Self::Error>;
fn poll_ready(
Expand Down Expand Up @@ -433,7 +433,9 @@ pub mod core_server {
}
_ => {
Box::pin(async move {
let mut response = http::Response::new(empty_body());
let mut response = http::Response::new(
tonic::body::Body::default(),
);
let headers = response.headers_mut();
headers
.insert(
Expand Down
Loading
Loading