diff --git a/.github/workflows/no-cashing-tests.yaml b/.github/workflows/no-cashing-tests.yaml index 07dad8bc..896b4a64 100644 --- a/.github/workflows/no-cashing-tests.yaml +++ b/.github/workflows/no-cashing-tests.yaml @@ -5,7 +5,7 @@ on: branches: - master env: - SOLANA_CLI_VERSION: 1.10.29 + SOLANA_CLI_VERSION: 1.14.9 NODE_VERSION: 17.0.1 jobs: diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 860e786e..fac38193 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -8,7 +8,7 @@ on: branches: - master env: - SOLANA_CLI_VERSION: 1.10.29 + SOLANA_CLI_VERSION: 1.14.9 NODE_VERSION: 17.0.1 jobs: diff --git a/cli/Cargo.toml b/cli/Cargo.toml index df992372..831a5bca 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -28,11 +28,11 @@ shellexpand = "2.1.0" toml = "0.5.8" semver = "1.0.4" serde = { version = "1.0.122", features = ["derive"] } -solana-sdk = "~1.10.29" -solana-program = "~1.10.29" -solana-client = "~1.10.29" -solana-cli-config = "~1.10.29" -solana-faucet = "~1.10.29" +solana-sdk = "~1.14.9" +solana-program = "~1.14.9" +solana-client = "~1.14.9" +solana-cli-config = "~1.14.9" +solana-faucet = "~1.14.9" dirs = "3.0" heck = "0.3.1" flate2 = "1.0.19" diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 921435b7..eb565b3a 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -1388,7 +1388,7 @@ pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result< .value .map_or(Err(anyhow!("Account not found")), Ok)?; let bin = account.data - [UpgradeableLoaderState::programdata_data_offset().unwrap_or(0)..] + [UpgradeableLoaderState::size_of_programdata_metadata()..] .to_vec(); if let UpgradeableLoaderState::ProgramData { @@ -1406,7 +1406,7 @@ pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result< } } UpgradeableLoaderState::Buffer { .. } => { - let offset = UpgradeableLoaderState::buffer_data_offset().unwrap_or(0); + let offset = UpgradeableLoaderState::size_of_buffer_metadata(); ( account.data[offset..].to_vec(), BinVerificationState::Buffer, diff --git a/client/Cargo.toml b/client/Cargo.toml index 5664a50c..58c8bfff 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -15,8 +15,8 @@ anchor-lang = { path = "../lang", version = "0.25.0" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } -solana-client = "~1.10.29" -solana-sdk = "~1.10.29" -solana-account-decoder = "~1.10.29" +solana-client = "~1.14.9" +solana-sdk = "~1.14.9" +solana-account-decoder = "~1.14.9" thiserror = "1.0.20" url = "2.2.2" diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index 087a788c..65dc7ad6 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -17,4 +17,4 @@ shellexpand = "2.1.0" anyhow = "1.0.32" rand = "0.7.3" clap = { version = "3.0.0-rc.0", features = ["derive"] } -solana-sdk = "~1.10.29" +solana-sdk = "~1.14.9" diff --git a/client/src/lib.rs b/client/src/lib.rs index af97bf79..2153f76d 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -15,10 +15,9 @@ use solana_client::rpc_config::{ RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSendTransactionConfig, RpcTransactionLogsConfig, RpcTransactionLogsFilter, }; -use solana_client::rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType}; +use solana_client::rpc_filter::{Memcmp, RpcFilterType}; use solana_client::rpc_response::{Response as RpcResponse, RpcLogsResponse}; use solana_sdk::account::Account; -use solana_sdk::bs58; use solana_sdk::commitment_config::CommitmentConfig; use solana_sdk::signature::{Signature, Signer}; use solana_sdk::transaction::Transaction; @@ -155,11 +154,8 @@ impl Program { &self, filters: Vec, ) -> Result, ClientError> { - let account_type_filter = RpcFilterType::Memcmp(Memcmp { - offset: 0, - bytes: MemcmpEncodedBytes::Base58(bs58::encode(T::discriminator()).into_string()), - encoding: None, - }); + let account_type_filter = + RpcFilterType::Memcmp(Memcmp::new_base58_encoded(0, &T::discriminator())); let config = RpcProgramAccountsConfig { filters: Some([vec![account_type_filter], filters].concat()), account_config: RpcAccountInfoConfig { diff --git a/docker/Makefile b/docker/Makefile index 7c0d362c..ea80d81b 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -6,7 +6,7 @@ ANCHOR_CLI=v$(shell awk -F ' = ' '$$1 ~ /version/ { gsub(/[\"]/, "", $$2); print # # Solana toolchain. # -SOLANA_CLI=v1.10.29 +SOLANA_CLI=v1.14.9 # # Build version should match the Anchor cli version. # diff --git a/lang/Cargo.toml b/lang/Cargo.toml index a0a18360..dea81ddc 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -39,6 +39,6 @@ arrayref = "0.3.6" base64 = "0.13.0" borsh = "0.9" bytemuck = "1.4.0" -solana-program = "~1.10.29" +solana-program = "~1.14.9" thiserror = "1.0.20" bincode = "1.3.3" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 7f46f9fc..80137906 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -21,7 +21,7 @@ dex = ["serum_dex"] [dependencies] anchor-lang = { path = "../lang", version = "0.25.0", features = ["derive"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } -solana-program = "~1.10.29" +solana-program = "~1.14.9" spl-token = { version = "~3.5.0", features = ["no-entrypoint"], optional = true } spl-associated-token-account = { version = "~1.1.1", features = ["no-entrypoint"], optional = true } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } diff --git a/tests/zero-copy/programs/zero-copy/Cargo.toml b/tests/zero-copy/programs/zero-copy/Cargo.toml index 583ae16c..dbcc2c8d 100644 --- a/tests/zero-copy/programs/zero-copy/Cargo.toml +++ b/tests/zero-copy/programs/zero-copy/Cargo.toml @@ -22,4 +22,4 @@ anchor-lang = { path = "../../../../lang" } [dev-dependencies] anchor-client = { path = "../../../../client", features = ["debug"] } bytemuck = "1.4.0" -solana-program-test = "1.10.35" +solana-program-test = "1.14.9"