[hermes] Switch to message structs in pythnet_sdk (#897)

Author: ali-behjati

hermes/Cargo.lock

@@ -39,7 +39,7 @@ moka                   = { version = "0.11.0", features = ["future"] }
 pyth-sdk               = { version = "0.7.0" }
 
 # Parse Wormhole attester price attestations.
-pythnet-sdk            = { path = "../pythnet/pythnet_sdk/", version = "=1.13.6" }
+pythnet-sdk            = { path = "../pythnet/pythnet_sdk/", version = "=1.13.6", features = ["strum"] }
 
 rand                   = { version = "0.8.5" }
 reqwest                = { version = "0.11.14", features = ["blocking", "json"] }
@@ -61,12 +61,6 @@ tokio                  = { version = "1.26.0", features = ["full"] }
 tower-http             = { version = "0.4.0", features = ["cors"] }
 wormhole-sdk           = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }
 
-# Oracle message types
-[dependencies.pyth-oracle]
-git = "https://github.com/pyth-network/pyth-client"
-rev = "1bdac0d2ee39a5a9f27eb86e4fd01229bd68aa5a"
-features = ["library", "strum", "serde"]
-
 [patch.crates-io]
 serde_wormhole         = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }
 

hermes/Cargo.toml

@@ -22,7 +22,7 @@ use {
     borsh::BorshDeserialize,
     byteorder::BE,
     futures::stream::StreamExt,
-    pyth_oracle::Message,
+    pythnet_sdk::messages::Message,
     solana_account_decoder::UiAccountEncoding,
     solana_client::{
         nonblocking::{

hermes/src/network/pythnet.rs

@@ -34,14 +34,16 @@ use {
         Result,
     },
     moka::future::Cache,
-    pyth_oracle::{
-        Message,
-        MessageType,
-    },
     pyth_sdk::PriceIdentifier,
-    pythnet_sdk::wire::v1::{
-        WormholeMessage,
-        WormholePayload,
+    pythnet_sdk::{
+        messages::{
+            Message,
+            MessageType,
+        },
+        wire::v1::{
+            WormholeMessage,
+            WormholePayload,
+        },
     },
     std::{
         collections::{

hermes/src/store.rs

@@ -79,8 +79,10 @@ pub fn construct_message_states_proofs(
     let raw_messages = accumulator_messages
         .messages
         .iter()
-        .map(|m| m.to_bytes())
-        .collect::<Vec<Vec<u8>>>();
+        .map(|m| {
+            to_vec::<_, byteorder::BE>(m).map_err(|e| anyhow!("Failed to serialize message: {}", e))
+        })
+        .collect::<Result<Vec<Vec<u8>>>>()?;
 
     // Check whether the state is valid
     let merkle_acc =
@@ -129,11 +131,15 @@ pub fn construct_update_data(mut message_states: Vec<&MessageState>) -> Result<V
                     vaa:     vaa.into(),
                     updates: messages
                         .iter()
-                        .map(|message| MerklePriceUpdate {
-                            message: message.message.to_bytes().into(),
-                            proof:   message.proof_set.wormhole_merkle_proof.proof.clone(),
+                        .map(|message| {
+                            Ok(MerklePriceUpdate {
+                                message: to_vec::<_, byteorder::BE>(&message.message)
+                                    .map_err(|e| anyhow!("Failed to serialize message: {}", e))?
+                                    .into(),
+                                proof:   message.proof_set.wormhole_merkle_proof.proof.clone(),
+                            })
                         })
-                        .collect(),
+                        .collect::<Result<_>>()?,
                 },
             ))?)
         })

hermes/src/store/proof/wormhole_merkle.rs

@@ -14,11 +14,11 @@ use {
         Result,
     },
     async_trait::async_trait,
-    pyth_oracle::{
+    pyth_sdk::PriceIdentifier,
+    pythnet_sdk::messages::{
         Message,
         MessageType,
     },
-    pyth_sdk::PriceIdentifier,
 };
 
 pub mod local_storage;

hermes/src/store/storage.rs

@@ -17,8 +17,8 @@ use {
     async_trait::async_trait,
     dashmap::DashMap,
     moka::sync::Cache,
-    pyth_oracle::MessageType,
     pyth_sdk::PriceIdentifier,
+    pythnet_sdk::messages::MessageType,
     std::{
         collections::VecDeque,
         sync::Arc,

hermes/src/store/storage/local_storage.rs

@@ -1,6 +1,6 @@
 use {
     super::proof::wormhole_merkle::WormholeMerkleMessageProof,
-    pyth_oracle::{
+    pythnet_sdk::messages::{
         Message,
         PriceFeedMessage,
     },

hermes/src/store/types.rs

@@ -29,7 +29,7 @@ use serde::{
         strum::EnumIter,
         strum::EnumString,
         strum::IntoStaticStr,
-        strum::ToString,
+        strum::Display,
         Serialize,
         Deserialize
     ))