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.

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

Update all packages #1

Open
wants to merge 2 commits into
base: 0.25_patch
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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,029 changes: 1,015 additions & 1,014 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8"
solana-program = "~1.14.8"
solana-client = "~1.14.8"
solana-cli-config = "~1.14.8"
solana-faucet = "~1.14.8"
dirs = "3.0"
heck = "0.3.1"
flate2 = "1.0.19"
Expand Down
4 changes: 2 additions & 2 deletions cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,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 {
Expand All @@ -1403,7 +1403,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,
Expand Down
6 changes: 3 additions & 3 deletions client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8"
solana-sdk = "~1.14.8"
solana-account-decoder = "~1.14.8"
thiserror = "1.0.20"
url = "2.2.2"
2 changes: 1 addition & 1 deletion client/example/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8"
10 changes: 3 additions & 7 deletions client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -155,11 +154,8 @@ impl Program {
&self,
filters: Vec<RpcFilterType>,
) -> Result<ProgramAccountsIterator<T>, 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 {
Expand Down
2 changes: 1 addition & 1 deletion lang/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8"
thiserror = "1.0.20"
bincode = "1.3.3"
6 changes: 3 additions & 3 deletions spl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
spl-token = { version = "~3.3.0", features = ["no-entrypoint"], optional = true }
spl-associated-token-account = { version = "~1.0.5", features = ["no-entrypoint"], optional = true }
solana-program = "~1.14.8"
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"] }
1 change: 1 addition & 0 deletions spl/src/associated_token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub fn create<'info>(ctx: CpiContext<'_, '_, '_, 'info, Create<'info>>) -> Resul
ctx.accounts.payer.key,
ctx.accounts.authority.key,
ctx.accounts.mint.key,
&spl_associated_token_account::ID,
);
solana_program::program::invoke_signed(
&ix,
Expand Down
2 changes: 1 addition & 1 deletion tests/misc/programs/misc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ default = []
anchor-lang = { path = "../../../../lang", features = ["init-if-needed"] }
anchor-spl = { path = "../../../../spl" }
misc2 = { path = "../misc2", features = ["cpi"] }
spl-associated-token-account = "~1.0.3"
spl-associated-token-account = "~1.1.1"
2 changes: 1 addition & 1 deletion tests/zero-copy/programs/zero-copy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ anchor-lang = { path = "../../../../lang" }
[dev-dependencies]
anchor-client = { path = "../../../../client", features = ["debug"] }
bytemuck = "1.4.0"
solana-program-test = "1.9.13"
solana-program-test = "1.14.7"