Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
5,153 changes: 2,642 additions & 2,511 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ tag-message = "Publish {{crate_name}} v{{version}}"
consolidate-commits = false

[workspace.dependencies]
mollusk-svm = "0.11.0"
mollusk-svm-fuzz-fixture = "0.11.0"
mollusk-svm = "0.17.1"
mollusk-svm-fuzz-fixture = "0.17.1"
num-traits = "0.2"
pinocchio = "0.9.3"
solana-instruction = "3.0.0"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RUST_TOOLCHAIN_NIGHTLY = nightly-2026-07-16
SOLANA_CLI_VERSION = 3.0.0
SOLANA_CLI_VERSION = 4.3.2

nightly = +${RUST_TOOLCHAIN_NIGHTLY}

Expand Down
17 changes: 9 additions & 8 deletions pinocchio/program/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,26 @@ pinocchio-pubkey = "0.3"
pinocchio-token-interface = { version = "^0", path = "../interface" }

[dev-dependencies]
agave-feature-set = "3.0.0"
agave-feature-set = "4.4.1"
assert_matches = "1.5.0"
mollusk-svm = { workspace = true }
mollusk-svm-fuzz-fixture = { workspace = true }
num-traits = { workspace = true }
solana-account = "3.0.0"
solana-account = "5.0.0"
solana-instruction = { workspace = true }
solana-keypair = "3.0.0"
solana-instruction-error = "3.0.0"
solana-keypair = "4.0.0"
solana-program-error = { workspace = true }
solana-program-option = { workspace = true }
solana-program-pack = { workspace = true }
solana-program-test = { version = "3.1.10", features = ["agave-unstable-api"] }
solana-program-test = { version = "4.4.1", features = ["agave-unstable-api"] }
solana-pubkey = { workspace = true }
solana-rent = "3.0.0"
solana-rent = "4.4.0"
solana-sdk-ids = "3.0.0"
solana-signature = "3.0.0"
solana-signer = "3.0.0"
solana-transaction = "3.0.0"
solana-transaction-error = "3.0.0"
solana-signer = "4.0.0"
solana-transaction = "5.0.0"
solana-transaction-error = "4.0.0"
solana-system-interface = { workspace = true }
spl-token-interface = { workspace = true }
spl-token-2022-interface = "2"
Expand Down
29 changes: 7 additions & 22 deletions pinocchio/program/tests/batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ fn mollusk() -> Mollusk {
//fs.active_mut()
// .remove(&agave_feature_set::account_data_direct_mapping::id());
//fs
FeatureSet::all_enabled()
FeatureSet::all_enabled().runtime_features()
};
let mut mollusk = Mollusk {
feature_set,
Expand Down Expand Up @@ -359,7 +359,7 @@ async fn batch_transfer() {
// Expected to succeed.

mollusk().process_and_validate_instruction_chain(
&[(&instruction, &[Check::success(), Check::all_rent_exempt()])],
&[(&instruction, &[Check::success()])],
&[
(source_account_key, source_account),
(destination_account_key, destination_account),
Expand Down Expand Up @@ -419,10 +419,7 @@ async fn batch_fail_transfer_with_invalid_program_owner() {
mollusk().process_and_validate_instruction_chain(
&[(
&instruction,
&[
Check::err(ProgramError::IncorrectProgramId),
Check::all_rent_exempt(),
],
&[Check::err(ProgramError::IncorrectProgramId)],
)],
&[
(source_account_key, source_account),
Expand Down Expand Up @@ -487,10 +484,7 @@ async fn batch_fail_transfer_checked_with_invalid_program_owner() {
mollusk().process_and_validate_instruction_chain(
&[(
&instruction,
&[
Check::err(ProgramError::IncorrectProgramId),
Check::all_rent_exempt(),
],
&[Check::err(ProgramError::IncorrectProgramId)],
)],
&[
(source_account_key, source_account),
Expand Down Expand Up @@ -576,10 +570,7 @@ async fn batch_fail_swap_tokens_with_invalid_program_owner() {
mollusk().process_and_validate_instruction_chain(
&[(
&instruction,
&[
Check::err(ProgramError::IncorrectProgramId),
Check::all_rent_exempt(),
],
&[Check::err(ProgramError::IncorrectProgramId)],
)],
&[
(account_a_key, account_a),
Expand Down Expand Up @@ -647,10 +638,7 @@ async fn batch_fail_mint_to_with_invalid_program_owner() {
mollusk().process_and_validate_instruction_chain(
&[(
&instruction,
&[
Check::err(ProgramError::IncorrectProgramId),
Check::all_rent_exempt(),
],
&[Check::err(ProgramError::IncorrectProgramId)],
)],
&[
(mint_key, mint),
Expand Down Expand Up @@ -742,10 +730,7 @@ async fn batch_fail_burn_with_invalid_program_owner() {
mollusk().process_and_validate_instruction_chain(
&[(
&instruction,
&[
Check::err(ProgramError::IncorrectProgramId),
Check::all_rent_exempt(),
],
&[Check::err(ProgramError::IncorrectProgramId)],
)],
&[
(mint_key, mint),
Expand Down
2 changes: 1 addition & 1 deletion pinocchio/program/tests/sync_native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ fn sync_native_with_rent_change() {
// Executes the sync_native instruction.

let mut rent = Rent::default();
rent.lamports_per_byte_year *= 2;
rent.lamports_per_byte *= 2;

let space = size_of::<TokenAccount>();
let new_rent_exempt_reserve = rent.minimum_balance(space);
Expand Down
3 changes: 2 additions & 1 deletion pinocchio/program/tests/unwrap_lamports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ use {
},
},
solana_account::Account,
solana_instruction::{error::InstructionError, AccountMeta, Instruction},
solana_instruction::{AccountMeta, Instruction},
solana_instruction_error::InstructionError,
solana_program_error::ProgramError,
solana_program_pack::Pack,
solana_pubkey::Pubkey,
Expand Down
2 changes: 1 addition & 1 deletion pinocchio/program/tests/withdraw_excess_lamports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use {
assert_matches::assert_matches,
pinocchio_token_interface::state::{account::Account, mint::Mint, multisig::Multisig},
setup::{mint, TOKEN_PROGRAM_ID},
solana_instruction::error::InstructionError,
solana_instruction_error::InstructionError,
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, BanksClientError, ProgramTest},
Expand Down
2 changes: 1 addition & 1 deletion program/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ mollusk-svm = { workspace = true }
mollusk-svm-fuzz-fixture = { workspace = true }
proptest = "1.5"
serial_test = "3.2.0"
solana-account = "3.0.0"
solana-account = "5.0.0"
solana-account-info = "3.0.0"
solana-clock = "3.0.0"
solana-native-token = "3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions program/tests/assert_instruction_count.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fn initialize_mint() {
let mint_account = {
let space = Mint::LEN;
let lamports = mollusk.sysvars.rent.minimum_balance(space);
SolanaAccount::new(lamports, space, &id())
SolanaAccount::new_with_data(lamports, vec![0; space], &id())
};

mollusk.process_and_validate_instruction(
Expand Down Expand Up @@ -57,7 +57,7 @@ fn initialize_account() {
let token_account = {
let space = Account::LEN;
let lamports = mollusk.sysvars.rent.minimum_balance(space);
SolanaAccount::new(lamports, space, &id())
SolanaAccount::new_with_data(lamports, vec![0; space], &id())
};

mollusk.process_and_validate_instruction(
Expand Down
6 changes: 4 additions & 2 deletions program/tests/close_account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ fn success_init_after_close_account() {
let destination = Pubkey::new_unique();
let decimals = 9;

let owner_account = SolanaAccount::new(1_000_000_000, 0, &system_program::id());
let owner_account =
SolanaAccount::new_with_data(1_000_000_000, vec![0; 0], &system_program::id());
let mint_account = setup::setup_mint_account(None, None, 0, decimals);
let token_account = setup::setup_token_account(&mint, &owner, 0);

Expand Down Expand Up @@ -92,7 +93,8 @@ fn fail_init_after_close_account() {
let destination = Pubkey::new_unique();
let decimals = 9;

let owner_account = SolanaAccount::new(1_000_000_000, 0, &system_program::id());
let owner_account =
SolanaAccount::new_with_data(1_000_000_000, vec![0; 0], &system_program::id());
let mint_account = setup::setup_mint_account(None, None, 0, decimals);
let token_account = setup::setup_token_account(&mint, &owner, 0);

Expand Down
Loading
Loading