first fixes

Author: ayushboss

target_chains/stylus/contracts/pyth-receiver/src/error.rs

@@ -27,6 +27,7 @@ pub enum PythReceiverError {
     OldGovernanceMessage,
     GovernanceMessageAlreadyExecuted,
     InvalidWormholeAddressToSet,
+    WormholeUninitialized,
 }
 
 impl core::fmt::Debug for PythReceiverError {
@@ -67,6 +68,9 @@ impl core::fmt::Debug for PythReceiverError {
             PythReceiverError::InvalidWormholeAddressToSet => {
                 write!(f, "InvalidWormholeAddressToSet")
             }
+            PythReceiverError::WormholeUninitialized => {
+                write!(f, "Wormhole is uninitialized, please set the Wormhole address and initialize the contract first")
+            }
         }
     }
 }
@@ -111,6 +115,9 @@ impl core::fmt::Display for PythReceiverError {
             PythReceiverError::InvalidWormholeAddressToSet => {
                 write!(f, "Invalid Wormhole address to set")
             }
+            PythReceiverError::WormholeUninitialized => {
+                write!(f, "Wormhole is uninitialized, please set the Wormhole address and initialize the contract first")
+            }
         }
     }
 }
@@ -143,6 +150,7 @@ impl From<PythReceiverError> for Vec<u8> {
             PythReceiverError::OldGovernanceMessage => 23,
             PythReceiverError::GovernanceMessageAlreadyExecuted => 24,
             PythReceiverError::InvalidWormholeAddressToSet => 25,
+            PythReceiverError::WormholeUninitialized => 26,
         }]
     }
 }

target_chains/stylus/contracts/pyth-receiver/src/governance_structs.rs

@@ -3,6 +3,7 @@ use crate::structs::DataSource;
 use alloc::vec::Vec;
 use stylus_sdk::alloy_primitives::{Address, FixedBytes, U16};
 
+// Magic is `PTGM` encoded as a 4 byte data: Pyth Governance Message
 const MAGIC: u32 = 0x5054474d;
 const MODULE_TARGET: u8 = 1;
 

target_chains/stylus/contracts/pyth-receiver/src/lib.rs

@@ -543,7 +543,7 @@ impl PythReceiver {
             .map_err(|_| PythReceiverError::InvalidWormholeMessage)?;
 
         let vm = Vaa::read(&mut Vec::from(data.clone()).as_slice())
-            .map_err(|_| PythReceiverError::VaaVerificationFailed)?;
+            .map_err(|_| PythReceiverError::InvalidVaa)?;
 
         verify_governance_vm(self, vm.clone())?;
 
@@ -554,7 +554,7 @@ impl PythReceiver {
 
         let wormhole_id = wormhole
             .chain_id(chain_id_config)
-            .map_err(|_| PythReceiverError::InvalidWormholeMessage)?;
+            .map_err(|_| PythReceiverError::WormholeUninitialized)?;
 
         if instruction.target_chain_id != 0 && instruction.target_chain_id != wormhole_id {
             return Err(PythReceiverError::InvalidGovernanceTarget);
@@ -618,7 +618,7 @@ impl PythReceiver {
     }
 
     fn set_fee(&mut self, value: u64, expo: u64) {
-        let new_fee = U256::from(value) * U256::from(10).pow(U256::from(expo));
+        let new_fee = U256::from(value).saturating_mul(U256::from(10).pow(U256::from(expo)));
         let old_fee = self.single_update_fee_in_wei.get();
 
         self.single_update_fee_in_wei.set(new_fee);
@@ -649,9 +649,7 @@ impl PythReceiver {
         let config = Call::new();
         wormhole
             .parse_and_verify_vm(config, data.clone())
-            .map_err(|_| PythReceiverError::InvalidGovernanceMessage)?;
-
-        // if !is_valid_governance_data_source()
+            .map_err(|_| PythReceiverError::InvalidVaa)?;
 
         let vm = Vaa::read(&mut data.as_slice())
             .map_err(|_| PythReceiverError::VaaVerificationFailed)?;
@@ -723,7 +721,7 @@ impl PythReceiver {
         }
 
         self.governance_data_source_index.set(U32::from(new_index));
-        let _old_data_source = self.governance_data_source_index.get();
+        let old_data_source_emitter_address = self.governance_data_source_emitter_address.get();
 
         self.governance_data_source_chain_id
             .set(U16::from(claim_vm.body.emitter_chain));
@@ -744,7 +742,7 @@ impl PythReceiver {
             self.vm(),
             GovernanceDataSourceSet {
                 old_chain_id: current_index as u16,
-                old_emitter_address: self.governance_data_source_emitter_address.get(),
+                old_emitter_address: old_data_source_emitter_address,
                 new_chain_id: claim_vm.body.emitter_chain,
                 new_emitter_address: FixedBytes::from(emitter_bytes),
                 initial_sequence: last_executed_governance_sequence,
@@ -755,7 +753,7 @@ impl PythReceiver {
     }
 
     fn set_transaction_fee(&mut self, value: u64, expo: u64) {
-        let new_fee = U256::from(value) * U256::from(10).pow(U256::from(expo));
+        let new_fee = U256::from(value).saturating_mul(U256::from(10).pow(U256::from(expo)));
         let old_fee = self.transaction_fee_in_wei.get();
 
         self.transaction_fee_in_wei.set(new_fee);
@@ -769,7 +767,8 @@ impl PythReceiver {
         expo: u64,
         target_address: Address,
     ) -> Result<(), PythReceiverError> {
-        let fee_to_withdraw = U256::from(value) * U256::from(10).pow(U256::from(expo));
+        let fee_to_withdraw =
+            U256::from(value).saturating_mul(U256::from(10).pow(U256::from(expo)));
         let current_balance = self.vm().balance(self.vm().contract_address());
 
         if current_balance < fee_to_withdraw {

target_chains/stylus/contracts/pyth-receiver/src/pyth_governance_test.rs

@@ -189,6 +189,7 @@ mod test {
         fn test_set_wormhole_address(
             pyth_contract: Contract<PythReceiver>,
             wormhole_contract: Contract<WormholeContract>,
+            wormhole_contract_2: Contract<WormholeContract>,
             alice: Address,
         ) {
             pyth_wormhole_init(&pyth_contract, &wormhole_contract, &alice, 0);
@@ -214,6 +215,7 @@ mod test {
 
         }
     */
+
     #[motsu::test]
     fn test_authorize_governance_data_source_transfer(
         pyth_contract: Contract<PythReceiver>,