[rust] Remove serde_wormhole patch (#1249)

* Do it * Do it
pyth-network · Jan 25, 2024 · e1db4aa · e1db4aa
1 parent 9697fad
commit e1db4aa
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 33 deletions.
diff --git a/pythnet/pythnet_sdk/Cargo.toml b/pythnet/pythnet_sdk/Cargo.toml
@@ -26,12 +26,8 @@ quickcheck = { version = "1", optional = true}
 sha3 = "0.10.4"
 slow_primes = "0.1.14"
 thiserror = "1.0.40"
-serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", optional = true, tag="v2.23.37"}
-wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", optional = true, tag="v2.23.37"}
-
-[patch.crates-io]
-serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37"}
-
+serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", optional = true, tag="rust-sdk-2024-01-25"}
+wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", optional = true, tag="rust-sdk-2024-01-25"}
 
 [dev-dependencies]
 base64 = "0.21.0"

diff --git a/target_chains/cosmwasm/Cargo.lock b/target_chains/cosmwasm/Cargo.lock
diff --git a/target_chains/cosmwasm/Cargo.toml b/target_chains/cosmwasm/Cargo.toml
@@ -14,6 +14,3 @@ codegen-units = 1
 panic = 'abort'
 incremental = false
 overflow-checks = true
-
-[patch.crates-io]
-serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37"}
diff --git a/target_chains/cosmwasm/contracts/pyth/Cargo.toml b/target_chains/cosmwasm/contracts/pyth/Cargo.toml
@@ -40,11 +40,11 @@ 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"}
+wormhole-cosmwasm =  {git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25"}
 
 [dev-dependencies]
 cosmwasm-vm = { version = "1.0.0", default-features = false }
 serde_json = "1.0"
 pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk", features = ["test-utils"] }
-serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37"}
-wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37"}
+serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25"}
+wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25"}
diff --git a/target_chains/near/receiver/Cargo.lock b/target_chains/near/receiver/Cargo.lock
diff --git a/target_chains/near/receiver/Cargo.toml b/target_chains/near/receiver/Cargo.toml
@@ -22,22 +22,19 @@ num-derive                 = { version = "0.3.3" }
 pyth-wormhole-attester-sdk = { path = "../../../wormhole_attester/sdk/rust" }
 pyth-sdk                   = { version = "0.7.0" }
 pythnet-sdk                = { path = "../../../pythnet/pythnet_sdk" }
-serde_wormhole             = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37" }
+serde_wormhole             = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25" }
 strum                      = { version = "0.24.1", features = ["derive"] }
 thiserror                  = { version = "1.0.38" }
-wormhole-sdk               = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37" }
-
-[patch.crates-io]
-serde_wormhole             = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37" }
+wormhole-sdk               = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25" }
 
 [dev-dependencies]
 lazy_static                = { version = "1.4.0" }
 serde_json                 = { version = "1.0.91" }
 serde                      = { version = "1.0.152", features = ["derive"] }
 tokio                      = { version = "1.23.0", features = ["full"] }
-serde_wormhole             = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37" }
+serde_wormhole             = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25" }
 workspaces                 = { version = "0.7.0" }
-wormhole-sdk               = { git = "https://github.com/wormhole-foundation/wormhole", tag="v2.23.37" }
+wormhole-sdk               = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25" }
 pythnet-sdk                = { path = "../../../pythnet/pythnet_sdk", features = ["test-utils"] }
 
 

diff --git a/target_chains/solana/Cargo.lock b/target_chains/solana/Cargo.lock
diff --git a/target_chains/solana/Cargo.toml b/target_chains/solana/Cargo.toml
@@ -13,8 +13,7 @@ opt-level = 3
 incremental = false
 codegen-units = 1
 
-[patch.crates-io]
-serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }
-
 [workspace.dependencies]
 wormhole-core-bridge-solana = {git = "https://github.com/wormhole-foundation/wormhole", branch = "wen/solana-rewrite"}
+wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag = "rust-sdk-2024-01-25" }
+serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "rust-sdk-2024-01-25" }
diff --git a/target_chains/solana/cli/Cargo.toml b/target_chains/solana/cli/Cargo.toml
@@ -14,8 +14,8 @@ clap = {version ="3.2.22", features = ["derive"]}
 pyth-solana-receiver = {path = "../programs/pyth-solana-receiver" }
 wormhole-solana = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"} # Used for initializing the wormhole receiver
 pythnet-sdk = { path = "../../../pythnet/pythnet_sdk", version = "2.0.0" }
-wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" } # Used to deserialize VAAs
-serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1"} # Used to deserialize VAAs
+wormhole-sdk = { workspace = true }
+serde_wormhole = { workspace = true }
 hex = "0.4.3"
 borsh = "0.9.3" # Old version of borsh needed for wormhole-solana
 wormhole-core-bridge-solana = {workspace = true}
diff --git a/target_chains/solana/programs/pyth-solana-receiver/Cargo.toml b/target_chains/solana/programs/pyth-solana-receiver/Cargo.toml
@@ -34,5 +34,5 @@ libsecp256k1 = "0.7.1"
 rand = "0.8.5"
 lazy_static = "1.4.0"
 program-simulator = { path = "../../program_simulator" }
-wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }
-serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1"}
+wormhole-sdk = { workspace = true }
+serde_wormhole = { workspace = true }