Skip to content

Commit cfe9532

Browse files
committed
small fixes
1 parent 8f013cb commit cfe9532

File tree

1 file changed

+10
-22
lines changed
  • target_chains/stylus/contracts/wormhole/src

1 file changed

+10
-22
lines changed

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

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,6 @@ impl WormholeContract {
131131
if self.initialized.get() {
132132
return Err(WormholeError::AlreadyInitialized.into());
133133
}
134-
135-
if initial_guardians.is_empty() {
136-
return Err(WormholeError::InvalidInput.into());
137-
}
138-
139134
self.current_guardian_set_index.set(U256::from(initial_guardian_set_index));
140135
self.chain_id.set(U256::from(chain_id));
141136
self.governance_chain_id.set(U256::from(governance_chain_id));
@@ -282,7 +277,7 @@ impl WormholeContract {
282277

283278
let payload = encoded_vaa[cursor..].to_vec();
284279

285-
let hash = Self::hash_static(&encoded_vaa[cursor - 51..])?;
280+
let hash = keccak256(&encoded_vaa[cursor - 51..]);
286281

287282
Ok(VerifiedVM {
288283
version,
@@ -350,13 +345,6 @@ impl WormholeContract {
350345
Ok(())
351346
}
352347

353-
354-
355-
fn hash_static(body: &[u8]) -> Result<FixedBytes<32>, WormholeError> {
356-
let hash = keccak256(body);
357-
Ok(hash)
358-
}
359-
360348
fn compute_gs_key(&self, set_index: u32, guardian_index: u8) -> U256 {
361349
let key_data = [&set_index.to_be_bytes()[..], &[guardian_index]].concat();
362350
U256::from_be_bytes(keccak256(&key_data).0)
@@ -495,7 +483,7 @@ mod tests {
495483
use core::str::FromStr;
496484
use k256::ecdsa::SigningKey;
497485
use stylus_sdk::alloy_primitives::keccak256;
498-
486+
499487
#[cfg(test)]
500488
use base64::engine::general_purpose;
501489
#[cfg(test)]
@@ -538,7 +526,7 @@ mod tests {
538526
0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40,
539527
]
540528
}
541-
529+
542530
#[cfg(test)]
543531
fn current_guardians() -> Vec<Address> {
544532
vec![
@@ -629,7 +617,7 @@ mod tests {
629617
contract.initialize(guardians, 1, CHAIN_ID, GOVERNANCE_CHAIN_ID, governance_contract).unwrap();
630618
contract
631619
}
632-
620+
633621
#[cfg(test)]
634622
fn deploy_with_current_mainnet_guardians() -> WormholeContract {
635623
let mut contract = WormholeContract::default();
@@ -797,7 +785,7 @@ mod tests {
797785
#[motsu::test]
798786
fn test_verification_multiple_guardian_sets() {
799787
let mut contract = deploy_with_current_mainnet_guardians();
800-
788+
801789
let store_result = contract.store_gs(4, current_guardians(), 0);
802790
if let Err(_) = store_result {
803791
panic!("Error deploying multiple guardian sets");
@@ -811,7 +799,7 @@ mod tests {
811799
#[motsu::test]
812800
fn test_verification_incorrect_guardian_set() {
813801
let mut contract = deploy_with_current_mainnet_guardians();
814-
802+
815803
let store_result = contract.store_gs(4, mock_guardian_set13(), 0);
816804
if let Err(_) = store_result {
817805
panic!("Error deploying guardian set");
@@ -1142,7 +1130,7 @@ mod tests {
11421130
let mut contract = WormholeContract::default();
11431131
let guardians = current_guardians();
11441132
let governance_contract = Address::from_slice(&GOVERNANCE_CONTRACT.to_be_bytes::<32>()[12..32]);
1145-
1133+
11461134
let result = contract.initialize(guardians.clone(), 4, CHAIN_ID, GOVERNANCE_CHAIN_ID, governance_contract);
11471135
assert!(result.is_ok(), "Contract initialization should succeed");
11481136
}
@@ -1201,7 +1189,7 @@ mod tests {
12011189

12021190
let _ = contract.initialize(guardians.clone(), 3, CHAIN_ID, GOVERNANCE_CHAIN_ID, governance_contract);
12031191
let test_vaa = create_vaa_bytes("AQAAAAQNAInUwKI1ItLfYeLaAibn9oXaouTs9BL3Aa9DKCFWrLu0KDaQQMQJlih0Qh7l7yH2o6kD/g9RCmRwZJ6q0OZE0t4AArCSH1wpX04N1U59tQmss2xXZilimAMKlogp7ErAhAo0LFkDogqB74+2By9rm3P5OUWlbC0lrFNut5CQQV38DGsAAxO+1nUTUc842P2afDSjdWcmjvJl2s8secQzuiW8zrdgPpbzhzWsiYXizLQBRKigDS8pWGD4vRk0fuR8H/ZkO/0BBOmDobl1BLNJx7+Pt+NWfuOUBipVFIXGxI9b3vxxH0BIec8hhxDN4m2Pd2I0klGEXKhv9plcR7VlzAsaC7ZE7QIABh4ff66tP7EHdVfZR4mTzv5B97agMcSB1eDeijpyl9JuBhbMupw7nExZNnZag/x2k6AUEWnQnfp8AoaCK7Av+icAB2Ouk9mPd1ybyju39Q8m7GMevt2f1nHVyWVsPRzdEcCuAbzjh5137DCLzVWuFUujTQJ7IJiznQb6cm2Ljk3WOXUACMa/JwRdpVKZf6eTD6O6tivqhdhMtbijlPBZX/kgVKk5Xuyv3h1SRTrNCwkMg5XOWegnCbXqjbUlo+F3qTjCalQBCxfp1itJskZmv+SXA47QivURKWzGa3mntNh0vcAXYi8FeChvoUYmfYpejmBlOkD1I73pmUsyrbYbetHa7qFu3eoBDZScdyrWp2dS5Y9L4b0who/PncVp5oFs/4J8ThHNQoXWXvys+nUc2aM+E+Fwazo2ODdI8XZz9YOGf/ZfE6iXFBYBDgckow8Nb2QD//C6MfP2Bz8zftqvt+D6Dko7v/Inb2OtCj342yjrxcvAMlCQ6lYoTIAMNemzNoqlfNyDMdB9yKoAEKebRtCm8QZSjLQ5uPk8aoQpmNwCpLhiHuzh2fqH55fcQrE6/KFttfw7VzeGUE7k3PF6xIMq0BPr3vkG2MedIh8BEQvpmYK4fChLY5JG26Kk6KuZ1eCkJAOQgdSjWasAvNgsSIlsb5mFjIkGwK9j20svLSl+OJ7I0olefXcZ2JywjgYAEu1jITMLHCMR1blXENulhApdhMfTef1aQ/USMqRVWNigausEzq49Hi2GtcQzHmZuhgnhBZEnjq9K8jsZwJk59iwBaFxZegAAAAAAATTNxrJiPzbWCugg6Vtg92ToHsLNO1e3fj+OJd3UOsNzAAAAAAATpFIAAVE6cNLnZT2Noq5nJ4VNRSf2KrRBNrlimFaXauHv3efDAAFm5RiKEwih25C20x8/vcqMPfJnjIES3909GSxaPMRXqAAAAAAAAAAAAAAAAFxIFHGlrpnuxd5M5WePQalLpUyHAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALFcwAAAAAAAAAAAAAAAAaFxdzQAAAAAAAAAAAAAAAK3MabLDE8LWvGN6+AdUvFHJdm5RAAMAAAAAAAAAAAAAAADf0SJhChSsEtk0iYwC2+wfcnCBFg==");
1204-
1192+
12051193
println!("test_vaa: {:?}", test_vaa);
12061194

12071195
let result1 = contract.parse_and_verify_vm(test_vaa.clone());
@@ -1221,5 +1209,5 @@ mod tests {
12211209
assert!(result2.is_ok());
12221210
}
12231211

1224-
1225-
}
1212+
1213+
}

0 commit comments

Comments
 (0)