From 15233ebb69f88d339f62c1fd6809a40b6852f6fb Mon Sep 17 00:00:00 2001 From: nidhi-singh02 Date: Mon, 1 Sep 2025 14:10:18 +0400 Subject: [PATCH 1/2] clean of guardian set and vaa utils --- .../ethereum/contracts/.env.template | 4 -- target_chains/ethereum/contracts/.env.test | 3 - target_chains/ethereum/contracts/README.md | 10 --- target_chains/ethereum/contracts/package.json | 1 - .../ReceiverSubmitGuardianSetUpgrades.s.sol | 67 ------------------ .../contracts/script/utils/VaaUtils.sol | 70 ------------------- 6 files changed, 155 deletions(-) delete mode 100644 target_chains/ethereum/contracts/script/ReceiverSubmitGuardianSetUpgrades.s.sol delete mode 100644 target_chains/ethereum/contracts/script/utils/VaaUtils.sol diff --git a/target_chains/ethereum/contracts/.env.template b/target_chains/ethereum/contracts/.env.template index 5918c47c9d..b6ae8496e7 100644 --- a/target_chains/ethereum/contracts/.env.template +++ b/target_chains/ethereum/contracts/.env.template @@ -27,10 +27,6 @@ INIT_GOV_CHAIN_ID=YOUR_GOV_CHAIN_ID_HERE # Example: INIT_GOV_CONTRACT=0x0000000000000000000000000000000000000000000000000000000000000004 INIT_GOV_CONTRACT=YOUR_GOV_CONTRACT_ADDRESS_HERE -# Guardian Set Sync Configuration (set after deployment) -# Example: WORMHOLE_ADDRESS=0x0000000000000000000000000000000000000000 -WORMHOLE_ADDRESS=DEPLOYED_WORMHOLE_ADDRESS_HERE - # ============================================================================= # PYTH CONFIGURATION # ============================================================================= diff --git a/target_chains/ethereum/contracts/.env.test b/target_chains/ethereum/contracts/.env.test index c79b414d6e..3035d0d626 100644 --- a/target_chains/ethereum/contracts/.env.test +++ b/target_chains/ethereum/contracts/.env.test @@ -17,9 +17,6 @@ INIT_CHAIN_ID=2 INIT_GOV_CHAIN_ID=1 INIT_GOV_CONTRACT=0x0000000000000000000000000000000000000000000000000000000000000004 -# Guardian Set Sync Configuration (will be set after deployment) -WORMHOLE_ADDRESS=0x0000000000000000000000000000000000000000 - # ============================================================================= # PYTH TEST CONFIGURATION # ============================================================================= diff --git a/target_chains/ethereum/contracts/README.md b/target_chains/ethereum/contracts/README.md index cb3460583f..e60fc4a629 100644 --- a/target_chains/ethereum/contracts/README.md +++ b/target_chains/ethereum/contracts/README.md @@ -90,16 +90,6 @@ The deployment script will: npm run deploy-and-verify ``` -### Guardian Set Sync - -After deploying Wormhole contracts on mainnet, you need to sync the guardian sets to match the current mainnet state: - -```bash -# Set WORMHOLE_ADDRESS in your .env file to the deployed Wormhole contract address -npm run receiver-submit-guardian-sets -``` - -This script submits the pre-configured mainnet guardian set upgrade VAAs to bring your contract up to date with the current mainnet guardian set. ### Gas Benchmarks diff --git a/target_chains/ethereum/contracts/package.json b/target_chains/ethereum/contracts/package.json index 733a085780..ff19e17ab0 100644 --- a/target_chains/ethereum/contracts/package.json +++ b/target_chains/ethereum/contracts/package.json @@ -18,7 +18,6 @@ "deploy": "forge script script/Deploy.s.sol --rpc-url testnet --broadcast", "deploy-and-verify": "forge script script/Deploy.s.sol --rpc-url testnet --broadcast --verify", "deploy-local": "ETHERSCAN_API_KEY= forge script script/Deploy.s.sol --slow --rpc-url local --broadcast -vvvv", - "receiver-submit-guardian-sets": "forge script script/ReceiverSubmitGuardianSetUpgrades.s.sol --rpc-url $RPC_URL --broadcast", "install-forge-deps": "forge install foundry-rs/forge-std@v1.7.6 --no-git", "coverage": "./coverage.sh", "test:format": "prettier --check .", diff --git a/target_chains/ethereum/contracts/script/ReceiverSubmitGuardianSetUpgrades.s.sol b/target_chains/ethereum/contracts/script/ReceiverSubmitGuardianSetUpgrades.s.sol deleted file mode 100644 index af4b606682..0000000000 --- a/target_chains/ethereum/contracts/script/ReceiverSubmitGuardianSetUpgrades.s.sol +++ /dev/null @@ -1,67 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; - -import "forge-std/Script.sol"; -import "forge-std/console.sol"; - -// Wormhole contracts -import "../contracts/wormhole/interfaces/IWormhole.sol"; -import "../contracts/wormhole/Governance.sol"; - -contract ReceiverSubmitGuardianSetUpgradesScript is Script { - // Mainnet guardian set upgrade VAAs (these are the official mainnet VAAs) - string[] private MAINNET_UPGRADE_VAAS = [ - "010000000001007ac31b282c2aeeeb37f3385ee0de5f8e421d30b9e5ae8ba3d4375c1c77a86e77159bb697d9c456d6f8c02d22a94b1279b65b0d6a9957e7d3857423845ac758e300610ac1d2000000030001000000000000000000000000000000000000000000000000000000000000000400000000000005390000000000000000000000000000000000000000000000000000000000436f7265020000000000011358cc3ae5c097b213ce3c81979e1b9f9570746aa5ff6cb952589bde862c25ef4392132fb9d4a42157114de8460193bdf3a2fcf81f86a09765f4762fd1107a0086b32d7a0977926a205131d8731d39cbeb8c82b2fd82faed2711d59af0f2499d16e726f6b211b39756c042441be6d8650b69b54ebe715e234354ce5b4d348fb74b958e8966e2ec3dbd4958a7cdeb5f7389fa26941519f0863349c223b73a6ddee774a3bf913953d695260d88bc1aa25a4eee363ef0000ac0076727b35fbea2dac28fee5ccb0fea768eaf45ced136b9d9e24903464ae889f5c8a723fc14f93124b7c738843cbb89e864c862c38cddcccf95d2cc37a4dc036a8d232b48f62cdd4731412f4890da798f6896a3331f64b48c12d1d57fd9cbe7081171aa1be1d36cafe3867910f99c09e347899c19c38192b6e7387ccd768277c17dab1b7a5027c0b3cf178e21ad2e77ae06711549cfbb1f9c7a9d8096e85e1487f35515d02a92753504a8d75471b9f49edb6fbebc898f403e4773e95feb15e80c9a99c8348d", - "01000000010d0012e6b39c6da90c5dfd3c228edbb78c7a4c97c488ff8a346d161a91db067e51d638c17216f368aa9bdf4836b8645a98018ca67d2fec87d769cabfdf2406bf790a0002ef42b288091a670ef3556596f4f47323717882881eaf38e03345078d07a156f312b785b64dae6e9a87e3d32872f59cb1931f728cecf511762981baf48303668f0103cef2616b84c4e511ff03329e0853f1bd7ee9ac5ba71d70a4d76108bddf94f69c2a8a84e4ee94065e8003c334e899184943634e12043d0dda78d93996da073d190104e76d166b9dac98f602107cc4b44ac82868faf00b63df7d24f177aa391e050902413b71046434e67c770b19aecdf7fce1d1435ea0be7262e3e4c18f50ddc8175c0105d9450e8216d741e0206a50f93b750a47e0a258b80eb8fed1314cc300b3d905092de25cd36d366097b7103ae2d184121329ba3aa2d7c6cc53273f11af14798110010687477c8deec89d36a23e7948feb074df95362fc8dcbd8ae910ac556a1dee1e755c56b9db5d710c940938ed79bc1895a3646523a58bc55f475a23435a373ecfdd0107fb06734864f79def4e192497362513171530daea81f07fbb9f698afe7e66c6d44db21323144f2657d4a5386a954bb94eef9f64148c33aef6e477eafa2c5c984c01088769e82216310d1827d9bd48645ec23e90de4ef8a8de99e2d351d1df318608566248d80cdc83bdcac382b3c30c670352be87f9069aab5037d0b747208eae9c650109e9796497ff9106d0d1c62e184d83716282870cef61a1ee13d6fc485b521adcce255c96f7d1bca8d8e7e7d454b65783a830bddc9d94092091a268d311ecd84c26010c468c9fb6d41026841ff9f8d7368fa309d4dbea3ea4bbd2feccf94a92cc8a20a226338a8e2126cd16f70eaf15b4fc9be2c3fa19def14e071956a605e9d1ac4162010e23fcb6bd445b7c25afb722250c1acbc061ed964ba9de1326609ae012acdfb96942b2a102a2de99ab96327859a34a2b49a767dbdb62e0a1fb26af60fe44fd496a00106bb0bac77ac68b347645f2fb1ad789ea9bd76fb9b2324f25ae06f97e65246f142df717f662e73948317182c62ce87d79c73def0dba12e5242dfc038382812cfe00126da03c5e56cb15aeeceadc1e17a45753ab4dc0ec7bf6a75ca03143ed4a294f6f61bc3f478a457833e43084ecd7c985bf2f55a55f168aac0e030fc49e845e497101626e9d9a5d9e343f00010000000000000000000000000000000000000000000000000000000000000004c1759167c43f501c2000000000000000000000000000000000000000000000000000000000436f7265020000000000021358cc3ae5c097b213ce3c81979e1b9f9570746aa5ff6cb952589bde862c25ef4392132fb9d4a42157114de8460193bdf3a2fcf81f86a09765f4762fd1107a0086b32d7a0977926a205131d8731d39cbeb8c82b2fd82faed2711d59af0f2499d16e726f6b211b39756c042441be6d8650b69b54ebe715e234354ce5b4d348fb74b958e8966e2ec3dbd4958a7cd66b9590e1c41e0b226937bf9217d1d67fd4e91f574a3bf913953d695260d88bc1aa25a4eee363ef0000ac0076727b35fbea2dac28fee5ccb0fea768eaf45ced136b9d9e24903464ae889f5c8a723fc14f93124b7c738843cbb89e864c862c38cddcccf95d2cc37a4dc036a8d232b48f62cdd4731412f4890da798f6896a3331f64b48c12d1d57fd9cbe7081171aa1be1d36cafe3867910f99c09e347899c19c38192b6e7387ccd768277c17dab1b7a5027c0b3cf178e21ad2e77ae06711549cfbb1f9c7a9d8096e85e1487f35515d02a92753504a8d75471b9f49edb6fbebc898f403e4773e95feb15e80c9a99c8348d", - "01000000020d00ce45474d9e1b1e7790a2d210871e195db53a70ffd6f237cfe70e2686a32859ac43c84a332267a8ef66f59719cf91cc8df0101fd7c36aa1878d5139241660edc0010375cc906156ae530786661c0cd9aef444747bc3d8d5aa84cac6a6d2933d4e1a031cffa30383d4af8131e929d9f203f460b07309a647d6cd32ab1cc7724089392c000452305156cfc90343128f97e499311b5cae174f488ff22fbc09591991a0a73d8e6af3afb8a5968441d3ab8437836407481739e9850ad5c95e6acfcc871e951bc30105a7956eefc23e7c945a1966d5ddbe9e4be376c2f54e45e3d5da88c2f8692510c7429b1ea860ae94d929bd97e84923a18187e777aa3db419813a80deb84cc8d22b00061b2a4f3d2666608e0aa96737689e3ba5793810ff3a52ff28ad57d8efb20967735dc5537a2e43ef10f583d144c12a1606542c207f5b79af08c38656d3ac40713301086b62c8e130af3411b3c0d91b5b50dcb01ed5f293963f901fc36e7b0e50114dce203373b32eb45971cef8288e5d928d0ed51cd86e2a3006b0af6a65c396c009080009e93ab4d2c8228901a5f4525934000b2c26d1dc679a05e47fdf0ff3231d98fbc207103159ff4116df2832eea69b38275283434e6cd4a4af04d25fa7a82990b707010aa643f4cf615dfff06ffd65830f7f6cf6512dabc3690d5d9e210fdc712842dc2708b8b2c22e224c99280cd25e5e8bfb40e3d1c55b8c41774e287c1e2c352aecfc010b89c1e85faa20a30601964ccc6a79c0ae53cfd26fb10863db37783428cd91390a163346558239db3cd9d420cfe423a0df84c84399790e2e308011b4b63e6b8015010ca31dcb564ac81a053a268d8090e72097f94f366711d0c5d13815af1ec7d47e662e2d1bde22678113d15963da100b668ba26c0c325970d07114b83c5698f46097010dc9fda39c0d592d9ed92cd22b5425cc6b37430e236f02d0d1f8a2ef45a00bde26223c0a6eb363c8b25fd3bf57234a1d9364976cefb8360e755a267cbbb674b39501108db01e444ab1003dd8b6c96f8eb77958b40ba7a85fefecf32ad00b7a47c0ae7524216262495977e09c0989dd50f280c21453d3756843608eacd17f4fdfe47600001261025228ef5af837cb060bcd986fcfa84ccef75b3fa100468cfd24e7fadf99163938f3b841a33496c2706d0208faab088bd155b2e20fd74c625bb1cc8c43677a0163c53c409e0c5dfa000100000000000000000000000000000000000000000000000000000000000000046c5a054d7833d1e42000000000000000000000000000000000000000000000000000000000436f7265020000000000031358cc3ae5c097b213ce3c81979e1b9f9570746aa5ff6cb952589bde862c25ef4392132fb9d4a42157114de8460193bdf3a2fcf81f86a09765f4762fd1107a0086b32d7a0977926a205131d8731d39cbeb8c82b2fd82faed2711d59af0f2499d16e726f6b211b39756c042441be6d8650b69b54ebe715e234354ce5b4d348fb74b958e8966e2ec3dbd4958a7cd15e7caf07c4e3dc8e7c469f92c8cd88fb8005a2074a3bf913953d695260d88bc1aa25a4eee363ef0000ac0076727b35fbea2dac28fee5ccb0fea768eaf45ced136b9d9e24903464ae889f5c8a723fc14f93124b7c738843cbb89e864c862c38cddcccf95d2cc37a4dc036a8d232b48f62cdd4731412f4890da798f6896a3331f64b48c12d1d57fd9cbe7081171aa1be1d36cafe3867910f99c09e347899c19c38192b6e7387ccd768277c17dab1b7a5027c0b3cf178e21ad2e77ae06711549cfbb1f9c7a9d8096e85e1487f35515d02a92753504a8d75471b9f49edb6fbebc898f403e4773e95feb15e80c9a99c8348d", - "01000000030d03d4a37a6ff4361d91714730831e9d49785f61624c8f348a9c6c1d82bc1d98cadc5e936338204445c6250bb4928f3f3e165ad47ca03a5d63111168a2de4576856301049a5df10464ea4e1961589fd30fc18d1970a7a2ffaad617e56a0f7777f25275253af7d10a0f0f2494dc6e99fc80e444ab9ebbbee252ded2d5dcb50cbf7a54bb5a01055f4603b553b9ba9e224f9c55c7bca3da00abb10abd19e0081aecd3b352be061a70f79f5f388ebe5190838ef3cd13a2f22459c9a94206883b739c90b40d5d74640006a8fade3997f650a36e46bceb1f609edff201ab32362266f166c5c7da713f6a19590c20b68ed3f0119cb24813c727560ede086b3d610c2d7a1efa66f655bad90900080f5e495a75ea52241c59d145c616bfac01e57182ad8d784cbcc9862ed3afb60c0983ccbc690553961ffcf115a0c917367daada8e60be2cbb8b8008bac6341a8c010935ab11e0eea28b87a1edc5ccce3f1fac25f75b5f640fe6b0673a7cd74513c9dc01c544216cf364cc9993b09fda612e0cd1ced9c00fb668b872a16a64ebb55d27010ab2bc39617a2396e7defa24cd7c22f42dc31f3c42ffcd9d1472b02df8468a4d0563911e8fb6a4b5b0ce0bd505daa53779b08ff660967b31f246126ed7f6f29a7e000bdb6d3fd7b33bdc9ac3992916eb4aacb97e7e21d19649e7fa28d2dd6e337937e4274516a96c13ac7a8895da9f91948ea3a09c25f44b982c62ce8842b58e20c8a9000d3d1b19c8bb000856b6610b9d28abde6c35cb7705c6ca5db711f7be96d60eed9d72cfa402a6bfe8bf0496dbc7af35796fc768da51a067b95941b3712dce8ae1e7010ec80085033157fd1a5628fc0c56267469a86f0e5a66d7dede1ad4ce74ecc3dff95b60307a39c3bfbeedc915075070da30d0395def9635130584f709b3885e1bdc0010fc480eb9ee715a2d151b23722b48b42581d7f4001fc1696c75425040bfc1ffc5394fe418adb2b64bd3dc692efda4cc408163677dbe233b16bcdabb853a20843301118ee9e115e1a0c981f19d0772b850e666591322da742a9a12cce9f52a5665bd474abdd59c580016bee8aae67fdf39b315be2528d12eec3a652910e03cc4c6fa3801129d0d1e2e429e969918ec163d16a7a5b2c6729aa44af5dccad07d25d19891556a79b574f42d9adbd9e2a9ae5a6b8750331d2fccb328dd94c3bf8791ee1bfe85aa00661e99781981faea00010000000000000000000000000000000000000000000000000000000000000004fd4c6c55ec8dfd342000000000000000000000000000000000000000000000000000000000436f726502000000000004135893b5a76c3f739645648885bdccc06cd70a3cd3ff6cb952589bde862c25ef4392132fb9d4a42157114de8460193bdf3a2fcf81f86a09765f4762fd1107a0086b32d7a0977926a205131d8731d39cbeb8c82b2fd82faed2711d59af0f2499d16e726f6b211b39756c042441be6d8650b69b54ebe715e234354ce5b4d348fb74b958e8966e2ec3dbd4958a7cd15e7caf07c4e3dc8e7c469f92c8cd88fb8005a2074a3bf913953d695260d88bc1aa25a4eee363ef0000ac0076727b35fbea2dac28fee5ccb0fea768eaf45ced136b9d9e24903464ae889f5c8a723fc14f93124b7c738843cbb89e864c862c38cddcccf95d2cc37a4dc036a8d232b48f62cdd4731412f4890da798f6896a3331f64b48c12d1d57fd9cbe7081171aa1be1d36cafe3867910f99c09e347899c19c38192b6e7387ccd768277c17dab1b7a5027c0b3cf178e21ad2e77ae06711549cfbb1f9c7a9d8096e85e1487f35515d02a92753504a8d75471b9f49edb6fbebc898f403e4773e95feb15e80c9a99c8348d" - ]; - - function run() external { - uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY"); - address wormholeAddress = vm.envAddress("WORMHOLE_ADDRESS"); - - vm.startBroadcast(deployerPrivateKey); - - console.log( - "Syncing guardian sets for Wormhole contract at:", - wormholeAddress - ); - - // Get the current guardian set index before syncing - IWormhole wormholeReader = IWormhole(wormholeAddress); - Governance wormholeGov = Governance(wormholeAddress); - uint32 initialIndex = wormholeReader.getCurrentGuardianSetIndex(); - console.log("Initial guardian set index:", initialIndex); - - // Submit each guardian set upgrade VAA starting from the current index - for (uint i = initialIndex; i < MAINNET_UPGRADE_VAAS.length; i++) { - console.log( - "Submitting guardian set upgrade VAA", - i + 1, - "of", - MAINNET_UPGRADE_VAAS.length - ); - bytes memory vaaBytes = vm.parseBytes(MAINNET_UPGRADE_VAAS[i]); - wormholeGov.submitNewGuardianSet(vaaBytes); - console.log("Successfully submitted VAA", i + 1); - } - - // Check the final guardian set index - uint32 finalIndex = wormholeReader.getCurrentGuardianSetIndex(); - console.log("Final guardian set index:", finalIndex); - - if (finalIndex > initialIndex) { - console.log( - "Successfully updated guardian set from index", - initialIndex, - "to", - finalIndex - ); - } else { - console.log("Guardian set was already up to date"); - } - - vm.stopBroadcast(); - } -} diff --git a/target_chains/ethereum/contracts/script/utils/VaaUtils.sol b/target_chains/ethereum/contracts/script/utils/VaaUtils.sol deleted file mode 100644 index 226159091a..0000000000 --- a/target_chains/ethereum/contracts/script/utils/VaaUtils.sol +++ /dev/null @@ -1,70 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -pragma solidity ^0.8.0; - -import "forge-std/Test.sol"; - -library VaaUtils { - /** - * @dev Assert that a VAA has the expected payload - * @param vaaBytes The VAA bytes to check - * @param expectedPayload The expected payload bytes - */ - function assertVaaPayloadEquals( - bytes memory vaaBytes, - bytes memory expectedPayload - ) internal pure { - // VAA structure: version (1) + guardianSetIndex (4) + signaturesLength (1) + signatures + body - // Body structure: timestamp (4) + nonce (4) + emitterChainId (2) + emitterAddress (32) + sequence (8) + consistencyLevel (1) + payload - - require(vaaBytes.length >= 51, "VAA too short"); // Minimum VAA length - - uint256 offset = 6; // Skip version (1) + guardianSetIndex (4) + signaturesLength (1) - - // Skip signatures (each signature is 66 bytes: guardianIndex (1) + r (32) + s (32) + v (1)) - uint8 signaturesLength = uint8(vaaBytes[5]); - offset += signaturesLength * 66; - - // Skip to payload (skip timestamp (4) + nonce (4) + emitterChainId (2) + emitterAddress (32) + sequence (8) + consistencyLevel (1)) - offset += 51; - - require(offset < vaaBytes.length, "Invalid VAA structure"); - - // Extract payload - bytes memory actualPayload = new bytes(vaaBytes.length - offset); - for (uint256 i = 0; i < actualPayload.length; i++) { - actualPayload[i] = vaaBytes[offset + i]; - } - - require( - keccak256(actualPayload) == keccak256(expectedPayload), - "VAA payload does not match expected payload" - ); - } - - /** - * @dev Extract payload from VAA bytes - * @param vaaBytes The VAA bytes - * @return payload The extracted payload - */ - function extractPayload( - bytes memory vaaBytes - ) internal pure returns (bytes memory payload) { - require(vaaBytes.length >= 51, "VAA too short"); - - uint256 offset = 6; // Skip version (1) + guardianSetIndex (4) + signaturesLength (1) - - // Skip signatures - uint8 signaturesLength = uint8(vaaBytes[5]); - offset += signaturesLength * 66; - - // Skip to payload - offset += 51; - - require(offset < vaaBytes.length, "Invalid VAA structure"); - - payload = new bytes(vaaBytes.length - offset); - for (uint256 i = 0; i < payload.length; i++) { - payload[i] = vaaBytes[offset + i]; - } - } -} From 036f571ddad4c7c18511e46b959ab3e4586a6f38 Mon Sep 17 00:00:00 2001 From: nidhi-singh02 Date: Mon, 1 Sep 2025 14:19:09 +0400 Subject: [PATCH 2/2] formating --- target_chains/ethereum/contracts/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/target_chains/ethereum/contracts/README.md b/target_chains/ethereum/contracts/README.md index e60fc4a629..c23f1194a2 100644 --- a/target_chains/ethereum/contracts/README.md +++ b/target_chains/ethereum/contracts/README.md @@ -90,7 +90,6 @@ The deployment script will: npm run deploy-and-verify ``` - ### Gas Benchmarks You can use foundry to run gas benchmark tests (which can be found in the `forge-test` directory). To run the tests with gas report