Skip to content

Update workspace dependencies #67

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.

Sign up for GitHub

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

Merged
febo merged 6 commits into from
Jul 9, 2025
Merged

Update workspace dependencies #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fe1d2a
Bump dependencies
febo Jul 1, 2025
b271a7e
Use individual crates
febo Jul 2, 2025
ce76e2d
Add workspace dependencies
febo Jul 2, 2025
145164a
Fix formatting
febo Jul 2, 2025
fb9a0c5
Add allow deprecated
febo Jul 2, 2025
2b7179b
Remove deprecated function usage
joncinque Jul 8, 2025
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,262 changes: 1,352 additions & 910 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,13 @@ config = "scripts/spellcheck.toml"
pre-release-commit-message = "Publish {{crate_name}} v{{version}}"
tag-message = "Publish {{crate_name}} v{{version}}"
consolidate-commits = false

[workspace.dependencies]
num-traits = "0.2"
pinocchio = "0.8.4"
solana-instruction = "2.3.0"
solana-program-error = "2.2.2"
solana-program-option = "2.2.1"
solana-program-pack = "2.2.1"
solana-pubkey = "2.4.0"
solana-system-interface = { version="1.0", features=["bincode"] }
2 changes: 1 addition & 1 deletion interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ readme = "./README.md"
crate-type = ["rlib"]

[dependencies]
pinocchio = "0.8.4"
pinocchio = { workspace = true }
pinocchio-pubkey = "0.2"

[dev-dependencies]
Expand Down
22 changes: 16 additions & 6 deletions p-token/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,27 @@ crate-type = ["cdylib"]
logging = []

[dependencies]
pinocchio = "0.8.4"
pinocchio = { workspace = true }
pinocchio-log = { version = "0.4", default-features = false }
spl-token-interface = { version = "^0", path = "../interface" }

[dev-dependencies]
assert_matches = "1.5.0"
num-traits = "0.2"
solana-program-test = "2.1"
solana-sdk = "2.1"
spl-token = { version="^4", features=["no-entrypoint"] }
spl-token-2022 = { version="^7", features=["no-entrypoint"] }
num-traits = { workspace = true }
solana-instruction = { workspace = true }
solana-keypair = "2.2.3"
solana-program-error = { workspace = true }
solana-program-option = { workspace = true }
solana-program-pack = { workspace = true }
solana-program-test = "2.3.2"
solana-pubkey = { workspace = true }
solana-signature = "2.3.0"
solana-signer = "2.2.1"
solana-transaction = "2.2.3"
solana-transaction-error = "2.2.1"
solana-system-interface = { workspace = true }
spl-token = { version="^8", features=["no-entrypoint"] }
spl-token-2022 = { version="^9", features=["no-entrypoint"] }

[lints]
workspace = true
4 changes: 3 additions & 1 deletion p-token/tests/amount_to_ui_amount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ mod setup;
use {
setup::{mint, TOKEN_PROGRAM_ID},
solana_program_test::{tokio, ProgramTest},
solana_sdk::{pubkey::Pubkey, signature::Signer, transaction::Transaction},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down
11 changes: 5 additions & 6 deletions p-token/tests/approve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ mod setup;

use {
setup::{account, mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down
11 changes: 5 additions & 6 deletions p-token/tests/approve_checked.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ mod setup;

use {
setup::{account, mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down
25 changes: 12 additions & 13 deletions p-token/tests/batch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@ mod setup;

use {
crate::setup::TOKEN_PROGRAM_ID,
solana_instruction::{AccountMeta, Instruction},
solana_keypair::Keypair,
solana_program_error::ProgramError,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
instruction::{AccountMeta, Instruction},
program_error::ProgramError,
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
system_instruction,
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
};

fn batch_instruction(instructions: Vec<Instruction>) -> Result<Instruction, ProgramError> {
Expand Down Expand Up @@ -57,7 +56,7 @@ async fn batch() {
// Create a mint
let mint_a = Keypair::new();
let mint_authority = Keypair::new();
let create_mint_a = system_instruction::create_account(
let create_mint_a = create_account(
&context.payer.pubkey(),
&mint_a.pubkey(),
mint_rent,
Expand All @@ -76,7 +75,7 @@ async fn batch() {
// Create a mint 2 with a freeze authority
let mint_b = Keypair::new();
let freeze_authority = Pubkey::new_unique();
let create_mint_b = system_instruction::create_account(
let create_mint_b = create_account(
&context.payer.pubkey(),
&mint_b.pubkey(),
mint_rent,
Expand All @@ -98,14 +97,14 @@ async fn batch() {
let owner_a_ta_a = Keypair::new();
let owner_b_ta_a = Keypair::new();

let create_owner_a_ta_a = system_instruction::create_account(
let create_owner_a_ta_a = create_account(
&context.payer.pubkey(),
&owner_a_ta_a.pubkey(),
account_rent,
account_len as u64,
&TOKEN_PROGRAM_ID,
);
let create_owner_b_ta_a = system_instruction::create_account(
let create_owner_b_ta_a = create_account(
&context.payer.pubkey(),
&owner_b_ta_a.pubkey(),
account_rent,
Expand Down
11 changes: 5 additions & 6 deletions p-token/tests/burn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ mod setup;

use {
setup::{account, mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down
11 changes: 5 additions & 6 deletions p-token/tests/burn_checked.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ mod setup;

use {
setup::{account, mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down
9 changes: 4 additions & 5 deletions p-token/tests/close_account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ mod setup;

use {
setup::{account, mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
pubkey::Pubkey,
signature::{Keypair, Signer},
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down
9 changes: 4 additions & 5 deletions p-token/tests/freeze_account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ mod setup;

use {
setup::{account, mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_pack::Pack,
signature::{Keypair, Signer},
transaction::Transaction,
},
solana_signer::Signer,
solana_transaction::Transaction,
spl_token::state::AccountState,
};

Expand Down
15 changes: 7 additions & 8 deletions p-token/tests/initialize_account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ mod setup;

use {
setup::{mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
system_instruction,
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down Expand Up @@ -51,7 +50,7 @@ async fn initialize_account() {
// When a new mint account is created and initialized.

let instructions = vec![
system_instruction::create_account(
create_account(
&context.payer.pubkey(),
&account.pubkey(),
rent.minimum_balance(account_size),
Expand Down
15 changes: 7 additions & 8 deletions p-token/tests/initialize_account2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ mod setup;

use {
setup::{mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
system_instruction,
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down Expand Up @@ -51,7 +50,7 @@ async fn initialize_account2() {
// When a new mint account is created and initialized.

let instructions = vec![
system_instruction::create_account(
create_account(
&context.payer.pubkey(),
&account.pubkey(),
rent.minimum_balance(account_size),
Expand Down
15 changes: 7 additions & 8 deletions p-token/tests/initialize_account3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ mod setup;

use {
setup::{mint, TOKEN_PROGRAM_ID},
solana_keypair::Keypair,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
system_instruction,
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
};

#[tokio::test]
Expand Down Expand Up @@ -51,7 +50,7 @@ async fn initialize_account3() {
// When a new mint account is created and initialized.

let instructions = vec![
system_instruction::create_account(
create_account(
&context.payer.pubkey(),
&account.pubkey(),
rent.minimum_balance(account_size),
Expand Down
17 changes: 8 additions & 9 deletions p-token/tests/initialize_mint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ mod setup;

use {
setup::TOKEN_PROGRAM_ID,
solana_keypair::Keypair,
solana_program_option::COption,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_option::COption,
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
system_instruction,
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
spl_token_interface::state::mint::Mint,
std::mem::size_of,
};
Expand Down Expand Up @@ -42,7 +41,7 @@ async fn initialize_mint() {
// When a new mint account is created and initialized.

let instructions = vec![
system_instruction::create_account(
create_account(
&context.payer.pubkey(),
&account.pubkey(),
rent.minimum_balance(account_size),
Expand Down
17 changes: 8 additions & 9 deletions p-token/tests/initialize_mint2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ mod setup;

use {
setup::TOKEN_PROGRAM_ID,
solana_keypair::Keypair,
solana_program_option::COption,
solana_program_pack::Pack,
solana_program_test::{tokio, ProgramTest},
solana_sdk::{
program_option::COption,
program_pack::Pack,
pubkey::Pubkey,
signature::{Keypair, Signer},
system_instruction,
transaction::Transaction,
},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
spl_token_interface::state::mint::Mint,
std::mem::size_of,
};
Expand Down Expand Up @@ -42,7 +41,7 @@ async fn initialize_mint2() {
// When a new mint account is created and initialized.

let instructions = vec![
system_instruction::create_account(
create_account(
&context.payer.pubkey(),
&account.pubkey(),
rent.minimum_balance(account_size),
Expand Down
Loading