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.

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

Update ics23 to 0.11.3, ibc-proto to 0.42.2, ibc-types to 0.14.1. Release v0.79.1 #4717

Closed
wants to merge 1 commit into from
Closed
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
54 changes: 27 additions & 27 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ hex = { version = "0.4.3" }
http = { version = "0.2.9" }
http-body = { version = "0.4.5" }
humantime = { version = "2.1" }
ibc-proto = { default-features = false, version = "0.41.0" }
ibc-types = { default-features = false, version = "0.12.0" }
ibc-proto = { default-features = false, version = "0.42.2" }
ibc-types = { default-features = false, version = "0.14.1" }
ibig = { version = "0.3" }
ics23 = { version = "0.11.0" }
ics23 = { version = "0.11.3" }
im = { version = "^15.1.0" }
indicatif = { version = "0.16" }
jmt = { version = "0.10", features = ["migration"] }
Expand Down
2 changes: 2 additions & 0 deletions crates/core/app/src/server/info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ impl Info {
let id_chan = IdentifiedChannelEnd {
channel_id: chan_id,
port_id: PortId::transfer(),
upgrade_sequence: channel.upgrade_sequence,
channel_end: channel,
};
channels.push(id_chan.into());
Expand Down Expand Up @@ -307,6 +308,7 @@ impl Info {
let id_chan = IdentifiedChannelEnd {
channel_id: chan_id,
port_id: PortId::transfer(),
upgrade_sequence: channel.upgrade_sequence,
channel_end: channel,
};
channels.push(id_chan.into());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ impl MsgHandler for MsgChannelCloseConfirm {
remote: expected_counterparty,
connection_hops: expected_connection_hops,
version: channel.version.clone(),
// Penumbra does not currently support channel upgrades
upgrade_sequence: 0,
};

state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ impl MsgHandler for MsgChannelOpenAck {
remote: expected_counterparty,
connection_hops: expected_connection_hops,
version: self.version_on_b.clone(),
// Penumbra does not currently support channel upgrades
upgrade_sequence: 0,
};

state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ impl MsgHandler for MsgChannelOpenConfirm {
remote: expected_counterparty,
connection_hops: expected_connection_hops,
version: channel.version.clone(),
// Penumbra does not currently support channel upgrades
upgrade_sequence: 0,
};

state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ impl MsgHandler for MsgChannelOpenInit {
remote: Counterparty::new(self.port_id_on_b.clone(), None),
connection_hops: self.connection_hops_on_a.clone(),
version: self.version_proposal.clone(),
// Penumbra does not currently support channel upgrades
upgrade_sequence: 0,
};

state.put_channel(&channel_id, &self.port_id_on_a, new_channel.clone());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ impl MsgHandler for MsgChannelOpenTry {
.clone()
.ok_or_else(|| anyhow::anyhow!("no counterparty connection id provided"))?],
version: self.version_supported_on_a.clone(),
// Penumbra does not currently support channel upgrades
upgrade_sequence: 0,
};

tracing::debug!(?self, ?expected_channel_on_a);
Expand Down Expand Up @@ -81,6 +83,8 @@ impl MsgHandler for MsgChannelOpenTry {
remote: Counterparty::new(self.port_id_on_a.clone(), Some(self.chan_id_on_a.clone())),
connection_hops: self.connection_hops_on_b.clone(),
version: self.version_supported_on_a.clone(),
// Penumbra does not currently support channel upgrades
upgrade_sequence: 0,
};

state.put_channel(&channel_id, &self.port_id_on_b, new_channel.clone());
Expand Down
35 changes: 34 additions & 1 deletion crates/core/component/ibc/src/component/rpc/consensus_query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ use async_trait::async_trait;
use ibc_proto::ibc::core::channel::v1::query_server::Query as ConsensusQuery;
use ibc_proto::ibc::core::channel::v1::{
Channel, PacketState, QueryChannelClientStateRequest, QueryChannelClientStateResponse,
QueryChannelConsensusStateRequest, QueryChannelConsensusStateResponse, QueryChannelRequest,
QueryChannelConsensusStateRequest, QueryChannelConsensusStateResponse,
QueryChannelParamsRequest, QueryChannelParamsResponse, QueryChannelRequest,
QueryChannelResponse, QueryChannelsRequest, QueryChannelsResponse,
QueryConnectionChannelsRequest, QueryConnectionChannelsResponse,
QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveResponse,
Expand All @@ -14,6 +15,7 @@ use ibc_proto::ibc::core::channel::v1::{
QueryPacketCommitmentResponse, QueryPacketCommitmentsRequest, QueryPacketCommitmentsResponse,
QueryPacketReceiptRequest, QueryPacketReceiptResponse, QueryUnreceivedAcksRequest,
QueryUnreceivedAcksResponse, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsResponse,
QueryUpgradeErrorRequest, QueryUpgradeErrorResponse, QueryUpgradeRequest, QueryUpgradeResponse,
};
use ibc_proto::ibc::core::client::v1::{Height, IdentifiedClientState};
use ibc_types::path::{
Expand Down Expand Up @@ -111,6 +113,7 @@ impl<HI: HostInterface + Send + Sync + 'static> ConsensusQuery for IbcQuery<HI>
let id_chan = IdentifiedChannelEnd {
channel_id: chan_id,
port_id: PortId::transfer(),
upgrade_sequence: channel.upgrade_sequence,
channel_end: channel,
};
channels.push(id_chan.into());
Expand Down Expand Up @@ -163,6 +166,7 @@ impl<HI: HostInterface + Send + Sync + 'static> ConsensusQuery for IbcQuery<HI>
let id_chan = IdentifiedChannelEnd {
channel_id: chan_id,
port_id: PortId::transfer(),
upgrade_sequence: channel.upgrade_sequence,
channel_end: channel,
};
channels.push(id_chan.into());
Expand Down Expand Up @@ -750,4 +754,33 @@ impl<HI: HostInterface + Send + Sync + 'static> ConsensusQuery for IbcQuery<HI>
}),
}))
}

async fn upgrade_error(
&self,
_request: tonic::Request<QueryUpgradeErrorRequest>,
) -> std::result::Result<tonic::Response<QueryUpgradeErrorResponse>, tonic::Status> {
Err(tonic::Status::unimplemented(
"penumbra chains do not currently support channel upgrades (see https://github.com/penumbra-zone/penumbra/issues/2985)"
))
}

async fn upgrade(
&self,
_request: tonic::Request<QueryUpgradeRequest>,
) -> std::result::Result<tonic::Response<QueryUpgradeResponse>, tonic::Status> {
Err(tonic::Status::unimplemented(
"penumbra chains do not currently support channel upgrades (see https://github.com/penumbra-zone/penumbra/issues/2985)"
))
}

async fn channel_params(
&self,
_request: tonic::Request<QueryChannelParamsRequest>,
) -> std::result::Result<tonic::Response<QueryChannelParamsResponse>, tonic::Status> {
Ok(tonic::Response::new(QueryChannelParamsResponse {
// This is only used to return a single param specifying the upgrade timeout.
// TODO: when upgrades are implemented, this will need to return the timeout duration.
params: None,
}))
}
}
4 changes: 2 additions & 2 deletions tools/proto-compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish = false

[dependencies]
anyhow = "1"
ibc-proto = { version = "0.40.0" }
ics23 = "0.11.0"
ibc-proto = { version = "0.42.2" }
ics23 = "0.11.3"
pbjson = "0.6"
pbjson-build = "0.6"
pbjson-types = "0.6"
Expand Down
Loading