refactor: move wormhole attester to pythnet_sdk legacy module (#2353)

* refactor: move wormhole attester to pythnet_sdk legacy module - Move wormhole_attester code to pythnet_sdk/legacy - Update downstream dependencies - Delete original wormhole_attester directory Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * refactor: update cosmwasm contract to use pythnet_sdk legacy module Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * chore: revert dependency version changes in pythnet_sdk Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * refactor: update cosmwasm contract to use pythnet_sdk::legacy::Identifier Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * chore: bump cosmwasm contract version to 1.3.1 Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * Update Cargo.toml * chore: bump near receiver version to 0.1.1 Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * style: fix rust formatting Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * refactor: update near receiver tests to use pythnet_sdk::legacy Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * refactor: remove solana-specific imports from legacy module Co-Authored-By: Jayant Krishnamurthy <jayant@dourolabs.xyz> * update lockfiles --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Jayant Krishnamurthy <jayant@dourolabs.xyz> Co-authored-by: Jayant Krishnamurthy <jayantkrishnamurthy@gmail.com>
pyth-network · Feb 12, 2025 · ee557d2 · ee557d2
1 parent c7ca8f0
commit ee557d2
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 1,463 deletions.
diff --git a/pythnet/pythnet_sdk/Cargo.toml b/pythnet/pythnet_sdk/Cargo.toml
@@ -28,6 +28,8 @@ quickcheck = { version = "1", optional = true}
 sha3 = "0.10.4"
 slow_primes = "0.1.14"
 thiserror = "1.0.40"
+pyth-sdk = { version = "0.5.0" }
+
 serde_wormhole = {version ="0.1.0", optional = true}
 wormhole-vaas-serde = {version = "0.1.0", optional = true}
 libsecp256k1 = {version ="0.7.1", optional = true}

diff --git a/pythnet/pythnet_sdk/src/legacy/mod.rs b/pythnet/pythnet_sdk/src/legacy/mod.rs
@@ -0,0 +1,2 @@
+mod wormhole_attester;
+pub use wormhole_attester::*;
diff --git a/wormhole_attester/sdk/rust/src/lib.rs → ...thnet_sdk/src/legacy/wormhole_attester.rs b/wormhole_attester/sdk/rust/src/lib.rs → ...thnet_sdk/src/legacy/wormhole_attester.rs
@@ -7,11 +7,6 @@
 //! the probable adversarial scenarios.
 
 pub use pyth_sdk::{Identifier, PriceStatus, UnixTimestamp};
-#[cfg(feature = "solana")]
-use {
-    pyth_sdk_solana::state::PriceAccount,
-    solitaire::{Derive, Info},
-};
 use {
     serde::{Deserialize, Serialize, Serializer},
     std::{convert::TryInto, io::Read, iter::Iterator, mem},
@@ -41,10 +36,6 @@ pub const P2W_FORMAT_HDR_SIZE: u16 = 1;
 
 pub const PUBKEY_LEN: usize = 32;
 
-/// Emmitter Address to wormhole is a PDA with seed p2w-emmiter from attestation contract
-#[cfg(feature = "solana")]
-pub type P2WEmitter<'b> = Derive<Info<'b>, "p2w-emitter">;
-
 /// Decides the format of following bytes
 #[repr(u8)]
 pub enum PayloadId {
@@ -263,48 +254,6 @@ impl BatchPriceAttestation {
 // On-chain data types
 
 impl PriceAttestation {
-    #[cfg(feature = "solana")]
-    pub fn from_pyth_price_bytes(
-        price_id: Identifier,
-        attestation_time: UnixTimestamp,
-        last_attested_publish_time: UnixTimestamp,
-        value: &[u8],
-    ) -> Result<Self, ErrBox> {
-        let price_struct = pyth_sdk_solana::state::load_price_account(value)?;
-        Ok(Self::from_pyth_price_struct(
-            price_id,
-            attestation_time,
-            last_attested_publish_time,
-            price_struct,
-        ))
-    }
-    #[cfg(feature = "solana")]
-    pub fn from_pyth_price_struct(
-        price_id: Identifier,
-        attestation_time: UnixTimestamp,
-        last_attested_publish_time: UnixTimestamp,
-        price: &PriceAccount,
-    ) -> Self {
-        PriceAttestation {
-            product_id: Identifier::new(price.prod.val),
-            price_id,
-            price: price.agg.price,
-            conf: price.agg.conf,
-            expo: price.expo,
-            ema_price: price.ema_price.val,
-            ema_conf: price.ema_conf.val as u64,
-            status: price.agg.status,
-            num_publishers: price.num_qt,
-            max_num_publishers: price.num,
-            attestation_time,
-            publish_time: price.timestamp,
-            prev_publish_time: price.prev_timestamp,
-            prev_price: price.prev_price,
-            prev_conf: price.prev_conf,
-            last_attested_publish_time,
-        }
-    }
-
     /// Serialize this attestation according to the Pyth-over-wormhole serialization format
     pub fn serialize(&self) -> Vec<u8> {
         // A nifty trick to get us yelled at if we forget to serialize a field
@@ -482,7 +431,7 @@ impl PriceAttestation {
 /// using `cargo test -- --nocapture`.
 #[cfg(test)]
 mod tests {
-    use {super::*, pyth_sdk_solana::state::PriceStatus};
+    use super::*;
 
     fn mock_attestation(prod: Option<[u8; 32]>, price: Option<[u8; 32]>) -> PriceAttestation {
         let product_id_bytes = prod.unwrap_or([21u8; 32]);

diff --git a/pythnet/pythnet_sdk/src/lib.rs b/pythnet/pythnet_sdk/src/lib.rs
@@ -1,6 +1,7 @@
 pub mod accumulators;
 pub mod error;
 pub mod hashers;
+pub mod legacy;
 pub mod messages;
 pub mod wire;
 pub mod wormhole;

diff --git a/target_chains/aptos/contracts/sources/batch_price_attestation.move b/target_chains/aptos/contracts/sources/batch_price_attestation.move
@@ -18,6 +18,7 @@ module pyth::batch_price_attestation {
 
     const MAGIC: u64 = 0x50325748; // "P2WH" (Pyth2Wormhole) raw ASCII bytes
 
+    /// @notice This struct is based on the legacy wormhole attester implementation in pythnet_sdk
     struct BatchPriceAttestation {
         header: Header,
         attestation_size: u64,

diff --git a/target_chains/cosmwasm/Cargo.lock b/target_chains/cosmwasm/Cargo.lock
diff --git a/target_chains/cosmwasm/contracts/pyth/Cargo.toml b/target_chains/cosmwasm/contracts/pyth/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pyth-cosmwasm"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["Wormhole Contributors <contact@certus.one>"]
 edition = "2018"
 description = "Pyth price receiver"
@@ -33,18 +33,17 @@ generic-array = { version = "0.14.4" }
 hex = "0.4.2"
 lazy_static = "1.4.0"
 bigint = "4"
-pyth-wormhole-attester-sdk = { path = "../../../../wormhole_attester/sdk/rust" }
+pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk" }
 pyth-sdk = "0.7.0"
 byteorder = "1.4.3"
 cosmwasm-schema = "1.1.9"
 osmosis-std = "0.15.2"
 pyth-sdk-cw = { path = "../../sdk/rust" }
-pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk" }
 wormhole-cosmwasm =  {git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25"}
 
 [dev-dependencies]
 cosmwasm-vm = { version = "1.0.0", default-features = false }
-serde_json = "1.0"
 pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk", features = ["test-utils"] }
+serde_json = "1.0"
 serde_wormhole = "0.1.0"
 wormhole-vaas-serde = "0.1.0"
diff --git a/target_chains/cosmwasm/contracts/pyth/src/contract.rs b/target_chains/cosmwasm/contracts/pyth/src/contract.rs
@@ -31,7 +31,7 @@ use {
         error::PythContractError, ExecuteMsg, Price, PriceFeed, PriceFeedResponse, PriceIdentifier,
         QueryMsg,
     },
-    pyth_wormhole_attester_sdk::{BatchPriceAttestation, PriceAttestation, PriceStatus},
+    pythnet_sdk::legacy::{BatchPriceAttestation, PriceAttestation, PriceStatus},
     pythnet_sdk::{
         accumulators::merkle::MerkleRoot,
         hashers::keccak256_160::Keccak160,
@@ -753,7 +753,7 @@ mod test {
         },
         pyth_sdk::UnixTimestamp,
         pyth_sdk_cw::PriceIdentifier,
-        pyth_wormhole_attester_sdk::PriceAttestation,
+        pythnet_sdk::legacy::PriceAttestation,
         pythnet_sdk::{
             accumulators::{merkle::MerkleTree, Accumulator},
             messages::{PriceFeedMessage, TwapMessage},
@@ -1478,7 +1478,7 @@ mod test {
     #[test]
     fn test_create_price_feed_from_price_attestation_status_trading() {
         let price_attestation = PriceAttestation {
-            price_id: pyth_wormhole_attester_sdk::Identifier::new([0u8; 32]),
+            price_id: pythnet_sdk::legacy::Identifier::new([0u8; 32]),
             price: 100,
             conf: 100,
             expo: 100,
@@ -1527,7 +1527,7 @@ mod test {
 
     fn test_create_price_feed_from_price_attestation_not_trading(status: PriceStatus) {
         let price_attestation = PriceAttestation {
-            price_id: pyth_wormhole_attester_sdk::Identifier::new([0u8; 32]),
+            price_id: pythnet_sdk::legacy::Identifier::new([0u8; 32]),
             price: 100,
             conf: 100,
             expo: 100,
@@ -1565,7 +1565,7 @@ mod test {
         let (mut deps, env) = setup_test();
 
         let price_attestation = PriceAttestation {
-            price_id: pyth_wormhole_attester_sdk::Identifier::new([0u8; 32]),
+            price_id: pythnet_sdk::legacy::Identifier::new([0u8; 32]),
             price: 100,
             conf: 100,
             expo: 100,
@@ -1607,7 +1607,7 @@ mod test {
         let (mut deps, env) = setup_test();
 
         let price_attestation = PriceAttestation {
-            price_id: pyth_wormhole_attester_sdk::Identifier::new([0u8; 32]),
+            price_id: pythnet_sdk::legacy::Identifier::new([0u8; 32]),
             price: 100,
             conf: 100,
             expo: 100,

diff --git a/target_chains/cosmwasm/contracts/pyth/src/governance.rs b/target_chains/cosmwasm/contracts/pyth/src/governance.rs
@@ -2,7 +2,7 @@ use {
     crate::state::PythDataSource,
     byteorder::{BigEndian, ReadBytesExt, WriteBytesExt},
     cosmwasm_std::Binary,
-    pyth_wormhole_attester_sdk::ErrBox,
+    pythnet_sdk::legacy::ErrBox,
     schemars::JsonSchema,
     serde::{Deserialize, Serialize},
     std::{convert::TryFrom, io::Write},

diff --git a/target_chains/near/receiver/Cargo.lock b/target_chains/near/receiver/Cargo.lock
diff --git a/target_chains/near/receiver/Cargo.toml b/target_chains/near/receiver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name                       = "pyth-near"
-version                    = "0.1.0"
+version                    = "0.1.1"
 authors                    = ["Pyth Data Association"]
 edition                    = "2021"
 description                = "A Pyth Receiver for Near"
@@ -20,9 +20,8 @@ near-sdk                   = { version = "5.5.0", features = ["legacy"] }
 nom                        = { version = "7.1.2" }
 num-traits                 = { version = "0.2.15" }
 num-derive                 = { version = "0.3.3" }
-pyth-wormhole-attester-sdk = { path = "../../../wormhole_attester/sdk/rust" }
+pythnet-sdk = { path = "../../../pythnet/pythnet_sdk" }
 pyth-sdk                   = { version = "0.7.0" }
-pythnet-sdk                = { path = "../../../pythnet/pythnet_sdk" }
 schemars                   = { version = "0.8.21" }
 serde_wormhole             = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25" }
 strum                      = { version = "0.24.1", features = ["derive"] }

diff --git a/target_chains/near/receiver/src/lib.rs b/target_chains/near/receiver/src/lib.rs
@@ -11,7 +11,7 @@ use {
         log, near_bindgen, AccountId, BorshStorageKey, Duration, Gas, NearToken, PanicOnDefault,
         Promise, StorageUsage,
     },
-    pyth_wormhole_attester_sdk::{BatchPriceAttestation, P2W_MAGIC},
+    pythnet_sdk::legacy::{BatchPriceAttestation, P2W_MAGIC},
     pythnet_sdk::{
         accumulators::merkle::MerkleRoot,
         hashers::keccak256_160::Keccak160,

diff --git a/target_chains/near/receiver/src/state.rs b/target_chains/near/receiver/src/state.rs
@@ -4,7 +4,7 @@ use {
         json_types::{I64, U64},
         serde::{Deserialize, Serialize},
     },
-    pyth_wormhole_attester_sdk::PriceAttestation,
+    pythnet_sdk::legacy::PriceAttestation,
     pythnet_sdk::messages::PriceFeedMessage,
     schemars::{gen::SchemaGenerator, schema::Schema, JsonSchema},
     wormhole_sdk::Chain as WormholeChain,

diff --git a/target_chains/near/receiver/tests/workspaces.rs b/target_chains/near/receiver/tests/workspaces.rs
@@ -5,7 +5,7 @@ use {
         governance::{GovernanceAction, GovernanceInstruction, GovernanceModule},
         state::{Chain, Price, PriceIdentifier, Source},
     },
-    pyth_wormhole_attester_sdk::{
+    pythnet_sdk::legacy::{
         BatchPriceAttestation, Identifier, PriceAttestation, PriceStatus,
     },
     pythnet_sdk::test_utils::{

diff --git a/target_chains/sui/contracts/sources/batch_price_attestation.move b/target_chains/sui/contracts/sources/batch_price_attestation.move
@@ -20,6 +20,7 @@ module pyth::batch_price_attestation {
     const E_INVALID_ATTESTATION_MAGIC_VALUE: u64 = 0;
     const E_INVALID_BATCH_ATTESTATION_HEADER_SIZE: u64 = 1;
 
+    /// @notice This struct is based on the legacy wormhole attester implementation in pythnet_sdk
     struct BatchPriceAttestation {
         header: Header,
         attestation_size: u64,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		mod wormhole_attester;
		pub use wormhole_attester::*;