Merge pull request #3009 from pyth-network/clean-contracts

chore(clean-up): Removal of guardian set and vaa utils

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
 # =============================================================================

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
 # =============================================================================

target_chains/ethereum/contracts/README.md

@@ -90,17 +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
 
 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

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 .",

target_chains/ethereum/contracts/script/utils/VaaUtils.sol

@@ -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];
-        }
-    }
-}