Merge pull request #5 from mikemaccana/fix-actions

Fix CI failures: Rust lint, Anchor, and Quasar workflows

Author: mikemaccana

.github/.ghaignore

@@ -29,6 +29,20 @@ tokens/escrow/anchor
 
 # not live
 tokens/token-2022/group/anchor
+tokens/token-2022/group/quasar
+
+# CPI quasar project uses subdirectories (hand/ and lever/) instead of a root Quasar.toml
+basics/cross-program-invocation/quasar
+
+# has Cargo.toml but no Quasar.toml
+tokens/spl-token-minter/quasar
+tokens/external-delegate-token-master/quasar
+tokens/nft-minter/quasar
+tokens/nft-operations/quasar
+tokens/token-swap/quasar
+
+# build failed - outdated quasar-lang API (no AccountView.data, no log_64)
+oracles/pyth/quasar
 
 # error in tests
 tokens/external-delegate-token-master/anchor

.github/workflows/solana-native.yml .github/workflows/native.yml.github/workflows/solana-native.yml renamed to .github/workflows/native.yml

@@ -38,7 +38,7 @@ jobs:
             native:
               - added|modified: '**/native/**'
             workflow:
-              - added|modified: '.github/workflows/solana-native.yml'
+              - added|modified: '.github/workflows/native.yml'
       - name: Analyze Changes
         id: analyze
         run: |

.github/workflows/solana-pinocchio.yml .github/workflows/pinocchio.yml.github/workflows/solana-pinocchio.yml renamed to .github/workflows/pinocchio.yml

@@ -38,7 +38,7 @@ jobs:
             pinocchio:
               - added|modified: '**/pinocchio/**'
             workflow:
-              - added|modified: '.github/workflows/solana-pinocchio.yml'
+              - added|modified: '.github/workflows/pinocchio.yml'
       - name: Analyze Changes
         id: analyze
         run: |

.github/workflows/solana-quasar.yml .github/workflows/quasar.yml.github/workflows/solana-quasar.yml renamed to .github/workflows/quasar.yml

@@ -40,7 +40,7 @@ jobs:
             quasar:
               - added|modified: '**/quasar/**'
             workflow:
-              - added|modified: '.github/workflows/solana-quasar.yml'
+              - added|modified: '.github/workflows/quasar.yml'
       - name: Analyze Changes
         id: analyze
         run: |

.gitignore

@@ -14,7 +14,8 @@ node_modules/
 **/*/.anchor
 **/*/.DS_Store
 **/*/target
-**/*/tests/fixtures
+**/*/tests/fixtures/*
+!**/*/tests/fixtures/*.so
 **/*.rs.bk
 **/*/test-ledger
 **/*/yarn.lock

basics/create-account/anchor/programs/create-system-account/src/lib.rs

@@ -25,8 +25,8 @@ pub mod create_system_account {
                     to: context.accounts.new_account.to_account_info(), // To pubkey
                 },
             ),
-            lamports,                           // Lamports
-            0,                                  // Space
+            lamports,                               // Lamports
+            0,                                      // Space
             &context.accounts.system_program.key(), // Owner Program
         )?;
 

basics/cross-program-invocation/anchor/programs/hand/tests/test_hand.rs

@@ -54,9 +54,13 @@ fn test_pull_lever_cpi() {
     // include_bytes!() runs at compile time, and during `anchor build` the IDL generation
     // step compiles tests before the .so files exist. Since this is a cross-program
     // dependency (not our own program), lever.so may not be built yet at compile time.
-    let lever_bytes = std::fs::read("target/deploy/lever.so").expect("lever.so not found — run `anchor build` first");
+    let lever_bytes = std::fs::read(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/../../target/deploy/lever.so"
+    ))
+    .expect("lever.so not found — run `anchor build` first");
     svm.add_program(hand_program_id, hand_bytes).unwrap();
-    svm.add_program(lever_program_id, lever_bytes).unwrap();
+    svm.add_program(lever_program_id, &lever_bytes).unwrap();
     let payer = create_wallet(&mut svm, 10_000_000_000).unwrap();
 
     let power_keypair = Keypair::new();

basics/pda-rent-payer/anchor/programs/anchor-program-example/src/instructions/create_new_account.rs

@@ -34,8 +34,8 @@ pub fn handle_create_new_account(context: Context<CreateNewAccount>) -> Result<(
             },
         )
         .with_signer(signer_seeds),
-        lamports,                           // Lamports
-        0,                                  // Space
+        lamports,                               // Lamports
+        0,                                      // Space
         &context.accounts.system_program.key(), // Owner Program
     )?;
     Ok(())

basics/program-derived-addresses/anchor/programs/anchor-program-example/src/instructions/increment.rs

@@ -15,7 +15,7 @@ pub struct IncrementPageVisits<'info> {
     page_visits: Account<'info, PageVisits>,
 }
 
-pub fn handle_increment_page_visits(mut context: Context<IncrementPageVisits>) -> Result<()> {
+pub fn handle_increment_page_visits(context: Context<IncrementPageVisits>) -> Result<()> {
     let page_visits = &mut context.accounts.page_visits;
     page_visits.increment();
     Ok(())

tokens/create-token/anchor/prepare.mjs

@@ -7,7 +7,7 @@ import { $ } from "zx";
 const programs = [
   {
     id: "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s",
-    name: "token_metadata.so",
+    name: "mpl_token_metadata.so",
   },
 ];