Skip to content

Update hermes-sdk with new export convention #410

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.

Sign up for GitHub

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

Merged
merged 13 commits into from
Apr 29, 2025
Merged

Update hermes-sdk with new export convention #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4079880
Update hermes-sdk with new export convention
soareschen Apr 28, 2025
855ecd9
Use hermes_core to simplify imports
soareschen Apr 28, 2025
0c7f32e
Use hermes_cosmos_core
soareschen Apr 28, 2025
08da031
Don't use hermes_cosmos_core when crates don't need concrete contexts
soareschen Apr 28, 2025
accca4d
Use hermes_cosmos instead of hermes_cosmos_core
soareschen Apr 28, 2025
99c395e
Use hermes_cosmos_core in other crates
soareschen Apr 28, 2025
3c66679
Migrating to use hermes-cosmos-core
soareschen Apr 28, 2025
090b04e
More refactoring
soareschen Apr 28, 2025
f4cf6c2
Simplify Cargo dependencies
soareschen Apr 29, 2025
2984572
Fix Nix build
soareschen Apr 29, 2025
d49ffb3
Update hermes sdk
soareschen Apr 29, 2025
754dbf3
Use hermes_prelude instead of cgp::prelude
soareschen Apr 29, 2025
e1a48da
Use back main branch
soareschen Apr 29, 2025
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
20 changes: 17 additions & 3 deletions light-client/Cargo.lock
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions light-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ibc-proto = { version = "0.51.1", default-features = false }
tendermint = { version = "0.40.0", default-features = false }

cgp = { version = "0.4.0" }
hermes-prelude = { version = "0.1.0" }
hermes-encoding-components = { version = "0.1.0" }
hermes-protobuf-encoding-components = { version = "0.1.0" }
hermes-cosmos-encoding-components = { version = "0.1.0" }
Expand Down Expand Up @@ -95,6 +96,7 @@ cgp-runtime = { git = "https://github.com/contextgeneric/cgp.git" }
cgp-sync = { git = "https://github.com/contextgeneric/cgp.git" }
cgp-inner = { git = "https://github.com/contextgeneric/cgp.git" }

hermes-prelude = { git = "https://github.com/informalsystems/hermes-sdk.git" }
hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
hermes-cosmos-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
1 change: 1 addition & 0 deletions light-client/ibc-client-starknet-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ derive_more = { workspace = true }
prost = { workspace = true }
serde = { workspace = true, optional = true }
cgp = { workspace = true }
hermes-prelude = { workspace = true }
hermes-encoding-components = { workspace = true }
hermes-protobuf-encoding-components = { workspace = true }
hermes-cosmos-encoding-components = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion light-client/ibc-client-starknet-types/src/client_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use cgp::prelude::*;
use hermes_prelude::*;
use ibc_core::client::types::Height;
use ibc_core::host::types::identifiers::ChainId;

Expand Down
2 changes: 1 addition & 1 deletion light-client/ibc-client-starknet-types/src/consensus_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use cgp::prelude::*;
use hermes_prelude::*;
use ibc_core::commitment_types::commitment::CommitmentRoot;
use ibc_core::primitives::Timestamp;

Expand Down
25 changes: 9 additions & 16 deletions light-client/ibc-client-starknet-types/src/encoding/components.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
#[cgp::re_export_imports]
mod preset {
use cgp::core::component::{UseContext, UseDelegate};
use cgp::prelude::*;
use hermes_cosmos_encoding_components::components::CosmosEncodingComponents;
use hermes_encoding_components::traits::convert::ConverterComponent;
use hermes_encoding_components::traits::decode::DecoderComponent;
use hermes_encoding_components::traits::decode_mut::MutDecoderComponent;
use hermes_encoding_components::traits::encode::EncoderComponent;
use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
use hermes_encoding_components::traits::schema::SchemaGetterComponent;
use hermes_encoding_components::traits::types::decode_buffer::DecodeBufferTypeComponent;
use hermes_encoding_components::traits::types::encode_buffer::EncodeBufferTypeComponent;
use hermes_encoding_components::traits::types::encoded::EncodedTypeComponent;
use hermes_encoding_components::traits::types::schema::SchemaTypeComponent;
use hermes_encoding_components::traits::{
ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent,
EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent,
SchemaGetterComponent, SchemaTypeComponent,
};
use hermes_prelude::*;
use hermes_protobuf_encoding_components::impl_type_url;
use hermes_protobuf_encoding_components::impls::any::{
DecodeAsAnyProtobuf, EncodeAsAnyProtobuf,
use hermes_protobuf_encoding_components::impls::{
DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, EncodeProtoWithMutBuffer, EncodeViaAny,
};
use hermes_protobuf_encoding_components::impls::encode::buffer::EncodeProtoWithMutBuffer;
use hermes_protobuf_encoding_components::impls::via_any::EncodeViaAny;
use hermes_protobuf_encoding_components::traits::length::EncodedLengthGetterComponent;
use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent;
use hermes_protobuf_encoding_components::types::any::Any;
use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf};
use ibc_core::client::types::Height;
Expand Down
18 changes: 7 additions & 11 deletions light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
use cgp::core::component::UseContext;
use cgp::prelude::*;
use hermes_cosmos_encoding_components::impls::chain_id::EncodeChainIdField;
use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders;
use hermes_encoding_components::impls::encode_mut::field::EncodeField;
use hermes_encoding_components::impls::encode_mut::from::DecodeFrom;
use hermes_encoding_components::traits::decode_mut::MutDecoderComponent;
use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
use hermes_encoding_components::traits::transform::Transformer;
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField;
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField;
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField;
use hermes_cosmos_encoding_components::impls::EncodeChainIdField;
use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField};
use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer};
use hermes_prelude::*;
use hermes_protobuf_encoding_components::impls::{
DecodeRequiredProtoField, EncodeByteField, EncodeLengthDelimitedProtoField,
};
use ibc_core::client::types::Height;
use ibc_core::host::types::identifiers::ChainId;

Expand Down
15 changes: 6 additions & 9 deletions light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
use cgp::core::component::UseContext;
use cgp::prelude::*;
use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders;
use hermes_encoding_components::impls::encode_mut::field::EncodeField;
use hermes_encoding_components::impls::encode_mut::from::DecodeFrom;
use hermes_encoding_components::traits::decode_mut::MutDecoderComponent;
use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
use hermes_encoding_components::traits::transform::Transformer;
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField;
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField;
use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField};
use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer};
use hermes_prelude::*;
use hermes_protobuf_encoding_components::impls::{
DecodeRequiredProtoField, EncodeLengthDelimitedProtoField,
};
use ibc_core::commitment_types::commitment::CommitmentRoot;
use ibc_core::primitives::Timestamp;

Expand Down
16 changes: 6 additions & 10 deletions light-client/ibc-client-starknet-types/src/encoding/impls/header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
use cgp::core::component::UseContext;
use cgp::prelude::*;
use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders;
use hermes_encoding_components::impls::encode_mut::field::EncodeField;
use hermes_encoding_components::impls::encode_mut::from::DecodeFrom;
use hermes_encoding_components::traits::decode_mut::MutDecoderComponent;
use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
use hermes_encoding_components::traits::transform::Transformer;
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField;
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField;
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField;
use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField};
use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer};
use hermes_prelude::*;
use hermes_protobuf_encoding_components::impls::{
DecodeRequiredProtoField, EncodeByteField, EncodeLengthDelimitedProtoField,
};
use ibc_core::client::types::Height;

use crate::header::{SignedStarknetHeader, StarknetHeader};
Expand Down
2 changes: 1 addition & 1 deletion light-client/ibc-client-starknet-types/src/header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use cgp::prelude::*;
use hermes_prelude::*;
use ibc_core::client::types::Height;

use crate::StarknetConsensusState;
Expand Down
1 change: 1 addition & 0 deletions light-client/ibc-client-starknet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ serde = { workspace = true, optional = true }
prost = { workspace = true }
prost-types = { workspace = true }
cgp = { workspace = true }
hermes-prelude = { workspace = true }
hermes-encoding-components = { workspace = true }
hermes-protobuf-encoding-components = { workspace = true }
hermes-cosmos-encoding-components = { workspace = true }
Expand Down
7 changes: 3 additions & 4 deletions light-client/ibc-client-starknet/src/client_state/execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use cgp::core::component::UseContext;
use hermes_cosmos_encoding_components::impls::any::ConvertIbcAny;
use hermes_encoding_components::impls::convert::ConvertVia;
use hermes_encoding_components::traits::convert::Converter;
use hermes_encoding_components::traits::decode::CanDecode;
use hermes_cosmos_encoding_components::impls::ConvertIbcAny;
use hermes_encoding_components::impls::ConvertVia;
use hermes_encoding_components::traits::{CanDecode, Converter};
use hermes_protobuf_encoding_components::types::strategy::ViaProtobuf;
use ibc_client_cw::context::client_ctx::CwClientExecution;
use ibc_client_starknet_types::header::{SignedStarknetHeader, StarknetHeader};
Expand Down
2 changes: 1 addition & 1 deletion light-client/ibc-client-starknet/src/client_state/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub mod cw;
pub mod execution;
pub mod validation;

use hermes_encoding_components::traits::convert::CanConvert;
use hermes_encoding_components::traits::CanConvert;
use ibc_client_starknet_types::StarknetClientState as ClientStateType;
use ibc_core::client::types::error::ClientError;
use ibc_core::primitives::proto::{Any, Protobuf};
Expand Down
2 changes: 1 addition & 1 deletion light-client/ibc-client-starknet/src/consensus_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use hermes_encoding_components::traits::convert::CanConvert;
use hermes_encoding_components::traits::CanConvert;
use ibc_client_starknet_types::StarknetConsensusState as ConsensusStateType;
use ibc_core::client::context::consensus_state::ConsensusState as ConsensusStateTrait;
use ibc_core::client::types::error::ClientError;
Expand Down
14 changes: 6 additions & 8 deletions light-client/ibc-client-starknet/src/encoding/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ use core::str::Utf8Error;
use cgp::core::error::{
ErrorRaiser, ErrorRaiserComponent, ErrorTypeProvider, ErrorTypeProviderComponent,
};
use cgp::prelude::*;
use hermes_encoding_components::traits::convert::{CanConvert, CanConvertBothWays};
use hermes_encoding_components::traits::encode_and_decode::CanEncodeAndDecode;
use hermes_encoding_components::traits::encode_and_decode_mut::CanEncodeAndDecodeMut;
use hermes_protobuf_encoding_components::impls::any::TypeUrlMismatchError;
use hermes_protobuf_encoding_components::impls::encode_mut::chunk::{
InvalidWireType, UnsupportedWireType,
use hermes_encoding_components::traits::{
CanConvert, CanConvertBothWays, CanEncodeAndDecode, CanEncodeAndDecodeMut,
};
use hermes_prelude::*;
use hermes_protobuf_encoding_components::impls::{
InvalidWireType, RequiredFieldTagNotFound, TypeUrlMismatchError, UnsupportedWireType,
};
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::RequiredFieldTagNotFound;
use hermes_protobuf_encoding_components::types::any::Any;
use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf};
use ibc_client_starknet_types::encoding::components::*;
Expand Down
2 changes: 1 addition & 1 deletion nix/ibc-starknet-cw.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let
lockFile = ./../light-client/Cargo.lock;
outputHashes = {
"cgp-0.4.0" = "sha256-aKSLWdiYRbRen9yj5K/xqsSsNp5YYee1fFPBfOYEdP8=";
"hermes-cosmos-encoding-components-0.1.0" = "sha256-KwCzSVS9J7Qe/M3bs0JqKej3HDSAhNPC2lBrzTw7gTU=";
"hermes-cosmos-encoding-components-0.1.0" = "sha256-NNR6fAVMa/u+bSeAygKSrViDxX5EaYu6dm4aTi6OULk=";
"ibc-client-cw-0.56.0" = "sha256-DA3AB8ejUrx4ksBtN/vaOznjpKE0+0F6vGA7JmWyHWA=";
"ibc-0.56.0" = "sha256-7DPIqu/zs0szjmtJTfXI2eQ0HEkRyvGjArcMZsFWMT4=";
};
Expand Down
Loading
Loading