blockworks-foundation
/
pyth-crosschain
mirror of https://github.com/blockworks-foundation/pyth-crosschain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(target_chains/starknet): use EthAddress and is_eth_signature_valid (#1556)

This commit is contained in:
Pavel Strakhov 2024-05-08 07:20:30 +01:00 committed by GitHub
parent dd9b07b5e4
commit d105a7aa86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 92 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
target_chains/starknet/contracts/src/wormhole.cairo
View File

@ -1,12 +1,13 @@
use super::byte_array::ByteArray;
use core::starknet::secp256_trait::Signature;
use core::starknet::EthAddress;
use pyth::util::UnwrapWithFelt252;
mod governance;
#[starknet::interface]
pub trait IWormhole<T> {
fn submit_new_guardian_set(ref self: T, set_index: u32, guardians: Array<felt252>);
fn submit_new_guardian_set(ref self: T, set_index: u32, guardians: Array<EthAddress>);
fn parse_and_verify_vm(self: @T, encoded_vm: ByteArray) -> VerifiedVM;
// We don't need to implement other governance actions for now.
@ -133,9 +134,10 @@ mod wormhole {
use core::starknet::secp256_trait::{Signature, recover_public_key, Secp256PointTrait};
use core::starknet::secp256k1::Secp256k1Point;
use core::starknet::{
ContractAddress, get_execution_info, get_caller_address, get_block_timestamp
ContractAddress, get_execution_info, get_caller_address, get_block_timestamp, EthAddress,
};
use core::keccak::cairo_keccak;
use core::starknet::eth_signature::is_eth_signature_valid;
use core::integer::u128_byte_reverse;
use core::panic_with_felt252;
use pyth::hash::{Hasher, HasherImpl};
@ -158,14 +160,14 @@ mod wormhole {
consumed_governance_actions: LegacyMap<u256, bool>,
guardian_sets: LegacyMap<u32, GuardianSet>,
// (guardian_set_index, guardian_index) => guardian_address
guardian_keys: LegacyMap<(u32, u8), u256>,
guardian_keys: LegacyMap<(u32, u8), EthAddress>,
}
#[constructor]
fn constructor(
ref self: ContractState,
owner: ContractAddress,
initial_guardians: Array<felt252>,
initial_guardians: Array<EthAddress>,
chain_id: u16,
governance_chain_id: u16,
governance_contract: u256,
@ -178,7 +180,7 @@ mod wormhole {
store_guardian_set(ref self, set_index, @initial_guardians);
}
fn store_guardian_set(ref self: ContractState, set_index: u32, guardians: @Array<felt252>) {
fn store_guardian_set(ref self: ContractState, set_index: u32, guardians: @Array<EthAddress>) {
if guardians.len() == 0 {
panic_with_felt252(SubmitNewGuardianSetError::NoGuardiansSpecified.into());
}
@ -188,7 +190,7 @@ mod wormhole {
let mut i = 0;
while i < guardians.len() {
if *guardians.at(i) == 0 {
if (*guardians.at(i)).into() == 0 {
panic_with_felt252(SubmitNewGuardianSetError::InvalidGuardianKey.into());
}
i += 1;
@ -217,7 +219,7 @@ mod wormhole {
#[abi(embed_v0)]
impl WormholeImpl of IWormhole<ContractState> {
fn submit_new_guardian_set(
ref self: ContractState, set_index: u32, guardians: Array<felt252>
ref self: ContractState, set_index: u32, guardians: Array<EthAddress>
) {
let execution_info = get_execution_info().unbox();
if self.owner.read() != execution_info.caller_address {
@ -271,9 +273,12 @@ mod wormhole {
let guardian_key = self
.guardian_keys
.read((vm.guardian_set_index, signature.guardian_index));
.read((vm.guardian_set_index, signature.guardian_index))
.try_into()
.expect(UNEXPECTED_OVERFLOW);
verify_signature(vm.hash, signature.signature, guardian_key);
is_eth_signature_valid(vm.hash, signature.signature, guardian_key)
.unwrap_with_felt252();
};
vm
}
@ -359,25 +364,6 @@ mod wormhole {
}
}
fn verify_signature(body_hash: u256, signature: Signature, guardian_key: u256,) {
let point: Secp256k1Point = recover_public_key(body_hash, signature)
.expect(ParseAndVerifyVmError::InvalidSignature.into());
let address = eth_address(point);
assert(guardian_key != 0, SubmitNewGuardianSetError::InvalidGuardianKey.into());
if address != guardian_key {
panic_with_felt252(ParseAndVerifyVmError::InvalidSignature.into());
}
}
fn eth_address(point: Secp256k1Point) -> u256 {
let (x, y) = point.get_coordinates().expect(ParseAndVerifyVmError::InvalidSignature.into());
let mut hasher = HasherImpl::new();
hasher.push_u256(x);
hasher.push_u256(y);
hasher.finalize() % ONE_SHIFT_160
}
#[generate_trait]
impl PrivateImpl of PrivateImplTrait {
fn verify_governance_vm(self: @ContractState, vm: @VerifiedVM) {

3
target_chains/starknet/contracts/src/wormhole/governance.cairo
View File

@ -2,6 +2,7 @@ use pyth::reader::{Reader, ReaderImpl};
use pyth::util::UNEXPECTED_OVERFLOW;
use super::GovernanceError;
use core::panic_with_felt252;
use core::starknet::EthAddress;
// "Core" (left padded)
const MODULE: u256 = 0x00000000000000000000000000000000000000000000000000000000436f7265;
@ -40,7 +41,7 @@ pub struct Header {
#[derive(Drop, Debug, Clone)]
pub struct NewGuardianSet {
pub set_index: u32,
pub keys: Array<felt252>,
pub keys: Array<EthAddress>,
}
pub fn parse_header(ref reader: Reader) -> Header {

20
target_chains/starknet/contracts/tests/wormhole.cairo
View File

@ -3,7 +3,7 @@ use pyth::wormhole::{IWormholeDispatcher, IWormholeDispatcherTrait, ParseAndVeri
use pyth::reader::ReaderImpl;
use pyth::byte_array::{ByteArray, ByteArrayImpl};
use pyth::util::{UnwrapWithFelt252, array_try_into};
use core::starknet::ContractAddress;
use core::starknet::{ContractAddress, EthAddress};
use core::panic_with_felt252;
#[test]
@ -118,7 +118,7 @@ fn test_submit_guardian_set_rejects_non_governance(pos: usize, random1: usize, r
fn deploy(
owner: ContractAddress,
guardians: Array<felt252>,
guardians: Array<EthAddress>,
chain_id: u16,
governance_chain_id: u16,
governance_contract: u256,
@ -211,13 +211,14 @@ fn corrupted_byte(value: u8, random: usize) -> u8 {
(v % 256).try_into().unwrap()
}
fn guardian_set0() -> Array<felt252> {
array![0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5]
fn guardian_set0() -> Array<EthAddress> {
array_try_into(array![0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5])
}
// Below are actual guardian keys from
// https://github.com/wormhole-foundation/wormhole-networks/tree/master/mainnetv2/guardianset
fn guardian_set1() -> Array<felt252> {
fn guardian_set1() -> Array<EthAddress> {
array_try_into(
array![
0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5,
0xfF6CB952589BDE862c25Ef4392132fb9D4A42157,
@ -239,8 +240,10 @@ fn guardian_set1() -> Array<felt252> {
0x5E1487F35515d02A92753504a8D75471b9f49EdB,
0x6FbEBc898F403E4773E95feB15E80C9A99c8348d,
]
)
}
fn guardian_set2() -> Array<felt252> {
fn guardian_set2() -> Array<EthAddress> {
array_try_into(
array![
0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5,
0xfF6CB952589BDE862c25Ef4392132fb9D4A42157,
@ -262,8 +265,10 @@ fn guardian_set2() -> Array<felt252> {
0x5E1487F35515d02A92753504a8D75471b9f49EdB,
0x6FbEBc898F403E4773E95feB15E80C9A99c8348d,
]
)
}
fn guardian_set3() -> Array<felt252> {
fn guardian_set3() -> Array<EthAddress> {
array_try_into(
array![
0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5,
0xfF6CB952589BDE862c25Ef4392132fb9D4A42157,
@ -285,6 +290,7 @@ fn guardian_set3() -> Array<felt252> {
0x5E1487F35515d02A92753504a8D75471b9f49EdB,
0x6FbEBc898F403E4773E95feB15E80C9A99c8348d,
]
)
}
// A random VAA pulled from Hermes.