Skip to content

Commit cc87e4c

Browse files
authored
Merge pull request #109 from hiddengearz/main
Solana - Update deps to support 1.16
2 parents bac6e6a + cf002e9 commit cc87e4c

File tree

9 files changed

+30
-30
lines changed

9 files changed

+30
-30
lines changed

.github/workflows/pyth-sdk-example-anchor-contract.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
run: sudo apt-get update && sudo apt-get install libudev-dev pkg-config build-essential
2222
- name: Install solana binaries
2323
run: |
24-
# Installing 1.14.x cli tools to have sbf instead of bpf. bpf does not work anymore.
25-
sh -c "$(curl -sSfL https://release.solana.com/v1.14.7/install)"
24+
# Installing 1.16.x cli tools to have sbf instead of bpf. bpf does not work anymore.
25+
sh -c "$(curl -sSfL https://release.solana.com/v1.16.0/install)"
2626
echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
2727
- name: Install anchor binaries
2828
run: |

.github/workflows/pyth-sdk-example-solana-contract.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
run: sudo apt-get update && sudo apt-get install libudev-dev
2222
- name: Install solana binaries
2323
run: |
24-
# Installing 1.14.x cli tools to have sbf instead of bpf. bpf does not work anymore.
25-
sh -c "$(curl -sSfL https://release.solana.com/v1.14.7/install)"
24+
# Installing 1.16.x cli tools to have sbf instead of bpf. bpf does not work anymore.
25+
sh -c "$(curl -sSfL https://release.solana.com/v1.16.0/install)"
2626
echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
2727
- name: Build
2828
run: scripts/build.sh

.github/workflows/pyth-sdk-solana.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
run: sudo apt-get update && sudo apt-get install libudev-dev
3535
- name: Install Solana Binaries
3636
run: |
37-
# Installing 1.14.x cli tools to have sbf instead of bpf. bpf does not work anymore.
38-
sh -c "$(curl -sSfL https://release.solana.com/v1.14.7/install)"
37+
# Installing 1.16.x cli tools to have sbf instead of bpf. bpf does not work anymore.
38+
sh -c "$(curl -sSfL https://release.solana.com/v1.16.0/install)"
3939
echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
4040
- name: Build
4141
run: cargo build --verbose

examples/sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ cpi = ["no-entrypoint"]
1717
default = []
1818

1919
[dependencies]
20-
anchor-lang = "0.27.0"
21-
pyth-sdk = { path = "../../../../pyth-sdk", version = "0.7.0" }
22-
pyth-sdk-solana = { path = "../../../../pyth-sdk-solana", version = "0.7.2" }
20+
anchor-lang = "0.28.0"
21+
pyth-sdk = { path = "../../../../pyth-sdk", version = "0.8.0" }
22+
pyth-sdk-solana = { path = "../../../../pyth-sdk-solana", version = "0.8.0" }

examples/sol-contract/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
crate-type = ["cdylib", "lib"]
99

1010
[dependencies]
11-
borsh = "0.9"
11+
borsh = "0.10.3"
1212
arrayref = "0.3.6"
13-
solana-program = ">= 1.10, < 1.15"
14-
pyth-sdk-solana = { path = "../../pyth-sdk-solana", version = "0.7.0" }
13+
solana-program = ">= 1.10, <= 1.16"
14+
pyth-sdk-solana = { path = "../../pyth-sdk-solana", version = "0.8.0" }

pyth-sdk-solana/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pyth-sdk-solana"
3-
version = "0.7.2"
3+
version = "0.8.0"
44
authors = ["Pyth Data Foundation"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -11,19 +11,19 @@ keywords = [ "pyth", "solana", "oracle" ]
1111
readme = "README.md"
1212

1313
[dependencies]
14-
solana-program = ">= 1.9, <= 1.15"
15-
borsh = "0.9"
16-
borsh-derive = "0.9.0"
14+
solana-program = ">= 1.9, <= 1.16"
15+
borsh = "0.10.3"
16+
borsh-derive = "0.10.3"
1717
bytemuck = "1.7.2"
1818
num-derive = "0.3"
1919
num-traits = "0.2"
2020
thiserror = "1.0"
2121
serde = { version = "1.0.136", features = ["derive"] }
22-
pyth-sdk = { path = "../pyth-sdk", version = "0.7.0" }
22+
pyth-sdk = { path = "../pyth-sdk", version = "0.8.0" }
2323

2424
[dev-dependencies]
25-
solana-client = ">= 1.9, <= 1.15"
26-
solana-sdk = ">= 1.9, <= 1.15"
25+
solana-client = ">= 1.9, <= 1.16"
26+
solana-sdk = ">= 1.9, <= 1.16"
2727

2828
[lib]
2929
crate-type = ["cdylib", "lib"]

pyth-sdk-solana/test-contract/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ test-bpf = []
88
no-entrypoint = []
99

1010
[dependencies]
11-
pyth-sdk-solana = { path = "../", version = "0.7.0" }
12-
solana-program = ">= 1.10, < 1.15"
11+
pyth-sdk-solana = { path = "../", version = "0.8.0" }
12+
solana-program = ">= 1.10, <= 1.16"
1313
bytemuck = "1.7.2"
14-
borsh = "0.9"
15-
borsh-derive = "0.9.0"
14+
borsh = "0.10.3"
15+
borsh-derive = "0.10.3"
1616

1717
[dev-dependencies]
18-
solana-program-test = ">= 1.10, < 1.15"
19-
solana-client = ">= 1.10, < 1.15"
20-
solana-sdk = ">= 1.10, < 1.15"
18+
solana-program-test = ">= 1.10, <= 1.16"
19+
solana-client = ">= 1.10, <= 1.16"
20+
solana-sdk = ">= 1.10, <= 1.16"
2121

2222
[lib]
2323
crate-type = ["cdylib", "lib"]
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

22
# This is only used for tests
33
[toolchain]
4-
channel = "1.66.1"
4+
channel = "1.68.0"
55
profile = "minimal"

pyth-sdk/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pyth-sdk"
3-
version = "0.7.0"
3+
version = "0.8.0"
44
authors = ["Pyth Data Foundation"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -15,8 +15,8 @@ crate-type = ["cdylib", "lib"]
1515

1616
[dependencies]
1717
hex = { version = "0.4.3", features = ["serde"] }
18-
borsh = "0.9"
19-
borsh-derive = "0.9.0"
18+
borsh = "0.10.3"
19+
borsh-derive = "0.10.3"
2020
serde = { version = "1.0.136", features = ["derive"] }
2121
schemars = "0.8.8"
2222
getrandom = { version = "0.2.2", features = ["custom"] }

0 commit comments

Comments
 (0)