blockworks-foundation
/
pyth-crosschain
mirror of https://github.com/blockworks-foundation/pyth-crosschain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small refactor

This commit is contained in:
Ali Behjati 2023-06-02 10:48:28 +02:00 committed by Reisen
parent 23340d5e6c
commit 9dd1520a25
6 changed files with 94 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
hermes/Cargo.lock generated
View File

@ -1141,18 +1141,8 @@ version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
dependencies = [
"darling_core 0.13.4",
"darling_macro 0.13.4",
]
[[package]]
name = "darling"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
dependencies = [
"darling_core 0.14.4",
"darling_macro 0.14.4",
"darling_core",
"darling_macro",
]
[[package]]
@ -1169,38 +1159,13 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "darling_core"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
dependencies = [
"fnv",
"ident_case",
"proc-macro2 1.0.56",
"quote 1.0.27",
"strsim 0.10.0",
"syn 1.0.109",
]
[[package]]
name = "darling_macro"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
dependencies = [
"darling_core 0.13.4",
"quote 1.0.27",
"syn 1.0.109",
]
[[package]]
name = "darling_macro"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [
"darling_core 0.14.4",
"darling_core",
"quote 1.0.27",
"syn 1.0.109",
]
@ -1259,37 +1224,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0"
[[package]]
name = "derive_builder"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
dependencies = [
"derive_builder_macro",
]
[[package]]
name = "derive_builder_core"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
dependencies = [
"darling 0.14.4",
"proc-macro2 1.0.56",
"quote 1.0.27",
"syn 1.0.109",
]
[[package]]
name = "derive_builder_macro"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
dependencies = [
"derive_builder_core",
"syn 1.0.109",
]
[[package]]
name = "derive_more"
version = "0.99.17"
@ -2004,7 +1938,6 @@ dependencies = [
"byteorder",
"dashmap",
"der 0.7.5",
"derive_builder",
"derive_more",
"env_logger 0.10.0",
"ethabi",
@ -6488,7 +6421,7 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b10a4f5dd87c279f90beef31edb7055bfd1ceb66e73148de107a5c9005e9f864"
dependencies = [
"darling 0.13.4",
"darling",
"ident_case",
"proc-macro-error",
"proc-macro2 1.0.56",

1
hermes/Cargo.toml
View File

@ -59,7 +59,6 @@ solana-sdk = "=1.13.3"
solana-account-decoder = "=1.13.3"
moka = { version = "0.11.0", features = ["future"] }
derive_builder = "0.12.0"
byteorder = "1.4.3"
serde_qs = { version = "0.12.0", features = ["axum"] }

40
hermes/src/store.rs
View File

@ -18,7 +18,10 @@ use {
construct_message_states_proofs,
store_wormhole_merkle_verified_message,
},
storage::AccumulatorState,
storage::{
AccumulatorState,
CompletedAccumulatorState,
},
types::{
MessageState,
ProofSet,
@ -113,7 +116,7 @@ impl Store {
.unwrap_or(AccumulatorState {
slot,
accumulator_messages: None,
wormhole_merkle_proof: None,
wormhole_merkle_state: None,
});
accumulator_state.accumulator_messages = Some(accumulator_messages);
self.storage
@ -128,21 +131,32 @@ impl Store {
None => return Ok(()),
};
let (accumulator_messages, wormhole_merkle_proof) =
match (state.accumulator_messages, state.wormhole_merkle_proof) {
(Some(accumulator_messages), Some(wormhole_merkle_proof)) => {
(accumulator_messages, wormhole_merkle_proof)
}
_ => return Ok(()),
};
let completed_state = state.try_into();
let completed_state: CompletedAccumulatorState = match completed_state {
Ok(completed_state) => completed_state,
Err(_) => {
return Ok(());
}
};
// Once the accumulator reaches a complete state for a specific slot
// we can build the message states
self.build_message_states(completed_state).await?;
self.update_tx.send(()).await?;
Ok(())
}
async fn build_message_states(&self, completed_state: CompletedAccumulatorState) -> Result<()> {
let wormhole_merkle_message_states_proofs =
construct_message_states_proofs(&accumulator_messages, &wormhole_merkle_proof)?;
construct_message_states_proofs(&completed_state)?;
let current_time: UnixTimestamp =
SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as _;
let message_states = accumulator_messages
let message_states = completed_state
.accumulator_messages
.messages
.iter()
.enumerate()
@ -158,7 +172,7 @@ impl Store {
.ok_or(anyhow!("Missing proof for message"))?
.clone(),
},
accumulator_messages.slot,
completed_state.slot,
current_time,
))
})
@ -168,8 +182,6 @@ impl Store {
self.storage.store_message_states(message_states).await?;
self.update_tx.send(()).await?;
Ok(())
}

39
hermes/src/store/proof/wormhole_merkle.rs
View File

@ -1,10 +1,10 @@
use {
crate::store::{
storage::AccumulatorState,
types::{
AccumulatorMessages,
MessageState,
storage::{
AccumulatorState,
CompletedAccumulatorState,
},
types::MessageState,
Store,
},
anyhow::{
@ -32,6 +32,12 @@ use {
},
};
#[derive(Clone, PartialEq, Debug)]
pub struct WormholeMerkleState {
pub root: WormholeMerkleRoot,
pub vaa: Vec<u8>,
}
#[derive(Clone, PartialEq, Debug)]
pub struct WormholeMerkleMessageProof {
pub vaa: Vec<u8>,
@ -40,20 +46,23 @@ pub struct WormholeMerkleMessageProof {
pub async fn store_wormhole_merkle_verified_message(
store: &Store,
proof: WormholeMerkleRoot,
root: WormholeMerkleRoot,
vaa_bytes: Vec<u8>,
) -> Result<()> {
let mut accumulator_state = store
.storage
.fetch_accumulator_state(proof.slot)
.fetch_accumulator_state(root.slot)
.await?
.unwrap_or(AccumulatorState {
slot: proof.slot,
slot: root.slot,
accumulator_messages: None,
wormhole_merkle_proof: None,
wormhole_merkle_state: None,
});
accumulator_state.wormhole_merkle_proof = Some((proof, vaa_bytes));
accumulator_state.wormhole_merkle_state = Some(WormholeMerkleState {
root,
vaa: vaa_bytes,
});
store
.storage
.store_accumulator_state(accumulator_state)
@ -62,9 +71,11 @@ pub async fn store_wormhole_merkle_verified_message(
}
pub fn construct_message_states_proofs(
accumulator_messages: &AccumulatorMessages,
wormhole_merkle_proof: &(WormholeMerkleRoot, Vec<u8>),
completed_accumulator_state: &CompletedAccumulatorState,
) -> Result<Vec<WormholeMerkleMessageProof>> {
let accumulator_messages = &completed_accumulator_state.accumulator_messages;
let wormhole_merkle_state = &completed_accumulator_state.wormhole_merkle_state;
// Check whether the state is valid
let merkle_acc = match MerkleAccumulator::<Keccak160>::from_set(
accumulator_messages.messages.iter().map(|m| m.as_ref()),
@ -73,9 +84,7 @@ pub fn construct_message_states_proofs(
None => return Ok(vec![]), // It only happens when the message set is empty
};
let (proof, vaa) = &wormhole_merkle_proof;
if merkle_acc.root != proof.root {
if merkle_acc.root != wormhole_merkle_state.root.root {
return Err(anyhow!("Invalid merkle root"));
}
@ -84,7 +93,7 @@ pub fn construct_message_states_proofs(
.iter()
.map(|m| {
Ok(WormholeMerkleMessageProof {
vaa: vaa.clone(),
vaa: wormhole_merkle_state.vaa.clone(),
proof: merkle_acc
.prove(m.as_ref())
.ok_or(anyhow!("Failed to prove message"))?,

49
hermes/src/store/storage.rs
View File

@ -1,13 +1,19 @@
use {
super::types::{
AccumulatorMessages,
MessageIdentifier,
MessageState,
MessageType,
RequestTime,
Slot,
super::{
proof::wormhole_merkle::WormholeMerkleState,
types::{
AccumulatorMessages,
MessageIdentifier,
MessageState,
MessageType,
RequestTime,
Slot,
},
},
anyhow::{
anyhow,
Result,
},
anyhow::Result,
async_trait::async_trait,
pyth_sdk::PriceIdentifier,
pythnet_sdk::wire::v1::WormholeMerkleRoot,
@ -19,7 +25,32 @@ pub mod local_storage;
pub struct AccumulatorState {
pub slot: Slot,
pub accumulator_messages: Option<AccumulatorMessages>,
pub wormhole_merkle_proof: Option<(WormholeMerkleRoot, Vec<u8>)>,
pub wormhole_merkle_state: Option<WormholeMerkleState>,
}
#[derive(Clone, PartialEq, Debug)]
pub struct CompletedAccumulatorState {
pub slot: Slot,
pub accumulator_messages: AccumulatorMessages,
pub wormhole_merkle_state: WormholeMerkleState,
}
impl TryFrom<AccumulatorState> for CompletedAccumulatorState {
type Error = anyhow::Error;
fn try_from(state: AccumulatorState) -> Result<Self> {
let accumulator_messages = state
.accumulator_messages
.ok_or_else(|| anyhow!("missing accumulator messages"))?;
let wormhole_merkle_state = state
.wormhole_merkle_state
.ok_or_else(|| anyhow!("missing wormhole merkle state"))?;
Ok(Self {
slot: state.slot,
accumulator_messages,
wormhole_merkle_state,
})
}
}
#[derive(Clone, Copy)]

6
hermes/src/store/types.rs
View File

@ -52,12 +52,6 @@ impl MessageExt for Message {
pub type RawMessage = Vec<u8>;
#[derive(Clone, PartialEq, Debug)]
pub struct WormholeMerkleState {
pub digest_proof: Vec<u8>,
pub tree: Option<Vec<Vec<u8>>>,
}
#[derive(Clone, PartialEq, Eq, Debug, Hash)]
pub struct MessageIdentifier {
pub price_id: PriceIdentifier,