From d607d19c7ca74b92c8e5c264641dca096d412fc5 Mon Sep 17 00:00:00 2001 From: dal Date: Tue, 5 Dec 2023 08:37:05 -0300 Subject: [PATCH 1/3] Allow solana-program 1.17 --- .github/workflows/pyth-sdk-example-anchor-contract.yml | 2 +- .github/workflows/pyth-sdk-example-solana-contract.yml | 2 +- .github/workflows/pyth-sdk-solana.yml | 4 ++-- pyth-sdk-solana/Cargo.toml | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pyth-sdk-example-anchor-contract.yml b/.github/workflows/pyth-sdk-example-anchor-contract.yml index 37482a9..320da62 100644 --- a/.github/workflows/pyth-sdk-example-anchor-contract.yml +++ b/.github/workflows/pyth-sdk-example-anchor-contract.yml @@ -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: | diff --git a/.github/workflows/pyth-sdk-example-solana-contract.yml b/.github/workflows/pyth-sdk-example-solana-contract.yml index ca124a0..82bb687 100644 --- a/.github/workflows/pyth-sdk-example-solana-contract.yml +++ b/.github/workflows/pyth-sdk-example-solana-contract.yml @@ -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 diff --git a/.github/workflows/pyth-sdk-solana.yml b/.github/workflows/pyth-sdk-solana.yml index 2921927..9b76483 100644 --- 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.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 diff --git a/pyth-sdk-solana/Cargo.toml b/pyth-sdk-solana/Cargo.toml index 4bc1150..9c59318 100644 --- a/pyth-sdk-solana/Cargo.toml +++ b/pyth-sdk-solana/Cargo.toml @@ -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" @@ -11,7 +11,7 @@ keywords = [ "pyth", "solana", "oracle" ] readme = "README.md" [dependencies] -solana-program = ">= 1.9, <= 1.16" +solana-program = ">= 1.9, <= 1.17" borsh = "0.10.3" borsh-derive = "0.10.3" bytemuck = "1.7.2" @@ -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, <= 1.17" +solana-sdk = ">= 1.9, <= 1.17" [lib] crate-type = ["cdylib", "lib"] From b84e14ecce36cbec8d7d2a162ea146d01eb1ecb4 Mon Sep 17 00:00:00 2001 From: Jayant Krishnamurthy Date: Mon, 11 Dec 2023 12:41:59 -0800 Subject: [PATCH 2/3] fix version specs --- examples/sol-contract/Cargo.toml | 6 +++--- pyth-sdk-solana/Cargo.toml | 6 +++--- pyth-sdk-solana/test-contract/Cargo.toml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/sol-contract/Cargo.toml b/examples/sol-contract/Cargo.toml index 505d9e9..ed2da1a 100644 --- a/examples/sol-contract/Cargo.toml +++ b/examples/sol-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "example-sol-contract" -version = "0.1.0" +version = "0.2.0" authors = ["Pyth Data Foundation"] edition = "2021" @@ -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" } diff --git a/pyth-sdk-solana/Cargo.toml b/pyth-sdk-solana/Cargo.toml index 9c59318..81bc8cc 100644 --- a/pyth-sdk-solana/Cargo.toml +++ b/pyth-sdk-solana/Cargo.toml @@ -11,7 +11,7 @@ keywords = [ "pyth", "solana", "oracle" ] readme = "README.md" [dependencies] -solana-program = ">= 1.9, <= 1.17" +solana-program = ">= 1.9" borsh = "0.10.3" borsh-derive = "0.10.3" bytemuck = "1.7.2" @@ -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.17" -solana-sdk = ">= 1.9, <= 1.17" +solana-client = ">= 1.9" +solana-sdk = ">= 1.9" [lib] crate-type = ["cdylib", "lib"] diff --git a/pyth-sdk-solana/test-contract/Cargo.toml b/pyth-sdk-solana/test-contract/Cargo.toml index 7feeabc..645a72e 100644 --- a/pyth-sdk-solana/test-contract/Cargo.toml +++ b/pyth-sdk-solana/test-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test-contract" -version = "0.2.0" +version = "0.3.0" edition = "2018" [features] @@ -8,7 +8,7 @@ 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" From 40409967552183366a647816b8541580680d496b Mon Sep 17 00:00:00 2001 From: Jayant Krishnamurthy Date: Mon, 11 Dec 2023 13:49:26 -0800 Subject: [PATCH 3/3] fix other version --- .../sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml b/examples/sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml index 2f34a65..ccddfe4 100644 --- a/examples/sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml +++ b/examples/sol-anchor-contract/programs/sol-anchor-contract/Cargo.toml @@ -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" }