Skip to content

Commit f924e76

Browse files
ayushbossayushboss
committed
fixed test case signatures
1 parent f5a9d45 commit f924e76

File tree

3 files changed

+21
-39
lines changed

3 files changed

+21
-39
lines changed

‎target_chains/stylus/contracts/pyth-receiver/src/integration_tests.rs‎

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -61,44 +61,25 @@ mod test {
6161
#[cfg(test)]
6262
fn current_guardians() -> Vec<Address> {
6363
vec![
64-
Address::from([0x58, 0x93, 0xB5, 0xA7, 0x6c, 0x3f, 0x73, 0x96, 0x45, 0x64, 0x88, 0x85, 0xBD, 0xCC, 0x06, 0xcd, 0x70, 0xa3, 0xCd, 0x3]), // Rockaway
65-
Address::from([0xfF, 0x6C, 0xB9, 0x52, 0x58, 0x9B, 0xDE, 0x86, 0x2c, 0x25, 0xEf, 0x43, 0x92, 0x13, 0x2f, 0xb9, 0xD4, 0xA4, 0x21, 0x57]), // Staked
66-
Address::from([0x11, 0x4D, 0xe8, 0x46, 0x01, 0x93, 0xbd, 0xf3, 0xA2, 0xfC, 0xf8, 0x1f, 0x86, 0xa0, 0x97, 0x65, 0xF4, 0x76, 0x2f, 0xD1]), // Figment
67-
Address::from([0x10, 0x7A, 0x00, 0x86, 0xb3, 0x2d, 0x7A, 0x09, 0x77, 0x92, 0x6A, 0x20, 0x51, 0x31, 0xd8, 0x73, 0x1D, 0x39, 0xcb, 0xEB]), // ChainodeTech
68-
Address::from([0x8C, 0x82, 0xB2, 0xfd, 0x82, 0xFa, 0xeD, 0x27, 0x11, 0xd5, 0x9A, 0xF0, 0xF2, 0x49, 0x9D, 0x16, 0xe7, 0x26, 0xf6, 0xb2]), // Inotel
69-
Address::from([0x11, 0xb3, 0x97, 0x56, 0xC0, 0x42, 0x44, 0x1B, 0xE6, 0xD8, 0x65, 0x0b, 0x69, 0xb5, 0x4E, 0xBE, 0x71, 0x5E, 0x23, 0x43]), // HashKey Cloud
70-
Address::from([0x54, 0xCe, 0x5B, 0x4D, 0x34, 0x8f, 0xb7, 0x4B, 0x95, 0x8e, 0x89, 0x66, 0xe2, 0xec, 0x3d, 0xBd, 0x49, 0x58, 0xa7, 0xcd]), // ChainLayer
71-
Address::from([0x15, 0xe7, 0xcA, 0xF0, 0x7C, 0x4e, 0x3D, 0xC8, 0xe7, 0xC4, 0x69, 0xf9, 0x2C, 0x8C, 0xd8, 0x8F, 0xB8, 0x00, 0x5a, 0x20]), // xLabs
72-
Address::from([0x74, 0xa3, 0xbf, 0x91, 0x39, 0x53, 0xD6, 0x95, 0x26, 0x0D, 0x88, 0xBC, 0x1a, 0xA2, 0x5A, 0x4e, 0xeE, 0x36, 0x3e, 0xf0]), // Forbole
73-
Address::from([0x00, 0x0a, 0xC0, 0x07, 0x67, 0x27, 0xb3, 0x5F, 0xBe, 0xa2, 0xdA, 0xc2, 0x8f, 0xEE, 0x5c, 0xCB, 0x0f, 0xEA, 0x76, 0x8e]), // Staking Fund
74-
Address::from([0xAF, 0x45, 0xCe, 0xd1, 0x36, 0xb9, 0xD9, 0xe2, 0x49, 0x03, 0x46, 0x4A, 0xE8, 0x89, 0xF5, 0xC8, 0xa7, 0x23, 0xFC, 0x14]), // Moonlet Wallet
75-
Address::from([0xf9, 0x31, 0x24, 0xb7, 0xc7, 0x38, 0x84, 0x3C, 0xBB, 0x89, 0xE8, 0x64, 0xc8, 0x62, 0xc3, 0x8c, 0xdd, 0xCc, 0xF9, 0x5]), // P2P Validator
76-
Address::from([0xD2, 0xCC, 0x37, 0xA4, 0xdc, 0x03, 0x6a, 0x8D, 0x23, 0x2b, 0x48, 0xf6, 0x2c, 0xDD, 0x47, 0x31, 0x41, 0x2f, 0x48, 0x90]), // 01node
77-
Address::from([0xDA, 0x79, 0x8F, 0x68, 0x96, 0xA3, 0x33, 0x1F, 0x64, 0xb4, 0x8c, 0x12, 0xD1, 0xD5, 0x7F, 0xd9, 0xcb, 0xe7, 0x08, 0x11]), // MCF
78-
Address::from([0x71, 0xAA, 0x1B, 0xE1, 0xD3, 0x6C, 0xaF, 0xE3, 0x86, 0x79, 0x10, 0xF9, 0x9C, 0x09, 0xe3, 0x47, 0x89, 0x9C, 0x19, 0xC3]), // Everstake
79-
Address::from([0x81, 0x92, 0xb6, 0xE7, 0x38, 0x7C, 0xCd, 0x76, 0x82, 0x77, 0xc1, 0x7D, 0xAb, 0x1b, 0x7a, 0x50, 0x27, 0xc0, 0xb3, 0xCf]), // Chorus One
80-
Address::from([0x17, 0x8e, 0x21, 0xad, 0x2E, 0x77, 0xAE, 0x06, 0x71, 0x15, 0x49, 0xCF, 0xBB, 0x1f, 0x9c, 0x7a, 0x9d, 0x80, 0x96, 0xe8]), // Syncnode
81-
Address::from([0x5E, 0x14, 0x87, 0xF3, 0x55, 0x15, 0xd0, 0x2A, 0x92, 0x75, 0x35, 0x04, 0xa8, 0xD7, 0x54, 0x71, 0xb9, 0xf4, 0x9E, 0xdB]), // Triton
82-
Address::from([0x6F, 0xBc, 0x89, 0x8F, 0x40, 0x3E, 0x47, 0x73, 0xE9, 0x5f, 0xeb, 0x15, 0xE8, 0x0C, 0x9A, 0x99, 0x9C, 0x83, 0x48, 0xd]), // Staking Facilities
83-
// Address::from_str("0x5893B5A76c3f739645648885bDCcC06cd70a3Cd3").unwrap(), // Rockaway
84-
// Address::from_str("0xfF6CB952589BDE862c25Ef4392132fb9D4A42157").unwrap(), // Staked
85-
// Address::from_str("0x114De8460193bdf3A2fCf81f86a09765F4762fD1").unwrap(), // Figment
86-
// Address::from_str("0x107A0086b32d7A0977926A205131d8731D39cbEB").unwrap(), // ChainodeTech
87-
// Address::from_str("0x8C82B2fd82FaeD2711d59AF0F2499D16e726f6b2").unwrap(), // Inotel
88-
// Address::from_str("0x11b39756C042441BE6D8650b69b54EbE715E2343").unwrap(), // HashKey Cloud
89-
// Address::from_str("0x54Ce5B4D348fb74B958e8966e2ec3dBd4958a7cd").unwrap(), // ChainLayer
90-
// Address::from_str("0x15e7cAF07C4e3DC8e7C469f92C8Cd88FB8005a20").unwrap(), // xLabs
91-
// Address::from_str("0x74a3bf913953D695260D88BC1aA25A4eeE363ef0").unwrap(), // Forbole
92-
// Address::from_str("0x000aC0076727b35FBea2dAc28fEE5cCB0fEA768e").unwrap(), // Staking Fund
93-
// Address::from_str("0xAF45Ced136b9D9e24903464AE889F5C8a723FC14").unwrap(), // Moonlet Wallet
94-
// Address::from_str("0xf93124b7c738843CBB89E864c862c38cddCccF95").unwrap(), // P2P Validator
95-
// Address::from_str("0xD2CC37A4dc036a8D232b48f62cDD4731412f4890").unwrap(), // 01node
96-
// Address::from_str("0xDA798F6896A3331F64b48c12D1D57Fd9cbe70811").unwrap(), // MCF
97-
// Address::from_str("0x71AA1BE1D36CaFE3867910F99C09e347899C19C3").unwrap(), // Everstake
98-
// Address::from_str("0x8192b6E7387CCd768277c17DAb1b7a5027c0b3Cf").unwrap(), // Chorus One
99-
// Address::from_str("0x178e21ad2E77AE06711549CFBB1f9c7a9d8096e8").unwrap(), // Syncnode
100-
// Address::from_str("0x5E1487F35515d02A92753504a8D75471b9f49EdB").unwrap(), // Triton
101-
// Address::from_str("0x6FbEBc898F403E4773E95feB15E80C9A99c8348d").unwrap(), // Staking Facilities
64+
address!("0x5893B5A76c3f739645648885bDCcC06cd70a3Cd3"), // Rockaway
65+
address!("0xfF6CB952589BDE862c25Ef4392132fb9D4A42157"), // Staked
66+
address!("0x114De8460193bdf3A2fCf81f86a09765F4762fD1"), // Figment
67+
address!("0x107A0086b32d7A0977926A205131d8731D39cbEB"), // ChainodeTech
68+
address!("0x8C82B2fd82FaeD2711d59AF0F2499D16e726f6b2"), // Inotel
69+
address!("0x11b39756C042441BE6D8650b69b54EbE715E2343"), // HashKey Cloud
70+
address!("0x54Ce5B4D348fb74B958e8966e2ec3dBd4958a7cd"), // ChainLayer
71+
address!("0x15e7cAF07C4e3DC8e7C469f92C8Cd88FB8005a20"), // xLabs
72+
address!("0x74a3bf913953D695260D88BC1aA25A4eeE363ef0"), // Forbole
73+
address!("0x000aC0076727b35FBea2dAc28fEE5cCB0fEA768e"), // Staking Fund
74+
address!("0xAF45Ced136b9D9e24903464AE889F5C8a723FC14"), // Moonlet Wallet
75+
address!("0xf93124b7c738843CBB89E864c862c38cddCccF95"), // P2P Validator
76+
address!("0xD2CC37A4dc036a8D232b48f62cDD4731412f4890"), // 01node
77+
address!("0xDA798F6896A3331F64b48c12D1D57Fd9cbe70811"), // MCF
78+
address!("0x71AA1BE1D36CaFE3867910F99C09e347899C19C3"), // Everstake
79+
address!("0x8192b6E7387CCd768277c17DAb1b7a5027c0b3Cf"), // Chorus One
80+
address!("0x178e21ad2E77AE06711549CFBB1f9c7a9d8096e8"), // Syncnode
81+
address!("0x5E1487F35515d02A92753504a8D75471b9f49EdB"), // Triton
82+
address!("0x6FbEBc898F403E4773E95feB15E80C9A99c8348d"), // Staking Facilities
10283
]
10384
}
10485

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ impl PythReceiver {
185185
Proof::WormholeMerkle { vaa, updates } => {
186186
let wormhole: IWormholeContract = IWormholeContract::new(self.wormhole.get());
187187
let config = Call::new();
188+
188189
wormhole.parse_and_verify_vm(config, Vec::from(vaa.clone())).map_err(|_| PythReceiverError::InvalidWormholeMessage).unwrap();
190+
189191
let vaa = Vaa::read(&mut Vec::from(vaa.clone()).as_slice()).unwrap();
190192

191193
let cur_emitter_address: &[u8; 32] = vaa.body.emitter_address.as_slice().try_into().expect("emitter address must be 32 bytes");

‎target_chains/stylus/contracts/wormhole/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ impl WormholeContract {
224224
}
225225

226226
fn verify_vm(&self, vaa: &VerifiedVM) -> Result<(), WormholeError> {
227-
228227
let guardian_set = self.get_gs_internal(vaa.guardian_set_index)?;
229228
if vaa.guardian_set_index != self.current_guardian_set_index.get().try_into().unwrap_or(0u32)
230229
&& guardian_set.expiration_time > 0 {

0 commit comments

Comments
 (0)