chore: changed Fixedbytes<32> to B256

target_chains/ethereum/sdk/stylus/contracts/src/pyth/functions.rs

@@ -15,7 +15,7 @@ use crate::pyth::types::{
 use crate::utils::helpers::{call_helper, delegate_call_helper};
 use alloc::vec::Vec;
 use stylus_sdk::storage::TopLevelStorage;
-use alloy_primitives::{ Address, FixedBytes, U256, Bytes};
+use alloy_primitives::{ Address, B256, U256, Bytes};
 use crate::pyth::mock::DecodeDataType;
 use alloy_sol_types::SolType;
 
@@ -32,7 +32,7 @@ use alloy_sol_types::SolType;
 pub fn get_price_no_older_than(
     storage: &mut impl TopLevelStorage,
     pyth_address: Address,
-    id: FixedBytes<32>,
+    id: B256,
     age: U256,
 ) -> Result<Price, Vec<u8>> {
     let price_call = call_helper::<getPriceNoOlderThanCall>(storage, pyth_address, (id, age,))?;
@@ -69,7 +69,7 @@ pub fn get_update_fee(
 pub fn get_ema_price_unsafe(
     storage: &mut impl TopLevelStorage,
     pyth_address: Address,
-    id: FixedBytes<32>,
+    id: B256,
 ) -> Result<Price, Vec<u8>> {
     let ema_price = call_helper::<getEmaPriceUnsafeCall>(storage, pyth_address, (id,))?;
     Ok(ema_price.price)
@@ -88,7 +88,7 @@ pub fn get_ema_price_unsafe(
 pub fn get_ema_price_no_older_than(
     storage: &mut impl TopLevelStorage,
     pyth_address: Address,
-    id: FixedBytes<32>,
+    id: B256,
     age: U256,
 ) -> Result<Price, Vec<u8>> {
     let ema_price = call_helper::<getEmaPriceNoOlderThanCall>(storage, pyth_address, (id, age,))?;
@@ -107,7 +107,7 @@ pub fn get_ema_price_no_older_than(
 pub fn get_price_unsafe(
     storage: &mut impl TopLevelStorage,
     pyth_address: Address,
-    id: FixedBytes<32>,
+    id: B256,
 ) -> Result<Price, Vec<u8>> {
     let price = call_helper::<getPriceUnsafeCall>(storage, pyth_address, (id,))?;
     let price = Price {
@@ -168,7 +168,7 @@ pub fn update_price_feeds_if_necessary(
     storage: &mut impl TopLevelStorage,
     pyth_address: Address,
     update_data: Vec<Bytes>,
-    price_ids: Vec<FixedBytes<32>>,
+    price_ids: Vec<B256>,
     publish_times: Vec<u64>,
 ) -> Result<(), Vec<u8>> {
     delegate_call_helper::<updatePriceFeedsIfNecessaryCall>(
@@ -195,7 +195,7 @@ pub fn parse_price_feed_updates(
     storage: &mut impl TopLevelStorage,
     pyth_address: Address,
     update_data: Vec<Bytes>,
-    price_ids: Vec<FixedBytes<32>>,
+    price_ids: Vec<B256>,
     min_publish_time: u64,
     max_publish_time: u64,
 ) -> Result<Vec<PriceFeed>, Vec<u8>> {
@@ -218,7 +218,7 @@ pub fn parse_price_feed_updates_unique(
     storage: &mut impl TopLevelStorage,
     pyth_address: Address,
     update_data: Vec<Bytes>,
-    price_ids: Vec<FixedBytes<32>>,
+    price_ids: Vec<B256>,
     min_publish_time: u64,
     max_publish_time: u64
 ) -> Result<Vec<PriceFeed>, Vec<u8>> {
@@ -243,7 +243,7 @@ pub fn parse_price_feed_updates_unique(
 /// # Returns
 /// - `Vec<u8>`: A byte vector containing the encoded update data for the price feed.
 pub fn create_price_feed_update_data(
-    id: FixedBytes<32>,
+    id: B256,
     price: i64,
     conf: u64,
     expo: i32,

target_chains/ethereum/sdk/stylus/contracts/src/pyth/mock.rs

@@ -1,5 +1,5 @@
 use alloc::vec::Vec;
-use alloy_primitives::{Uint, FixedBytes, U256, Bytes};
+use alloy_primitives::{Uint, U256, Bytes, B256};
 use alloy_sol_types::{ sol_data::Uint as SolUInt, SolType, SolValue};
 use stylus_sdk::{abi::Bytes as AbiBytes,evm, msg, prelude::*};
 use crate::{pyth::errors::{FalledDecodeData, InsufficientFee, InvalidArgument}, utils::helpers::CALL_RETDATA_DECODING_ERROR_MESSAGE};
@@ -32,15 +32,15 @@ impl MockPythContract {
     }
 
 
-    fn query_price_feed(&self, id: FixedBytes<32>) -> Result<Vec<u8>, Vec<u8>> {
+    fn query_price_feed(&self, id: B256) -> Result<Vec<u8>, Vec<u8>> {
         let price_feed  =  self.price_feeds.get(id).to_price_feed();
-        if price_feed.id.eq(&FixedBytes::<32>::ZERO) {
+        if price_feed.id.eq(&B256::ZERO) {
             return Err(Error::PriceFeedNotFound(PriceFeedNotFound {}).into());
         }
         Ok(price_feed.abi_encode())
     }
 
-    fn price_feed_exists(&self, id:FixedBytes<32>) -> bool {
+    fn price_feed_exists(&self, id:B256) -> bool {
          self.price_feeds.getter(id).id.is_empty()
     }
 
@@ -97,7 +97,7 @@ impl MockPythContract {
     fn parse_price_feed_updates(
         &mut self,
         update_data:Vec<AbiBytes>,
-        price_ids:Vec<FixedBytes<32>>,
+        price_ids:Vec<B256>,
         min_publish_time:u64,
         max_publish_time:u64
     ) -> Result<Vec<u8>, Vec<u8>>{
@@ -108,15 +108,15 @@ impl MockPythContract {
     fn parse_price_feed_updates_unique(
         &mut self,
         update_data:Vec<AbiBytes>,
-        price_ids:Vec<FixedBytes<32>>,
+        price_ids:Vec<B256>,
         min_publish_time:u64,
         max_publish_time:u64
     ) ->  Result<Vec<u8>, Vec<u8>>{
         self.parse_price_feed_updates_internal(update_data, price_ids, min_publish_time, max_publish_time, true)
     }
 
     fn create_price_feed_update_data(&self,
-        id:FixedBytes<32>,
+        id:B256,
         price:i64,
         conf:u64,
         expo:i32,
@@ -141,7 +141,7 @@ impl  MockPythContract  {
 
      fn parse_price_feed_updates_internal(&mut self,
         update_data: Vec<AbiBytes>,
-        price_ids: Vec<FixedBytes<32>>,
+        price_ids: Vec<B256>,
         min_publish_time:u64,
         max_publish_time:u64,
         unique:bool
@@ -183,7 +183,7 @@ impl  MockPythContract  {
                      {
                         break;
                   } else {
-                       feeds[i].id = FixedBytes::<32>::ZERO;
+                       feeds[i].id = B256::ZERO;
                    }
                 }
 
@@ -197,10 +197,10 @@ impl  MockPythContract  {
     }  
 }
 
-pub fn create_price_feed_update_data_list() -> (Vec<Bytes>, Vec<FixedBytes<32>>) {
+pub fn create_price_feed_update_data_list() -> (Vec<Bytes>, Vec<B256>) {
     let id = ["ETH","SOL","BTC"].map(|x| {
         let x =  keccak_const::Keccak256::new().update(x.as_bytes()).finalize().to_vec();
-        return  FixedBytes::<32>::from_slice(&x) ;
+        return  B256::from_slice(&x);
     });
     let mut price_feed_data_list = Vec::new();
     for i in 0..3 {
@@ -214,7 +214,7 @@ pub fn create_price_feed_update_data_list() -> (Vec<Bytes>, Vec<FixedBytes<32>>)
 #[cfg(all(test, feature = "std"))]
 mod tests {
     use alloc::vec;
-    use alloy_primitives::{ U256, FixedBytes};
+    use alloy_primitives::{ U256, B256};
     use stylus_sdk::abi::Bytes;
     use 
     crate::pyth::mock::{MockPythContract, DecodeDataType};
@@ -228,8 +228,8 @@ mod tests {
     const EMA_CONF: u64 = 1000;
     const PREV_PUBLISH_TIME: u64 = 1000;
 
-    fn generate_bytes() -> FixedBytes<32> {
-        FixedBytes::<32>::repeat_byte(30)
+    fn generate_bytes() -> B256 {
+        B256::repeat_byte(30)
     }
 
     #[motsu::test]
@@ -241,7 +241,8 @@ mod tests {
 
     #[motsu::test]
     fn error_initialize_mock_contract(contract: MockPythContract) {
-      let err = contract.initialize(U256::from(0), U256::from(0)).expect_err("should not initialize with invalid parameters");
+      let err = contract.initialize(U256::from(0), U256::from(0))  ;
+      assert!(err.is_err())
     }
 
     #[motsu::test]
@@ -298,12 +299,4 @@ mod tests {
         assert_eq!(valid_time_period, U256::from(1000));
     }
 
-    #[motsu::test]
-    fn can_update_price_feeds(contract: MockPythContract) {
-        let _ = contract.initialize(U256::from(1000), U256::from(1000));
-        let id = generate_bytes();
-        //let price_feed_created = contract.create_price_feed_update_data(id, PRICE, CONF, EXPO, EMA_PRICE, EMA_CONF, U256::from(1000), PREV_PUBLISH_TIME);    
-        //let mut update_data: Vec<Bytes> = vec![];
-        //update_data.push(Bytes::from(price_feed_created));
-    }
 }

target_chains/ethereum/sdk/stylus/contracts/src/pyth/pyth_contract.rs

@@ -1,7 +1,7 @@
 use alloy_sol_types::SolValue;
 use stylus_sdk::{abi::Bytes as AbiBytes, prelude::*, storage::TopLevelStorage};
 use alloc::vec::Vec;
-use alloy_primitives::{ FixedBytes, U256 , Bytes };
+use alloy_primitives::{ U256 , Bytes, B256 };
 use crate::pyth::functions::{
     get_price_unsafe,
     get_price_no_older_than,
@@ -27,7 +27,7 @@ pub trait IPyth {
     ///
     /// # Returns
     /// - `Result<Vec<u8>, Self::Error>`: The price data in bytes, or an error.
-    fn get_price_unsafe(&mut self, id: FixedBytes<32>) -> Result<Vec<u8>, Self::Error>;
+    fn get_price_unsafe(&mut self, id: B256) -> Result<Vec<u8>, Self::Error>;
 
     /// Retrieves a price that is no older than a specified `age`.
     /// 
@@ -37,7 +37,7 @@ pub trait IPyth {
     ///
     /// # Returns
     /// - `Result<Vec<u8>, Self::Error>`: The price data in bytes, or an error.
-    fn get_price_no_older_than(&mut self, id: FixedBytes<32>, age: U256) -> Result<Vec<u8>, Self::Error>;
+    fn get_price_no_older_than(&mut self, id: B256, age: U256) -> Result<Vec<u8>, Self::Error>;
 
     /// Retrieves the exponentially-weighted moving average (EMA) price without recency checks.
     /// 
@@ -46,7 +46,7 @@ pub trait IPyth {
     ///
     /// # Returns
     /// - `Result<Vec<u8>, Self::Error>`: The EMA price data in bytes, or an error.
-    fn get_ema_price_unsafe(&mut self, id: FixedBytes<32>) -> Result<Vec<u8>, Self::Error>;
+    fn get_ema_price_unsafe(&mut self, id: B256) -> Result<Vec<u8>, Self::Error>;
 
     /// Retrieves an EMA price that is no older than the specified `age`.
     /// 
@@ -56,7 +56,7 @@ pub trait IPyth {
     ///
     /// # Returns
     /// - `Result<Vec<u8>, Self::Error>`: The EMA price data in bytes, or an error.
-    fn get_ema_price_no_older_than(&mut self, id: FixedBytes<32>, age: U256) -> Result<Vec<u8>, Self::Error>;
+    fn get_ema_price_no_older_than(&mut self, id: B256, age: U256) -> Result<Vec<u8>, Self::Error>;
 
     /// Updates price feeds with the given data.
     ///
@@ -79,7 +79,7 @@ pub trait IPyth {
     fn update_price_feeds_if_necessary(
         &mut self,
         update_data: Vec<AbiBytes>,
-        price_ids: Vec<FixedBytes<32>>,
+        price_ids: Vec<B256>,
         publish_times: Vec<u64>,
     ) -> Result<(), Self::Error>;
 
@@ -114,7 +114,7 @@ pub trait IPyth {
     fn parse_price_feed_updates(
         &mut self,
         update_data: Vec<AbiBytes>,
-        price_ids: Vec<FixedBytes<32>>,
+        price_ids: Vec<B256>,
         min_publish_time: u64,
         max_publish_time: u64,
     ) -> Result<Vec<u8>, Self::Error>;
@@ -132,7 +132,7 @@ pub trait IPyth {
     fn parse_price_feed_updates_unique(
         &mut self,
         update_data: Vec<AbiBytes>,
-        price_ids: Vec<FixedBytes<32>>,
+        price_ids: Vec<B256>,
         min_publish_time: u64,
         max_publish_time: u64,
     ) -> Result<Vec<u8>, Self::Error>;
@@ -154,25 +154,25 @@ impl IPyth for PythContract  {
 
     type Error = Vec<u8>;
 
-    fn get_price_unsafe(&mut self, id: FixedBytes<32>) -> Result<Vec<u8>, Self::Error> {
+    fn get_price_unsafe(&mut self, id: B256) -> Result<Vec<u8>, Self::Error> {
         let price = get_price_unsafe(self, self._ipyth.get(), id)?;
         let data =  price.abi_encode();
         Ok(data)
     }
 
-    fn get_price_no_older_than(&mut self,id: FixedBytes<32>, age: U256) -> Result<Vec<u8>, Self::Error> {
+    fn get_price_no_older_than(&mut self,id: B256, age: U256) -> Result<Vec<u8>, Self::Error> {
         let price = get_price_no_older_than(self, self._ipyth.get(), id,age)?;
         let data =  price.abi_encode();
         Ok(data)
     }
 
-    fn get_ema_price_unsafe(&mut self, id: FixedBytes<32>) -> Result<Vec<u8>, Self::Error> {
+    fn get_ema_price_unsafe(&mut self, id: B256) -> Result<Vec<u8>, Self::Error> {
         let price = get_ema_price_unsafe(self, self._ipyth.get(), id)?;
         let data =  price.abi_encode();
         Ok(data)
     }
 
-    fn get_ema_price_no_older_than(&mut self, id: FixedBytes<32>, age: U256) -> Result<Vec<u8>, Self::Error> {
+    fn get_ema_price_no_older_than(&mut self, id: B256, age: U256) -> Result<Vec<u8>, Self::Error> {
         let price = get_ema_price_no_older_than(self, self._ipyth.get(), id,age)?;
         let data =  price.abi_encode();
         Ok(data)
@@ -200,7 +200,7 @@ impl IPyth for PythContract  {
     fn update_price_feeds_if_necessary(
         &mut self,
         update_data: Vec<AbiBytes>,
-        price_ids: Vec<FixedBytes<32>>,
+        price_ids: Vec<B256>,
         publish_times: Vec<u64>,
     ) -> Result<(), Self::Error> {
         let data = update_data.into_iter().map(|x| Bytes::from(x.0)).collect();
@@ -212,7 +212,7 @@ impl IPyth for PythContract  {
     fn parse_price_feed_updates(
         &mut self,
         update_data: Vec<AbiBytes>,
-        price_ids: Vec<FixedBytes<32>>,
+        price_ids: Vec<B256>,
         min_publish_time: u64,
         max_publish_time: u64,
     ) -> Result<Vec<u8>, Self::Error> {
@@ -225,7 +225,7 @@ impl IPyth for PythContract  {
     fn parse_price_feed_updates_unique(
         &mut self,
         update_data: Vec<AbiBytes>,
-        price_ids: Vec<FixedBytes<32>>,
+        price_ids: Vec<B256>,
         min_publish_time: u64,
         max_publish_time: u64,
     ) -> Result<Vec<u8>, Self::Error> {

target_chains/ethereum/sdk/stylus/contracts/src/pyth/types.rs

@@ -214,18 +214,22 @@ impl StoragePriceFeed {
 
 #[cfg(all(test, feature = "std"))]
 mod tests {
-    use alloy_primitives::{ FixedBytes, U256};
+    use alloy_primitives::{  B256, U256};
     use crate::pyth::types::{PriceFeed, Price, StoragePriceFeed, StoragePrice};
 
     // Updated constants to use uppercase naming convention
     const PRICE: i64 = 1000;
     const CONF: u64 = 1000;
-    const EXPO: i32 = 1000;
-    const EMA_PRICE: i64 = 1000;
-    const EMA_CONF: u64 = 1000;
+    const EXPO: i32 = 1000; 
 
-    fn generate_bytes() -> FixedBytes<32> {
-        FixedBytes::<32>::repeat_byte(30)
+
+
+    /// Generates a 256-bit hash filled with the byte value 30.
+    ///
+    /// # Returns
+    /// - `B256`: A 256-bit hash where each byte is set to 30.
+    fn generate_bytes() -> B256 {
+        B256::repeat_byte(30)
     }
 
     #[motsu::test]