Merge branch 'solana-developers:main' into litesvm/hello-solana

Author: Perelyn-sama

.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

Cargo.lock

@@ -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();
 

basics/account-data/native/program/tests/tests.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();
 

basics/checking-accounts/native/program/tests/test.rs

@@ -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();

basics/checking-accounts/native/tests/test.ts

@@ -6,13 +6,26 @@ edition = "2021"
 [features]
 no-entrypoint = []
 cpi = ["no-entrypoint"]
+custom-heap = []
+custom-panic = []
 
 [dependencies]
 borsh = "1.5.7"
 borsh-derive = "1.5.7"
 solana-program = "3.0"
 cross-program-invocatio-native-lever = { path = "../lever", features = ["cpi"] }
 
-
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[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"
+solana-system-interface = {version = "2.0.0", features = ["bincode"]}
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] }

basics/cross-program-invocation/native/programs/hand/Cargo.toml

@@ -0,0 +1,73 @@
+use cross_program_invocatio_native_lever::{PowerStatus, SetPowerStatus};
+use litesvm::LiteSVM;
+use solana_instruction::{AccountMeta, Instruction};
+use solana_keypair::{Keypair, Signer};
+use solana_native_token::LAMPORTS_PER_SOL;
+use solana_pubkey::Pubkey;
+use solana_transaction::Transaction;
+
+#[test]
+fn test_cpi() {
+    let hand_program_id = Pubkey::new_unique();
+    let lever_program_id = Pubkey::new_unique();
+    let hand_program_bytes =
+        include_bytes!("../../../target/deploy/cross_program_invocatio_native_hand.so");
+    let lever_program_bytes =
+        include_bytes!("../../../target/deploy/cross_program_invocatio_native_lever.so");
+
+    let payer = Keypair::new();
+    let power_account = Keypair::new();
+
+    let mut svm = LiteSVM::new();
+
+    svm.add_program(hand_program_id, hand_program_bytes)
+        .unwrap();
+    svm.add_program(lever_program_id, lever_program_bytes)
+        .unwrap();
+
+    svm.airdrop(&payer.pubkey(), LAMPORTS_PER_SOL * 10).unwrap();
+
+    let data = borsh::to_vec(&PowerStatus { is_on: true }).unwrap();
+
+    let initiate_lever_ix = Instruction {
+        program_id: lever_program_id,
+        accounts: vec![
+            AccountMeta::new(power_account.pubkey(), true),
+            AccountMeta::new(payer.pubkey(), true),
+            AccountMeta::new(solana_system_interface::program::ID, false),
+        ],
+        data,
+    };
+
+    let tx = Transaction::new_signed_with_payer(
+        &[initiate_lever_ix],
+        Some(&payer.pubkey()),
+        &[&payer, &power_account],
+        svm.latest_blockhash(),
+    );
+
+    let _ = svm.send_transaction(tx).is_ok();
+
+    let data = borsh::to_vec(&SetPowerStatus {
+        name: "Chris".to_string(),
+    })
+    .unwrap();
+
+    let pull_lever_ix = Instruction {
+        program_id: hand_program_id,
+        accounts: vec![
+            AccountMeta::new(power_account.pubkey(), false),
+            AccountMeta::new(lever_program_id, false),
+        ],
+        data,
+    };
+
+    let tx = Transaction::new_signed_with_payer(
+        &[pull_lever_ix],
+        Some(&payer.pubkey()),
+        &[&payer],
+        svm.latest_blockhash(),
+    );
+
+    let _ = svm.send_transaction(tx).is_ok();
+}

basics/cross-program-invocation/native/programs/hand/tests/test.rs

@@ -6,6 +6,8 @@ edition = "2021"
 [features]
 no-entrypoint = []
 cpi = ["no-entrypoint"]
+custom-heap = []
+custom-panic = []
 
 [dependencies]
 borsh = "1.5.7"
@@ -15,3 +17,6 @@ solana-system-interface = {version = "2.0.0", features = ["bincode"]}
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] }

basics/cross-program-invocation/native/programs/lever/Cargo.toml

@@ -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();

basics/program-derived-addresses/native/tests/test.ts

@@ -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"