Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow solana-program 1.17 #111

Merged
merged 3 commits into from
Dec 12, 2023
Merged

Allow solana-program 1.17 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d607d19
Allow solana-program 1.17
0xdal Dec 5, 2023
b84e14e
fix version specs
jayantk Dec 11, 2023
4040996
fix other version
jayantk Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pyth-sdk-example-anchor-contract.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install solana binaries
run: |
# 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)"
sh -c "$(curl -sSfL https://release.solana.com/v1.17.0/install)"
echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
- name: Install anchor binaries
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pyth-sdk-example-solana-contract.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install solana binaries
run: |
# 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)"
sh -c "$(curl -sSfL https://release.solana.com/v1.17.0/install)"
echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
- name: Build
run: scripts/build.sh
4 changes: 2 additions & 2 deletions .github/workflows/pyth-sdk-solana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: Install Solana Binaries
run: |
# 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)"
# Installing 1.17.x cli tools to have sbf instead of bpf. bpf does not work anymore.
sh -c "$(curl -sSfL https://release.solana.com/v1.17.0/install)"
echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
- name: Build
run: cargo build --verbose
Expand Down
2 changes: 1 addition & 1 deletion examples/sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ default = []
[dependencies]
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" }
pyth-sdk-solana = { path = "../../../../pyth-sdk-solana", version = "0.9.0" }
6 changes: 3 additions & 3 deletions examples/sol-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "example-sol-contract"
version = "0.1.0"
version = "0.2.0"
authors = ["Pyth Data Foundation"]
edition = "2021"

Expand All @@ -10,5 +10,5 @@ crate-type = ["cdylib", "lib"]
[dependencies]
borsh = "0.10.3"
arrayref = "0.3.6"
solana-program = ">= 1.10, <= 1.16"
pyth-sdk-solana = { path = "../../pyth-sdk-solana", version = "0.8.0" }
solana-program = ">= 1.10"
pyth-sdk-solana = { path = "../../pyth-sdk-solana", version = "0.9.0" }
8 changes: 4 additions & 4 deletions pyth-sdk-solana/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pyth-sdk-solana"
version = "0.8.0"
version = "0.9.0"
authors = ["Pyth Data Foundation"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -11,7 +11,7 @@ keywords = [ "pyth", "solana", "oracle" ]
readme = "README.md"

[dependencies]
solana-program = ">= 1.9, <= 1.16"
solana-program = ">= 1.9"
borsh = "0.10.3"
borsh-derive = "0.10.3"
bytemuck = "1.7.2"
Expand All @@ -22,8 +22,8 @@ serde = { version = "1.0.136", features = ["derive"] }
pyth-sdk = { path = "../pyth-sdk", version = "0.8.0" }

[dev-dependencies]
solana-client = ">= 1.9, <= 1.16"
solana-sdk = ">= 1.9, <= 1.16"
solana-client = ">= 1.9"
solana-sdk = ">= 1.9"

[lib]
crate-type = ["cdylib", "lib"]
Expand Down
4 changes: 2 additions & 2 deletions pyth-sdk-solana/test-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "test-contract"
version = "0.2.0"
version = "0.3.0"
edition = "2018"

[features]
test-bpf = []
no-entrypoint = []

[dependencies]
pyth-sdk-solana = { path = "../", version = "0.8.0" }
pyth-sdk-solana = { path = "../", version = "0.9.0" }
solana-program = ">= 1.10, <= 1.16"
bytemuck = "1.7.2"
borsh = "0.10.3"
Expand Down
Loading