Skip to content

fix(apps/hermes/server): use RpcPriceIdentifier instead of PriceIdentifier #1662

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 3 commits into from
Jun 6, 2024
Merged

fix(apps/hermes/server): use RpcPriceIdentifier instead of PriceIdentifier #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
427000f
use RpcPriceIdentifier instead of PriceIdentifier
cctdaniel Jun 6, 2024
7f9e059
fix test
cctdaniel Jun 6, 2024
6648ebb
fix imports
cctdaniel Jun 6, 2024
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
2 changes: 1 addition & 1 deletion apps/hermes/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: 1 addition & 1 deletion apps/hermes/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hermes"
version = "0.5.11"
version = "0.5.12"
description = "Hermes is an agent that provides Verified Prices from the Pythnet Pyth Oracle."
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion apps/hermes/src/api/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ impl TryFrom<PriceUpdate> for PriceFeedsWithUpdateData {

#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
pub struct PriceFeedMetadata {
pub id: PriceIdentifier,
pub id: RpcPriceIdentifier,
// BTreeMap is used to automatically sort the keys to ensure consistent ordering of attributes in the JSON response.
// This enhances user experience by providing a predictable structure, avoiding confusion from varying orders in different responses.
pub attributes: BTreeMap<String, String>,
Expand Down
8 changes: 5 additions & 3 deletions apps/hermes/src/network/pythnet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

use {
crate::{
api::types::PriceFeedMetadata,
api::types::{
PriceFeedMetadata,
RpcPriceIdentifier,
},
config::RunOptions,
network::wormhole::{
BridgeData,
Expand All @@ -30,7 +33,6 @@ use {
},
borsh::BorshDeserialize,
futures::stream::StreamExt,
pyth_sdk::PriceIdentifier,
pyth_sdk_solana::state::{
load_mapping_account,
load_product_account,
Expand Down Expand Up @@ -442,7 +444,7 @@ async fn fetch_price_feeds_metadata(
.expect("Invalid length for PriceIdentifier");

let price_feed_metadata = PriceFeedMetadata {
id: PriceIdentifier::new(px_pkey_array),
id: RpcPriceIdentifier::new(px_pkey_array),
attributes,
};

Expand Down
3 changes: 2 additions & 1 deletion apps/hermes/src/state/aggregate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use {
WormholeMerkleState,
},
crate::{
api::types::RpcPriceIdentifier,
network::wormhole::VaaBytes,
state::{
benchmarks::Benchmarks,
Expand Down Expand Up @@ -870,7 +871,7 @@ mod test {
// Add a dummy price feeds metadata
state
.store_price_feeds_metadata(&[PriceFeedMetadata {
id: PriceIdentifier::new([100; 32]),
id: RpcPriceIdentifier::new([100; 32]),
attributes: Default::default(),
}])
.await
Expand Down