Skip to content

Commit

Permalink
refactor(target_chains/starknet): remove old config instructions and …
Browse files Browse the repository at this point in the history 
…owner from wormhole (#1558)
  • Loading branch information
@Riateche
Riateche authored May 9, 2024
1 parent d105a7a commit 1e1be9d
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 211 deletions.
72 changes: 8 additions & 64 deletions target_chains/starknet/contracts/deploy/local_deploy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ fee_contract_address=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e
${sleep}
# guardian set #0
wormhole_address=$(starkli deploy "${wormhole_hash}" \
"${owner}" \
1 `# num_guardians` \
0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5 \
1 `# chain_id` \
Expand All @@ -41,77 +40,22 @@ wormhole_address=$(starkli deploy "${wormhole_hash}" \
${sleep}
# guardian set #1: https://raw.githubusercontent.com/wormhole-foundation/wormhole-networks/master/mainnetv2/guardianset/v1.prototxt
starkli invoke "${wormhole_address}" submit_new_guardian_set \
1 `# set index` \
19 `# num_guardians` \
0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5 \
0xfF6CB952589BDE862c25Ef4392132fb9D4A42157 \
0x114De8460193bdf3A2fCf81f86a09765F4762fD1 \
0x107A0086b32d7A0977926A205131d8731D39cbEB \
0x8C82B2fd82FaeD2711d59AF0F2499D16e726f6b2 \
0x11b39756C042441BE6D8650b69b54EbE715E2343 \
0x54Ce5B4D348fb74B958e8966e2ec3dBd4958a7cd \
0xeB5F7389Fa26941519f0863349C223b73a6DDEE7 \
0x74a3bf913953D695260D88BC1aA25A4eeE363ef0 \
0x000aC0076727b35FBea2dAc28fEE5cCB0fEA768e \
0xAF45Ced136b9D9e24903464AE889F5C8a723FC14 \
0xf93124b7c738843CBB89E864c862c38cddCccF95 \
0xD2CC37A4dc036a8D232b48f62cDD4731412f4890 \
0xDA798F6896A3331F64b48c12D1D57Fd9cbe70811 \
0x71AA1BE1D36CaFE3867910F99C09e347899C19C3 \
0x8192b6E7387CCd768277c17DAb1b7a5027c0b3Cf \
0x178e21ad2E77AE06711549CFBB1f9c7a9d8096e8 \
0x5E1487F35515d02A92753504a8D75471b9f49EdB \
0x6FbEBc898F403E4773E95feB15E80C9A99c8348d \
16 18 1766847064779994277746302277072294871108550301449637470263976489521154979 374953657095152923031303770743522269007103499920836805761143506434463979495 373725794026553362537846905304981854320892126869150736450761801254169477120 4835703278458516786446336 1131377253 3533694129556775410652111826415980944262631656421498398215501759245151417 145493015216602589471695207668173527044214450021182755196032581352392984224 267497573836069714380350521200881787609530659298168186016481773490244091266 443348533394886521835330696538264729103669807313401311199245411889706258110 200303433165499832354845293203843028338419687800279845786613090211434473108 37282816539161742972709083946551920068062204748477644719930149699874385462 111200938271608595261384934914291476246753101189480743698823215749338358345 5785682963869019134199015821749288033381872318410562688180948003975909269 372447340016996751453958019806457886428852701283870538393820846119845147788 33251468085387571623103303511315696691298281336333243761063342581452341650 323161992096034641767541451811925056802673576212351940217752194462561980347 55852237138651071644815135002358067220635692701051811455610533875912981641 190413173566657072516608762222993749133

${sleep}
# guardian set #2: https://raw.githubusercontent.com/wormhole-foundation/wormhole-networks/master/mainnetv2/guardianset/v2.prototxt
starkli invoke "${wormhole_address}" submit_new_guardian_set \
2 `# set index` \
19 `# num_guardians` \
0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5 \
0xfF6CB952589BDE862c25Ef4392132fb9D4A42157 \
0x114De8460193bdf3A2fCf81f86a09765F4762fD1 \
0x107A0086b32d7A0977926A205131d8731D39cbEB \
0x8C82B2fd82FaeD2711d59AF0F2499D16e726f6b2 \
0x11b39756C042441BE6D8650b69b54EbE715E2343 \
0x54Ce5B4D348fb74B958e8966e2ec3dBd4958a7cd \
0x66B9590e1c41e0B226937bf9217D1d67Fd4E91F5 \
0x74a3bf913953D695260D88BC1aA25A4eeE363ef0 \
0x000aC0076727b35FBea2dAc28fEE5cCB0fEA768e \
0xAF45Ced136b9D9e24903464AE889F5C8a723FC14 \
0xf93124b7c738843CBB89E864c862c38cddCccF95 \
0xD2CC37A4dc036a8D232b48f62cDD4731412f4890 \
0xDA798F6896A3331F64b48c12D1D57Fd9cbe70811 \
0x71AA1BE1D36CaFE3867910F99C09e347899C19C3 \
0x8192b6E7387CCd768277c17DAb1b7a5027c0b3Cf \
0x178e21ad2E77AE06711549CFBB1f9c7a9d8096e8 \
0x5E1487F35515d02A92753504a8D75471b9f49EdB \
0x6FbEBc898F403E4773E95feB15E80C9A99c8348d \
2 44 1766847065210651126944505525521222069599854288126726949998063840465138797 39054013088470866893599813322035661048501117089555726788687392536164861911 186918267413056900890218521593203545230034250983266377769400670103688217224 54214750922097681971590495378823998039261772575502204791108963815396679538 248994008232667872698758486001506749115615219491023036208140426934463230397 224235483823871042187452194579994340291351644933258737665365374081962645784 129444929990547403397151941456764812818993218972657847255833740800106200260 318548597134783137700627869311159664823693239605331630210202210299165477657 308852933010951129895011963941866000261904600807292935694851016610643657184 57272874228621364335170723193404742446392708606247574725663969156507973216 268057363923565984687253533797066429881117576606682526627284795527707196557 421894189151847402000239734668088381785344768284464330085711322870200424121 387584417395337067059819722404321580961380603778956902593594676080614899975 443523131755342451570503958659975367050637907361274652611595274647186073286 375107813087591446268414166006799680982485924290770541964399283524664437852 269085314426821465871247165234113878276592898426373369094610290261431112145 394348694527460459816454348661249546781513091938003106009521096332701847735 125670844183465056159554034633959680574572737212268749779705635378223489518 35053869475614771227400345921974210525173525784259894123687028214330135561 57544237843860512274491447149877290860624174166427313971286819807773907946 110681468147560408039747352809294082929396639199393789980441736520638055418 45709869872872997180086402576677640909777820941436708911954532772405320395 339910511168418517917975736269171135752028257685502872671902330279073260362 76482764517489607955778008190826845581092838692650194719207882266659669490 443663869577220861680293443959666949893574779475752540587040489501289361777 231057874919577223790659840464529054850239319545221055959374917590157019925 309066533217885002074480704480667619809952056265738927105682076502747220549 212379788814604791028007106821871908074818251907335322546331543385945316762 165408661499085325620077702639227003047567884011538988728381864749733773312 29852013947978990147012099107546124222651092940097518043136 5874446556610227706402640854088357165514903 314635470832203526600706472223155382046271943513513368538979543914002758100 289993023590817330918274026889451152915026890048318491140264484864242055689 211265316833000774821515110003986084297271807500310630074520699505436206838 314620948986744608212517578488307826224331071350776523303159889004405167502 242768143829057016675085776170635413106817756232919004913342240722183648628 289318220340670045883106021427202666948428587921558828582664470923483208386 254304247593881109676724582609273741670949040469906895867342151706444640548 324707984060675446628128892371664948354047882542253609514703956739624414429 125786084546320950738753348592393927755418642173185609412108154831520915923 192033422676298173731756291271054199566981168481817292625435767748408605264 70237018464728620254434305961956673950089621204502627373468857093940647376 75218391584551901010047495874303520775865073092730040058902770251005073864 13453

${sleep}
# guardian set #3: https://raw.githubusercontent.com/wormhole-foundation/wormhole-networks/master/mainnetv2/guardianset/v3.prototxt
starkli invoke "${wormhole_address}" submit_new_guardian_set \
3 `# set index` \
19 `# num_guardians` \
0x58CC3AE5C097b213cE3c81979e1B9f9570746AA5 \
0xfF6CB952589BDE862c25Ef4392132fb9D4A42157 \
0x114De8460193bdf3A2fCf81f86a09765F4762fD1 \
0x107A0086b32d7A0977926A205131d8731D39cbEB \
0x8C82B2fd82FaeD2711d59AF0F2499D16e726f6b2 \
0x11b39756C042441BE6D8650b69b54EbE715E2343 \
0x54Ce5B4D348fb74B958e8966e2ec3dBd4958a7cd \
0x15e7cAF07C4e3DC8e7C469f92C8Cd88FB8005a20 \
0x74a3bf913953D695260D88BC1aA25A4eeE363ef0 \
0x000aC0076727b35FBea2dAc28fEE5cCB0fEA768e \
0xAF45Ced136b9D9e24903464AE889F5C8a723FC14 \
0xf93124b7c738843CBB89E864c862c38cddCccF95 \
0xD2CC37A4dc036a8D232b48f62cDD4731412f4890 \
0xDA798F6896A3331F64b48c12D1D57Fd9cbe70811 \
0x71AA1BE1D36CaFE3867910F99C09e347899C19C3 \
0x8192b6E7387CCd768277c17DAb1b7a5027c0b3Cf \
0x178e21ad2E77AE06711549CFBB1f9c7a9d8096e8 \
0x5E1487F35515d02A92753504a8D75471b9f49EdB \
0x6FbEBc898F403E4773E95feB15E80C9A99c8348d \
2 44 1766847065622031860560134801367788401015571316785630090767859240961980367 408239335069601434456324970231880063141100099721451058487412176729277688481 239499689753305520381601038928513796227317320911002802551444547638809838552 377515301744513788082523380503265415136454305699441419871183462725292421897 293792427782284265052215516935690252661713253004854348809536189867737815900 307592266914902727916633292174670243188255704510048236277225897328900269063 127373290139474278928992577974696343462455769904046193125018730285162391253 391788800785481654990215164673817619378887263909639120513493454202816019863 410413307118599096084169722886408584518140871169074821252461819158667354254 18837648490111595970198935552266546643395427923804444528866768515056419823 29964034682984173558839379357821569529808274426015494950430380078317881569 86017868501532670528023530422115758730056738654625156800662778409971102579 316587967137295297243489759859408971025377360462781809717927347025414193161 412080542369789462767669836400697110505430973769191785499739175360336337147 342817079347905714229318925597762381802367663565411998187223317628701911440 323381353160339090772037140072061985169258958022395380273676898316834639836 199931590715070935127318740956564588449721873695471932311700469202637695100 53310522180389647586576928116330850824055549848985438538201222342553700451 387322343922164253479438966163491855981414317104760621828688810466847848718 81609701542274539489711635515209037026645626576756528749469616228397567798 182108205861564989333892774796475580877981373947799860454217397980367659628 21549663410658134468902761710868642321546772465973442277960059676129502668 189434039785735939400321781125039794740638779195156759980704929066694157130 52255833533187953003213955242027099690232530588872309460610106220279805641 197105018621162723372171195601447549272902142615124680111298974553437412361 243585516151555343004264928593678764289083751554802049062044286334698216184 98577806073901898829375415748245478967425496216912736575886605480181121443 92916551389967933235240931764170084503123511470557201449603712010638670912 279247190794260779926452059689914005511524938154821508635388069101252378624 27765181507524306000048567556593270127801507143251178553344 5874446556610227706402640926145951203442839 314635470832203526600706472223155382046271943513513368538979543914002758100 289993023590817330918274026889451152915026890048318491140264484864242055689 211265316833000774821515110003986084297271807500310630074520699505436206838 314620948986744608212517578488307826224331071350776523303159889004405167502 242768143829057016675085658054156069029173843566452718977789980910319968372 289318220340670045883106021427202666948428587921558828582664470923483208386 254304247593881109676724582609273741670949040469906895867342151706444640548 324707984060675446628128892371664948354047882542253609514703956739624414429 125786084546320950738753348592393927755418642173185609412108154831520915923 192033422676298173731756291271054199566981168481817292625435767748408605264 70237018464728620254434305961956673950089621204502627373468857093940647376 75218391584551901010047495874303520775865073092730040058902770251005073864 13453

${sleep}
# guardian set #4
starkli invoke "${wormhole_address}" submit_new_guardian_set \
2 44 1766847066033426987337757245669159273063358729535478806850006662056807068 191023158244075433218055661747029015323596061316379687901032561397223546211 30156550775609732785124128084945604136341937408029517653427049258063209215 301841618969457377999846355946508544313297803407604349411042057045510372286 399879387152070823070522891203531321261797829310211644637928969034931151834 1184971666775858810527395126763859219514013163556756790208661779020321698 427827873217506136303198988655697899138087317492051993053159867826892618987 55439109913191967501571602277685262841453050617358377329061538069328212552 34944602254693785869427132065664922748183924456022812505745784482260734500 50091615215549712387991200985741575718080363004681463525186508796585379155 265247833149227842278059484961926330281584344437952973839486092319885300192 421631446041795295328070636491346018953171276542115189082171457479754499396 59057903625576869235407103565877017330396402246452653660114888284545941770 315797852826246435174946736461540321579373154656484006452063031513301027405 9521420622979958910372839981791309896262328383324674284772682980734269170 272964069264268937653695089515793248726920319914036642027008415285406913245 194708434228888226032102758315234166672190899487218971410889219134701358728 117864954129109327302856065706421701676973859697066630532570005860486924893 323457021720552374478769194145226061243431674370101604382965685057422991463 327482733702858147057975319784026874245182397914737119038454598086198587150 159726033816658034104416471293601013976445904149240898589368461412472508473 165970343982649234398221341351816767302457220504375238905210573566962780340 66269488760319836583658182431744051236825244016843316092957806563966254500 360882001282595740056823749884962228392082962172369522212117195988772429063 202692667772209236945884489592750537635169234501360011152939202347962132650 407257364829649465305126488148712878739144584682351279109461295389594525334 270499607712829989691415988895838806019492861138165540862008308077962735002 388443296961168536186587069708212659389994895697827691755155284015603161464 45068266527940236008536134081672474027695203549460934893262212861351952384 31319268777966350508118557206583844424308993254125039779840 5874446556610227706402640998203302487747647 204224545225244051821590480758420624947979343122083461045877549162059250132 289993023590817330918274026889451152915026890048318491140264484864242055689 211265316833000774821515110003986084297271807500310630074520699505436206838 314620948986744608212517578488307826224331071350776523303159889004405167502 242768143829057016675085658054156069029173843566452718977789980910319968372 289318220340670045883106021427202666948428587921558828582664470923483208386 254304247593881109676724582609273741670949040469906895867342151706444640548 324707984060675446628128892371664948354047882542253609514703956739624414429 125786084546320950738753348592393927755418642173185609412108154831520915923 192033422676298173731756291271054199566981168481817292625435767748408605264 70237018464728620254434305961956673950089621204502627373468857093940647376 75218391584551901010047495874303520775865073092730040058902770251005073864 13453

${sleep}
starkli call "${wormhole_address}" parse_and_verify_vm \
Expand Down
25 changes: 2 additions & 23 deletions target_chains/starknet/contracts/src/wormhole.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ mod governance;

#[starknet::interface]
pub trait IWormhole<T> {
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.
// Instead of upgrading the Wormhole contract, we can switch to another Wormhole address
// in the Pyth contract.
fn submit_new_guardian_set2(ref self: T, encoded_vm: ByteArray);
fn submit_new_guardian_set(ref self: T, encoded_vm: ByteArray);
}

#[derive(Drop, Debug, Clone, Serde)]
Expand Down Expand Up @@ -152,7 +151,6 @@ mod wormhole {

#[storage]
struct Storage {
owner: ContractAddress,
chain_id: u16,
governance_chain_id: u16,
governance_contract: u256,
Expand All @@ -166,13 +164,11 @@ mod wormhole {
#[constructor]
fn constructor(
ref self: ContractState,
owner: ContractAddress,
initial_guardians: Array<EthAddress>,
chain_id: u16,
governance_chain_id: u16,
governance_contract: u256,
) {
self.owner.write(owner);
self.chain_id.write(chain_id);
self.governance_chain_id.write(governance_chain_id);
self.governance_contract.write(governance_contract);
Expand Down Expand Up @@ -218,23 +214,6 @@ mod wormhole {

#[abi(embed_v0)]
impl WormholeImpl of IWormhole<ContractState> {
fn submit_new_guardian_set(
ref self: ContractState, set_index: u32, guardians: Array<EthAddress>
) {
let execution_info = get_execution_info().unbox();
if self.owner.read() != execution_info.caller_address {
panic_with_felt252(SubmitNewGuardianSetError::AccessDenied.into());
}
let current_set_index = self.current_guardian_set_index.read();
if set_index != current_set_index + 1 {
panic_with_felt252(SubmitNewGuardianSetError::InvalidGuardianSetSequence.into());
}
store_guardian_set(ref self, set_index, @guardians);
expire_guardian_set(
ref self, current_set_index, execution_info.block_info.unbox().block_timestamp
);
}

fn parse_and_verify_vm(self: @ContractState, encoded_vm: ByteArray) -> VerifiedVM {
let vm = parse_vm(encoded_vm);
let guardian_set = self.guardian_sets.read(vm.guardian_set_index);
Expand Down Expand Up @@ -283,7 +262,7 @@ mod wormhole {
vm
}

fn submit_new_guardian_set2(ref self: ContractState, encoded_vm: ByteArray) {
fn submit_new_guardian_set(ref self: ContractState, encoded_vm: ByteArray) {
let vm = self.parse_and_verify_vm(encoded_vm);
self.verify_governance_vm(@vm);
let mut reader = ReaderImpl::new(vm.payload);
Expand Down
2 changes: 1 addition & 1 deletion target_chains/starknet/contracts/tests/pyth.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn decode_event(event: @Event) -> PythEvent {
fn update_price_feeds_works() {
let owner = 'owner'.try_into().unwrap();
let user = 'user'.try_into().unwrap();
let wormhole = super::wormhole::deploy_and_init(owner);
let wormhole = super::wormhole::deploy_and_init();
let fee_contract = deploy_fee_contract(user);
let pyth = deploy(
owner,
Expand Down
Loading

0 comments on commit 1e1be9d

Please sign in to comment.