feat(pyth-solana-receiver-sdk): upgrade anchor-lang to 0.31.1 (#3026)

* solana program 2

* remove solana_program::pubkey imports

* fix test

* don't run pyth-solana-receiver-sdk doctests in CI

* doc

* remove SDK from workspace

* remove SDK from workspace

* patch pythnet-sdk import

* suppress borsh deprecation warning

* comments

* update comment

* fix ci

* pr comments

---------

Co-authored-by: Guillermo Bescos <[email protected]>

Author: tejasbadadare

.github/workflows/ci-solana-contract.yml

@@ -42,4 +42,5 @@ jobs:
         if: success() || failure()
       - name: Run sdk tests
         run: cargo test --package pyth-solana-receiver-sdk
+        working-directory: target_chains/solana/pyth_solana_receiver_sdk
         if: success() || failure()

target_chains/solana/Cargo.lock

@@ -1,15 +1,10 @@
 [workspace]
-members = [
-    "programs/*",
-    "cli/",
-    "program_simulator/",
-    "pyth_solana_receiver_sdk/",
-    "common_test_utils",
-]
+members = ["programs/*", "cli/", "program_simulator/", "common_test_utils"]
 
 exclude = [
-    "programs/pyth-price-store"
-]
+    "programs/pyth-price-store",
+    "pyth_solana_receiver_sdk",
+] # pyth_solana_receiver_sdk is excluded because it uses a later anchor-lang version than the contract
 
 [profile.release]
 overflow-checks = true
@@ -21,12 +16,15 @@ incremental = false
 codegen-units = 1
 
 [workspace.dependencies]
-wormhole-core-bridge-solana = {git = "https://github.com/wormhole-foundation/wormhole", rev = "7bd40b595e22c5512dfaa2ed8e6d7441df743a69"}
-wormhole-vaas-serde =  "0.1.0"
+wormhole-core-bridge-solana = { git = "https://github.com/wormhole-foundation/wormhole", rev = "7bd40b595e22c5512dfaa2ed8e6d7441df743a69" }
+wormhole-vaas-serde = "0.1.0"
 serde_wormhole = "0.1.0"
 anchor-lang = "0.28.0"
 anchor-client = "0.28.0"
 solana-program = "1.16.20"
 solana-program-test = "1.16.20"
 solana-sdk = "1.16.20"
 solana-client = "1.16.20"
+
+[patch.crates-io]
+pythnet-sdk = { path = "../../pythnet/pythnet_sdk" } # Avoid clashing modules, use the local pythnet_sdk instead of the one from crates.io, (which is brought in by `pyth-solana-receiver-sdk==0.6.1`)

target_chains/solana/Cargo.toml

@@ -19,4 +19,4 @@ 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 }
-pyth-solana-receiver-sdk = { path = "../pyth_solana_receiver_sdk" }
+pyth-solana-receiver-sdk = "0.6.1"  # This is the highest version of pyth-solana-receiver-sdk that is compatible with the anchor-lang version used in the contract (0.28.0)

target_chains/solana/cli/Cargo.toml

@@ -25,4 +25,4 @@ anchor-lang = { workspace = true }
 solana-program = { workspace = true }
 pyth-solana-receiver = { path = "../programs/pyth-solana-receiver" }
 wormhole-core-bridge-solana = {workspace = true}
-pyth-solana-receiver-sdk = { path = "../pyth_solana_receiver_sdk"}
+pyth-solana-receiver-sdk = "0.6.1"  # This is the highest version of pyth-solana-receiver-sdk that is compatible with the anchor-lang version used in the contract (0.28.0)

target_chains/solana/common_test_utils/Cargo.toml

@@ -20,10 +20,12 @@ anchor-lang = { workspace = true }
 pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk" }
 solana-program = { workspace = true }
 byteorder = "1.4.3"
-pyth-solana-receiver-sdk = { path = "../../pyth_solana_receiver_sdk"}
+pyth-solana-receiver-sdk = "0.6.1"  # This is the highest version of pyth-solana-receiver-sdk that is compatible with the anchor-lang version used in the contract (0.28.0)
 
 [dev-dependencies]
-pyth-solana-receiver = { path = "../pyth-solana-receiver", features = ["no-entrypoint"]}
+pyth-solana-receiver = { path = "../pyth-solana-receiver", features = [
+    "no-entrypoint",
+] }
 solana-sdk = { workspace = true }
 tokio = "1.14.1"
 program-simulator = { path = "../../program_simulator" }

target_chains/solana/programs/pyth-push-oracle/Cargo.toml

@@ -27,7 +27,7 @@ wormhole-raw-vaas = { version = "0.1.3", features = [
     "ruint",
     "on-chain",
 ], default-features = false }
-pyth-solana-receiver-sdk = { path = "../../pyth_solana_receiver_sdk" }
+pyth-solana-receiver-sdk = "0.6.1" # This is the highest version of pyth-solana-receiver-sdk that is compatible with the anchor-lang version used in the contract (0.28.0)
 rand = "0.8.5"
 
 [dev-dependencies]