remove createGovernancevaa and use the custom path for deployment path

Author: nidhi-singh02

contract_manager/scripts/common.ts

@@ -35,7 +35,7 @@ export async function deployIfNotCached(
   const key = cacheKey ?? `${chain.getId()}-${artifactName}`;
   return runIfNotCached(key, async () => {
     const artifact = JSON.parse(
-      readFileSync(join(config.jsonOutputDir, `${artifactName}.json`), "utf8"),
+      readFileSync(join(config.jsonOutputDir, `${artifactName}.sol`, `${artifactName}.json`), "utf8"),
     );
 
     // Handle bytecode which can be either a string or an object with an 'object' property
@@ -74,7 +74,7 @@ export function getWeb3Contract(
   address: string,
 ): Contract {
   const artifact = JSON.parse(
-    readFileSync(join(jsonOutputDir, `${artifactName}.json`), "utf8"),
+    readFileSync(join(jsonOutputDir, `${artifactName}.sol`, `${artifactName}.json`), "utf8"),
   );
   const web3 = new Web3();
   return new web3.eth.Contract(artifact["abi"], address);
@@ -84,7 +84,7 @@ export const COMMON_DEPLOY_OPTIONS = {
   "std-output-dir": {
     type: "string",
     demandOption: true,
-    desc: "Path to the standard JSON output of the contracts (build artifact) directory",
+    desc: "Path to the Foundry output directory (contains Contract.sol/Contract.json structure)",
   },
   "private-key": {
     type: "string",

target_chains/ethereum/contracts/README.md

@@ -101,28 +101,6 @@ 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.
 
-### Utility Scripts
-
-Additional utility scripts are available for testing and development:
-
-#### Create Governance VAA (for testing)
-
-```bash
-# Create a governance VAA for localnet testing
-GOVERNANCE_DATA=0x... npm run create-governance-vaa
-```
-
-This script creates a properly signed governance VAA for local testing. You can customize it with environment variables:
-
-- `TIMESTAMP` - VAA timestamp (defaults to current block timestamp)
-- `NONCE` - VAA nonce (defaults to 0)
-- `EMITTER_CHAIN_ID` - Chain ID of the emitter (defaults to 1)
-- `EMITTER_ADDRESS` - Address of the emitter (defaults to test address)
-- `SEQUENCE` - VAA sequence number (defaults to 0)
-- `GOVERNANCE_DATA` - The governance payload data (required)
-- `GUARDIAN_SET_INDEX` - Guardian set index (defaults to 0)
-- `CONSISTENCY_LEVEL` - Consistency level (defaults to 32)
-
 ### 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/deploy.sh

@@ -21,34 +21,7 @@ shift
 
 if [ "$version" = "latest" ]; then
   echo "Deploying latest version"
-  # Create a temporary directory for flattened contract artifacts
-  contracts_dir="out/contracts"
-  mkdir -p "$contracts_dir"
-  
-  echo "Copying contract artifacts from Foundry output structure..."
-  
-  # List of required contracts for EVM deployment
-  contracts=(
-    "PythUpgradable"
-    "ERC1967Proxy" 
-    "ReceiverSetup"
-    "WormholeReceiver"
-    "ReceiverImplementation"
-  )
-  
-  # Copy each contract artifact
-  for contract in "${contracts[@]}"; do
-    source_file="./out/${contract}.sol/${contract}.json"
-    dest_file="$contracts_dir/${contract}.json"
-    
-    if [ -f "$source_file" ]; then
-      cp "$source_file" "$dest_file"
-      echo "✓ Copied ${contract}.json"
-    else
-      echo "Warning: ${contract}.json not found at $source_file"
-    fi
-  done
-  stdoutputdir="$(pwd)/$contracts_dir"
+  stdoutputdir="$(pwd)/out"
 else
   # make sure version has format of vX.Y.Z
   if [[ ! "$version" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
@@ -78,11 +51,6 @@ if [ -n "${tmpdir:-}" ]; then
   rm -rf $tmpdir
 fi
 
-# Clean up the contracts directory if we created it for the latest version
-if [ "$version" = "latest" ]; then
-  rm -rf "out/contracts"
-  echo "Cleaned up contracts directory"
-fi
 
 if [ "$version" != "latest" ]; then
     echo "Verify the contracts by using the std-input artifacts of the contracts in https://github.com/pyth-network/pyth-crosschain/releases/tag/pyth-evm-contract-$version"

target_chains/ethereum/contracts/package.json

@@ -19,7 +19,6 @@
     "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",
-    "create-governance-vaa": "forge script script/CreateLocalnetGovernanceVaa.s.sol",
     "install-forge-deps": "forge install foundry-rs/[email protected] --no-git",
     "coverage": "./coverage.sh",
     "test:format": "prettier --check .",