fix(pyth): remove stale migration entrypoint

The router verifier contract is intended for fresh deployment, so keeping a
migrate entrypoint implied an unsupported in-place legacy state conversion
path. Removing it avoids a broken migration surface and aligns the contract
with the deployment plan.

Router signature validation now reports out-of-range signer indexes separately
from payloads that carry more signatures than the configured router set.

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

Author: chalabi2

contracts/pyth/src/contract.rs

@@ -6,7 +6,7 @@ use cosmwasm_std::{
 use crate::accumulator::{parse_accumulator_update, verify_merkle_proof};
 use crate::error::ContractError;
 use crate::msg::{
-    ConfigResponse, ExecuteMsg, InstantiateMsg, MigrateMsg, PriceFeedIdResponse, PriceFeedResponse,
+    ConfigResponse, ExecuteMsg, InstantiateMsg, PriceFeedIdResponse, PriceFeedResponse,
     PriceResponse, QueryMsg, RouterVerifierConfigMsg,
 };
 use crate::oracle::{pyth_price_to_decimal, MsgAddPriceEntry};
@@ -357,23 +357,6 @@ fn query_price_feed_id(deps: Deps) -> StdResult<PriceFeedIdResponse> {
     })
 }
 
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
-    let mut response = Response::new()
-        .add_attribute("method", "migrate")
-        .add_attribute("version", "3.0.0");
-
-    if let Some(router_config) = msg.router_verifier {
-        let mut config = CONFIG.load(deps.storage)?;
-        config.router_verifier = router::parse_config(router_config)?;
-        CONFIG.save(deps.storage, &config)?;
-
-        response = response.add_attribute("router_verifier", "configured");
-    }
-
-    Ok(response)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -482,31 +465,6 @@ mod tests {
         assert_eq!(26, response.router_verifier.expected_emitter_chain);
     }
 
-    #[test]
-    fn test_migrate_can_update_router_verifier() {
-        let mut deps = mock_deps();
-        setup_config(&mut deps);
-
-        let mut router_config = production_router_config_msg();
-        router_config.router_set_index = 1;
-        let res = migrate(
-            deps.as_mut(),
-            mock_env(),
-            MigrateMsg {
-                router_verifier: Some(router_config),
-            },
-        )
-        .unwrap();
-
-        assert!(res
-            .attributes
-            .iter()
-            .any(|attr| attr.key == "router_verifier" && attr.value == "configured"));
-
-        let config = CONFIG.load(&deps.storage).unwrap();
-        assert_eq!(1, config.router_verifier.router_set_index);
-    }
-
     #[test]
     fn test_update_price_feed_with_router_verified_pnau() {
         let mut deps = mock_deps();

contracts/pyth/src/error.rs

@@ -45,6 +45,9 @@ pub enum ContractError {
     #[error("WrongRouterIndexOrder")]
     WrongRouterIndexOrder,
 
+    #[error("InvalidRouterIndex")]
+    InvalidRouterIndex,
+
     #[error("TooManySignatures")]
     TooManySignatures,
 

contracts/pyth/src/integration_tests.rs

@@ -6,8 +6,6 @@
 // Note: Price update execution requires router-signed PNAU data. Those flows are
 // tested via the contract's unit tests and actual chain integration tests.
 
-#![cfg(test)]
-
 use cosmwasm_std::testing::{message_info, mock_env, MockApi, MockQuerier, MockStorage};
 use cosmwasm_std::{from_json, Addr, Binary, Empty, OwnedDeps, Uint128, Uint256};
 

contracts/pyth/src/msg.rs

@@ -97,8 +97,3 @@ pub struct ConfigResponse {
 pub struct PriceFeedIdResponse {
     pub price_feed_id: String,
 }
-
-#[cw_serde]
-pub struct MigrateMsg {
-    pub router_verifier: Option<RouterVerifierConfigMsg>,
-}

contracts/pyth/src/router.rs

@@ -104,7 +104,7 @@ fn verify_router_signatures(
 
         let router_index = router_index as usize;
         if router_index >= config.routers.len() {
-            return Err(ContractError::TooManySignatures);
+            return Err(ContractError::InvalidRouterIndex);
         }
 
         let signature = Signature::try_from(
@@ -239,6 +239,41 @@ mod tests {
         assert!(err.to_string().contains("InvalidConfig"));
     }
 
+    #[test]
+    fn rejects_invalid_router_index() {
+        let keys = router_keys();
+        let config = setup(&keys);
+        let vaa = signed_vaa_with_keys(
+            &[keys[0].clone(), keys[1].clone(), keys[4].clone()],
+            &[0, 1, 5],
+            ROUTER_SET_INDEX,
+            EMITTER_CHAIN,
+            EMITTER_ADDRESS,
+            vec![],
+        );
+
+        let err = verify_vaa(&config, &vaa).unwrap_err();
+        assert!(matches!(err, ContractError::InvalidRouterIndex));
+    }
+
+    #[test]
+    fn rejects_too_many_signatures() {
+        let mut keys = router_keys();
+        keys.push(SigningKey::from_bytes((&[6u8; 32]).into()).unwrap());
+        let config = setup(&keys[..ROUTER_COUNT]);
+        let vaa = signed_vaa_with_keys(
+            &keys,
+            &[0, 1, 2, 3, 4, 5],
+            ROUTER_SET_INDEX,
+            EMITTER_CHAIN,
+            EMITTER_ADDRESS,
+            vec![],
+        );
+
+        let err = verify_vaa(&config, &vaa).unwrap_err();
+        assert!(matches!(err, ContractError::TooManySignatures));
+    }
+
     #[test]
     fn verifies_live_upgraded_hermes_akt_vaa_fixture() {
         let config = setup_production();