From 7e93212b0322278970618a048b78b3fb654dcd42 Mon Sep 17 00:00:00 2001 From: Dadepo Aderemi Date: Tue, 27 Sep 2022 22:53:29 +0200 Subject: [PATCH 1/4] Update dependency requirements for solana related depdencies --- pyth-sdk-solana/Cargo.toml | 6 +++--- pyth-sdk-solana/test-contract/Cargo.toml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyth-sdk-solana/Cargo.toml b/pyth-sdk-solana/Cargo.toml index 38e0012..59d7d98 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.8.1, < 1.11" +solana-program = "1.8.1, < 1.14.1" borsh = "0.9" borsh-derive = "0.9.0" bytemuck = "1.7.2" @@ -22,8 +22,8 @@ serde = { version = "1.0.136", features = ["derive"] } pyth-sdk = { path = "../pyth-sdk", version = "0.6.1" } [dev-dependencies] -solana-client = "1.8.1, < 1.11" -solana-sdk = "1.8.1, < 1.11" +solana-client = "1.8.1, < 1.14.1" +solana-sdk = "1.8.1, < 1.14.1" [lib] crate-type = ["cdylib", "lib"] diff --git a/pyth-sdk-solana/test-contract/Cargo.toml b/pyth-sdk-solana/test-contract/Cargo.toml index 27e2710..ab81fd8 100644 --- a/pyth-sdk-solana/test-contract/Cargo.toml +++ b/pyth-sdk-solana/test-contract/Cargo.toml @@ -9,15 +9,15 @@ no-entrypoint = [] [dependencies] pyth-sdk-solana = { path = "../", version = "0.6.1" } -solana-program = "1.8.1, < 1.11" # Currently latest Solana 1.11 crate can't build bpf: https://github.com/solana-labs/solana/issues/26188 +solana-program = "1.8.1, < 1.14.1" bytemuck = "1.7.2" borsh = "0.9" borsh-derive = "0.9.0" [dev-dependencies] -solana-program-test = "1.8.1, < 1.11" -solana-client = "1.8.1, < 1.11" -solana-sdk = "1.8.1, < 1.11" +solana-program-test = "1.8.1, < 1.14.1" +solana-client = "1.8.1, < 1.14.1" +solana-sdk = "1.8.1, < 1.14.1" [lib] crate-type = ["cdylib", "lib"] From 246cc7a13ba8c89d38ce858a6cf2cbd33e9ffb64 Mon Sep 17 00:00:00 2001 From: Dadepo Aderemi Date: Wed, 28 Sep 2022 04:14:31 +0200 Subject: [PATCH 2/4] Remove solana version constraints --- pyth-sdk-solana/Cargo.toml | 6 +++--- pyth-sdk-solana/test-contract/Cargo.toml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyth-sdk-solana/Cargo.toml b/pyth-sdk-solana/Cargo.toml index 59d7d98..9b4161e 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.8.1, < 1.14.1" +solana-program = "1.8.1" borsh = "0.9" borsh-derive = "0.9.0" bytemuck = "1.7.2" @@ -22,8 +22,8 @@ serde = { version = "1.0.136", features = ["derive"] } pyth-sdk = { path = "../pyth-sdk", version = "0.6.1" } [dev-dependencies] -solana-client = "1.8.1, < 1.14.1" -solana-sdk = "1.8.1, < 1.14.1" +solana-client = "1.8.1" +solana-sdk = "1.8.1" [lib] crate-type = ["cdylib", "lib"] diff --git a/pyth-sdk-solana/test-contract/Cargo.toml b/pyth-sdk-solana/test-contract/Cargo.toml index ab81fd8..139cffd 100644 --- a/pyth-sdk-solana/test-contract/Cargo.toml +++ b/pyth-sdk-solana/test-contract/Cargo.toml @@ -9,15 +9,15 @@ no-entrypoint = [] [dependencies] pyth-sdk-solana = { path = "../", version = "0.6.1" } -solana-program = "1.8.1, < 1.14.1" +solana-program = "1.8.1" bytemuck = "1.7.2" borsh = "0.9" borsh-derive = "0.9.0" [dev-dependencies] -solana-program-test = "1.8.1, < 1.14.1" -solana-client = "1.8.1, < 1.14.1" -solana-sdk = "1.8.1, < 1.14.1" +solana-program-test = "1.8.1" +solana-client = "1.8.1" +solana-sdk = "1.8.1" [lib] crate-type = ["cdylib", "lib"] From f791457a582ff40ad129c6a582465d9f18e1778e Mon Sep 17 00:00:00 2001 From: Dadepo Aderemi Date: Wed, 28 Sep 2022 04:43:29 +0200 Subject: [PATCH 3/4] Remove solana version constraints and set version to latest --- pyth-sdk-solana/Cargo.toml | 6 +++--- pyth-sdk-solana/test-contract/Cargo.toml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyth-sdk-solana/Cargo.toml b/pyth-sdk-solana/Cargo.toml index 9b4161e..7b73334 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.8.1" +solana-program = "1.14.3" borsh = "0.9" borsh-derive = "0.9.0" bytemuck = "1.7.2" @@ -22,8 +22,8 @@ serde = { version = "1.0.136", features = ["derive"] } pyth-sdk = { path = "../pyth-sdk", version = "0.6.1" } [dev-dependencies] -solana-client = "1.8.1" -solana-sdk = "1.8.1" +solana-client = "1.14.3" +solana-sdk = "1.14.3" [lib] crate-type = ["cdylib", "lib"] diff --git a/pyth-sdk-solana/test-contract/Cargo.toml b/pyth-sdk-solana/test-contract/Cargo.toml index 139cffd..8436bd9 100644 --- a/pyth-sdk-solana/test-contract/Cargo.toml +++ b/pyth-sdk-solana/test-contract/Cargo.toml @@ -9,15 +9,15 @@ no-entrypoint = [] [dependencies] pyth-sdk-solana = { path = "../", version = "0.6.1" } -solana-program = "1.8.1" +solana-program = "1.14.3" bytemuck = "1.7.2" borsh = "0.9" borsh-derive = "0.9.0" [dev-dependencies] -solana-program-test = "1.8.1" -solana-client = "1.8.1" -solana-sdk = "1.8.1" +solana-program-test = "1.14.3" +solana-client = "1.14.3" +solana-sdk = "1.14.3" [lib] crate-type = ["cdylib", "lib"] From 8c16dee2b84cdca5eefd7177820f63fb08c264eb Mon Sep 17 00:00:00 2001 From: Dadepo Aderemi Date: Thu, 6 Oct 2022 11:18:08 +0400 Subject: [PATCH 4/4] Updating to use mainnet version of solana deps. --- .github/workflows/pyth-sdk-solana.yml | 2 +- pyth-sdk-solana/Cargo.toml | 6 +++--- pyth-sdk-solana/test-contract/Cargo.toml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pyth-sdk-solana.yml b/.github/workflows/pyth-sdk-solana.yml index 4470624..6a891ce 100644 --- a/.github/workflows/pyth-sdk-solana.yml +++ b/.github/workflows/pyth-sdk-solana.yml @@ -34,7 +34,7 @@ jobs: run: sudo apt-get update && sudo apt-get install libudev-dev - name: Install Solana Binaries run: | - sh -c "$(curl -sSfL https://release.solana.com/v1.8.14/install)" + sh -c "$(curl -sSfL https://release.solana.com/v1.10.40/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 7b73334..4e4c7a7 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.14.3" +solana-program = "1.10.40" borsh = "0.9" borsh-derive = "0.9.0" bytemuck = "1.7.2" @@ -22,8 +22,8 @@ serde = { version = "1.0.136", features = ["derive"] } pyth-sdk = { path = "../pyth-sdk", version = "0.6.1" } [dev-dependencies] -solana-client = "1.14.3" -solana-sdk = "1.14.3" +solana-client = "1.10.40" +solana-sdk = "1.10.40" [lib] crate-type = ["cdylib", "lib"] diff --git a/pyth-sdk-solana/test-contract/Cargo.toml b/pyth-sdk-solana/test-contract/Cargo.toml index 8436bd9..754f44c 100644 --- a/pyth-sdk-solana/test-contract/Cargo.toml +++ b/pyth-sdk-solana/test-contract/Cargo.toml @@ -9,15 +9,15 @@ no-entrypoint = [] [dependencies] pyth-sdk-solana = { path = "../", version = "0.6.1" } -solana-program = "1.14.3" +solana-program = "1.10.40" bytemuck = "1.7.2" borsh = "0.9" borsh-derive = "0.9.0" [dev-dependencies] -solana-program-test = "1.14.3" -solana-client = "1.14.3" -solana-sdk = "1.14.3" +solana-program-test = "1.10.40" +solana-client = "1.10.40" +solana-sdk = "1.10.40" [lib] crate-type = ["cdylib", "lib"]