Merge pull request #109 from hiddengearz/main

Solana - Update deps to support 1.16
pyth-network · Jul 7, 2023 · cc87e4c · cc87e4c
2 parents bac6e6a + cf002e9
commit cc87e4c
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/pyth-sdk-example-anchor-contract.yml b/.github/workflows/pyth-sdk-example-anchor-contract.yml
@@ -21,8 +21,8 @@ jobs:
  run: sudo apt-get update && sudo apt-get install libudev-dev pkg-config build-essential
  - name: Install solana binaries
  run: |
- # Installing 1.14.x cli tools to have sbf instead of bpf. bpf does not work anymore.
- sh -c "$(curl -sSfL https://release.solana.com/v1.14.7/install)"
+ # Installing 1.16.x cli tools to have sbf instead of bpf. bpf does not work anymore.
+ sh -c "$(curl -sSfL https://release.solana.com/v1.16.0/install)"
  echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
  - name: Install anchor binaries
  run: |

diff --git a/.github/workflows/pyth-sdk-example-solana-contract.yml b/.github/workflows/pyth-sdk-example-solana-contract.yml
@@ -21,8 +21,8 @@ jobs:
  run: sudo apt-get update && sudo apt-get install libudev-dev
  - name: Install solana binaries
  run: |
- # Installing 1.14.x cli tools to have sbf instead of bpf. bpf does not work anymore.
- sh -c "$(curl -sSfL https://release.solana.com/v1.14.7/install)"
+ # Installing 1.16.x cli tools to have sbf instead of bpf. bpf does not work anymore.
+ sh -c "$(curl -sSfL https://release.solana.com/v1.16.0/install)"
  echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
  - name: Build
  run: scripts/build.sh
diff --git a/.github/workflows/pyth-sdk-solana.yml b/.github/workflows/pyth-sdk-solana.yml
@@ -34,8 +34,8 @@ jobs:
  run: sudo apt-get update && sudo apt-get install libudev-dev
  - name: Install Solana Binaries
  run: |
- # Installing 1.14.x cli tools to have sbf instead of bpf. bpf does not work anymore.
- sh -c "$(curl -sSfL https://release.solana.com/v1.14.7/install)"
+ # Installing 1.16.x cli tools to have sbf instead of bpf. bpf does not work anymore.
+ sh -c "$(curl -sSfL https://release.solana.com/v1.16.0/install)"
  echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
  - name: Build
  run: cargo build --verbose

diff --git a/examples/sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml b/examples/sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml
@@ -17,6 +17,6 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.27.0"
-pyth-sdk = { path = "../../../../pyth-sdk", version = "0.7.0" }
-pyth-sdk-solana = { path = "../../../../pyth-sdk-solana", version = "0.7.2" }
+anchor-lang = "0.28.0"
+pyth-sdk = { path = "../../../../pyth-sdk", version = "0.8.0" }
+pyth-sdk-solana = { path = "../../../../pyth-sdk-solana", version = "0.8.0" }
diff --git a/examples/sol-contract/Cargo.toml b/examples/sol-contract/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-borsh = "0.9"
+borsh = "0.10.3"
 arrayref = "0.3.6"
-solana-program = ">= 1.10, < 1.15"
-pyth-sdk-solana = { path = "../../pyth-sdk-solana", version = "0.7.0" }
+solana-program = ">= 1.10, <= 1.16"
+pyth-sdk-solana = { path = "../../pyth-sdk-solana", version = "0.8.0" }
diff --git a/pyth-sdk-solana/Cargo.toml b/pyth-sdk-solana/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pyth-sdk-solana"
-version = "0.7.2"
+version = "0.8.0"
 authors = ["Pyth Data Foundation"]
 edition = "2018"
 license = "Apache-2.0"
@@ -11,19 +11,19 @@ keywords = [ "pyth", "solana", "oracle" ]
 readme = "README.md"
 
 [dependencies]
-solana-program = ">= 1.9, <= 1.15"
-borsh = "0.9"
-borsh-derive = "0.9.0"
+solana-program = ">= 1.9, <= 1.16"
+borsh = "0.10.3"
+borsh-derive = "0.10.3"
 bytemuck = "1.7.2"
 num-derive = "0.3"
 num-traits = "0.2"
 thiserror = "1.0"
 serde = { version = "1.0.136", features = ["derive"] }
-pyth-sdk = { path = "../pyth-sdk", version = "0.7.0" }
+pyth-sdk = { path = "../pyth-sdk", version = "0.8.0" }
 
 [dev-dependencies]
-solana-client = ">= 1.9, <= 1.15"
-solana-sdk = ">= 1.9, <= 1.15"
+solana-client = ">= 1.9, <= 1.16"
+solana-sdk = ">= 1.9, <= 1.16"
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/pyth-sdk-solana/test-contract/Cargo.toml b/pyth-sdk-solana/test-contract/Cargo.toml
@@ -8,16 +8,16 @@ test-bpf = []
 no-entrypoint = []
 
 [dependencies]
-pyth-sdk-solana = { path = "../", version = "0.7.0" }
-solana-program = ">= 1.10, < 1.15"
+pyth-sdk-solana = { path = "../", version = "0.8.0" }
+solana-program = ">= 1.10, <= 1.16"
 bytemuck = "1.7.2"
-borsh = "0.9"
-borsh-derive = "0.9.0"
+borsh = "0.10.3"
+borsh-derive = "0.10.3"
 
 [dev-dependencies]
-solana-program-test = ">= 1.10, < 1.15"
-solana-client = ">= 1.10, < 1.15"
-solana-sdk = ">= 1.10, < 1.15"
+solana-program-test = ">= 1.10, <= 1.16"
+solana-client = ">= 1.10, <= 1.16"
+solana-sdk = ">= 1.10, <= 1.16"
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/pyth-sdk-solana/test-contract/rust-toolchain b/pyth-sdk-solana/test-contract/rust-toolchain
@@ -1,5 +1,5 @@
 
 # This is only used for tests
 [toolchain]
-channel = "1.66.1"
+channel = "1.68.0"
 profile = "minimal"
diff --git a/pyth-sdk/Cargo.toml b/pyth-sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pyth-sdk"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Pyth Data Foundation"]
 edition = "2018"
 license = "Apache-2.0"
@@ -15,8 +15,8 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 hex = { version = "0.4.3", features = ["serde"] }
-borsh = "0.9"
-borsh-derive = "0.9.0"
+borsh = "0.10.3"
+borsh-derive = "0.10.3"
 serde = { version = "1.0.136", features = ["derive"] }
 schemars = "0.8.8"
 getrandom = { version = "0.2.2", features = ["custom"] }