[cosmwasm] Use ParsedVaa from wormhole contract

target_chains/cosmwasm/Cargo.toml

@@ -2,6 +2,8 @@
 members = ["contracts/pyth", "sdk/rust"]
 exclude = ["examples/cw-contract"]
 
+resolver = "2"
+
 [profile.release]
 opt-level = 3
 debug = false
@@ -12,6 +14,3 @@ codegen-units = 1
 panic = 'abort'
 incremental = false
 overflow-checks = true
-
-[patch.crates-io]
-cw20-wrapped-2 = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8"}

target_chains/cosmwasm/contracts/pyth/Cargo.toml

@@ -40,6 +40,7 @@ cosmwasm-schema = "1.1.9"
 osmosis-std = "0.15.2"
 pyth-sdk-cw = { path = "../../sdk/rust" }
 pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk" }
+wormhole-cosmwasm = {git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37"}
 
 [dev-dependencies]
 cosmwasm-vm = { version = "1.0.0", default-features = false }

target_chains/cosmwasm/contracts/pyth/src/contract.rs

@@ -34,10 +34,6 @@ use {
  ConfigInfo,
  PythDataSource,
  },
- wormhole::{
- ParsedVAA,
- WormholeQueryMsg,
- },
  },
  byteorder::BigEndian,
  cosmwasm_std::{
@@ -60,6 +56,10 @@ use {
  WasmMsg,
  WasmQuery,
  },
+ cw_wormhole::{
+ msg::QueryMsg as WormholeQueryMsg,
+ state::ParsedVAA,
+ },
  pyth_sdk::{
  Identifier,
  UnixTimestamp,
@@ -1095,28 +1095,28 @@ mod test {
  #[cfg(feature = "osmosis")]
  fn check_sufficient_fee(deps: &Deps, data: &[Binary]) {
  let mut info = mock_info("123", coins(100, "foo").as_slice());
- let result = is_fee_sufficient(&deps, info.clone(), &data);
+ let result = is_fee_sufficient(deps, info.clone(), data);
  assert_eq!(result, Ok(true));
 
  // insufficient fee in base denom -> false
  info.funds = coins(50, "foo");
- let result = is_fee_sufficient(&deps, info.clone(), &data);
+ let result = is_fee_sufficient(deps, info.clone(), data);
  assert_eq!(result, Ok(false));
 
  // valid denoms are 'uion' or 'ibc/FF3065989E34457F342D4EFB8692406D49D4E2B5C70F725F127862E22CE6BDCD'
  // a valid denom other than base denom with sufficient fee
  info.funds = coins(100, "uion");
- let result = is_fee_sufficient(&deps, info.clone(), &data);
+ let result = is_fee_sufficient(deps, info.clone(), data);
  assert_eq!(result, Ok(true));
 
  // insufficient fee in valid denom -> false
  info.funds = coins(50, "uion");
- let result = is_fee_sufficient(&deps, info.clone(), &data);
+ let result = is_fee_sufficient(deps, info.clone(), data);
  assert_eq!(result, Ok(false));
 
  // an invalid denom -> Err invalid fee denom
  info.funds = coins(100, "invalid_denom");
- let result = is_fee_sufficient(&deps, info, &data);
+ let result = is_fee_sufficient(deps, info, data);
  assert_eq!(
  result,
  Err(PythContractError::InvalidFeeDenom {

target_chains/cosmwasm/contracts/pyth/src/lib.rs

@@ -5,7 +5,6 @@ pub mod contract;
 pub mod governance;
 pub mod msg;
 pub mod state;
-pub mod wormhole;
 
 #[cfg(feature = "injective")]
 mod injective;