Bump Solana Version to fix CI issue (#302)

* bump solana version

* bump harder

* Update image digest hash

* Use solana 1.14.7 image

This is because we want to use spf instead of bpf

* Add a comment to explain version discrepency

* Update path to oracle.so

* Format

* Remove unused import

* Fix python

Co-authored-by: Jayant Krishnamurthy <jkrishnamurthy@jumptrading.com>
Co-authored-by: Ali Behjati <bahjatia@gmail.com>
Co-authored-by: Guillermo Bescos Alapont <gbescos@stanford.edu>

Author: 4 people

.github/workflows/docker.yaml

@@ -6,8 +6,8 @@ on:
     branches: [ main ]
 
 env:
-  SOLANA_VERSION: 1.10.29
-  SOLANA_DOCKER_IMAGE_HASH: 78900501ccd1ade1bf088fa0830c46bc6095c6799469ff9b335e1f02d957e53a
+  SOLANA_VERSION: 1.14.7 # Using 1.14.x to have sbf instead of bpf. bpf does not work anymore.
+  SOLANA_DOCKER_IMAGE_HASH: 9130b4a26ec00c4ba99c023da98c06abb0dba2904c990af7770928e0f7dfd2d5
   DOCKER_HUB: docker.io
   DOCKER_USER: ${{ secrets.DOCKER_IO_USER }}
   IS_RELEASE: ${{

program/rust/Cargo.toml

@@ -9,16 +9,16 @@ publish = false
 bindgen = "0.60.1"
 
 [dependencies]
-solana-program = "=1.10.29"
+solana-program = "=1.13.3"
 bytemuck = "1.11.0"
 thiserror = "1.0"
 num-derive = "0.3"
 num-traits = "0.2"
 bincode = "1.3.3"
 
 [dev-dependencies]
-solana-program-test = "=1.10.29"
-solana-sdk = "=1.10.29"
+solana-program-test = "=1.13.3"
+solana-sdk = "=1.13.3"
 tokio = "1.14.1"
 hex = "0.3.1"
 quickcheck = "1"

program/rust/src/tests/pyth_simulator.rs

@@ -1,4 +1,5 @@
 use std::mem::size_of;
+use std::path::Path;
 
 use bytemuck::{
     bytes_of,
@@ -22,7 +23,6 @@ use solana_program::{
     system_program,
 };
 use solana_program_test::{
-    find_file,
     read_file,
     BanksClient,
     BanksClientError,
@@ -69,9 +69,11 @@ pub struct PythSimulator {
 impl PythSimulator {
     /// Deploys the oracle program as upgradable
     pub async fn new() -> PythSimulator {
-        let mut bpf_data = read_file(find_file("pyth_oracle.so").unwrap_or_else(|| {
-            panic!("Unable to locate {}", "pyth_oracle.so");
-        }));
+        let mut bpf_data = read_file(
+            std::env::current_dir()
+                .unwrap()
+                .join(Path::new("../../target/deploy/pyth_oracle.so")),
+        );
 
 
         let mut program_test = ProgramTest::default();

pyth/tests/test_publish.py

@@ -78,8 +78,7 @@ def get_account_size(acc_address):
         """
         PublicKey(acc_address)
         solana_client = Client("http://localhost:8899")
-        data = solana_client.get_account_info(PublicKey(acc_address), encoding = 'base64')['result']['value']['data'][0]
-        data = base64.b64decode(data)
+        data = solana_client.get_account_info(PublicKey(acc_address), encoding = 'base64').value.data
         return len(data)