diff --git a/.github/workflows/solana-native.yml b/.github/workflows/solana-native.yml index 97e89aedb..15affaad9 100644 --- a/.github/workflows/solana-native.yml +++ b/.github/workflows/solana-native.yml @@ -135,7 +135,15 @@ jobs: return 1 fi - # Run Rust unit tests + # Test + if ! pnpm build-and-test; then + echo "::error::tests failed for $project" + echo "$project: tests failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt + cd - > /dev/null + return 1 + fi + + # Run Rust unit tests if [ -d "program" ]; then echo "Running Rust unit tests for $project" if ! cargo test --manifest-path=./program/Cargo.toml; then @@ -146,14 +154,6 @@ jobs: fi fi - # Test - if ! pnpm build-and-test; then - echo "::error::tests failed for $project" - echo "$project: tests failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt - cd - > /dev/null - return 1 - fi - echo "Build and tests succeeded for $project with $solana_version version." cd - > /dev/null return 0 diff --git a/Cargo.lock b/Cargo.lock index 1275e977e..e8bf47fc5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5506,8 +5506,14 @@ version = "0.1.0" dependencies = [ "borsh 1.5.7", "borsh-derive 1.5.7", + "litesvm", + "solana-instruction 3.0.0", + "solana-keypair", + "solana-native-token 3.0.0", "solana-program 3.0.0", + "solana-pubkey 3.0.0", "solana-system-interface 2.0.0", + "solana-transaction", ] [[package]] diff --git a/basics/account-data/native/program/tests/tests.rs b/basics/account-data/native/program/tests/tests.rs index 540d8eb91..25fa5beba 100644 --- a/basics/account-data/native/program/tests/tests.rs +++ b/basics/account-data/native/program/tests/tests.rs @@ -19,8 +19,7 @@ fn test_account_data() { svm.airdrop(&payer.pubkey(), LAMPORTS_PER_SOL * 10).unwrap(); - let program_bytes = - include_bytes!("../../../../../target/deploy/account_data_native_program.so"); + let program_bytes = include_bytes!("../../tests/fixtures/account_data_native_program.so"); svm.add_program(program_id, program_bytes).unwrap(); diff --git a/basics/checking-accounts/native/program/tests/test.rs b/basics/checking-accounts/native/program/tests/test.rs index 133921c25..a9eb81d59 100644 --- a/basics/checking-accounts/native/program/tests/test.rs +++ b/basics/checking-accounts/native/program/tests/test.rs @@ -16,8 +16,7 @@ fn test_checking_accounts() { svm.airdrop(&payer.pubkey(), LAMPORTS_PER_SOL * 10).unwrap(); let program_id = Pubkey::new_unique(); - let program_bytes = - include_bytes!("../../../../../target/deploy/checking_accounts_native_program.so"); + let program_bytes = include_bytes!("../../tests/fixtures/checking_accounts_native_program.so"); svm.add_program(program_id, program_bytes).unwrap(); diff --git a/basics/checking-accounts/native/tests/test.ts b/basics/checking-accounts/native/tests/test.ts index d7102d4f2..8e39eea31 100644 --- a/basics/checking-accounts/native/tests/test.ts +++ b/basics/checking-accounts/native/tests/test.ts @@ -4,7 +4,7 @@ import { start } from 'solana-bankrun'; describe('Checking accounts', async () => { const PROGRAM_ID = PublicKey.unique(); - const context = await start([{ name: 'checking_accounts_program', programId: PROGRAM_ID }], []); + const context = await start([{ name: 'checking_accounts_native_program', programId: PROGRAM_ID }], []); const client = context.banksClient; const payer = context.payer; const rent = await client.getRent(); diff --git a/basics/program-derived-addresses/native/tests/test.ts b/basics/program-derived-addresses/native/tests/test.ts index 0b9aa3747..fb5c99189 100644 --- a/basics/program-derived-addresses/native/tests/test.ts +++ b/basics/program-derived-addresses/native/tests/test.ts @@ -6,7 +6,7 @@ import { start } from 'solana-bankrun'; describe('PDAs', async () => { const PROGRAM_ID = PublicKey.unique(); - const context = await start([{ name: 'program_derived_addresses_program', programId: PROGRAM_ID }], []); + const context = await start([{ name: 'program_derived_addresses_native_program', programId: PROGRAM_ID }], []); const client = context.banksClient; const payer = context.payer; const rent = await client.getRent(); diff --git a/basics/repository-layout/native/program/Cargo.toml b/basics/repository-layout/native/program/Cargo.toml index 9a7842bca..ec568966d 100644 --- a/basics/repository-layout/native/program/Cargo.toml +++ b/basics/repository-layout/native/program/Cargo.toml @@ -12,7 +12,6 @@ solana-program = "2.0" crate-type = ["cdylib", "lib"] [features] -anchor-debug = [] custom-heap = [] custom-panic = [] diff --git a/basics/transfer-sol/native/program/Cargo.toml b/basics/transfer-sol/native/program/Cargo.toml index cb63445f7..821c85031 100644 --- a/basics/transfer-sol/native/program/Cargo.toml +++ b/basics/transfer-sol/native/program/Cargo.toml @@ -13,9 +13,16 @@ solana-system-interface.workspace = true crate-type = ["cdylib", "lib"] [features] -anchor-debug = [] custom-heap = [] custom-panic = [] [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } + +[dev-dependencies] +litesvm = "0.8.1" +solana-instruction = "3.0.0" +solana-keypair = "3.0.1" +solana-native-token = "3.0.0" +solana-pubkey = "3.0.0" +solana-transaction = "3.0.1" diff --git a/basics/transfer-sol/native/program/tests/test.rs b/basics/transfer-sol/native/program/tests/test.rs new file mode 100644 index 000000000..fa7e0a349 --- /dev/null +++ b/basics/transfer-sol/native/program/tests/test.rs @@ -0,0 +1,93 @@ +use litesvm::LiteSVM; +use solana_instruction::{AccountMeta, Instruction}; +use solana_keypair::{Keypair, Signer}; +use solana_program::native_token::LAMPORTS_PER_SOL; +use solana_pubkey::Pubkey; +use solana_system_interface::instruction::create_account; +use solana_transaction::Transaction; +use transfer_sol_program::processor::TransferInstruction; + +#[test] +fn test_transfer_sol() { + let mut svm = LiteSVM::new(); + + let program_id = Pubkey::new_unique(); + let program_bytes = include_bytes!("../../tests/fixtures/transfer_sol_program.so"); + + svm.add_program(program_id, program_bytes).unwrap(); + + let payer = Keypair::new(); + svm.airdrop(&payer.pubkey(), LAMPORTS_PER_SOL * 10).unwrap(); + + let test_recipient1 = Keypair::new(); + let test_recipient2 = Keypair::new(); + let test_recipient3 = Keypair::new(); + + let payer_balance_before = svm.get_balance(&payer.pubkey()).unwrap(); + let recipient_balance_before = svm.get_balance(&test_recipient1.pubkey()).unwrap_or(0); + + let data = borsh::to_vec(&TransferInstruction::CpiTransfer(LAMPORTS_PER_SOL)).unwrap(); + + let ix = Instruction { + program_id, + accounts: vec![ + AccountMeta::new(payer.pubkey(), true), + AccountMeta::new(test_recipient1.pubkey(), false), + AccountMeta::new(solana_system_interface::program::ID, false), + ], + data, + }; + + let tx = Transaction::new_signed_with_payer( + &[ix], + Some(&payer.pubkey()), + &[&payer], + svm.latest_blockhash(), + ); + + let _ = svm.send_transaction(tx).is_ok(); + + let payer_balance_after = svm.get_balance(&payer.pubkey()).unwrap(); + let recipient_balance_after = svm.get_balance(&test_recipient1.pubkey()).unwrap_or(0); + + assert!(payer_balance_before > payer_balance_after); + assert!(recipient_balance_before < recipient_balance_after); + + let create_ix = create_account( + &payer.pubkey(), + &test_recipient2.pubkey(), + 2 * LAMPORTS_PER_SOL, + 0, + &program_id, + ); + + let tx = Transaction::new_signed_with_payer( + &[create_ix], + Some(&payer.pubkey()), + &[&payer, &test_recipient2], + svm.latest_blockhash(), + ); + + let _ = svm.send_transaction(tx).is_ok(); + + let data = borsh::to_vec(&TransferInstruction::ProgramTransfer(LAMPORTS_PER_SOL)).unwrap(); + + let ix = Instruction { + program_id, + accounts: vec![ + AccountMeta::new(test_recipient2.pubkey(), true), + AccountMeta::new(test_recipient3.pubkey(), false), + AccountMeta::new(solana_system_interface::program::ID, false), + ], + data, + }; + + let tx = Transaction::new_signed_with_payer( + &[ix], + Some(&payer.pubkey()), + &[&payer, &test_recipient2], + svm.latest_blockhash(), + ); + + let _ = svm.send_transaction(tx).is_ok(); +}