fix(pyth): keep router work out of chain upgrade

Restores the v2.1.0 upgrade handler and wasm generation script to main so
the PR no longer changes chain-upgrade behavior. The router verifier is a
fresh contract deployment path, not a software-upgrade migration path.

Renames the reused VAA parser module from wormhole to vaa and updates
comments so the code does not imply Wormhole contract verification.

Signed-off-by: Joseph Chalabi <chalabi.joseph@gmail.com>

Author: chalabi2

contracts/pyth/src/accumulator.rs

@@ -1,7 +1,7 @@
 //! PNAU (Pyth Network Accumulator Update) parser
 //!
 //! Parses the accumulator format returned by Pyth Hermes v2 API.
-//! This format wraps a Wormhole VAA containing a Merkle root,
+//! This format wraps a router-signed VAA-format message containing a Merkle root,
 //! along with price updates and their Merkle proofs.
 //!
 //! The MerklePriceUpdate section uses big-endian for length prefixes.
@@ -14,8 +14,8 @@ use sha3::{Digest, Keccak256};
 /// Magic bytes identifying PNAU format
 pub const PNAU_MAGIC: &[u8] = b"PNAU";
 
-/// Wormhole Merkle update type
-pub const UPDATE_TYPE_WORMHOLE_MERKLE: u8 = 0;
+/// Merkle proof update type used by Pyth accumulator payloads.
+pub const UPDATE_TYPE_MERKLE_PROOF: u8 = 0;
 
 /// Merkle tree constants (matching Pyth's implementation)
 const MERKLE_LEAF_PREFIX: u8 = 0;
@@ -24,7 +24,7 @@ const MERKLE_NODE_PREFIX: u8 = 1;
 /// Parsed PNAU accumulator update
 #[derive(Debug)]
 pub struct AccumulatorUpdate {
-    /// The embedded Wormhole VAA (contains signed Merkle root)
+    /// The embedded router-signed VAA-format message.
     pub vaa: Binary,
     /// Merkle root from the VAA payload
     pub merkle_root: [u8; 20],
@@ -49,7 +49,7 @@ pub struct PriceUpdateWithProof {
 /// - Minor version (1 byte) [offset 5]
 /// - Trailing length (1 byte) [offset 6]
 /// - Trailing data (trailing_len bytes) [offset 7 to 7+trailing_len-1]
-/// - Proof discriminant (1 byte): 0=WormholeMerkle [offset 7+trailing_len]
+/// - Proof discriminant (1 byte): 0=Merkle proof update [offset 7+trailing_len]
 /// - VAA length (2 bytes, big-endian) [offset 8+trailing_len]
 /// - VAA data (vaa_len bytes)
 /// - Number of updates (1 byte)
@@ -96,10 +96,10 @@ pub fn parse_accumulator_update(data: &[u8]) -> StdResult<AccumulatorUpdate> {
     let update_type = data[offset];
     offset += 1;
 
-    // Only support WormholeMerkle updates
-    if update_type != UPDATE_TYPE_WORMHOLE_MERKLE {
+    // Only support Merkle proof updates carrying the router-signed VAA message.
+    if update_type != UPDATE_TYPE_MERKLE_PROOF {
         return Err(StdError::msg(format!(
-            "Unsupported update type: {}, expected WormholeMerkle (0)",
+            "Unsupported update type: {}, expected Merkle proof update (0)",
             update_type
         )));
     }
@@ -148,11 +148,11 @@ pub fn parse_accumulator_update(data: &[u8]) -> StdResult<AccumulatorUpdate> {
     })
 }
 
-/// Extract the Merkle root from a Wormhole VAA payload
+/// Extract the Merkle root from a router-signed VAA-format payload.
 fn extract_merkle_root_from_vaa(vaa: &[u8]) -> StdResult<[u8; 20]> {
     // VAA structure:
     // - Version (1 byte)
-    // - Guardian set index (4 bytes)
+    // - Router set index, stored in the VAA guardian_set_index field (4 bytes)
     // - Signature count (1 byte)
     // - Signatures (66 bytes each)
     // - Body starts after signatures
@@ -181,7 +181,7 @@ fn extract_merkle_root_from_vaa(vaa: &[u8]) -> StdResult<[u8; 20]> {
     let payload = &vaa[payload_offset..];
 
     // Payload for Merkle root:
-    // - Magic "AUWV" (4 bytes) - Accumulator Update Wormhole Verification
+    // - Magic "AUWV" (4 bytes)
     // - Update type (1 byte)
     // - Slot (8 bytes)
     // - Ring size (4 bytes)
@@ -261,7 +261,7 @@ fn parse_price_update(data: &[u8], mut offset: usize) -> StdResult<(PriceUpdateW
 /// Verify a Merkle proof for a price update
 ///
 /// The proof demonstrates that the message is included in the tree
-/// whose root was signed by Wormhole guardians.
+/// whose root was signed by Pyth routers.
 pub fn verify_merkle_proof(
     message_data: &[u8],
     proof: &[[u8; 20]],

contracts/pyth/src/integration_tests.rs

@@ -76,7 +76,7 @@ fn setup_contract(deps: &mut MockDeps) -> Addr {
 }
 
 /// Helper to simulate a price update by directly modifying state
-/// (Used to test query responses without needing Wormhole mock)
+/// (Used to test query responses without needing a signed PNAU fixture)
 fn simulate_price_update(deps: &mut MockDeps, price: u128, conf: u128, publish_time: i64) {
     let mut price_feed = PRICE_FEED.load(&deps.storage).unwrap();
     price_feed.prev_publish_time = price_feed.publish_time;

contracts/pyth/src/lib.rs

@@ -6,7 +6,7 @@ pub mod oracle;
 pub mod pyth;
 pub mod router;
 pub mod state;
-pub mod wormhole;
+pub mod vaa;
 
 #[cfg(test)]
 mod integration_tests;

contracts/pyth/src/router.rs

@@ -6,7 +6,7 @@ use crate::{
     error::ContractError,
     msg::{RouterAddress, RouterVerifierConfigMsg},
     state::RouterVerifierConfig,
-    wormhole::ParsedVAA,
+    vaa::ParsedVAA,
 };
 
 const ROUTER_COUNT: usize = 5;

contracts/pyth/src/wormhole.rs contracts/pyth/src/vaa.rscontracts/pyth/src/wormhole.rs renamed to contracts/pyth/src/vaa.rs

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+# Generate Go source file containing wasm contract byte arrays.
+# Usage: script/wasm2go.sh
+#
+# Reads .wasm files from .cache/cosmwasm/artifacts/ and writes a Go source file
+# to upgrades/software/v2.0.0/contracts.go with byte slice variables.
+
+set -euo pipefail
+
+ARTIFACTS_DIR=".cache/cosmwasm/artifacts"
+OUTPUT_FILE="upgrades/software/v2.1.0/contracts.go"
+
+if [[ ! -d "$ARTIFACTS_DIR" ]]; then
+	echo "error: $ARTIFACTS_DIR does not exist. Run 'make build-contracts' first." >&2
+	exit 1
+fi
+
+wormhole_wasm="$ARTIFACTS_DIR/wormhole.wasm"
+pyth_wasm="$ARTIFACTS_DIR/pyth.wasm"
+
+for f in "$wormhole_wasm" "$pyth_wasm"; do
+	if [[ ! -f "$f" ]]; then
+		echo "error: $f not found. Run 'make build-contracts' first." >&2
+		exit 1
+	fi
+done
+
+# Convert a binary file to a Go byte slice literal.
+# Outputs one long line of comma-separated hex bytes with a trailing comma.
+file_to_go_bytes() {
+	xxd -i < "$1" | tr -d '\n ' | sed 's/$/,/'
+}
+
+{
+	cat <<'HEADER'
+// Code generated by script/wasm2go.sh from .cache/cosmwasm/artifacts. DO NOT EDIT.
+
+// nolint revive
+package v2_1_0
+HEADER
+
+	printf '\nvar wormholeContract = []byte{\n\t'
+	file_to_go_bytes "$wormhole_wasm"
+	printf '\n}\n'
+
+	printf '\nvar pythContract = []byte{\n\t'
+	file_to_go_bytes "$pyth_wasm"
+	printf '\n}\n'
+} > "$OUTPUT_FILE"
+
+gofmt -w "$OUTPUT_FILE"
+
+echo "Generated $OUTPUT_FILE"
+echo "  wormhole: $(wc -c < "$wormhole_wasm" | tr -d ' ') bytes"
+echo "  pyth:     $(wc -c < "$pyth_wasm" | tr -d ' ') bytes"

script/wasm2go.sh

@@ -10,11 +10,14 @@ import (
 	sdkmath "cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
+	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	etypes "pkg.akt.dev/go/node/escrow/module"
 	mvbeta "pkg.akt.dev/go/node/market/v1beta5"
+	otypes "pkg.akt.dev/go/node/oracle/v2"
 	"pkg.akt.dev/go/sdkutil"
 
 	apptypes "pkg.akt.dev/node/v2/app/types"
@@ -57,6 +60,31 @@ func (up *upgrade) UpgradeHandler() upgradetypes.UpgradeHandler {
 			return toVM, err
 		}
 
+		msgServer := wasmkeeper.NewMsgServerImpl(up.Keepers.Cosmos.Wasm)
+		govAddr := up.Keepers.Cosmos.Wasm.GetAuthority()
+
+		contractAddr := "akash1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrqyagled"
+
+		_, err = msgServer.StoreAndMigrateContract(ctx, &wasmtypes.MsgStoreAndMigrateContract{
+			Authority:             govAddr,
+			WASMByteCode:          pythContract,
+			Contract:              contractAddr,
+			InstantiatePermission: &wasmtypes.AllowNobody,
+			Msg:                   []byte("{}"),
+		})
+		if err != nil {
+			return toVM, err
+		}
+
+		oparams := otypes.DefaultParams()
+		oparams.MinPriceSources = 1
+		// Set the pyth contract as an authorized oracle price source
+		oparams.Sources = []string{contractAddr}
+		err = up.Keepers.Akash.Oracle.SetParams(sctx, oparams)
+		if err != nil {
+			return toVM, err
+		}
+
 		if sctx.ChainID() == "akashnet-2" {
 			feePool, err := up.Keepers.Cosmos.Distr.FeePool.Get(ctx)
 			if err != nil {